From c5f0c6794d222cdcc70d2b37bdb83be2d2eeb9f4 Mon Sep 17 00:00:00 2001 From: Jekyll Wu Date: Wed, 21 Mar 2012 06:08:23 +0800 Subject: [PATCH] Prefer the convenient methods for accesing profile options --- src/EditProfileDialog.cpp | 3 +-- src/SessionManager.cpp | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/EditProfileDialog.cpp b/src/EditProfileDialog.cpp index eb720641..4c111b2a 100644 --- a/src/EditProfileDialog.cpp +++ b/src/EditProfileDialog.cpp @@ -547,8 +547,7 @@ void EditProfileDialog::updateKeyBindingsList(bool selectCurrentTranslator) if (!_ui->keyBindingList->model()) _ui->keyBindingList->setModel(new QStandardItemModel(this)); - const QString& name = lookupProfile() - ->property(Profile::KeyBindings); + const QString& name = lookupProfile()->keyBindings(); KeyboardTranslatorManager* keyManager = KeyboardTranslatorManager::instance(); const KeyboardTranslator* currentTranslator = keyManager->findTranslator(name); diff --git a/src/SessionManager.cpp b/src/SessionManager.cpp index 28ec6988..bc9988f2 100644 --- a/src/SessionManager.cpp +++ b/src/SessionManager.cpp @@ -123,7 +123,7 @@ SessionManager* SessionManager::instance() Profile::Ptr SessionManager::loadProfile(const QString& shortPath) { // the fallback profile has a 'special' path name, "FALLBACK/" - if (shortPath == _fallbackProfile->property(Profile::Path)) + if (shortPath == _fallbackProfile->path()) return _fallbackProfile; QString path = shortPath; @@ -221,7 +221,7 @@ void SessionManager::sortProfiles(QList& list) for (int i = 0; i < list.size(); ++i) { // dis-regard the fallback profile - if (list.at(i)->path() == _fallbackProfile->property(Profile::Path)) + if (list.at(i)->path() == _fallbackProfile->path()) continue; if (list.at(i)->menuIndexAsInt() == 0)