From 617096a4974fcaf1ac8b3448d03ae3f3059827fe Mon Sep 17 00:00:00 2001 From: Josef Gajdusek Date: Thu, 12 Feb 2015 09:46:14 -0500 Subject: [PATCH] Shortcuts: don't store the contents of the columns in the settings file. Fixes #11820 and #11849. Signed-off-by: Augustin Cavalier --- src/preferences/shortcuts/ShortcutsSpec.cpp | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/src/preferences/shortcuts/ShortcutsSpec.cpp b/src/preferences/shortcuts/ShortcutsSpec.cpp index b4a651b440..3bb63e2263 100644 --- a/src/preferences/shortcuts/ShortcutsSpec.cpp +++ b/src/preferences/shortcuts/ShortcutsSpec.cpp @@ -191,9 +191,8 @@ ShortcutsSpec::ShortcutsSpec(BMessage* from) printf(" Error, no modifiers int32 in archive BMessage!\n"); } - const char* string; - for (int i = 0; (string = from->GetString("strings", i, NULL)); i++) - SetField(new BStringField(string), i); + for (int i = 0; i <= STRING_COLUMN_INDEX; i++) + SetField(new BStringField(GetCellText(i)), i); } @@ -226,12 +225,6 @@ ShortcutsSpec::Archive(BMessage* into, bool deep) const into->AddString("class", "ShortcutsSpec"); - for (int i = 0; i < CountFields(); i++) { - const BStringField* field = - static_cast(GetField(i)); - into->AddString("strings", field->String()); - } - // These fields are for our prefs panel's benefit only into->AddString("command", fCommand); into->AddInt32("key", fKey);