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 --- kcontrol/randr/krandrapp.cpp | 2 +- kcontrol/randr/krandrtray.cpp | 2 +- kcontrol/randr/main.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'kcontrol/randr') 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; -- cgit v1.2.3