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

List:       kde-commits
Subject:    KDE/kdebase/kdesktop
From:       Stefan Nikolaus <stefan.nikolaus () kdemail ! net>
Date:       2005-10-22 13:09:55
Message-ID: 1129986595.149903.28489.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 473039 by nikolaus:

compile



 M  +2 -2      Makefile.am  
 M  +13 -13    desktop.cc  
 M  +2 -2      desktop.h  
 M  +1 -1      kdiconview.cc  
 M  +1 -1      krootwm.cc  
 M  +1 -1      lock/Makefile.am  
 M  +3 -2      minicli.cpp  


--- trunk/KDE/kdebase/kdesktop/Makefile.am #473038:473039
@@ -1,8 +1,8 @@
 ## Makefile.am of kdebase/kdesktop
 
-INCLUDES = -I$(top_srcdir)/workspace/kcontrol/background -I$(top_srcdir)/libkonq \
-I$(top_srcdir)/kdmlib $(all_includes) +INCLUDES = -I$(top_srcdir)/workspace/lib \
-I$(top_srcdir)/workspace/kcontrol/background -I$(top_srcdir)/libkonq \
-I$(top_srcdir)/kdmlib $(all_includes)  kdesktop_la_LDFLAGS  = $(all_libraries) \
                -module $(KDE_PLUGIN)
-kdesktop_la_LIBADD   = libkdesktopsettings.la $(top_builddir)/libkonq/libkonq.la \
$(top_builddir)/workspace/kcontrol/background/libbgnd.la \
$(top_builddir)/kdmlib/libdmctl.la $(LIB_XSS) +kdesktop_la_LIBADD   = \
libkdesktopsettings.la $(top_builddir)/libkonq/libkonq.la \
$(top_builddir)/workspace/kcontrol/background/libbgnd.la \
$(top_builddir)/kdmlib/libdmctl.la $(LIB_XSS) \
$(top_builddir)/workspace/lib/libkworkspace.la   
 SUBDIRS = . lock pics patterns programs init kwebdesktop
 
--- trunk/KDE/kdebase/kdesktop/desktop.cc #473038:473039
@@ -812,14 +812,14 @@
 // for dcop interface backward compatibility
 void KDesktop::logout()
 {
-    logout( KApplication::ShutdownConfirmDefault,
-            KApplication::ShutdownTypeNone );
+    logout( KWorkSpace::ShutdownConfirmDefault,
+            KWorkSpace::ShutdownTypeNone );
 }
 
-void KDesktop::logout( KApplication::ShutdownConfirm confirm,
-                       KApplication::ShutdownType sdtype )
+void KDesktop::logout( KWorkSpace::ShutdownConfirm confirm,
+                       KWorkSpace::ShutdownType sdtype )
 {
-    if( !kapp->requestShutDown( confirm, sdtype ) )
+    if( !KWorkSpace::requestShutDown( confirm, sdtype ) )
         // this i18n string is also in kicker/applets/run/runapplet
         KMessageBox::error( this, i18n("Could not log out properly.\nThe session \
                manager cannot "
                                         "be contacted. You can try to force a \
shutdown by pressing " @@ -829,26 +829,26 @@
 
 void KDesktop::slotLogout()
 {
-    logout( KApplication::ShutdownConfirmDefault,
-            KApplication::ShutdownTypeDefault );
+    logout( KWorkSpace::ShutdownConfirmDefault,
+            KWorkSpace::ShutdownTypeDefault );
 }
 
 void KDesktop::slotLogoutNoCnf()
 {
-    logout( KApplication::ShutdownConfirmNo,
-            KApplication::ShutdownTypeNone );
+    logout( KWorkSpace::ShutdownConfirmNo,
+            KWorkSpace::ShutdownTypeNone );
 }
 
 void KDesktop::slotHaltNoCnf()
 {
-    logout( KApplication::ShutdownConfirmNo,
-            KApplication::ShutdownTypeHalt );
+    logout( KWorkSpace::ShutdownConfirmNo,
+            KWorkSpace::ShutdownTypeHalt );
 }
 
 void KDesktop::slotRebootNoCnf()
 {
-    logout( KApplication::ShutdownConfirmNo,
-            KApplication::ShutdownTypeReboot );
+    logout( KWorkSpace::ShutdownConfirmNo,
+            KWorkSpace::ShutdownTypeReboot );
 }
 
 void KDesktop::setVRoot( bool enable )
--- trunk/KDE/kdebase/kdesktop/desktop.h #473038:473039
@@ -25,7 +25,7 @@
 #include <qwidget.h>
 #include <qstringlist.h>
 
-#include <kapplication.h>	// for logout parameters
+#include <kworkspace.h>	// for logout parameters
 
 class KURL;
 class QCloseEvent;
@@ -86,7 +86,7 @@
 
   virtual void switchDesktops( int delta );
 
-  void logout( KApplication::ShutdownConfirm confirm, KApplication::ShutdownType \
sdtype ); +  void logout( KWorkSpace::ShutdownConfirm confirm, \
KWorkSpace::ShutdownType sdtype );  
   KWinModule* kwinModule() const { return m_pKwinmodule; }
 
--- trunk/KDE/kdebase/kdesktop/kdiconview.cc #473038:473039
@@ -651,7 +651,7 @@
 
 void KDIconView::slotExecuted( Q3IconViewItem *item )
 {
-    kapp->propagateSessionManager();
+    KWorkSpace::propagateSessionManager();
     m_lastDeletedIconPos = QPoint(); // user action -> not renaming an icon
     if (item) {
         visualActivate(item);
--- trunk/KDE/kdebase/kdesktop/krootwm.cc #473038:473039
@@ -778,7 +778,7 @@
 
 
 void KRootWm::slotLogout() {
-    m_pDesktop->logout(KApplication::ShutdownConfirmDefault, \
KApplication::ShutdownTypeDefault); +    \
m_pDesktop->logout(KWorkSpace::ShutdownConfirmDefault, \
KWorkSpace::ShutdownTypeDefault);  }
 
 void KRootWm::slotPopulateSessions()
--- trunk/KDE/kdebase/kdesktop/lock/Makefile.am #473038:473039
@@ -1,6 +1,6 @@
 ## Makefile.am of kdebase/kdesktop/lock
 
-INCLUDES = -I.. -I$(top_srcdir)/kcheckpass -I$(top_srcdir)/kdmlib $(GLINC) \
$(all_includes) +INCLUDES = -I.. -I$(top_srcdir)/workspace/lib \
-I$(top_srcdir)/kcheckpass -I$(top_srcdir)/kdmlib $(GLINC) $(all_includes)  \
kdesktop_lock_LDFLAGS  = $(all_libraries) $(KDE_RPATH)  kdesktop_lock_LDADD    = \
../libkdesktopsettings.la ../../kdmlib/libdmctl.la $(LIB_KIO) $(LIB_XF86MISC) \
$(GLLIB)  
--- trunk/KDE/kdebase/kdesktop/minicli.cpp #473038:473039
@@ -64,6 +64,7 @@
 #include <kmimetype.h>
 #include <kurifilter.h>
 #include <kcompletionbox.h>
+#include <kworkspace.h>
 
 #include "minicli.moc"
 #include "minicli_ui.h"
@@ -289,8 +290,8 @@
 
   if ( logout )
   {
-     kapp->propagateSessionManager();
-     kapp->requestShutDown();
+     KWorkSpace::propagateSessionManager();
+     KWorkSpace::requestShutDown();
   }
 }
 


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