jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-06-12 17:14:52 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Clang-format (#3028)

Browse source 
* 1/3 Add .clang-format file and travis compilation check

* 2/3 Run clang-format

* 3/3 Fix compilation problems due to include reordering

* 3bis/3 AfterControlStatement: false
This commit is contained in:
ctrlaltca 2018-01-27 10:41:32 +01:00 • committed by GitHub
parent 8dbdd24c8e
commit b29bd9e070
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
272 changed files with 13378 additions and 9535 deletions
Download patch file Download diff file Expand all files Collapse all files

45
cockatrice/src/shortcutssettings.cpp
View file

@ -8,19 +8,17 @@ ShortcutsSettings::ShortcutsSettings(QString settingsPath, QObject *parent) : QO
this->settingsFilePath = std::move(settingsPath);
this->settingsFilePath.append("shortcuts.ini");
fillDefaultShorcuts();
shortCuts = QMap<QString,QList<QKeySequence> >(defaultShortCuts);
shortCuts = QMap<QString, QList<QKeySequence>>(defaultShortCuts);
bool exists = QFile(settingsFilePath).exists();
QSettings shortCutsFile(settingsFilePath, QSettings::IniFormat);
if (exists)
{
if (exists) {
shortCutsFile.beginGroup("Custom");
const QStringList customKeys = shortCutsFile.allKeys();
for(QStringList::const_iterator it = customKeys.constBegin(); it != customKeys.constEnd(); ++it)
{
for (QStringList::const_iterator it = customKeys.constBegin(); it != customKeys.constEnd(); ++it) {
QString stringSequence = shortCutsFile.value(*it).toString();
QList<QKeySequence> SequenceList = parseSequenceString(stringSequence);
shortCuts.insert(*it, SequenceList);
@ -32,8 +30,7 @@ ShortcutsSettings::ShortcutsSettings(QString settingsPath, QObject *parent) : QO
QList<QKeySequence> ShortcutsSettings::getShortcut(QString name)
{
if (shortCuts.contains(name))
{
if (shortCuts.contains(name)) {
return shortCuts.value(name);
}
@ -58,11 +55,9 @@ QString ShortcutsSettings::getShortcutString(QString name)
QString ShortcutsSettings::stringifySequence(QList<QKeySequence> Sequence) const
{
QString stringSequence;
for (int i=0; i < Sequence.size(); ++i)
{
for (int i = 0; i < Sequence.size(); ++i) {
stringSequence.append(Sequence.at(i).toString(QKeySequence::PortableText));
if (i < Sequence.size() - 1)
{
if (i < Sequence.size() - 1) {
stringSequence.append(";");
}
}
@ -74,8 +69,7 @@ QList<QKeySequence> ShortcutsSettings::parseSequenceString(QString stringSequenc
{
QStringList Sequences = stringSequence.split(";");
QList<QKeySequence> SequenceList;
for (QStringList::const_iterator ss = Sequences.constBegin(); ss != Sequences.constEnd(); ++ss)
{
for (QStringList::const_iterator ss = Sequences.constBegin(); ss != Sequences.constEnd(); ++ss) {
SequenceList.append(QKeySequence(*ss, QKeySequence::PortableText));
}
@ -111,16 +105,12 @@ bool ShortcutsSettings::isValid(QString name, QString Sequences)
QString checkSequence = Sequences.split(";").last();
QList<QString> allKeys = shortCuts.keys();
for (const auto &key : allKeys)
{
if (key.startsWith(checkKey) || key.startsWith("MainWindow") || checkKey.startsWith("MainWindow"))
{
for (const auto &key : allKeys) {
if (key.startsWith(checkKey) || key.startsWith("MainWindow") || checkKey.startsWith("MainWindow")) {
QString storedSequence = stringifySequence(shortCuts.value(key));
QStringList stringSequences = storedSequence.split(";");
for (int j = 0; j < stringSequences.size(); j++)
{
if (checkSequence == stringSequences.at(j))
{
for (int j = 0; j < stringSequences.size(); j++) {
if (checkSequence == stringSequences.at(j)) {
return false;
}
}
@ -131,17 +121,15 @@ bool ShortcutsSettings::isValid(QString name, QString Sequences)
void ShortcutsSettings::resetAllShortcuts()
{
for (auto it = defaultShortCuts.begin(); it != defaultShortCuts.end(); ++it)
{
setShortcuts(it.key(), it.value());
}
emit allShortCutsReset();
for (auto it = defaultShortCuts.begin(); it != defaultShortCuts.end(); ++it) {
setShortcuts(it.key(), it.value());
}
emit allShortCutsReset();
}
void ShortcutsSettings::clearAllShortcuts()
{
for(auto it = shortCuts.begin(); it != shortCuts.end(); ++it)
{
for (auto it = shortCuts.begin(); it != shortCuts.end(); ++it) {
setShortcuts(it.key(), "");
}
emit allShortCutsClear();
@ -254,7 +242,6 @@ void ShortcutsSettings::fillDefaultShorcuts()
defaultShortCuts["Player/phase8"] = parseSequenceString("");
defaultShortCuts["Player/phase9"] = parseSequenceString("F9");
defaultShortCuts["Player/aIncCounter_w"] = parseSequenceString("");
defaultShortCuts["Player/aDecCounter_w"] = parseSequenceString("");
defaultShortCuts["Player/aSetCounter_w"] = parseSequenceString("");