SVN commit 1192699 by ivan:

removed availableActivities method in favour of listActivities

 M  +0 -6      libs/kworkspace/kactivityconsumer.cpp  
 M  +1 -6      libs/kworkspace/kactivityconsumer.h  
 M  +1 -1      plasma/desktop/shell/activity.cpp  
 M  +1 -1      plasma/desktop/shell/activitymanager/activitylist.cpp  
 M  +3 -3      plasma/desktop/shell/desktopcorona.cpp  


--- trunk/KDE/kdebase/workspace/libs/kworkspace/kactivityconsumer.cpp #1192698:1192699
@@ -69,12 +69,6 @@
         QStringList, KActivityManager::self()->ListActivities(), QStringList() );
 }
 
-QStringList KActivityConsumer::availableActivities() const
-{
-    KACTIVITYCONSUMER_DBUS_RETURN(
-        QStringList, KActivityManager::self()->ListActivities(), QStringList() );
-}
-
 QStringList KActivityConsumer::activitiesForResource(const KUrl & uri)
 {
     KACTIVITYCONSUMER_DBUS_RETURN(
--- trunk/KDE/kdebase/workspace/libs/kworkspace/kactivityconsumer.h #1192698:1192699
@@ -58,7 +58,7 @@
     Q_OBJECT
 
     Q_PROPERTY(QString currentActivity READ currentActivity)
-    Q_PROPERTY(QStringList availableActivities READ availableActivities)
+    Q_PROPERTY(QStringList activities READ listActivities)
 
 public:
     /**
@@ -89,11 +89,6 @@
     QString currentActivity() const;
 
     /**
-     * @returns the list of all existing activities
-     */
-    KDE_DEPRECATED QStringList availableActivities() const;
-
-    /**
      * @returns the list of activities filtered by state
      * @param state state of the activity
      */
--- trunk/KDE/kdebase/workspace/plasma/desktop/shell/activity.cpp #1192698:1192699
@@ -272,7 +272,7 @@
     if (controller.currentActivity() == m_id) {
         //activate someone else
         //TODO we could use a better strategy here
-        QStringList list = controller.availableActivities();
+        QStringList list = controller.listActivities();
         QString next = list.first();
         if (next == m_id && list.count() > 1) {
             next = list.at(1);
--- trunk/KDE/kdebase/workspace/plasma/desktop/shell/activitymanager/activitylist.cpp #1192698:1192699
@@ -32,7 +32,7 @@
     : AbstractIconList(location, parent),
       m_activityController(new KActivityController(this))
 {
-    QStringList activities = m_activityController->availableActivities();
+    QStringList activities = m_activityController->listActivities();
     foreach (const QString &activity, activities) {
         createActivityIcon(activity);
     }
--- trunk/KDE/kdebase/workspace/plasma/desktop/shell/desktopcorona.cpp #1192698:1192699
@@ -526,7 +526,7 @@
         return;
     }
 
-    QStringList existingActivities = m_activityController->availableActivities();
+    QStringList existingActivities = m_activityController->listActivities();
     foreach (const QString &id, existingActivities) {
         activityAdded(id);
     }
@@ -652,7 +652,7 @@
 
 void DesktopCorona::activateNextActivity()
 {
-    QStringList list = m_activityController->availableActivities();
+    QStringList list = m_activityController->listActivities();
     if (list.isEmpty()) {
         return;
     }
@@ -665,7 +665,7 @@
 
 void DesktopCorona::activatePreviousActivity()
 {
-    QStringList list = m_activityController->availableActivities();
+    QStringList list = m_activityController->listActivities();
     if (list.isEmpty()) {
         return;
     }