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 /kdesktop/lock | |
| parent | d41050ea3f6904e5156d35f664346b816b9e4d12 (diff) | |
| download | tdebase-e4e0479220e9e9616b68b2a11e42cff7a8af7b3d.tar.gz tdebase-e4e0479220e9e9616b68b2a11e42cff7a8af7b3d.zip | |
Rename KApplication to TDEApplication to avoid conflicts with KDE4
Diffstat (limited to 'kdesktop/lock')
| -rw-r--r-- | kdesktop/lock/lockprocess.cc | 2 | ||||
| -rw-r--r-- | kdesktop/lock/main.cc | 4 | ||||
| -rw-r--r-- | kdesktop/lock/main.h | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/kdesktop/lock/lockprocess.cc b/kdesktop/lock/lockprocess.cc index 5db594306..cd8f38da1 100644 --- a/kdesktop/lock/lockprocess.cc +++ b/kdesktop/lock/lockprocess.cc @@ -776,7 +776,7 @@ void LockProcess::startSecureDialog() } if (ret == 3) { trinity_desktop_lock_closing_windows = 1; - DCOPRef("ksmserver","ksmserver").send("logout", (int)KApplication::ShutdownConfirmYes, (int)KApplication::ShutdownTypeNone, (int)KApplication::ShutdownModeInteractive); + DCOPRef("ksmserver","ksmserver").send("logout", (int)TDEApplication::ShutdownConfirmYes, (int)TDEApplication::ShutdownTypeNone, (int)TDEApplication::ShutdownModeInteractive); kapp->quit(); } // FIXME diff --git a/kdesktop/lock/main.cc b/kdesktop/lock/main.cc index 88c28d11b..89e29a5c0 100644 --- a/kdesktop/lock/main.cc +++ b/kdesktop/lock/main.cc @@ -149,7 +149,7 @@ bool MyApp::x11EventFilter( XEvent *ev ) } } #endif - return KApplication::x11EventFilter( ev ); + return TDEApplication::x11EventFilter( ev ); } @@ -213,7 +213,7 @@ int main( int argc, char **argv ) putenv(strdup("SESSION_MANAGER=")); - KApplication::disableAutoDcopRegistration(); // not needed + TDEApplication::disableAutoDcopRegistration(); // not needed XSetErrorHandler(trapXErrors); diff --git a/kdesktop/lock/main.h b/kdesktop/lock/main.h index 23797e4b0..12db9ebca 100644 --- a/kdesktop/lock/main.h +++ b/kdesktop/lock/main.h @@ -24,10 +24,10 @@ #include <time.h> -class MyApp : public KApplication { +class MyApp : public TDEApplication { Q_OBJECT public: - MyApp() : KApplication(), lastTick( 0 ) {} + MyApp() : TDEApplication(), lastTick( 0 ) {} protected: bool x11EventFilter( XEvent * ); signals: |