Rename KInstance and KAboutData to avoid conflicts with KDE4

5 files changed, 8 insertions, 8 deletions

diff --git a/kapptemplate/ChangeLog b/kapptemplate/ChangeLog
index dc15a2a2..8cb9b55a 100644
--- a/kapptemplate/ChangeLog
+++ b/kapptemplate/ChangeLog
@@ -98,7 +98,7 @@ Oct-14-2000 - Malte Starostik (v0.7.2)
   o Added option to not run ./configure on newly created project
 
 Sep-26-2000 - Kurt Granroth (v0.7.1)
-  o Added hooks for more KAboutData information
+  o Added hooks for more TDEAboutData information
   o Now building moc files as moc.cpp instead of #including them
 
 Jul-21-2000 - Kurt Granroth (v0.7)
@@ -122,7 +122,7 @@ Feb-26-2000 - Kurt Granroth (v0.6)
   o Converted to use the new XML UI framework (big change!)
 
 Jan-12-2000 - Kurt Granroth (v0.5.2)
-  o Use KAboutData and TDECmdLineArgs
+  o Use TDEAboutData and TDECmdLineArgs
 
 Dec-28-1999 - Kurt Granroth (v0.5.1)
   o The po Makefile now uses the autogenerated rules.  I don't know
diff --git a/kapptemplate/kapp/main.cpp b/kapptemplate/kapp/main.cpp
index abf4cf92..14cabdd4 100644
--- a/kapptemplate/kapp/main.cpp
+++ b/kapptemplate/kapp/main.cpp
@@ -20,7 +20,7 @@ static KCmdLineOptions options[] =
 
 int main(int argc, char **argv)
 {
-    KAboutData about("${APP_NAME_LC}", I18N_NOOP("${APP_NAME}"), version, description, KAboutData::License_GPL, "(C) 2004 ${AUTHOR}", 0, 0, "${EMAIL}");
+    TDEAboutData about("${APP_NAME_LC}", I18N_NOOP("${APP_NAME}"), version, description, TDEAboutData::License_GPL, "(C) 2004 ${AUTHOR}", 0, 0, "${EMAIL}");
     about.addAuthor( "${AUTHOR}", 0, "${EMAIL}" );
     TDECmdLineArgs::init(argc, argv, &about);
     TDECmdLineArgs::addCmdLineOptions(options);
diff --git a/kapptemplate/kpartapp/app_part.cpp b/kapptemplate/kpartapp/app_part.cpp
index adbda9db..a95c0711 100644
--- a/kapptemplate/kpartapp/app_part.cpp
+++ b/kapptemplate/kpartapp/app_part.cpp
@@ -83,12 +83,12 @@ void ${APP_NAME}Part::setModified(bool modified)
     ReadWritePart::setModified(modified);
 }
 
-KAboutData *${APP_NAME}Part::createAboutData()
+TDEAboutData *${APP_NAME}Part::createAboutData()
 {
     // the non-i18n name here must be the same as the directory in
     // which the part's rc file is installed ('partrcdir' in the
     // Makefile)
-    KAboutData *aboutData = new KAboutData("${APP_NAME_LC}part", I18N_NOOP("${APP_NAME}Part"), "${APP_VERSION}");
+    TDEAboutData *aboutData = new TDEAboutData("${APP_NAME_LC}part", I18N_NOOP("${APP_NAME}Part"), "${APP_VERSION}");
     aboutData->addAuthor("${AUTHOR}", 0, "${EMAIL}");
     return aboutData;
 }
diff --git a/kapptemplate/kpartapp/app_part.h b/kapptemplate/kpartapp/app_part.h
index 556c3502..1150a21d 100644
--- a/kapptemplate/kpartapp/app_part.h
+++ b/kapptemplate/kpartapp/app_part.h
@@ -9,7 +9,7 @@ class TQWidget;
 class TQPainter;
 class KURL;
 class TQMultiLineEdit;
-class KAboutData;
+class TDEAboutData;
 
 /**
  * This is a "Part".  It that does all the real work in a KPart
@@ -47,7 +47,7 @@ public:
      */
     virtual void setModified(bool modified);
 
-    static KAboutData *createAboutData();
+    static TDEAboutData *createAboutData();
 
 protected:
     /**
diff --git a/kapptemplate/kpartapp/main.cpp b/kapptemplate/kpartapp/main.cpp
index 55cb53d7..dc584543 100644
--- a/kapptemplate/kpartapp/main.cpp
+++ b/kapptemplate/kpartapp/main.cpp
@@ -19,7 +19,7 @@ static KCmdLineOptions options[] =
 
 int main(int argc, char **argv)
 {
-    KAboutData about("${APP_NAME_LC}", I18N_NOOP("${APP_NAME}"), version, description, KAboutData::License_GPL, "(C) 2004 ${AUTHOR}", 0, 0, "${EMAIL}");
+    TDEAboutData about("${APP_NAME_LC}", I18N_NOOP("${APP_NAME}"), version, description, TDEAboutData::License_GPL, "(C) 2004 ${AUTHOR}", 0, 0, "${EMAIL}");
     about.addAuthor( "${AUTHOR}", 0, "${EMAIL}" );
     TDECmdLineArgs::init(argc, argv, &about);
     TDECmdLineArgs::addCmdLineOptions( options );