From e4e0479220e9e9616b68b2a11e42cff7a8af7b3d Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sun, 20 Jan 2013 00:17:06 -0600 Subject: Rename KApplication to TDEApplication to avoid conflicts with KDE4 --- kdesktop/lock/main.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'kdesktop/lock/main.cc') 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); -- cgit v1.2.1