diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-22 20:15:55 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-22 20:15:55 -0600 |
| commit | 1d061b286a8b183b39be60fe531f2b1c2915f03a (patch) | |
| tree | 0a4c6ee79918e366077094fb59e9c1196d7f4156 /kcontrol/kcontrol/main.cpp | |
| parent | 1e0a98b8623428064963b1627e4e09ea02c1e87e (diff) | |
| download | tdebase-1d061b286a8b183b39be60fe531f2b1c2915f03a.tar.gz tdebase-1d061b286a8b183b39be60fe531f2b1c2915f03a.zip | |
Rename KInstance and KAboutData to avoid conflicts with KDE4
Diffstat (limited to 'kcontrol/kcontrol/main.cpp')
| -rw-r--r-- | kcontrol/kcontrol/main.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/kcontrol/kcontrol/main.cpp b/kcontrol/kcontrol/main.cpp index e80f0603f..411a95748 100644 --- a/kcontrol/kcontrol/main.cpp +++ b/kcontrol/kcontrol/main.cpp @@ -101,16 +101,16 @@ KControlApp::~KControlApp() extern "C" KDE_EXPORT int kdemain(int argc, char *argv[]) { KLocale::setMainCatalogue("kcontrol"); - KAboutData aboutKControl( "kcontrol", I18N_NOOP("Trinity Control Center"), - KCONTROL_VERSION, I18N_NOOP("The Trinity Control Center"), KAboutData::License_GPL, + TDEAboutData aboutKControl( "kcontrol", I18N_NOOP("Trinity Control Center"), + KCONTROL_VERSION, I18N_NOOP("The Trinity Control Center"), TDEAboutData::License_GPL, I18N_NOOP("(c) 1998-2004, The TDE Control Center Developers")); - KAboutData aboutKInfoCenter( "kinfocenter", I18N_NOOP("Trinity Info Center"), - KCONTROL_VERSION, I18N_NOOP("The Trinity Info Center"), KAboutData::License_GPL, + TDEAboutData aboutKInfoCenter( "kinfocenter", I18N_NOOP("Trinity Info Center"), + KCONTROL_VERSION, I18N_NOOP("The Trinity Info Center"), TDEAboutData::License_GPL, I18N_NOOP("(c) 1998-2004, The TDE Control Center Developers")); TQCString argv_0 = argv[0]; - KAboutData *aboutData; + TDEAboutData *aboutData; if (argv_0.right(11) == "kinfocenter") { aboutData = &aboutKInfoCenter; |