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

List:       kde-commits
Subject:    branches/work/non-x11-kde4/kdelibs/kutils
From:       Benjamin Reed <ranger () befunk ! com>
Date:       2005-06-15 21:15:33
Message-ID: 1118870133.752295.3083.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 425914 by reed:

more kde/mac fixes and more merging from work/kde4

 M  +16 -3     kcmoduleproxy.cpp  
 M  +3 -3      kmultitabbar.h  


--- branches/work/non-x11-kde4/kdelibs/kutils/kcmoduleproxy.cpp #425913:425914
@@ -31,8 +31,10 @@
 #include <q3vbox.h>
 #include <qwidget.h>
 
+#ifdef Q_WS_X11
 #include <qxembed.h>
 #include <qx11info_x11.h>
+#endif
 
 #include <kapplication.h>
 #include <kaboutdata.h>
@@ -47,8 +49,6 @@
 #include <kstandarddirs.h>
 #include <kuser.h>
 
-#include <X11/Xlib.h>
-
 #include "kcmoduleproxy.h"
 #include "kcmoduleproxyIface.h"
 #include "kcmoduleproxyIfaceImpl.h"
@@ -61,7 +61,9 @@
 			: args( 0 )
 			, kcm( 0 )
 			//, view( 0 )
+#ifdef Q_WS_X11
 			, embedWidget( 0 )
+#endif
 			, rootProcess ( 0 )
 			, embedFrame ( 0 )
 			, dcopObject( 0 )
@@ -80,7 +82,9 @@
 		~KCModuleProxyPrivate()
 		{
 			delete rootInfo; // Delete before embedWidget!
+#ifdef Q_WS_X11
 			delete embedWidget; // Delete before embedFrame!
+#endif
 			delete embedFrame;
 			delete dcopClient;
 			delete dcopObject;
@@ -91,7 +95,9 @@
 
 		QStringList							args;
 		KCModule							*kcm;
+#ifdef Q_WS_X11
 		QXEmbed								*embedWidget;
+#endif
 		KProcess							*rootProcess;
 		Q3VBox								*embedFrame;
 		KCModuleProxyIfaceImpl  			*dcopObject;
@@ -296,6 +302,7 @@
 
 void KCModuleProxy::runAsRoot()
 {
+#ifdef Q_WS_X11
 	if ( !moduleInfo().needsRootPrivileges() )
 		return;
 
@@ -391,10 +398,14 @@
 	d->embedFrame = 0;
 
 	QApplication::restoreOverrideCursor();
+#else
+	return;
+#endif
 }
 
 void KCModuleProxy::rootExited()
 {
+#ifdef Q_WS_X11
 	kdDebug(711) << k_funcinfo << endl;
 
 	if ( d->embedWidget->embeddedWinId() )
@@ -422,6 +433,7 @@
 
 	moduleChanged( false );
 	emit childClosed();
+#endif;
 }
 
 KCModuleProxy::~KCModuleProxy()
@@ -434,6 +446,7 @@
 
 void KCModuleProxy::deleteClient()
 {
+#ifdef Q_WS_X11
 	if( d->embedWidget )
 		XKillClient(QX11Info::display(), d->embedWidget->embeddedWinId());
 
@@ -451,7 +464,7 @@
 	d->dcopClient = 0;
 
 	kapp->syncX();
-
+#endif
 }
 
 void KCModuleProxy::moduleChanged( bool c )
--- branches/work/non-x11-kde4/kdelibs/kutils/kmultitabbar.h #425913:425914
@@ -61,9 +61,9 @@
 
 	/**
 	 * The list of available styles for KMultiTabBar
-	 * <li>VSNET - Visual Studio .Net like (only show the text of active tabs
-	 * <li>KDEV3 - Kdevelop 3 like (always show the text)
-	 * <li>KONQSBC - konqy's classic sidebar style (unthemed) (currently disabled)
+	 *   - VSNET - Visual Studio .Net like (only show the text of active tabs
+	 *   - KDEV3 - Kdevelop 3 like (always show the text)
+	 *   - KONQSBC - konqy's classic sidebar style (unthemed) (currently disabled)
 	 */
 	enum KMultiTabBarStyle{VSNET=0, KDEV3=1, KONQSBC=2, KDEV3ICON=3,STYLELAST=0xffff};
 
[prev in list] [next in list] [prev in thread] [next in thread]