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

List:       kde-commits
Subject:    KDE/kdebase/workspace/kdm/kfrontend
From:       Oswald Buddenhagen <ossi () kde ! org>
Date:       2006-08-27 18:32:29
Message-ID: 1156703549.396511.2032.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 577862 by ossi:

- replace kapp with qapp + kinstance
- some other setup tinkering
kdm now "works" again.


 M  +9 -9      kgapp.cpp  
 M  +4 -4      kgapp.h  


--- trunk/KDE/kdebase/workspace/kdm/kfrontend/kgapp.cpp #577861:577862
@@ -31,6 +31,7 @@
 # include "kchooser.h"
 #endif
 
+#include <kapplication.h>
 #include <kprocess.h>
 #include <kcmdlineargs.h>
 #include <kcrash.h>
@@ -64,7 +65,8 @@
 
 }
 
-GreeterApp::GreeterApp()
+GreeterApp::GreeterApp(int argc, char **argv) :
+	inherited(argc, argv)
 {
 	pingInterval = _isLocal ? 0 : _pingInterval;
 	if (pingInterval) {
@@ -119,8 +121,6 @@
 	return false;
 }
 
-extern bool kde_have_kipc;
-
 extern "C" {
 
 static int
@@ -133,13 +133,13 @@
 kg_main( const char *argv0 )
 {
 	static char *argv[] = { (char *)"kdmgreet", 0 };
-	KCmdLineArgs::init( 1, argv, *argv, 0, 0, 0, \
KCmdLineArgs::StdCmdLineArgs(KCmdLineArgs::CmdLineArgNone) );  
-	kde_have_kipc = false;
-	//KApplication::disableAutoDcopRegistration();
-	KCrash::setSafer( true );
-	GreeterApp app;
+	KCrash::setFlags( KCrash::KeepFDs | KCrash::SaferDialog | KCrash::AlwaysDirectly );
+	KCrash::setApplicationName( QLatin1String( argv[0] ) );
+	KCrash::setCrashHandler( KCrash::defaultCrashHandler );
 	XSetIOErrorHandler( xIOErr );
+	KInstance inst( argv[0] );
+	GreeterApp app( 1, argv );
 
 	Display *dpy = QX11Info::display();
 
@@ -150,7 +150,7 @@
 	if (!_colorScheme.isEmpty()) {
 		KSimpleConfig config( _colorScheme, true );
 		config.setGroup( "Color Scheme" );
-		app.setPalette( app.createApplicationPalette( &config, 7 ) );
+		app.setPalette( KApplication::createApplicationPalette( &config, 7 ) );
 	}
 
 	app.setFont( _normalFont );
--- trunk/KDE/kdebase/workspace/kdm/kfrontend/kgapp.h #577861:577862
@@ -26,16 +26,16 @@
 #ifndef KGAPP_H
 #define KGAPP_H
 
-#include <kapplication.h>
+#include <qapplication.h>
 //Added by qt3to4:
 #include <QTimerEvent>
 
-class GreeterApp : public KApplication {
+class GreeterApp : public QApplication {
 	Q_OBJECT
-	typedef KApplication inherited;
+	typedef QApplication inherited;
 
   public:
-	GreeterApp();
+	GreeterApp(int argc, char **argv);
 	virtual bool x11EventFilter( XEvent * );
 
   protected:


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