diff options
| author | Fabian Schillinger | 2010-07-10 02:14:20 +0200 |
|---|---|---|
| committer | Fabian Schillinger | 2010-07-10 02:14:20 +0200 |
| commit | 99021fc683c36f57fdad8dc812e2267fca4cbcf7 (patch) | |
| tree | 5fd77585e4e5dbd171427186e4c31ad09ca18e68 /src/pvs.h | |
| parent | Inserted some Buttons in GUI and TouchGUI and modified handling of commands i... (diff) | |
| parent | Configuration by pvs via D-Bus. Old .allow ist now deprecated, config file: .... (diff) | |
| download | pvs-99021fc683c36f57fdad8dc812e2267fca4cbcf7.tar.gz pvs-99021fc683c36f57fdad8dc812e2267fca4cbcf7.tar.xz pvs-99021fc683c36f57fdad8dc812e2267fca4cbcf7.zip | |
Merge branch 'master' of openslx.org:pvs
Conflicts:
i18n/pvs_ar_JO.ts
i18n/pvs_de_DE.ts
i18n/pvs_es_MX.ts
i18n/pvs_fr_FR.ts
i18n/pvs_pl_PL.ts
Diffstat (limited to 'src/pvs.h')
| -rw-r--r-- | src/pvs.h | 7 |
1 files changed, 5 insertions, 2 deletions
@@ -80,6 +80,9 @@ public Q_SLOTS: QStringList getAvailableHosts(); QString getIpByNick(QString nick); + void setConfigValue(QString key, QString value); + QString getConfigValue(QString key); + Q_SIGNALS: void project(QString host, int port, QString passwd, bool fullscreen, bool smoothTransformation, int quality); @@ -131,8 +134,6 @@ private: PVSServerConnection* _pvsServerConnection; ///< our tcp connection object to the pvsserver - QSettings _settings; - PVSServiceDiscovery *_sdClient; PVSChatClient *_chat; @@ -142,5 +143,7 @@ private: int _timerLockTest; int _timerLockDelay; + QSettings _settings; + }; #endif /* PVSCLIENT_H_ */ |