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

Fix merge & relative path for portable build

Browse source
This commit is contained in:
marco 2015-08-25 20:09:01 +02:00
commit 4125d690fa
33 changed files with 1556 additions and 581 deletions
Download patch file Download diff file Expand all files Collapse all files

4
cockatrice/src/settingscache.h
View file

@ -115,6 +115,8 @@ private:
bool spectatorsCanSeeEverything;
int keepalive;
void translateLegacySettings();
bool rememberGameSettings;
public:
SettingsCache();
QString getSettingsPath();
@ -187,6 +189,7 @@ public:
bool getSpectatorsNeedPassword() const { return spectatorsNeedPassword; }
bool getSpectatorsCanTalk() const { return spectatorsCanTalk; }
bool getSpectatorsCanSeeEverything() const { return spectatorsCanSeeEverything; }
bool getRememberGameSettings() const { return rememberGameSettings; }
int getKeepAlive() const { return keepalive; }
void setClientID(QString clientID);
QString getClientID() { return clientID; }
@ -260,6 +263,7 @@ public slots:
void setSpectatorsNeedPassword(const bool _spectatorsNeedPassword);
void setSpectatorsCanTalk(const bool _spectatorsCanTalk);
void setSpectatorsCanSeeEverything(const bool _spectatorsCanSeeEverything);
void setRememberGameSettings(const bool _rememberGameSettings);
};
extern SettingsCache *settingsCache;