new settings classes for client and server, derived from a common base class

Author: corrados

src/clientdlg.cpp

@@ -26,14 +26,14 @@
 
 
 /* Implementation *************************************************************/
-CClientDlg::CClientDlg ( CClient*        pNCliP,
-                         CSettings*      pNSetP,
-                         const QString&  strConnOnStartupAddress,
-                         const int       iCtrlMIDIChannel,
-                         const bool      bNewShowComplRegConnList,
-                         const bool      bShowAnalyzerConsole,
-                         QWidget*        parent,
-                         Qt::WindowFlags f ) :
+CClientDlg::CClientDlg ( CClient*         pNCliP,
+                         CClientSettings* pNSetP,
+                         const QString&   strConnOnStartupAddress,
+                         const int        iCtrlMIDIChannel,
+                         const bool       bNewShowComplRegConnList,
+                         const bool       bShowAnalyzerConsole,
+                         QWidget*         parent,
+                         Qt::WindowFlags  f ) :
     QDialog             ( parent, f ),
     pClient             ( pNCliP ),
     pSettings           ( pNSetP ),

src/clientdlg.h

@@ -72,14 +72,14 @@ class CClientDlg : public QDialog, private Ui_CClientDlgBase
     Q_OBJECT
 
 public:
-    CClientDlg ( CClient*        pNCliP,
-                 CSettings*      pNSetP,
-                 const QString&  strConnOnStartupAddress,
-                 const int       iCtrlMIDIChannel,
-                 const bool      bNewShowComplRegConnList,
-                 const bool      bShowAnalyzerConsole,
-                 QWidget*        parent = nullptr,
-                 Qt::WindowFlags f = nullptr );
+    CClientDlg ( CClient*         pNCliP,
+                 CClientSettings* pNSetP,
+                 const QString&   strConnOnStartupAddress,
+                 const int        iCtrlMIDIChannel,
+                 const bool       bNewShowComplRegConnList,
+                 const bool       bShowAnalyzerConsole,
+                 QWidget*         parent = nullptr,
+                 Qt::WindowFlags  f = nullptr );
 
 protected:
     void               SetGUIDesign ( const EGUIDesign eNewDesign );
@@ -96,7 +96,7 @@ class CClientDlg : public QDialog, private Ui_CClientDlgBase
     void               Disconnect();
 
     CClient*           pClient;
-    CSettings*         pSettings;
+    CClientSettings*   pSettings;
 
     bool               bConnected;
     bool               bConnectDlgWasShown;

src/main.cpp

@@ -617,7 +617,7 @@ int main ( int argc, char** argv )
                              strClientName );
 
             // load settings from init-file
-            CSettings Settings ( &Client, strIniFileName );
+            CClientSettings Settings ( &Client, strIniFileName );
             Settings.Load();
 
 #ifndef HEADLESS
@@ -670,7 +670,7 @@ int main ( int argc, char** argv )
             if ( bUseGUI )
             {
                 // load settings from init-file
-                CSettings Settings ( &Server, strIniFileName );
+                CServerSettings Settings ( &Server, strIniFileName );
                 Settings.Load();
 
                 // update server list AFTER restoring the settings from the

src/serverdlg.cpp

@@ -26,11 +26,11 @@
 
 
 /* Implementation *************************************************************/
-CServerDlg::CServerDlg ( CServer*        pNServP,
-                         CSettings*      pNSetP,
-                         const bool      bStartMinimized,
-                         QWidget*        parent,
-                         Qt::WindowFlags f )
+CServerDlg::CServerDlg ( CServer*         pNServP,
+                         CServerSettings* pNSetP,
+                         const bool       bStartMinimized,
+                         QWidget*         parent,
+                         Qt::WindowFlags  f )
     : QDialog                  ( parent, f ),
       pServer                  ( pNServP ),
       pSettings                ( pNSetP ),

src/serverdlg.h

@@ -52,11 +52,11 @@ class CServerDlg : public QDialog, private Ui_CServerDlgBase
     Q_OBJECT
 
 public:
-    CServerDlg ( CServer*        pNServP,
-                 CSettings*      pNSetP,
-                 const bool      bStartMinimized,
-                 QWidget*        parent = nullptr,
-                 Qt::WindowFlags f = nullptr );
+    CServerDlg ( CServer*         pNServP,
+                 CServerSettings* pNSetP,
+                 const bool       bStartMinimized,
+                 QWidget*         parent = nullptr,
+                 Qt::WindowFlags  f = nullptr );
 
 protected:
     virtual void changeEvent ( QEvent* pEvent );
@@ -70,7 +70,7 @@ class CServerDlg : public QDialog, private Ui_CServerDlgBase
 
     QTimer                    Timer;
     CServer*                  pServer;
-    CSettings*                pSettings;
+    CServerSettings*          pSettings;
 
     CVector<QTreeWidgetItem*> vecpListViewItems;
     QMutex                    ListViewMutex;