summaryrefslogtreecommitdiffstats
path: root/ksmserver/main.cpp
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-22 20:15:55 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-22 20:15:55 -0600
commit1d061b286a8b183b39be60fe531f2b1c2915f03a (patch)
tree0a4c6ee79918e366077094fb59e9c1196d7f4156 /ksmserver/main.cpp
parent1e0a98b8623428064963b1627e4e09ea02c1e87e (diff)
downloadtdebase-1d061b286a8b183b39be60fe531f2b1c2915f03a.tar.gz
tdebase-1d061b286a8b183b39be60fe531f2b1c2915f03a.zip
Rename KInstance and KAboutData to avoid conflicts with KDE4
Diffstat (limited to 'ksmserver/main.cpp')
-rw-r--r--ksmserver/main.cpp4
1 files changed, 2 insertions, 2 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, "ettrich@kde.org");
aboutData.addAuthor("Luboš Luňák", I18N_NOOP( "Maintainer" ), "l.lunak@kde.org" );