diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-20 00:17:06 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-20 00:17:06 -0600 |
| commit | e4e0479220e9e9616b68b2a11e42cff7a8af7b3d (patch) | |
| tree | 8e01571cdd132dad34ebec38b12c2dbc37d05bd9 /twin/main.cpp | |
| parent | d41050ea3f6904e5156d35f664346b816b9e4d12 (diff) | |
| download | tdebase-e4e0479220e9e9616b68b2a11e42cff7a8af7b3d.tar.gz tdebase-e4e0479220e9e9616b68b2a11e42cff7a8af7b3d.zip | |
Rename KApplication to TDEApplication to avoid conflicts with KDE4
Diffstat (limited to 'twin/main.cpp')
| -rw-r--r-- | twin/main.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/twin/main.cpp b/twin/main.cpp index df2470c3e..d53578caf 100644 --- a/twin/main.cpp +++ b/twin/main.cpp @@ -82,7 +82,7 @@ int x11ErrorHandler(Display *d, XErrorEvent *e) } Application::Application( ) -: KApplication( ), owner( screen_number ) +: TDEApplication( ), owner( screen_number ) { #ifdef USE_QT4 // I'm special... @@ -216,7 +216,7 @@ bool Application::x11EventFilter( XEvent *e ) { if ( Workspace::self()->workspaceEvent( e ) ) return TRUE; - return KApplication::x11EventFilter( e ); + return TDEApplication::x11EventFilter( e ); } static void sighandler(int) @@ -327,7 +327,7 @@ KDE_EXPORT int kdemain( int argc, char * argv[] ) if (signal(SIGHUP, KWinInternal::sighandler) == SIG_IGN) signal(SIGHUP, SIG_IGN); - KApplication::disableAutoDcopRegistration(); + TDEApplication::disableAutoDcopRegistration(); KWinInternal::Application a; KWinInternal::SessionManaged weAreIndeed; KWinInternal::SessionSaveDoneHelper helper; |