From b5273a041cb334d4de886d6fcbbc76f91f4cd5b2 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sat, 19 Jan 2013 23:59:10 -0600 Subject: Rename KApplication to TDEApplication to avoid conflicts with KDE4 --- kradio3/convert-presets/convert-presets.cpp | 2 +- kradio3/src/include/kradioapp.h | 2 +- kradio3/src/kradioapp.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/kradio3/convert-presets/convert-presets.cpp b/kradio3/convert-presets/convert-presets.cpp index e68033d..5d9e96f 100644 --- a/kradio3/convert-presets/convert-presets.cpp +++ b/kradio3/convert-presets/convert-presets.cpp @@ -170,7 +170,7 @@ int main(int argc, char *argv[]) TDECmdLineArgs::init( argc, argv, &aboutData ); TDECmdLineArgs::addCmdLineOptions( options ); // Add our own options. - KApplication a (false, false); + TDEApplication a (false, false); TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs(); diff --git a/kradio3/src/include/kradioapp.h b/kradio3/src/include/kradioapp.h index e2a9e50..facecae 100644 --- a/kradio3/src/include/kradioapp.h +++ b/kradio3/src/include/kradioapp.h @@ -80,7 +80,7 @@ struct PluginClassInfo { }; -class KRadioApp : public KApplication +class KRadioApp : public TDEApplication { Q_OBJECT diff --git a/kradio3/src/kradioapp.cpp b/kradio3/src/kradioapp.cpp index b5bc509..78ee7e0 100644 --- a/kradio3/src/kradioapp.cpp +++ b/kradio3/src/kradioapp.cpp @@ -125,7 +125,7 @@ PluginLibraryInfo::PluginLibraryInfo (const TQString &lib_name) //// KRadioApp KRadioApp::KRadioApp() - : KApplication(), + : TDEApplication(), m_quitting(false) { m_Instances.setAutoDelete(true); -- cgit v1.2.3