jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-06-11 16:44:48 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Removed 2nd arg from ShortcutsSettings::getShortcut

Browse source
This commit is contained in:
marco 2015-08-16 20:11:17 +02:00
parent 1ca89e0b09
commit d3d6f70496
12 changed files with 117 additions and 196 deletions
Download patch file Download diff file Expand all files Collapse all files

33
cockatrice/src/shortcutssettings.cpp
View file

@ -23,43 +23,20 @@ ShortcutsSettings::ShortcutsSettings(QString settingsPath, QObject *parent) : QO
shortCuts.insert(*it, secuenceList);
}
shortCutsFile.endGroup();
shortCutsFile.beginGroup("Defaults");
const QStringList defaultKeys = shortCutsFile.allKeys();
for(QStringList::const_iterator it = defaultKeys.constBegin(); it != defaultKeys.constEnd(); ++it)
{
QString stringSecuence = shortCutsFile.value(*it).toString();
QList<QKeySequence> secuenceList = parseSecuenceString(stringSecuence);
defaultShortCuts.insert(*it, secuenceList);
}
shortCutsFile.endGroup();
}
}
QList<QKeySequence> ShortcutsSettings::getShortcut(QString name, QList<QKeySequence> defaultShortCut)
QList<QKeySequence> ShortcutsSettings::getShortcut(QString name)
{
if(shortCuts.contains(name))
return shortCuts.value(name);
setShortcuts(name, defaultShortCut);
defaultShortCuts[name] = defaultShortCut;
QSettings shortCutsFile(settingsFilePath, QSettings::IniFormat);
shortCutsFile.beginGroup("Defaults");
shortCutsFile.setValue(name, stringifySecuence(defaultShortCut));
shortCutsFile.endGroup();
return defaultShortCut;
return defaultShortCuts.value(name, QList<QKeySequence>());
}
QList<QKeySequence> ShortcutsSettings::getShortcut(QString name, QKeySequence defaultShortCut)
QKeySequence ShortcutsSettings::getSingleShortcut(QString name)
{
return getShortcut(name, QList<QKeySequence>() << defaultShortCut);
}
QKeySequence ShortcutsSettings::getSingleShortcut(QString name, QKeySequence defaultShortCut)
{
return getShortcut(name,defaultShortCut).at(0);
return getShortcut(name).at(0);
}
QString ShortcutsSettings::getDefaultShortcutString(QString name)
@ -244,5 +221,7 @@ void ShortcutsSettings::fillDefaultShorcuts()
defaultShortCuts["Player/phase7"] = parseSecuenceString("");
defaultShortCuts["Player/phase8"] = parseSecuenceString("");
defaultShortCuts["Player/phase9"] = parseSecuenceString("F9");
defaultShortCuts["tab_room/aClearChat"] = parseSecuenceString("F12");
defaultShortCuts["DlgLoadDeckFromClipboard/refreshButton"] = parseSecuenceString("F5");
}