Rename KApplication to TDEApplication to avoid conflicts with KDE4

3 files changed, 3 insertions, 3 deletions

diff --git a/kcontrol/randr/krandrapp.cpp b/kcontrol/randr/krandrapp.cpp
index eab459e8e..f5cfbbde1 100644
--- a/kcontrol/randr/krandrapp.cpp
+++ b/kcontrol/randr/krandrapp.cpp
@@ -43,5 +43,5 @@ bool KRandRApp::x11EventFilter(XEvent* e)
 	if (e->type == m_tray->screenChangeNotifyEvent()) {
 		m_eventMergingTimer.start(1000, TRUE);
 	}
-	return KApplication::x11EventFilter( e );
+	return TDEApplication::x11EventFilter( e );
 }
diff --git a/kcontrol/randr/krandrtray.cpp b/kcontrol/randr/krandrtray.cpp
index 89315f75c..2cdcdb636 100644
--- a/kcontrol/randr/krandrtray.cpp
+++ b/kcontrol/randr/krandrtray.cpp
@@ -537,7 +537,7 @@ void KRandRSystemTray::slotDisplayConfig()
 
 void KRandRSystemTray::slotSettingsChanged(int category)
 {
-	if ( category == (int) KApplication::SETTINGS_SHORTCUTS ) {
+	if ( category == (int) TDEApplication::SETTINGS_SHORTCUTS ) {
 		globalKeys->readSettings();
 		globalKeys->updateConnections();
 	}
diff --git a/kcontrol/randr/main.cpp b/kcontrol/randr/main.cpp
index 39903351b..c1a9e6a41 100644
--- a/kcontrol/randr/main.cpp
+++ b/kcontrol/randr/main.cpp
@@ -44,7 +44,7 @@ int main(int argc, char **argv)
 
 	TDECmdLineArgs::init(argc,argv,&aboutData);
 	TDECmdLineArgs::addCmdLineOptions(options);
-	KApplication::addCmdLineOptions();
+	TDEApplication::addCmdLineOptions();
 
 	KRandRApp app;