Remove unnecessary characters and use qt copy constructor hiding

sailfishos · Oct 10, 2016 · a4266d0 · a4266d0
1 parent 52ee9e2
commit a4266d0
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 7 deletions.
diff --git a/libssu/ssucoreconfig.cpp b/libssu/ssucoreconfig.cpp
@@ -20,7 +20,7 @@ SsuCoreConfig *SsuCoreConfig::ssuCoreConfig = 0;
 SsuCoreConfig *SsuCoreConfig::instance()
 {
     if (!ssuCoreConfig)
-        ssuCoreConfig = new SsuCoreConfig();
+        ssuCoreConfig = new SsuCoreConfig;
 
     return ssuCoreConfig;
 }

diff --git a/libssu/ssucoreconfig_p.h b/libssu/ssucoreconfig_p.h
@@ -109,8 +109,8 @@ class SsuCoreConfig: public SsuSettings
 
 
 private:
-    SsuCoreConfig(): SsuSettings(SSU_CONFIGURATION, QSettings::IniFormat, SSU_DEFAULT_CONFIGURATION) {};
-    SsuCoreConfig(const SsuCoreConfig &); // hide copy constructor
+    SsuCoreConfig(): SsuSettings(SSU_CONFIGURATION, QSettings::IniFormat, SSU_DEFAULT_CONFIGURATION) {}
+    Q_DISABLE_COPY(SsuCoreConfig)
 
     static SsuCoreConfig *ssuCoreConfig;
 };

diff --git a/libssu/ssulog.cpp b/libssu/ssulog.cpp
@@ -16,7 +16,7 @@ SsuLog *SsuLog::ssuLog = 0;
 SsuLog *SsuLog::instance()
 {
     if (!ssuLog) {
-        ssuLog = new SsuLog();
+        ssuLog = new SsuLog;
         ssuLog->fallbackLogPath = "/tmp/ssu.log";
         ssuLog->ssuLogLevel = -1;
     }

diff --git a/libssu/ssulog_p.h b/libssu/ssulog_p.h
@@ -23,8 +23,8 @@ class SsuLog
     void print(int priority, QString message);
 
 private:
-    SsuLog() {};
-    SsuLog(const SsuLog &); // hide copy constructor
+    SsuLog() {}
+    Q_DISABLE_COPY(SsuLog)
 
     static SsuLog *ssuLog;
     int ssuLogLevel;

diff --git a/ssuks/ssuks.h b/ssuks/ssuks.h
@@ -16,7 +16,7 @@ class SsuKs: public QObject
     Q_OBJECT
 
 public:
-    SsuKs() {};
+    SsuKs() {}
 
 public slots:
     void run();