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

List:       kde-commits
Subject:    playground/base/nepomuk-kde/libactivities/services/activitydirector
From:       Ivan Čukić <ivan.cukic () kde ! org>
Date:       2010-10-25 9:00:05
Message-ID: 20101025090005.04322AC899 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1189544 by ivan:

refactor

 M  +16 -37    ActivityDirector.cpp  
 U             ActivityDirector_p.h  
 M  +1 -0      EventProcessor.cpp  
 M  +4 -1      config-features.h.cmake  


--- trunk/playground/base/nepomuk-kde/libactivities/services/activitydirector/ActivityDirector.cpp \
#1189543:1189544 @@ -1,6 +1,5 @@
 /*
  *   Copyright (C) 2010 Ivan Cukic <ivan.cukic(at)kde.org>
-   Copyright (c) 2010 Sebastian Trueg <trueg@kde.org>
  *
  *   This program is free software; you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License version 2,
@@ -39,6 +38,14 @@
 #include "activitydirectoradaptor.h"
 #include "EventProcessor.h"
 
+#include "config-features.h"
+
+#ifdef HAVE_NEPOMUK
+    #define NEPOMUK_RUNNING (Nepomuk::ResourceManager::instance()->initialized())
+#else
+    #define NEPOMUK_RUNNING false
+#endif
+
 #define ActivityDirectorServicePath "org.kde.ActivityDirector"
 #define ACTIVITIES_PROTOCOL "activities://"
 
@@ -94,7 +101,7 @@
      * Treating 'Starting' as 'Running', and 'Stopping' as 'Stopped'
      * as far as the config file is concerned
      */
-    bool configNeedsUpdating = (activities[id] & 4 != state & 4);
+    bool configNeedsUpdating = ((activities[id] & 4) != (state & 4));
 
     activities[id] == state;
 
@@ -102,9 +109,11 @@
         case ActivityDirector::Running:
             emit q->ActivityStarted(id);
             break;
+
         case ActivityDirector::Stopped:
             emit q->ActivityStopped(id);
             break;
+
         default:
             break;
     }
@@ -373,11 +382,9 @@
 
     d->activitiesConfig().writeEntry(id, name);
 
-#ifdef HAVE_NEPOMUK
-    if (Nepomuk::ResourceManager::instance()->initialized()) {
+    if (NEPOMUK_RUNNING) {
         d->activityResource(id).setLabel(name);
     }
-#endif // HAVE_NEPOMUK
 
     d->scheduleConfigSync();
     emit ActivityChanged(id);
@@ -385,44 +392,27 @@
 
 QString ActivityDirector::ActivityDescription(const QString & id) const
 {
-#ifdef HAVE_NEPOMUK
-
-    if (!d->activities.contains(id) ||
-            !Nepomuk::ResourceManager::instance()->initialized()) {
+    if (!NEPOMUK_RUNNING || !d->activities.contains(id)) {
         return QString();
     }
 
     return d->activityResource(id).description();
-
-#else // not HAVE_NEPOMUK
-
-    return QString();
-
-#endif // HAVE_NEPOMUK
 }
 
 void ActivityDirector::SetActivityDescription(const QString & id, const QString & \
description)  {
-#ifdef HAVE_NEPOMUK
-
-    if (!d->activities.contains(id) ||
-            !Nepomuk::ResourceManager::instance()->initialized()) {
+    if (!NEPOMUK_RUNNING || !d->activities.contains(id)) {
         return;
     }
 
     d->activityResource(id).setDescription(description);
 
     emit ActivityChanged(id);
-
-#endif // HAVE_NEPOMUK
 }
 
 QString ActivityDirector::ActivityIcon(const QString & id) const
 {
-#ifdef HAVE_NEPOMUK
-
-    if (!d->activities.contains(id) ||
-            !Nepomuk::ResourceManager::instance()->initialized()) {
+    if (!NEPOMUK_RUNNING || !d->activities.contains(id)) {
         return QString();
     }
 
@@ -433,28 +423,17 @@
     } else {
         return symbols.first();
     }
-
-#else // not HAVE_NEPOMUK
-
-    return QString();
-
-#endif
 }
 
 void ActivityDirector::SetActivityIcon(const QString & id, const QString & icon)
 {
-#ifdef HAVE_NEPOMUK
-
-    if (!d->activities.contains(id) ||
-            !Nepomuk::ResourceManager::instance()->initialized()) {
+    if (!NEPOMUK_RUNNING || !d->activities.contains(id)) {
         return;
     }
 
     d->activityResource(id).setSymbols(QStringList() << icon);
 
     emit ActivityChanged(id);
-
-#endif
 }
 
 
--- trunk/playground/base/nepomuk-kde/libactivities/services/activitydirector/EventProcessor.cpp \
#1189543:1189544 @@ -1,5 +1,6 @@
 /*
  *   Copyright (C) 2010 Ivan Cukic <ivan.cukic(at)kde.org>
+ *   Copyright (c) 2010 Sebastian Trueg <trueg@kde.org>
  *
  *   This program is free software; you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License version 2,
--- trunk/playground/base/nepomuk-kde/libactivities/services/activitydirector/config-features.h.cmake \
#1189543:1189544 @@ -1,3 +1,6 @@
+#ifndef CONFIG_FEATURES_H_
+#define CONFIG_FEATURES_H_
 
 #cmakedefine HAVE_NEPOMUK
-#cmakedefine HAVE_WORKSPACE
+
+#endif


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