summaryrefslogtreecommitdiffstats
path: root/kate/app
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 /kate/app
parent1e0a98b8623428064963b1627e4e09ea02c1e87e (diff)
downloadtdebase-1d061b286a8b183b39be60fe531f2b1c2915f03a.tar.gz
tdebase-1d061b286a8b183b39be60fe531f2b1c2915f03a.zip
Rename KInstance and KAboutData to avoid conflicts with KDE4
Diffstat (limited to 'kate/app')
-rw-r--r--kate/app/katemain.cpp4
-rw-r--r--kate/app/kwritemain.cpp4
2 files changed, 4 insertions, 4 deletions
diff --git a/kate/app/katemain.cpp b/kate/app/katemain.cpp
index 28f293509..f5dd1ea5c 100644
--- a/kate/app/katemain.cpp
+++ b/kate/app/katemain.cpp
@@ -60,8 +60,8 @@ extern "C" KDE_EXPORT int kdemain( int argc, char **argv )
// here we go, construct the Kate version
TQString kateVersion = KateApp::kateVersion();
- KAboutData aboutData ("kate", I18N_NOOP("Kate"), kateVersion.latin1(),
- I18N_NOOP( "Kate - Advanced Text Editor" ), KAboutData::License_LGPL_V2,
+ TDEAboutData aboutData ("kate", I18N_NOOP("Kate"), kateVersion.latin1(),
+ I18N_NOOP( "Kate - Advanced Text Editor" ), TDEAboutData::License_LGPL_V2,
I18N_NOOP( "(c) 2000-2005 The Kate Authors" ), 0, "http://kate.kde.org");
aboutData.addAuthor ("Christoph Cullmann", I18N_NOOP("Maintainer"), "cullmann@kde.org", "http://www.babylon2k.de");
diff --git a/kate/app/kwritemain.cpp b/kate/app/kwritemain.cpp
index 02b00017f..2f32d2c24 100644
--- a/kate/app/kwritemain.cpp
+++ b/kate/app/kwritemain.cpp
@@ -549,10 +549,10 @@ extern "C" KDE_EXPORT int kdemain(int argc, char **argv)
We now hard-code the first two numbers to match the 3.5.x days and only update the last number. */
TQString kWriteVersion = TQString ("4.5.%1").arg(KDE::versionMajor());
- KAboutData aboutData ( "kwrite",
+ TDEAboutData aboutData ( "kwrite",
I18N_NOOP("KWrite"),
kWriteVersion.latin1(),
- I18N_NOOP( "KWrite - Text Editor" ), KAboutData::License_LGPL_V2,
+ I18N_NOOP( "KWrite - Text Editor" ), TDEAboutData::License_LGPL_V2,
I18N_NOOP( "(c) 2000-2005 The Kate Authors" ), 0, "http://kate.kde.org" );
aboutData.addAuthor ("Christoph Cullmann", I18N_NOOP("Maintainer"), "cullmann@kde.org", "http://www.babylon2k.de");