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

List:       kde-commits
Subject:    KDE/kdebase/kicker
From:       Michel Hermier <michel.hermier () wanadoo ! fr>
Date:       2005-11-03 10:34:56
Message-ID: 1131014096.845367.15155.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 477193 by hermier:

Adapt to KSharedPtr.

 M  +12 -15    menuext/prefmenu/prefmenu.cpp  
 M  +1 -1      taskmanager/tasklmbmenu.cpp  


--- trunk/KDE/kdebase/kicker/menuext/prefmenu/prefmenu.cpp #477192:477193
@@ -128,7 +128,7 @@
 
     QIcon iconset = Plasma::menuIconSet(s->icon());
     int newId = insertItem(iconset, serviceName, nId, nIndex);
-    m_entryMap.insert(newId, static_cast<KSycocaEntry*>(s));
+    m_entryMap.insert(newId, KSycocaEntry::Ptr::staticCast(s));
 }
 
 void PrefMenu::mousePressEvent(QMouseEvent * ev)
@@ -166,7 +166,7 @@
         return;
     }
 
-    KSycocaEntry * e = m_entryMap[id];
+    KSycocaEntry::Ptr e = m_entryMap[id];
 
     QPixmap icon;
     KURL url;
@@ -175,8 +175,9 @@
     {
         case KST_KService:
         {
-            icon = static_cast<KService *>(e)->pixmap(KIcon::Small);
-            QString filePath = static_cast<KService *>(e)->desktopEntryPath();
+            KService::Ptr service(KService::Ptr::staticCast(e));
+            icon = service->pixmap(KIcon::Small);
+            QString filePath = service->desktopEntryPath();
             if (filePath[0] != '/')
             {
                 filePath = locate("apps", filePath);
@@ -187,9 +188,9 @@
 
         case KST_KServiceGroup:
         {
-            icon = KGlobal::iconLoader()->loadIcon(static_cast<KServiceGroup*>(e)->icon(),
-                                                   KIcon::Small);
-            url = "programs:/" + static_cast<KServiceGroup*>(e)->relPath();
+            KServiceGroup::Ptr serviceGroup = KServiceGroup::Ptr::staticCast(e);
+            icon = KGlobal::iconLoader()->loadIcon(serviceGroup->icon(), KIcon::Small);
+            url = "programs:/" + serviceGroup->relPath();
             break;
         }
 
@@ -254,15 +255,12 @@
 
     QStringList suppressGenericNames = root->suppressGenericNames();
 
-    KServiceGroup::List::ConstIterator it = list.begin();
-    for (; it != list.end(); ++it)
+    foreach(const KSycocaEntry::Ptr &e, list)
     {
-        KSycocaEntry* e = *it;
-
         if (e->isType(KST_KServiceGroup))
         {
 
-            KServiceGroup::Ptr g(static_cast<KServiceGroup *>(e));
+            KServiceGroup::Ptr g(KServiceGroup::Ptr::staticCast(e));
             QString groupCaption = g->caption();
 
             // Avoid adding empty groups.
@@ -290,7 +288,7 @@
         }
         else if (e->isType(KST_KService))
         {
-            KService::Ptr s(static_cast<KService *>(e));
+            KService::Ptr s(KService::Ptr::staticCast(e));
             insertMenuItem(s, id++, -1, &suppressGenericNames);
         }
         else if (e->isType(KST_KServiceSeparator))
@@ -310,8 +308,7 @@
     }
 
     KWorkSpace::propagateSessionManager();
-    KSycocaEntry *e = m_entryMap[id];
-    KService::Ptr service = static_cast<KService *>(e);
+    KService::Ptr service(KService::Ptr::staticCast(m_entryMap[id]));
     KToolInvocation::startServiceByDesktopPath(service->desktopEntryPath(),
                                             QStringList(), 0, 0, 0, "", true);
     m_dragStartPos = QPoint(-1,-1);
--- trunk/KDE/kdebase/kicker/taskmanager/tasklmbmenu.cpp #477192:477193
@@ -132,7 +132,7 @@
                                                   t->demandsAttention());*/
         //QAction* menuItem = 
         int id = insertItem(QIcon(t->pixmap()), text);
-        connectItem(id, t, SLOT(activateRaiseOrIconify()));
+        connectItem(id, t.data(), SLOT(activateRaiseOrIconify()));
         setItemChecked(id, t->isActive());
 
         if (t->demandsAttention())
[prev in list] [next in list] [prev in thread] [next in thread]