Funkwhale/Clementine-audio-player-Mac-Linux-Windows
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Use settings.remove("") instead of foreach

Browse Source
This commit is contained in:
Bartłomiej Burdukiewicz 2010-08-28 19:31:38 +00:00
parent d87733b005
commit a3e6a302c6
2 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/ui/wiimotedevshortcutsconfig.cpp
View File

@ -123,6 +123,7 @@ WiimotedevShortcutsConfig::WiimotedevShortcutsConfig(QWidget* parent)
void WiimotedevShortcutsConfig::LoadSettings(){ void WiimotedevShortcutsConfig::LoadSettings(){
settings_.beginGroup(WiimotedevShortcuts::kActionsGroup); settings_.beginGroup(WiimotedevShortcuts::kActionsGroup);
settings_.sync();
ui_->list->clear(); ui_->list->clear();
quint64 fvalue, svalue; quint64 fvalue, svalue;
@ -147,9 +148,8 @@ void WiimotedevShortcutsConfig::LoadSettings(){
void WiimotedevShortcutsConfig::DefaultSettings() void WiimotedevShortcutsConfig::DefaultSettings()
{ {
settings_.beginGroup(WiimotedevShortcuts::kActionsGroup); settings_.beginGroup(WiimotedevShortcuts::kActionsGroup);
foreach (const QString& key, settings_.allKeys()) { settings_.sync();
settings_.remove(key); settings_.remove("");
}
settings_.setValue(QString::number(WIIMOTE_BTN_LEFT), WiimotedevShortcuts::PlayerPreviousTrack); settings_.setValue(QString::number(WIIMOTE_BTN_LEFT), WiimotedevShortcuts::PlayerPreviousTrack);
settings_.setValue(QString::number(WIIMOTE_BTN_RIGHT), WiimotedevShortcuts::PlayerNextTrack); settings_.setValue(QString::number(WIIMOTE_BTN_RIGHT), WiimotedevShortcuts::PlayerNextTrack);
settings_.setValue(QString::number(WIIMOTE_BTN_SHIFT_LEFT), WiimotedevShortcuts::PlayerPreviousTrack); settings_.setValue(QString::number(WIIMOTE_BTN_SHIFT_LEFT), WiimotedevShortcuts::PlayerPreviousTrack);
@ -159,7 +159,6 @@ void WiimotedevShortcutsConfig::DefaultSettings()
settings_.setValue(QString::number(WIIMOTE_BTN_1), WiimotedevShortcuts::PlayerTogglePause); settings_.setValue(QString::number(WIIMOTE_BTN_1), WiimotedevShortcuts::PlayerTogglePause);
settings_.setValue(QString::number(WIIMOTE_BTN_2), WiimotedevShortcuts::PlayerShowOSD); settings_.setValue(QString::number(WIIMOTE_BTN_2), WiimotedevShortcuts::PlayerShowOSD);
settings_.endGroup(); settings_.endGroup();
settings_.sync();
LoadSettings(); LoadSettings();
} }

10
src/wiimotedev/shortcuts.cpp
View File

@ -45,6 +45,7 @@ WiimotedevShortcuts::WiimotedevShortcuts(Player* player, QObject* parent)
void WiimotedevShortcuts::ReloadSettings() { void WiimotedevShortcuts::ReloadSettings() {
settings_.beginGroup(WiimotedevShortcuts::kActionsGroup); settings_.beginGroup(WiimotedevShortcuts::kActionsGroup);
settings_.sync();
actions_.clear(); actions_.clear();
if (!settings_.allKeys().count()) { if (!settings_.allKeys().count()) {
@ -77,9 +78,7 @@ void WiimotedevShortcuts::SetDefaultSettings()
{ {
QSettings settings; QSettings settings;
settings.beginGroup(WiimotedevShortcuts::kActionsGroup); settings.beginGroup(WiimotedevShortcuts::kActionsGroup);
foreach (const QString& key, settings_.allKeys()) { settings.remove("");
settings_.remove(key);
}
settings.setValue(QString::number(WIIMOTE_BTN_LEFT), PlayerPreviousTrack); settings.setValue(QString::number(WIIMOTE_BTN_LEFT), PlayerPreviousTrack);
settings.setValue(QString::number(WIIMOTE_BTN_RIGHT), PlayerNextTrack); settings.setValue(QString::number(WIIMOTE_BTN_RIGHT), PlayerNextTrack);
settings.setValue(QString::number(WIIMOTE_BTN_SHIFT_LEFT), PlayerPreviousTrack); settings.setValue(QString::number(WIIMOTE_BTN_SHIFT_LEFT), PlayerPreviousTrack);
@ -91,16 +90,13 @@ void WiimotedevShortcuts::SetDefaultSettings()
settings.endGroup(); settings.endGroup();
settings.beginGroup(WiimotedevShortcuts::kSettingsGroup); settings.beginGroup(WiimotedevShortcuts::kSettingsGroup);
foreach (const QString& key, settings_.allKeys()) { settings.remove("");
settings_.remove(key);
}
settings.setValue("enabled", true); settings.setValue("enabled", true);
settings.setValue("device", 1); settings.setValue("device", 1);
settings.setValue("use_active_action", true); settings.setValue("use_active_action", true);
settings.setValue("only_when_focused", false); settings.setValue("only_when_focused", false);
settings.setValue("use_notification", true); settings.setValue("use_notification", true);
settings.endGroup(); settings.endGroup();
settings.sync();
} }
void WiimotedevShortcuts::DbusWiimoteGeneralButtons(quint32 id, quint64 value) { void WiimotedevShortcuts::DbusWiimoteGeneralButtons(quint32 id, quint64 value) {