Changeset 137 for trunk/settings

Timestamp:

Sep 20, 2021, 6:48:26 PM (4 years ago)

Author:

Gregg Young

Message:

Fix some issues identified by cppcheck; minor code cleanup.

File:

• trunk/settings/thth_settings.h (modified) (4 diffs)

trunk/settings/thth_settings.h

@@ -77 +77 @@
 public:
     ththSettingsEntryFlag (ID id, PSZ pszGroup, PSZ pszKey, BOOL f)
-        : ththSettingsEntry (id, pszGroup, pszKey, ththSettingsEntry::SET_FLAG) {
-            fDefault = f; Reset (); }
+        : ththSettingsEntry (id, pszGroup, pszKey, ththSettingsEntry::SET_FLAG), fDefault (f)
+    {
+        Reset ();
+    }
 
     ththSettingsEntryFlag (ID id, PSZ pszGroup, PSZ pszKey, BOOL f, HINI hini)
-        : ththSettingsEntry (id, pszGroup, pszKey, ththSettingsEntry::SET_FLAG) {
-            fDefault = f; Load (hini); }
+            : ththSettingsEntry (id, pszGroup, pszKey, ththSettingsEntry::SET_FLAG), fDefault (f)
+        {
+            Load (hini);
+        }
 
     VOID   Set (BOOL f) { this->f = f; }
     BOOL   Query (VOID) { return f; }
-    VOID   Reset (VOID) { f = fDefault; }
+    VOID   Reset (VOID) { f = fDefault; } 
 
     VOID Load (HINI hini)
@@ -120 +124 @@
 public:
     ththSettingsEntryLong (ID id, PSZ pszGroup, PSZ pszKey, LONG l)
-        : ththSettingsEntry (id, pszGroup, pszKey, ththSettingsEntry::SET_LONG) {
-            lDefault = l; Reset (); }
+        : ththSettingsEntry (id, pszGroup, pszKey, ththSettingsEntry::SET_LONG), lDefault (l)
+    {
+         Reset ();
+    }
 
     ththSettingsEntryLong (ID id, PSZ pszGroup, PSZ pszKey, LONG l, HINI hini)
-        : ththSettingsEntry (id, pszGroup, pszKey, ththSettingsEntry::SET_LONG) {
-            lDefault = l; Load (hini); }
+            : ththSettingsEntry (id, pszGroup, pszKey, ththSettingsEntry::SET_LONG), lDefault (l)
+        {
+            Load (hini);
+        }
 
     VOID   Set (LONG l) { this->l = l; }
@@ -163 +171 @@
 public:
     ththSettingsEntryString (ID id, PSZ pszGroup, PSZ pszKey, PSZ psz)
-        : ththSettingsEntry (id, pszGroup, pszKey, ththSettingsEntry::SET_STRING) {
-            pszDefault = psz; Reset (); }
+        : ththSettingsEntry (id, pszGroup, pszKey, ththSettingsEntry::SET_STRING), pszDefault(psz)
+    {
+        Reset ();
+    }
 
     ththSettingsEntryString (ID id, PSZ pszGroup, PSZ pszKey, PSZ psz, HINI hini)
-        : ththSettingsEntry (id, pszGroup, pszKey, ththSettingsEntry::SET_STRING) {
-            pszDefault = psz; Load (hini); }
+            : ththSettingsEntry (id, pszGroup, pszKey, ththSettingsEntry::SET_STRING), pszDefault(psz)
+        {
+            Load (hini);
+        }
 
     VOID Set (PSZ psz)
@@ -218 +230 @@
 public:
     ththSettingsEntryBinary (ID id, PSZ pszGroup, PSZ pszKey, PVOID pv, size_t size)
-        : ththSettingsEntry (id, pszGroup, pszKey, ththSettingsEntry::SET_BINARY) {
-            pvDefault = pv; this->sizeDefault = size; Reset (); }
+        : ththSettingsEntry (id, pszGroup, pszKey, ththSettingsEntry::SET_BINARY), pvDefault (pv)
+    {
+        this->sizeDefault = size; Reset ();
+    }
 
     ththSettingsEntryBinary (ID id, PSZ pszGroup, PSZ pszKey, PVOID pv, size_t size, HINI hini)
-        : ththSettingsEntry (id, pszGroup, pszKey, ththSettingsEntry::SET_BINARY) {
-            pvDefault = pv; this->sizeDefault = size; Load (hini); }
+            : ththSettingsEntry (id, pszGroup, pszKey, ththSettingsEntry::SET_BINARY), pvDefault (pv)
+            {
+                this->sizeDefault = size; Load (hini);
+            }
 
     VOID Set (PVOID pv, size_t size)