eeva/jamulus
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

move vecWindowPosMain in the settings base class

Browse source
This commit is contained in:
Volker Fischer 2020-07-09 18:19:33 +02:00
parent d0f4b9b6a0
commit 8cd4f5b3e8
1 changed files with 7 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/settings.h
View file

@ -40,6 +40,7 @@ class CSettings
{ {
public: public:
CSettings() : CSettings() :
vecWindowPosMain ( ), // empty array
strLanguage ( "" ), strLanguage ( "" ),
strFileName ( "" ) {} strFileName ( "" ) {}
@ -47,6 +48,7 @@ public:
void Save(); void Save();
// common settings // common settings
QByteArray vecWindowPosMain;
QString strLanguage; QString strLanguage;
protected: protected:
@ -126,7 +128,6 @@ public:
vstrIPAddress ( MAX_NUM_SERVER_ADDR_ITEMS, "" ), vstrIPAddress ( MAX_NUM_SERVER_ADDR_ITEMS, "" ),
iNewClientFaderLevel ( 100 ), iNewClientFaderLevel ( 100 ),
bConnectDlgShowAllMusicians ( true ), bConnectDlgShowAllMusicians ( true ),
vecWindowPosMain ( ), // empty array
vecWindowPosSettings ( ), // empty array vecWindowPosSettings ( ), // empty array
vecWindowPosChat ( ), // empty array vecWindowPosChat ( ), // empty array
vecWindowPosProfile ( ), // empty array vecWindowPosProfile ( ), // empty array
@ -150,7 +151,6 @@ public:
bool bConnectDlgShowAllMusicians; bool bConnectDlgShowAllMusicians;
// window position/state settings // window position/state settings
QByteArray vecWindowPosMain;
QByteArray vecWindowPosSettings; QByteArray vecWindowPosSettings;
QByteArray vecWindowPosChat; QByteArray vecWindowPosChat;
QByteArray vecWindowPosProfile; QByteArray vecWindowPosProfile;
@ -173,13 +173,9 @@ class CServerSettings : public CSettings
public: public:
CServerSettings ( CServer* pNSerP, const QString& sNFiName ) : CServerSettings ( CServer* pNSerP, const QString& sNFiName ) :
CSettings ( ), CSettings ( ),
vecWindowPosMain ( ), // empty array
pServer ( pNSerP ) pServer ( pNSerP )
{ SetFileName ( sNFiName, DEFAULT_INI_FILE_NAME_SERVER); } { SetFileName ( sNFiName, DEFAULT_INI_FILE_NAME_SERVER); }
// window position/state settings
QByteArray vecWindowPosMain;
protected: protected:
virtual void ReadFromXML ( const QDomDocument& IniXMLDocument ) override; virtual void ReadFromXML ( const QDomDocument& IniXMLDocument ) override;
virtual void WriteToXML ( QDomDocument& IniXMLDocument ) override; virtual void WriteToXML ( QDomDocument& IniXMLDocument ) override;