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

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

19
servatrice/src/settingscache.h
View file

@ -1,21 +1,28 @@
#ifndef SERVATRICE_SETTINGSCACHE_H
#define SERVATRICE_SETTINGSCACHE_H
#include <QSettings>
#include <QString>
#include <QList>
#include <QRegExp>
#include <QSettings>
#include <QString>
class SettingsCache : public QSettings {
class SettingsCache : public QSettings
{
Q_OBJECT
private:
QSettings *settings;
bool isPortableBuild;
public:
SettingsCache(const QString & fileName="servatrice.ini", QSettings::Format format=QSettings::IniFormat, QObject * parent = 0);
static QString guessConfigurationPath(QString & specificPath);
SettingsCache(const QString &fileName = "servatrice.ini",
QSettings::Format format = QSettings::IniFormat,
QObject *parent = 0);
static QString guessConfigurationPath(QString &specificPath);
QList<QRegExp> disallowedRegExp;
bool getIsPortableBuild() const { return isPortableBuild; }
bool getIsPortableBuild() const
{
return isPortableBuild;
}
};
extern SettingsCache *settingsCache;