summaryrefslogtreecommitdiffstats
path: root/kdesktop/main.cc
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 /kdesktop/main.cc
parent1e0a98b8623428064963b1627e4e09ea02c1e87e (diff)
downloadtdebase-1d061b286a8b183b39be60fe531f2b1c2915f03a.tar.gz
tdebase-1d061b286a8b183b39be60fe531f2b1c2915f03a.zip
Rename KInstance and KAboutData to avoid conflicts with KDE4
Diffstat (limited to 'kdesktop/main.cc')
-rw-r--r--kdesktop/main.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/kdesktop/main.cc b/kdesktop/main.cc
index 51eb7b2a3..a12f241b8 100644
--- a/kdesktop/main.cc
+++ b/kdesktop/main.cc
@@ -168,8 +168,8 @@ extern "C" KDE_EXPORT int kdemain( int argc, char **argv )
twin_name.sprintf("twin-screen-%d", kdesktop_screen_number);
}
- KAboutData aboutData( kdesktop_name, I18N_NOOP("KDesktop"),
- version, description, KAboutData::License_GPL,
+ TDEAboutData aboutData( kdesktop_name, I18N_NOOP("KDesktop"),
+ version, description, TDEAboutData::License_GPL,
"(c) 1998-2000, The KDesktop Authors");
aboutData.addAuthor("David Faure", 0, "faure@kde.org");
aboutData.addAuthor("Martin Koller", 0, "m.koller@surfeu.at");