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

List:       kde-commits
Subject:    KDE/kdebase/kicker
From:       Stephan Kulow <coolo () kde ! org>
Date:       2005-10-22 20:04:00
Message-ID: 1130011440.226525.8216.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 473175 by coolo:

more compile


 M  +1 -1      applets/launcher/Makefile.am  
 M  +1 -0      applets/launcher/quickbutton.cpp  
 M  +1 -1      applets/lockout/Makefile.am  
 M  +1 -0      applets/lockout/lockout.cpp  
 M  +10 -15    extensions/dockbar/dockcontainer.cpp  


--- trunk/KDE/kdebase/kicker/applets/launcher/Makefile.am #473174:473175
@@ -1,5 +1,5 @@
 
-INCLUDES = -I$(top_srcdir)/kicker/libkicker -I$(top_srcdir)/kicker/kicker/ui \
$(all_includes) +INCLUDES = -I$(top_srcdir)/kicker/libkicker \
-I$(top_srcdir)/kicker/kicker/ui -I$(top_srcdir)/workspace/lib $(all_includes)  
 kde_module_LTLIBRARIES = launcher_panelapplet.la
 
--- trunk/KDE/kdebase/kicker/applets/launcher/quickbutton.cpp #473174:473175
@@ -48,6 +48,7 @@
 #include <kiconloader.h>
 #include <k3urldrag.h>
 #include <kstandarddirs.h>
+#include <kworkspace.h>
 
 #include <math.h>
 #include <algorithm>
--- trunk/KDE/kdebase/kicker/applets/lockout/Makefile.am #473174:473175
@@ -1,4 +1,4 @@
-INCLUDES = -I$(top_srcdir)/kicker/libkicker $(all_includes)
+INCLUDES = -I$(top_srcdir)/kicker/libkicker -I$(top_srcdir)/workspace/lib \
$(all_includes)  METASOURCES = AUTO
 
 kde_module_LTLIBRARIES = lockout_panelapplet.la
--- trunk/KDE/kdebase/kicker/applets/lockout/lockout.cpp #473174:473175
@@ -45,6 +45,7 @@
 #include <kiconloader.h>
 #include <krun.h>
 #include <kdebug.h>
+#include <kworkspace.h>
 
 #include <stdlib.h>
 #include <kauthorized.h>
--- trunk/KDE/kdebase/kicker/extensions/dockbar/dockcontainer.cpp #473174:473175
@@ -170,23 +170,18 @@
 
 void DockContainer::popupMenu(QPoint p)
 {
-    int r;
-    {
-        KMenu pm(this);
-        pm.insertItem( i18n("Kill This Applet"), 0);
-        pm.insertItem( i18n("Change Command"), 1);
-        r = pm.exec(p);
+    KMenu *pm = new KMenu(this);
+    QAction *kill  = pm->addAction( i18n("Kill This Applet"));
+    QAction *change = pm->addAction( i18n("Change Command"));
+    QAction *r = pm->exec(p);
         /* pm is destroyed now .. if it is destroyed later,
            there is a risk that kill() double-frees it */
-    }
-    switch (r) {
-        case 0: {
-            kill();
-        } break;
-        case 1: {
-            askNewCommand(false);
-        } break;
-    }
+    delete pm;
+    
+    if (r == kill)
+	kill;
+    if (r == change)
+        askNewCommand(false);
 }
 
 int& DockContainer::sz() {


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