diff options
author | Timothy Pearson <[email protected]> | 2013-01-20 00:17:06 -0600 |
---|---|---|
committer | Timothy Pearson <[email protected]> | 2013-01-20 00:17:06 -0600 |
commit | e4e0479220e9e9616b68b2a11e42cff7a8af7b3d (patch) | |
tree | 8e01571cdd132dad34ebec38b12c2dbc37d05bd9 /kicker/proxy | |
parent | d41050ea3f6904e5156d35f664346b816b9e4d12 (diff) | |
download | tdebase-e4e0479220e9e9616b68b2a11e42cff7a8af7b3d.tar.gz tdebase-e4e0479220e9e9616b68b2a11e42cff7a8af7b3d.zip |
Rename KApplication to TDEApplication to avoid conflicts with KDE4
Diffstat (limited to 'kicker/proxy')
-rw-r--r-- | kicker/proxy/appletproxy.cpp | 4 | ||||
-rw-r--r-- | kicker/proxy/extensiondebugger.cpp | 4 | ||||
-rw-r--r-- | kicker/proxy/extensionproxy.cpp | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/kicker/proxy/appletproxy.cpp b/kicker/proxy/appletproxy.cpp index 04e81612e..328cec09c 100644 --- a/kicker/proxy/appletproxy.cpp +++ b/kicker/proxy/appletproxy.cpp @@ -78,10 +78,10 @@ extern "C" KDE_EXPORT int kdemain( int argc, char ** argv ) TDECmdLineArgs::init(argc, argv, &aboutData ); aboutData.addAuthor("Matthias Elter",0, "[email protected]"); aboutData.addAuthor("Matthias Ettrich",0, "[email protected]"); - KApplication::addCmdLineOptions(); + TDEApplication::addCmdLineOptions(); TDECmdLineArgs::addCmdLineOptions(options); // Add our own options. - KApplication a; + TDEApplication a; a.disableSessionManagement(); KGlobal::dirs()->addResourceType("applets", KStandardDirs::kde_default("data") + diff --git a/kicker/proxy/extensiondebugger.cpp b/kicker/proxy/extensiondebugger.cpp index 4fa1d8332..0910294b1 100644 --- a/kicker/proxy/extensiondebugger.cpp +++ b/kicker/proxy/extensiondebugger.cpp @@ -82,10 +82,10 @@ int main( int argc, char ** argv ) TDECmdLineArgs::init(argc, argv, &aboutData ); aboutData.addAuthor("Matthias Elter",0, "[email protected]"); aboutData.addAuthor("Matthias Ettrich",0, "[email protected]"); - KApplication::addCmdLineOptions(); + TDEApplication::addCmdLineOptions(); TDECmdLineArgs::addCmdLineOptions(options); // Add our own options. - KApplication a; + TDEApplication a; a.disableSessionManagement(); KGlobal::dirs()->addResourceType("extensions", KStandardDirs::kde_default("data") + diff --git a/kicker/proxy/extensionproxy.cpp b/kicker/proxy/extensionproxy.cpp index eab6f4bb4..a5345dfcf 100644 --- a/kicker/proxy/extensionproxy.cpp +++ b/kicker/proxy/extensionproxy.cpp @@ -64,10 +64,10 @@ extern "C" KDE_EXPORT int kdemain( int argc, char ** argv ) TDECmdLineArgs::init(argc, argv, &aboutData ); aboutData.addAuthor("Matthias Elter",0, "[email protected]"); aboutData.addAuthor("Matthias Ettrich",0, "[email protected]"); - KApplication::addCmdLineOptions(); + TDEApplication::addCmdLineOptions(); TDECmdLineArgs::addCmdLineOptions(options); // Add our own options. - KApplication a; + TDEApplication a; a.disableSessionManagement(); KGlobal::dirs()->addResourceType("extensions", KStandardDirs::kde_default("data") + |