[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-22 12:20:30
Message-ID: 1129983630.178943.27060.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 473026 by mlaurent:

Fix other compile error


 M  +1 -1      applets/launcher/quickbutton.cpp  
 M  +1 -1      applets/lockout/lockout.cpp  
 M  +1 -1      applets/media/mediaapplet.cpp  
 M  +1 -1      applets/menu/menuapplet.cpp  
 M  +1 -1      applets/run/runapplet.cpp  
 M  +1 -1      applets/taskbar/taskbarapplet.cpp  
 M  +1 -1      applets/trash/trashapplet.cpp  
 M  +1 -1      extensions/kasbar/kasbarextension.cpp  
 M  +1 -1      menuext/find/findmenu.cpp  
 M  +1 -1      menuext/konsole/konsole_mnu.cpp  
 M  +1 -1      menuext/prefmenu/prefmenu.cpp  
 M  +1 -1      menuext/recentdocs/recentdocsmenu.cpp  


--- trunk/KDE/kdebase/kicker/applets/launcher/quickbutton.cpp #473025:473026
@@ -116,7 +116,7 @@
 }
 
 void QuickURL::run() const
-{  kapp->propagateSessionManager();   // is this needed?
+{  KWorkSpace::propagateSessionManager();   // is this needed?
    if (_service)
       KRun::run(*(_service), KURL::List());
    else
--- trunk/KDE/kdebase/kicker/applets/lockout/lockout.cpp #473025:473026
@@ -171,7 +171,7 @@
 
 void Lockout::logout()
 {
-    kapp->requestShutDown();
+    KWorkSpace::requestShutDown();
 }
 
 void Lockout::mousePressEvent(QMouseEvent* e)
--- trunk/KDE/kdebase/kicker/applets/media/mediaapplet.cpp #473025:473026
@@ -81,7 +81,7 @@
             mButtonList.clear();
 	}
 
-        KGlobal::locale()->removeCatalogue("mediaapplet");
+        KGlobal::locale()->removeCatalog("mediaapplet");
 }
 
 void MediaApplet::about()
--- trunk/KDE/kdebase/kicker/applets/menu/menuapplet.cpp #473025:473026
@@ -106,7 +106,7 @@
     delete selection;
     delete selection_watcher;
     delete module;
-    KGlobal::locale()->removeCatalogue("kmenuapplet");
+    KGlobal::locale()->removeCatalog("kmenuapplet");
     }
 
 void Applet::windowAdded( WId w_P )
--- trunk/KDE/kdebase/kicker/applets/run/runapplet.cpp #473025:473026
@@ -214,7 +214,7 @@
     QString exec;
     bool focusNeeded = false;
 
-    kapp->propagateSessionManager();
+   	KWorkSpace::propagateSessionManager();
 
     _filterData->setData( _input->currentText().trimmed() );
     QStringList filters;
--- trunk/KDE/kdebase/kicker/applets/taskbar/taskbarapplet.cpp #473025:473026
@@ -45,7 +45,7 @@
         // FIXME: what about two taskbars? perhaps this should be inserted just once
         KGlobal::locale()->insertCatalog( "ktaskbarapplet" );
         int options = 0;
-        if (KAuthorized::authorizeKActionControlModule("kde-kcmtaskbar.desktop"))
+        if (KAuthorized::authorizeControlModule("kde-kcmtaskbar.desktop"))
            options = Plasma::Preferences;
         TaskbarApplet *taskbar = new TaskbarApplet( configFile, Plasma::Stretch,
                                                     options, parent, "ktaskbarapplet" );
--- trunk/KDE/kdebase/kicker/applets/trash/trashapplet.cpp #473025:473026
@@ -70,7 +70,7 @@
 	disconnect( mpDirLister, SIGNAL( clear() ),
 	            this, SLOT( slotClear() ) );
 	delete mpDirLister;
-	KGlobal::locale()->removeCatalogue("trashapplet");
+	KGlobal::locale()->removeCatalog("trashapplet");
 }
 
 void TrashApplet::about()
--- trunk/KDE/kdebase/kicker/extensions/kasbar/kasbarextension.cpp #473025:473026
@@ -111,7 +111,7 @@
 {
     if ( detached_ && (!kasbar.isNull()) )
 	kasbar->deleteLater();
-    KGlobal::locale()->removeCatalogue("kasbarextension");
+    KGlobal::locale()->removeCatalog("kasbarextension");
 }
 
 void KasBarExtension::setDetached( bool detach )
--- trunk/KDE/kdebase/kicker/menuext/find/findmenu.cpp #473025:473026
@@ -68,7 +68,7 @@
 {
   QString app = mConfigList[ pos ];
 
-  kapp->propagateSessionManager();
+  KWorkSpace::propagateSessionManager();
   KToolInvocation::startServiceByDesktopPath( app );
 }
 
--- trunk/KDE/kdebase/kicker/menuext/konsole/konsole_mnu.cpp #473025:473026
@@ -248,7 +248,7 @@
     }
 
     --id;
-    kapp->propagateSessionManager();
+    KWorkSpace::propagateSessionManager();
     QStringList args;
     if (id < sessionList.count())
     {
--- trunk/KDE/kdebase/kicker/menuext/prefmenu/prefmenu.cpp #473025:473026
@@ -309,7 +309,7 @@
         return;
     }
 
-    kapp->propagateSessionManager();
+    KWorkSpace::propagateSessionManager();
     KSycocaEntry *e = m_entryMap[id];
     KService::Ptr service = static_cast<KService *>(e);
     KToolInvocation::startServiceByDesktopPath(service->desktopEntryPath(),
--- trunk/KDE/kdebase/kicker/menuext/recentdocs/recentdocsmenu.cpp #473025:473026
@@ -84,7 +84,7 @@
 
 void RecentDocsMenu::slotExec(int id) {
 	if (id >= 0) {
-		kapp->propagateSessionManager();
+		KWorkSpace::propagateSessionManager();
 		KURL u;
 		u.setPath(_fileList[id]);
 		KDEDesktopMimeType::run(u, true);
[prev in list] [next in list] [prev in thread] [next in thread]