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

List:       kde-commits
Subject:    playground/base/plasma/applets/networkmanager/monolithic
From:       Sebastian Kügler <sebas () kde ! org>
Date:       2009-09-03 0:36:20
Message-ID: 1251938180.386911.9346.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 1019155 by sebas:

NotificationItem has moved to kdelibs and is not experimental anymore

 M  +0 -1      CMakeLists.txt  
 M  +3 -3      knetworkmanagertrayicon.cpp  
 M  +2 -2      knetworkmanagertrayicon.h  


--- trunk/playground/base/plasma/applets/networkmanager/monolithic/CMakeLists.txt \
#1019154:1019155 @@ -48,7 +48,6 @@
 target_link_libraries(knetworkmanager
    ${KDE4_KDECORE_LIBS}
    ${KDE4_KDEUI_LIBS}
-   knotificationitem-1
    knminternals
    knmservice
    knm_nm
--- trunk/playground/base/plasma/applets/networkmanager/monolithic/knetworkmanagertrayicon.cpp \
#1019154:1019155 @@ -99,7 +99,7 @@
     d->active = active;
 
     setStandardActionsEnabled(false);
-    setCategory(Experimental::KNotificationItem::Hardware);
+    setCategory(KNotificationItem::Hardware);
     setTitle(i18nc("@title:window KNotificationItem tray icon title", "Network \
Management"));  setIconByName(d->iconName);
 
@@ -536,9 +536,9 @@
 void KNetworkManagerTrayIcon::networkingStatusChanged(Solid::Networking::Status \
status)  {
     if (status == Solid::Networking::Unknown) {
-        setStatus(Experimental::KNotificationItem::Passive);
+        setStatus(KNotificationItem::Passive);
     } else {
-        setStatus(Experimental::KNotificationItem::Active);
+        setStatus(KNotificationItem::Active);
     }
 }
 
--- trunk/playground/base/plasma/applets/networkmanager/monolithic/knetworkmanagertrayicon.h \
#1019154:1019155 @@ -21,7 +21,7 @@
 #ifndef SIMPLEUI_H
 #define SIMPLEUI_H
 
-#include <knotificationitem-1/knotificationitem.h>
+#include <KNotificationItem>
 #include <activatableobserver.h>
 
 #include <QHash>
@@ -54,7 +54,7 @@
 /**
  * Tray icon representing one or more network interfaces
  */
-class KNetworkManagerTrayIcon : public Experimental::KNotificationItem, public \
ActivatableObserver +class KNetworkManagerTrayIcon : public KNotificationItem, public \
ActivatableObserver  {
 Q_OBJECT
 Q_DECLARE_PRIVATE(KNetworkManagerTrayIcon)


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