Rename KInstance and KAboutData to avoid conflicts with KDE4

5 files changed, 6 insertions, 6 deletions

diff --git a/kdoctools/main.cpp b/kdoctools/main.cpp
index 8e096d6cf..7ba294bfb 100644
--- a/kdoctools/main.cpp
+++ b/kdoctools/main.cpp
@@ -25,7 +25,7 @@ extern "C"
 {
     KDE_EXPORT int kdemain( int argc, char **argv )
     {
-        KInstance instance( "kio_help" );
+        TDEInstance instance( "kio_help" );
         fillInstance(instance);
         (void)instance.config(); // we need this one to make sure system globals are read
 
diff --git a/kdoctools/main_ghelp.cpp b/kdoctools/main_ghelp.cpp
index 281b31f17..bbdb5d7c0 100644
--- a/kdoctools/main_ghelp.cpp
+++ b/kdoctools/main_ghelp.cpp
@@ -25,7 +25,7 @@ extern "C"
 {
     KDE_EXPORT int kdemain( int argc, char **argv )
     {
-        KInstance instance( "kio_ghelp" );
+        TDEInstance instance( "kio_ghelp" );
         fillInstance(instance);
         (void)instance.config(); // we need this one to make sure system globals are read
 
diff --git a/kdoctools/meinproc.cpp b/kdoctools/meinproc.cpp
index 8f9b94350..577d0341d 100644
--- a/kdoctools/meinproc.cpp
+++ b/kdoctools/meinproc.cpp
@@ -91,7 +91,7 @@ int main(int argc, char **argv) {
 
     // xsltSetGenericDebugFunc(stderr, NULL);
 
-    KAboutData aboutData( "meinproc", I18N_NOOP("XML-Translator" ),
+    TDEAboutData aboutData( "meinproc", I18N_NOOP("XML-Translator" ),
 	"$Revision$",
 	I18N_NOOP("TDE Translator for XML"));
 
@@ -99,7 +99,7 @@ int main(int argc, char **argv) {
     TDECmdLineArgs::addCmdLineOptions( options );
 
     KLocale::setMainCatalogue("kio_help");
-    KInstance ins("meinproc");
+    TDEInstance ins("meinproc");
     KGlobal::locale();
 
 
diff --git a/kdoctools/xslt.cpp b/kdoctools/xslt.cpp
index f9803ff0d..6653c7cd5 100644
--- a/kdoctools/xslt.cpp
+++ b/kdoctools/xslt.cpp
@@ -179,7 +179,7 @@ TQString splitOut(const TQString &parsed, int index)
     return filedata;
 }
 
-void fillInstance(KInstance &ins, const TQString &srcdir) {
+void fillInstance(TDEInstance &ins, const TQString &srcdir) {
     TQString catalogs;
 
     if ( srcdir.isEmpty() ) {
diff --git a/kdoctools/xslt.h b/kdoctools/xslt.h
index 975bd3c88..c09e0c9eb 100644
--- a/kdoctools/xslt.h
+++ b/kdoctools/xslt.h
@@ -7,7 +7,7 @@
 TQString transform(const TQString &file, const TQString& stylesheet,
                   const TQValueVector<const char *> &params = TQValueVector<const char *>());
 TQString splitOut(const TQString &parsed, int index);
-void fillInstance(KInstance &ins, const TQString &srcdir = TQString::null );
+void fillInstance(TDEInstance &ins, const TQString &srcdir = TQString::null );
 bool saveToCache( const TQString &contents, const TQString &filename );
 TQString lookForCache( const TQString &filename );
 TQCString fromUnicode( const TQString &data );