From 8cd4f5b3e8541009e5d67ceb4f014b68f3b574cd Mon Sep 17 00:00:00 2001 From: Volker Fischer Date: Thu, 9 Jul 2020 18:19:33 +0200 Subject: [PATCH] move vecWindowPosMain in the settings base class --- src/settings.h | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/src/settings.h b/src/settings.h index 4884c5f9..0c1d9122 100755 --- a/src/settings.h +++ b/src/settings.h @@ -40,14 +40,16 @@ class CSettings { public: CSettings() : - strLanguage ( "" ), - strFileName ( "" ) {} + vecWindowPosMain ( ), // empty array + strLanguage ( "" ), + strFileName ( "" ) {} void Load(); void Save(); // common settings - QString strLanguage; + QByteArray vecWindowPosMain; + QString strLanguage; protected: virtual void ReadFromXML ( const QDomDocument& IniXMLDocument ) = 0; @@ -126,7 +128,6 @@ public: vstrIPAddress ( MAX_NUM_SERVER_ADDR_ITEMS, "" ), iNewClientFaderLevel ( 100 ), bConnectDlgShowAllMusicians ( true ), - vecWindowPosMain ( ), // empty array vecWindowPosSettings ( ), // empty array vecWindowPosChat ( ), // empty array vecWindowPosProfile ( ), // empty array @@ -150,7 +151,6 @@ public: bool bConnectDlgShowAllMusicians; // window position/state settings - QByteArray vecWindowPosMain; QByteArray vecWindowPosSettings; QByteArray vecWindowPosChat; QByteArray vecWindowPosProfile; @@ -172,14 +172,10 @@ class CServerSettings : public CSettings { public: CServerSettings ( CServer* pNSerP, const QString& sNFiName ) : - CSettings ( ), - vecWindowPosMain ( ), // empty array - pServer ( pNSerP ) + CSettings ( ), + pServer ( pNSerP ) { SetFileName ( sNFiName, DEFAULT_INI_FILE_NAME_SERVER); } - // window position/state settings - QByteArray vecWindowPosMain; - protected: virtual void ReadFromXML ( const QDomDocument& IniXMLDocument ) override; virtual void WriteToXML ( QDomDocument& IniXMLDocument ) override;