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

List:       kde-commits
Subject:    kdebase/kdm/kfrontend
From:       Oswald Buddenhagen <ossi () kde ! org>
Date:       2004-08-24 20:12:07
Message-ID: 20040824201207.D4DC91773 () office ! kde ! org
[Download RAW message or body]

CVS commit by ossi: 

fix lilo-less compile.
moc sucks. i really hope the trolls make it grok #ifdefs for qt4.


  M +2 -2      kdmshutdown.cpp   1.50
  M +2 -6      kdmshutdown.h   1.24


--- kdebase/kdm/kfrontend/kdmshutdown.cpp  #1.49:1.50
@@ -540,8 +540,8 @@ KDMSlimShutdown::slotReboot()
 {
     if (checkShutdown()) {
-        #if defined(__linux__) && ( defined(__i386__) || defined(__amd64__) )
+#if defined(__linux__) && ( defined(__i386__) || defined(__amd64__) )
         if (_useLilo)
             applyTarget();
-        #endif
+#endif
         doShutdown( SHUT_REBOOT );
     }

--- kdebase/kdm/kfrontend/kdmshutdown.h  #1.23:1.24
@@ -85,6 +85,6 @@ public: // from KGVerifyHandler
 
 
-#if defined(__linux__) && (defined(__i386__) || defined(__amd64__))
 class LiloHandler {
+#if defined(__linux__) && (defined(__i386__) || defined(__amd64__))
 public:
     LiloHandler();
@@ -96,11 +96,9 @@ public:
     QComboBox           *targets;
     int                 defaultLiloTarget, oldLiloTarget;
-};
 #endif
+};
 
 class KDMShutdown : public KDMShutdownBase
-#if defined(__linux__) && (defined(__i386__) || defined(__amd64__))
                   , public LiloHandler
-#endif
 {
     Q_OBJECT
@@ -148,7 +146,5 @@ signals:
 
 class KDMSlimShutdown : public FDialog
-#if defined(__linux__) && (defined(__i386__) || defined(__amd64__))
                       , public LiloHandler
-#endif
 {
     Q_OBJECT


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