Allow the use of synonyms in settings. Refactor settings.

Remove a bunch of obsolete/unused code.
This commit is contained in:
Petr Mrázek
2014-01-01 15:08:40 +01:00
parent 6648c7ad90
commit 396e63500e
24 changed files with 232 additions and 643 deletions

View File

@ -42,10 +42,10 @@ IconList::IconList(QObject *parent) : QAbstractListModel(parent)
connect(m_watcher.get(), SIGNAL(directoryChanged(QString)),
SLOT(directoryChanged(QString)));
connect(m_watcher.get(), SIGNAL(fileChanged(QString)), SLOT(fileChanged(QString)));
auto setting = MMC->settings()->getSetting("IconsDir");
QString path = setting->get().toString();
connect(setting, SIGNAL(settingChanged(const Setting &, QVariant)),
connect(setting.get(), SIGNAL(settingChanged(const Setting &, QVariant)),
SLOT(settingChanged(const Setting &, QVariant)));
directoryChanged(path);
}
@ -145,7 +145,7 @@ void IconList::fileChanged(const QString &path)
void IconList::settingChanged(const Setting &setting, QVariant value)
{
if(setting.configKey() != "IconsDir")
if(setting.id() != "IconsDir")
return;
directoryChanged(value.toString());