diff options
Diffstat (limited to 'twin/main.cpp')
| -rw-r--r-- | twin/main.cpp | 22 |
1 files changed, 10 insertions, 12 deletions
diff --git a/twin/main.cpp b/twin/main.cpp index 4fd81d245..c988b53f2 100644 --- a/twin/main.cpp +++ b/twin/main.cpp @@ -45,13 +45,13 @@ Atoms* atoms; int screen_number = -1; bool disable_twin_composition_manager = false; -static bool initting = FALSE; +static bool initting = false; static int x11ErrorHandler(Display *d, XErrorEvent *e) { char msg[80], req[80], number[80]; - bool ignore_badwindow = TRUE; //maybe temporary + bool ignore_badwindow = true; //maybe temporary if (initting && ( @@ -84,10 +84,6 @@ int x11ErrorHandler(Display *d, XErrorEvent *e) Application::Application( ) : TDEApplication( ), owner( screen_number ) { -#ifdef USE_QT4 - // I'm special... - setQuitOnLastWindowClosed(false); -#endif // USE_QT4 TDECmdLineArgs* args = TDECmdLineArgs::parsedArgs(); if (!config()->isImmutable() && args->isSet("lock")) { @@ -150,12 +146,12 @@ Application::Application( ) ::exit(1); } } - connect( &owner, TQT_SIGNAL( lostOwnership()), TQT_SLOT( lostSelection())); + connect( &owner, TQ_SIGNAL( lostOwnership()), TQ_SLOT( lostSelection())); // if there was already twin running, it saved its configuration after loosing the selection -> reread config()->reparseConfiguration(); - initting = TRUE; // startup.... + initting = true; // startup.... // install X11 error handler XSetErrorHandler( x11ErrorHandler ); @@ -180,7 +176,7 @@ Application::Application( ) DCOPRef ref( "kded", "kded" ); ref.send( "unloadModule", TQCString( "kdetrayproxy" )); - initting = FALSE; // startup done, we are up and running now. + initting = false; // startup done, we are up and running now. dcopClient()->send( "ksplash", "", "upAndRunning(TQString)", TQString("wm started")); XEvent e; @@ -198,7 +194,7 @@ Application::~Application() delete Workspace::self(); if( owner.ownerWindow() != None ) // if there was no --replace (no new WM) { - XSetInputFocus( tqt_xdisplay(), PointerRoot, RevertToPointerRoot, GET_QT_X_TIME() ); + XSetInputFocus( tqt_xdisplay(), PointerRoot, RevertToPointerRoot, get_tqt_x_time() ); DCOPRef ref( "kded", "kded" ); if( !ref.send( "loadModule", TQCString( "kdetrayproxy" ))) kdWarning( 176 ) << "Loading of kdetrayproxy failed." << endl; @@ -220,7 +216,7 @@ void Application::lostSelection() bool Application::x11EventFilter( XEvent *e ) { if ( Workspace::self()->workspaceEvent( e ) ) - return TRUE; + return true; return TDEApplication::x11EventFilter( e ); } @@ -244,7 +240,7 @@ static TDECmdLineOptions args[] = }; extern "C" -KDE_EXPORT int kdemain( int argc, char * argv[] ) +TDE_EXPORT int kdemain( int argc, char * argv[] ) { bool restored = false; for (int arg = 1; arg < argc; arg++) @@ -346,6 +342,8 @@ KDE_EXPORT int kdemain( int argc, char * argv[] ) else appname.sprintf("twin-screen-%d", KWinInternal::screen_number); + TDEGlobal::locale()->insertCatalogue("twin_lib"); + DCOPClient* client = a.dcopClient(); client->registerAs( appname.data(), false); client->setDefaultObject( "KWinInterface" ); |