[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [kactivitymanagerd] src/service: Renamed the configuration transition checker to be explicit about K
From:       Ivan Čukić <ivan.cukic () kde ! org>
Date:       2016-10-09 18:03:25
Message-ID: E1btIRZ-0003wd-O2 () code ! kde ! org
[Download RAW message or body]

Git commit 7e14df1d7b61b7ce61ca3f3aaff052a4b1b346a8 by Ivan Čukić.
Committed on 09/10/2016 at 18:02.
Pushed by ivan into branch 'master'.

Renamed the configuration transition checker to be explicit about KDE4

M  +2    -2    src/service/Activities.cpp
M  +3    -3    src/service/Activities_p.h

http://commits.kde.org/kactivitymanagerd/7e14df1d7b61b7ce61ca3f3aaff052a4b1b346a8

diff --git a/src/service/Activities.cpp b/src/service/Activities.cpp
index e4c5f4a..55dab56 100644
--- a/src/service/Activities.cpp
+++ b/src/service/Activities.cpp
@@ -51,7 +51,7 @@
 // Private
 #define ACTIVITY_MANAGER_CONFIG_FILE_NAME QStringLiteral("kactivitymanagerdrc")
 
-Activities::Private::ConfigurationChecker::ConfigurationChecker()
+Activities::Private::KDE4ConfigurationTransitionChecker::KDE4ConfigurationTransitionChecker()
 {
     // Checking whether we need to transfer the KActivities/KDE4
     // configuration file to the new location.
@@ -76,7 +76,7 @@ Activities::Private::ConfigurationChecker::ConfigurationChecker()
 }
 
 Activities::Private::Private(Activities *parent)
-    : configChecker()
+    : kde4ConfigurationTransitionChecker()
     , config(QStringLiteral("kactivitymanagerdrc"))
     , q(parent)
 {
diff --git a/src/service/Activities_p.h b/src/service/Activities_p.h
index f8c4aa0..e95f12d 100644
--- a/src/service/Activities_p.h
+++ b/src/service/Activities_p.h
@@ -60,10 +60,10 @@ public:
     void setActivityState(const QString &activity, Activities::State state);
 
     // Configuration
-    class ConfigurationChecker {
+    class KDE4ConfigurationTransitionChecker {
     public:
-        ConfigurationChecker();
-    } configChecker;
+        KDE4ConfigurationTransitionChecker();
+    } kde4ConfigurationTransitionChecker;
     QTimer configSyncTimer;
     KConfig config;
 
[prev in list] [next in list] [prev in thread] [next in thread]