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

List:       kde-commits
Subject:    KDE/kdebase/kicker
From:       Laurent Montel <montel () kde ! org>
Date:       2005-10-04 9:13:00
Message-ID: 1128417180.581242.28280.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 467083 by mlaurent:

Start to fix kicker


 M  +2 -1      kicker/buttons/kbutton.cpp  
 M  +1 -1      kicker/core/kicker.cpp  
 M  +1 -1      kicker/ui/browser_dlg.cpp  
 M  +1 -1      libkicker/kpanelmenu.cpp  
 M  +2 -2      libkicker/menuinfo.cpp  
 M  +1 -1      libkicker/panelbutton.h  
 M  +2 -1      menuext/prefmenu/prefmenu.cpp  


--- trunk/KDE/kdebase/kicker/kicker/buttons/kbutton.cpp #467082:467083
@@ -26,6 +26,7 @@
 #include <klocale.h>
 #include <kapplication.h>
 #include <kdebug.h>
+#include <ktoolinvocation.h>
 
 #include "kickerSettings.h"
 
@@ -62,7 +63,7 @@
 
 void KButton::properties()
 {
-    KApplication::startServiceByDesktopName("kmenuedit", QStringList(),
+    KToolInvocation::startServiceByDesktopName("kmenuedit", QStringList(),
                                             0, 0, 0, "", true);
 }
 
--- trunk/KDE/kdebase/kicker/kicker/core/kicker.cpp #467082:467083
@@ -96,7 +96,7 @@
     }
 
     // Make kicker immutable if configuration modules have been marked immutable
-    if (isImmutable() && \
KAuthorized::authorizeKActionControlModules(Kicker::configModules(true)).isEmpty()) + \
if (isImmutable() && \
KAuthorized::authorizeControlModules(Kicker::configModules(true)).isEmpty())  {
         config()->setReadOnly(true);
         config()->reparseConfiguration();
--- trunk/KDE/kdebase/kicker/kicker/ui/browser_dlg.cpp #467082:467083
@@ -40,7 +40,7 @@
 {
     setMinimumWidth( 300 );
 
-    Q3VBox *page = makeVBoxMainWidget();
+    KVBox *page = makeVBoxMainWidget();
 
     Q3HBox *hbox2 = new Q3HBox( page );
     hbox2->setSpacing( KDialog::spacingHint() );
--- trunk/KDE/kdebase/kicker/libkicker/kpanelmenu.cpp #467082:467083
@@ -105,7 +105,7 @@
         connect(&(d->t), SIGNAL(timeout()), this, SLOT(slotClear()));
         d->t.start(d->clearDelay, true);
     }
-    Q3PopupMenu::hideEvent(ev);
+    KMenu::hideEvent(ev);
 }
 
 void KPanelMenu::disableAutoClear()
--- trunk/KDE/kdebase/kicker/libkicker/menuinfo.cpp #467082:467083
@@ -57,7 +57,7 @@
            it != list.end();
            ++it)
        {
-          if (!KAuthorized::authorizeKAction((*it).trimmed()))
+          if (!KAuthorized::authorize((*it).trimmed()))
              return;
        }
     }
@@ -105,7 +105,7 @@
     if (d->library.isEmpty())
         return 0;
 
-    return KParts::ComponentFactory::createInstanceFromLibrary<KPanelMenu>(
+    return KLibLoader::createInstance<KPanelMenu>(
                QFile::encodeName( d->library ),
                parent, name );
 }
--- trunk/KDE/kdebase/kicker/libkicker/panelbutton.h #467082:467083
@@ -30,7 +30,7 @@
 
 #include <kpanelapplet.h>
 #include <kpanelextension.h>
-#include <kurldrag.h>
+#include <k3urldrag.h>
 
 #include "kickertip.h"
 #include "utils.h"
--- trunk/KDE/kdebase/kicker/menuext/prefmenu/prefmenu.cpp #467082:467083
@@ -40,6 +40,7 @@
 #include <ksycoca.h>
 #include <kurl.h>
 #include <kurldrag.h>
+#include <ktoolinvocation.h>
 
 #include "kickerSettings.h"
 #include "prefmenu.h"
@@ -476,7 +477,7 @@
 
 void PrefMenu::launchControlCenter()
 {
-    KApplication::startServiceByDesktopName("kcontrol", QStringList(),
+    KToolInvocation::startServiceByDesktopName("kcontrol", QStringList(),
                                             0, 0, 0, "", true);
 }
 


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