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 /kmenuedit | |
| parent | 1e0a98b8623428064963b1627e4e09ea02c1e87e (diff) | |
| download | tdebase-1d061b286a8b183b39be60fe531f2b1c2915f03a.tar.gz tdebase-1d061b286a8b183b39be60fe531f2b1c2915f03a.zip | |
Rename KInstance and KAboutData to avoid conflicts with KDE4
Diffstat (limited to 'kmenuedit')
| -rw-r--r-- | kmenuedit/kcontrol_main.cpp | 4 | ||||
| -rw-r--r-- | kmenuedit/main.cpp | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/kmenuedit/kcontrol_main.cpp b/kmenuedit/kcontrol_main.cpp index 3555937b5..50e9055d2 100644 --- a/kmenuedit/kcontrol_main.cpp +++ b/kmenuedit/kcontrol_main.cpp @@ -35,8 +35,8 @@ static const char version[] = "1.0"; extern "C" int KDE_EXPORT kdemain( int argc, char **argv ) { KLocale::setMainCatalogue("kmenuedit"); - KAboutData aboutData("kcontroledit", I18N_NOOP("TDE Control Center Editor"), - version, description, KAboutData::License_GPL, + TDEAboutData aboutData("kcontroledit", I18N_NOOP("TDE Control Center Editor"), + version, description, TDEAboutData::License_GPL, "(C) 2000-2004, Waldo Bastian, Raffaele Sandrini, Matthias Elter"); aboutData.addAuthor("Waldo Bastian", I18N_NOOP("Maintainer"), "[email protected]"); aboutData.addAuthor("Raffaele Sandrini", I18N_NOOP("Previous Maintainer"), "[email protected]"); diff --git a/kmenuedit/main.cpp b/kmenuedit/main.cpp index e2f70b62d..1addbbcaa 100644 --- a/kmenuedit/main.cpp +++ b/kmenuedit/main.cpp @@ -64,8 +64,8 @@ public: extern "C" int KDE_EXPORT kdemain( int argc, char **argv ) { - KAboutData aboutData("kmenuedit", I18N_NOOP("TDE Menu Editor"), - version, description, KAboutData::License_GPL, + TDEAboutData aboutData("kmenuedit", I18N_NOOP("TDE Menu Editor"), + version, description, TDEAboutData::License_GPL, "(C) 2000-2003, Waldo Bastian, Raffaele Sandrini, Matthias Elter"); aboutData.addAuthor("Waldo Bastian", I18N_NOOP("Maintainer"), "[email protected]"); aboutData.addAuthor("Raffaele Sandrini", I18N_NOOP("Previous Maintainer"), "[email protected]"); |