diff --git a/libssu/ssucoreconfig.cpp b/libssu/ssucoreconfig.cpp index 1419936..ee72c85 100644 --- 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 index e6f5170..1b92a23 100644 --- 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 index 3e3f99b..64b395c 100644 --- 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 index 36ec044..250ba6b 100644 --- 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 index 76e973c..dbcd0e6 100644 --- 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();