summaryrefslogtreecommitdiffstats
path: root/koshell
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-22 19:55:40 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-22 19:55:40 -0600
commit73ff676f11662d6178c8854a7832ebffe2ae409d (patch)
tree9e89ea7d87940087d2d3c5db9b378ef989dd1346 /koshell
parentc2ba2f56121c21a762619faf195e8332ef5b224f (diff)
downloadkoffice-73ff676f11662d6178c8854a7832ebffe2ae409d.tar.gz
koffice-73ff676f11662d6178c8854a7832ebffe2ae409d.zip
Rename KInstance and KAboutData to avoid conflicts with KDE4
Diffstat (limited to 'koshell')
-rw-r--r--koshell/koshell_main.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/koshell/koshell_main.cc b/koshell/koshell_main.cc
index e940360e..83be2342 100644
--- a/koshell/koshell_main.cc
+++ b/koshell/koshell_main.cc
@@ -69,8 +69,8 @@ int KoShellApp::newInstance()
extern "C" KOSHELL_EXPORT int kdemain( int argc, char **argv )
{
- KAboutData * aboutData = new KAboutData( "koshell", I18N_NOOP("KOffice Workspace"),
- version, description, KAboutData::License_GPL,
+ TDEAboutData * aboutData = new TDEAboutData( "koshell", I18N_NOOP("KOffice Workspace"),
+ version, description, TDEAboutData::License_GPL,
"(c) 1998-2006, Torben Weis\n(c) 2002-2005, David Faure\n(c) 2005, Sven Lüppken");
aboutData->addAuthor("Sven Lüppken", I18N_NOOP("Current Maintainer"), "sven@kde.org");
aboutData->addAuthor("Torben Weis", 0, "weis@kde.org");