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 /ksmserver | |
| parent | 1e0a98b8623428064963b1627e4e09ea02c1e87e (diff) | |
| download | tdebase-1d061b286a8b183b39be60fe531f2b1c2915f03a.tar.gz tdebase-1d061b286a8b183b39be60fe531f2b1c2915f03a.zip | |
Rename KInstance and KAboutData to avoid conflicts with KDE4
Diffstat (limited to 'ksmserver')
| -rw-r--r-- | ksmserver/main.cpp | 4 | ||||
| -rw-r--r-- | ksmserver/test.cpp | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/ksmserver/main.cpp b/ksmserver/main.cpp index 443a978e2..ba8c0454d 100644 --- a/ksmserver/main.cpp +++ b/ksmserver/main.cpp @@ -180,8 +180,8 @@ extern "C" KDE_EXPORT int kdemain( int argc, char* argv[] ) { sanity_check(argc, argv); - KAboutData aboutData( "ksmserver", I18N_NOOP("The TDE Session Manager"), - version, description, KAboutData::License_BSD, + TDEAboutData aboutData( "ksmserver", I18N_NOOP("The TDE Session Manager"), + version, description, TDEAboutData::License_BSD, "(C) 2000, The KDE Developers"); aboutData.addAuthor("Matthias Ettrich",0, "[email protected]"); aboutData.addAuthor("Luboš Luňák", I18N_NOOP( "Maintainer" ), "[email protected]" ); diff --git a/ksmserver/test.cpp b/ksmserver/test.cpp index 5ccb4243a..126164db9 100644 --- a/ksmserver/test.cpp +++ b/ksmserver/test.cpp @@ -7,7 +7,7 @@ int main(int argc, char *argv[]) { - KAboutData about("kapptest", "kapptest", "version"); + TDEAboutData about("kapptest", "kapptest", "version"); TDECmdLineArgs::init(argc, argv, &about); TDEApplication a; |