diff options
| author | Timothy Pearson <[email protected]> | 2013-01-22 20:15:55 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2013-01-22 20:15:55 -0600 |
| commit | 1d061b286a8b183b39be60fe531f2b1c2915f03a (patch) | |
| tree | 0a4c6ee79918e366077094fb59e9c1196d7f4156 /kicker/proxy | |
| parent | 1e0a98b8623428064963b1627e4e09ea02c1e87e (diff) | |
| download | tdebase-1d061b286a8b183b39be60fe531f2b1c2915f03a.tar.gz tdebase-1d061b286a8b183b39be60fe531f2b1c2915f03a.zip | |
Rename KInstance and KAboutData 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 328cec09c..734c6ef8c 100644 --- a/kicker/proxy/appletproxy.cpp +++ b/kicker/proxy/appletproxy.cpp @@ -70,10 +70,10 @@ static KCmdLineOptions options[] = extern "C" KDE_EXPORT int kdemain( int argc, char ** argv ) { - KAboutData aboutData( "kicker", I18N_NOOP("Panel applet proxy.") + TDEAboutData aboutData( "kicker", I18N_NOOP("Panel applet proxy.") , "v0.1.0" ,I18N_NOOP("Panel applet proxy.") - , KAboutData::License_BSD + , TDEAboutData::License_BSD , "(c) 2000, The KDE Developers"); TDECmdLineArgs::init(argc, argv, &aboutData ); aboutData.addAuthor("Matthias Elter",0, "[email protected]"); diff --git a/kicker/proxy/extensiondebugger.cpp b/kicker/proxy/extensiondebugger.cpp index 0910294b1..a27d59321 100644 --- a/kicker/proxy/extensiondebugger.cpp +++ b/kicker/proxy/extensiondebugger.cpp @@ -74,10 +74,10 @@ KPanelExtension* loadExtension(const AppletInfo& info) int main( int argc, char ** argv ) { - KAboutData aboutData( "extensionproxy", I18N_NOOP("Panel extension proxy.") + TDEAboutData aboutData( "extensionproxy", I18N_NOOP("Panel extension proxy.") , "v0.1.0" ,I18N_NOOP("Panel extension proxy.") - , KAboutData::License_BSD + , TDEAboutData::License_BSD , "(c) 2000, The KDE Developers"); TDECmdLineArgs::init(argc, argv, &aboutData ); aboutData.addAuthor("Matthias Elter",0, "[email protected]"); diff --git a/kicker/proxy/extensionproxy.cpp b/kicker/proxy/extensionproxy.cpp index a5345dfcf..a2fc35ecc 100644 --- a/kicker/proxy/extensionproxy.cpp +++ b/kicker/proxy/extensionproxy.cpp @@ -56,10 +56,10 @@ static KCmdLineOptions options[] = extern "C" KDE_EXPORT int kdemain( int argc, char ** argv ) { - KAboutData aboutData( "extensionproxy", I18N_NOOP("Panel Extension Proxy") + TDEAboutData aboutData( "extensionproxy", I18N_NOOP("Panel Extension Proxy") , "v0.1.0" ,I18N_NOOP("Panel extension proxy") - , KAboutData::License_BSD + , TDEAboutData::License_BSD , "(c) 2000, The KDE Developers"); TDECmdLineArgs::init(argc, argv, &aboutData ); aboutData.addAuthor("Matthias Elter",0, "[email protected]"); |