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

List:       kde-commits
Subject:    kdebase/ksmserver
From:       Oswald Buddenhagen <ossi () kde ! org>
Date:       2004-08-15 13:54:23
Message-ID: 20040815135423.8017B94A3 () office ! kde ! org
[Download RAW message or body]

CVS commit by ossi: 

removing cruft


  M +1 -1      server.cpp   1.126
  M +3 -5      shutdown.cpp   1.51
  M +2 -6      shutdown.h   1.12


--- kdebase/ksmserver/server.cpp  #1.125:1.126
@@ -974,5 +974,5 @@ void KSMServer::shutdown( KApplication::
         KSMShutdownFeedback::start(); // make the screen gray
         logoutConfirmed =
-            KSMShutdownDlg::confirmShutdown( maysd, maynuke, sdtype, sdmode );
+            KSMShutdownDlg::confirmShutdown( maysd, sdtype );
         // ###### We can't make the screen remain gray while talking to the apps,
         // because this prevents interaction ("do you want to save", etc.)

--- kdebase/ksmserver/shutdown.cpp  #1.50:1.51
@@ -73,6 +73,5 @@ void KSMShutdownFeedback::slotPaintEffec
 
 KSMShutdownDlg::KSMShutdownDlg( QWidget* parent,
-                                bool maysd, bool /*maynuke*/,
-                                KApplication::ShutdownType sdtype, \
KApplication::ShutdownMode /*sdmode*/ ) +                                bool maysd, \
KApplication::ShutdownType sdtype )  : QDialog( parent, 0, TRUE, WType_Popup )
     // this is a WType_Popup on purpose. Do not change that! Not
@@ -173,11 +172,10 @@ void KSMShutdownDlg::slotHalt()
 
 
-bool KSMShutdownDlg::confirmShutdown( bool maysd, bool maynuke,
-                                      KApplication::ShutdownType& sdtype, \
KApplication::ShutdownMode& sdmode ) +bool KSMShutdownDlg::confirmShutdown( bool \
maysd, KApplication::ShutdownType& sdtype )  {
     kapp->enableStyles();
     KSMShutdownDlg* l = new KSMShutdownDlg( 0,
                                             //KSMShutdownFeedback::self(),
-                                            maysd, maynuke, sdtype, sdmode );
+                                            maysd, sdtype );
 
     // Show dialog (will save the background in showEvent)

--- kdebase/ksmserver/shutdown.h  #1.11:1.12
@@ -43,5 +43,5 @@ class KSMShutdownDlg : public QDialog
 
 public:
-    static bool confirmShutdown( bool maysd, bool maynuke, \
KApplication::ShutdownType& sdtype, KApplication::ShutdownMode& sdmode ); +    static \
bool confirmShutdown( bool maysd, KApplication::ShutdownType& sdtype );  
 public slots:
@@ -54,10 +54,6 @@ protected:
 
 private:
-    KSMShutdownDlg( QWidget* parent, bool maysd, bool maynuke, \
KApplication::ShutdownType sdtype, KApplication::ShutdownMode sdmode ); +    \
KSMShutdownDlg( QWidget* parent, bool maysd, KApplication::ShutdownType sdtype );  \
                KApplication::ShutdownType m_shutdownType;
-#if 0
-    , *rSched, *rTry, *rForce;
-    QVButtonGroup *mgrp;
-#endif
 };
 


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