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

List:       kde-commits
Subject:    branches/work/kde4/playground/base/systemsettings
From:       Benjamin Meyer <ben () meyerhome ! net>
Date:       2005-11-11 15:38:10
Message-ID: 1131723490.292008.14582.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 479736 by bmeyer:

KDElibs porting.... (working... who knows)


 M  +5 -4      kcmodulemenu.cpp  
 M  +1 -1      kcmodulemenu.h  
 M  +2 -7      mainwindow.cpp  


--- branches/work/kde4/playground/base/systemsettings/kcmodulemenu.cpp #479735:479736
@@ -67,9 +67,10 @@
         column = parent.column();
     bool topLevel = (columnCount() == 0) && !parent.isValid();
     for (KServiceGroup::List::ConstIterator it = list.begin(); it != list.end(); it++) {
-        KSycocaEntry *entry = (*it);
+        KSycocaEntry::Ptr entry = (*it);
         if (canAddEntry(entry)) {
-            KCModuleInfo module((KService *) entry);
+            KService::Ptr service(KService::Ptr::staticCast(entry));
+            KCModuleInfo module(service);
 
             // Model item
             if(rowCount(parent) < children+1)
@@ -124,12 +125,12 @@
     }
 }
 
-bool KCModuleMenu::canAddEntry(KSycocaEntry * entry)
+bool KCModuleMenu::canAddEntry(KSycocaEntry::Ptr entry)
 {
     if (!entry->isType(KST_KService))
         return false;
 
-    KService *service = static_cast < KService * >(entry);
+    KService::Ptr service(KService::Ptr::staticCast(entry));
     if (!KAuthorized::authorizeControlModule(service->menuId()))
         return false;
 
--- branches/work/kde4/playground/base/systemsettings/kcmodulemenu.h #479735:479736
@@ -116,7 +116,7 @@
      * @entry to test
      * @return true if it should be included
      */
-    virtual bool canAddEntry(KSycocaEntry * entry);
+    virtual bool canAddEntry(KSycocaEntry::Ptr entry);
 
   private:
       KCModuleMenuPrivate * d;
--- branches/work/kde4/playground/base/systemsettings/mainwindow.cpp #479735:479736
@@ -266,10 +266,6 @@
     if (list.count() == 1)
         type = KDialogBase::Plain;
     groupWidget = new KCMultiWidget(type, stackedWidget);
-    connect(groupWidget, SIGNAL(aboutToShow(KCModuleProxy *)), this,
-            SLOT(updateModuleHelp(KCModuleProxy *)));
-    connect(groupWidget, SIGNAL(aboutToShowPage(QWidget *)), this,
-            SLOT(widgetChange()));
 
     for (int i = 0; i < list.size(); ++i) {
         qDebug() << "adding" << list.at(i);
@@ -287,10 +283,9 @@
         searchText->setEnabled(false);
         searchClear->setEnabled(false);
         searchAction->setEnabled(false);
-        connect(groupWidget, SIGNAL(finished()), this,
-            SLOT(groupModulesFinished()));
+        connect(groupWidget, SIGNAL(finished()), this, SLOT(groupModulesFinished()));
     }
-    else
+    //else
         groupWidget->show();
 }
 
[prev in list] [next in list] [prev in thread] [next in thread]