Converted ASettings to namespace

main.cpp

@@ -57,7 +57,7 @@ int main(int argc, char *argv[])
 //    }
 
     //Theming
-    int selectedtheme = ASettings::getSettings().value("main/theme").toInt();
+    int selectedtheme = ASettings::settings().value("main/theme").toInt();
     QDir::setCurrent("/themes");
     switch (2) {
     case 1:{

src/classes/asettings.cpp

@@ -19,25 +19,23 @@
 #include "src/astandardpaths.h"
 #include <QSettings>
 
-QSettings ASettings::settings;
-
 void ASettings::setup()
 {
-    settings.setDefaultFormat(QSettings::IniFormat);
-    settings.setPath(QSettings::IniFormat, QSettings::UserScope, AStandardPaths::getPaths()[QStandardPaths::AppDataLocation]);
+    QSettings::setDefaultFormat(QSettings::IniFormat);
+    QSettings::setPath(QSettings::IniFormat, QSettings::UserScope, AStandardPaths::getPaths()[QStandardPaths::AppDataLocation]);
 }
 
 QVariant ASettings::read(const QString &key)
 {
-    return settings.value(key);
+    return QSettings().value(key);
 }
 
 void ASettings::write(const QString &key, const QVariant &val)
 {
-    settings.setValue(key, val);
+    QSettings().setValue(key, val);
 }
 
-QSettings& ASettings::getSettings()
+QSettings ASettings::settings()
 {
-    return settings;
+    return QSettings();
 }

src/classes/asettings.h

@@ -21,22 +21,18 @@
 #include <QSettings>
 
 /*!
- * \brief The Settings class is a thin wrapper for the QSettings class,
+ * \brief Thin (namespace) wrapper for the QSettings class,
  * simplifying reading and writing of settings.
  */
-class ASettings
+namespace ASettings
 {
-private:
-    static QSettings settings;
+    void setup();
 
-public:
-    static void setup();
+    QVariant read(const QString &key);
 
-    static QVariant read(const QString &key);
+    void write(const QString &key, const QVariant &val);
 
-    static void write(const QString &key, const QVariant &val);
-
-    static QSettings& getSettings();
-};
+    QSettings settings();
+}
 
 #endif // ASETTINGS_H

src/database/declarations.h

@@ -60,8 +60,8 @@ struct DataPosition {
     DataPosition& operator=(const DataPosition& other) = default;
 
     REPR(DataPosition,
-         "tableName=" << object.tableName << ", "
-         "rowId=" << object.rowId
+         "tableName=" + object.tableName + ", "
+         "rowId=" + object.rowId
          )
 };
 

src/testing/adebug.h

@@ -13,8 +13,8 @@
  * class Myclass {
  *  ...
  * 	REPR(MyClass,
- *       "member1=" << object.member1 << ", "
- *       "something2" << object.calculate()
+ *       "member1=" + object.member1 + ", "
+ *       "something2" + object.calculate()
  *      )
  * };
  *
@@ -22,13 +22,13 @@
  * DEB mc;
  *
  * output:
- * MyClass( member1= 3000 , something2= "A320" )
+ * MyClass(member1=3000, something2="A320")
  */
-#define REPR(cls, expr) \
+#define REPR(cls, str) \
 friend \
 QDebug operator<<(QDebug qdb, const cls& object) \
 { \
-    qdb << #cls "(" << expr << ')'; \
+    qdb << QString(#cls) + '(' + str + ')'; \
     return qdb; \
 }