Rename KInstance and KAboutData to avoid conflicts with KDE4

25 files changed, 39 insertions, 39 deletions

diff --git a/kioslave/about/kio_about.cpp b/kioslave/about/kio_about.cpp
index 5f012fdd6..5ef52196d 100644
--- a/kioslave/about/kio_about.cpp
+++ b/kioslave/about/kio_about.cpp
@@ -59,7 +59,7 @@ extern "C"
 {
     int KDE_EXPORT kdemain( int argc, char **argv ) {
 
-        KInstance instance("kio_about");
+        TDEInstance instance("kio_about");
 
         if (argc != 4)
         {
diff --git a/kioslave/cgi/cgi.cpp b/kioslave/cgi/cgi.cpp
index 7c92a1a76..0181c066a 100644
--- a/kioslave/cgi/cgi.cpp
+++ b/kioslave/cgi/cgi.cpp
@@ -257,7 +257,7 @@ extern "C" { int KDE_EXPORT kdemain( int argc, char **argv ); }
 
 int kdemain( int argc, char **argv )
 {
-  KInstance instance( "kio_cgi" );
+  TDEInstance instance( "kio_cgi" );
 
   kdDebug(7124) << "kio_cgi starting " << getpid() << endl;
 
diff --git a/kioslave/cgi/kcmcgi/kcmcgi.cpp b/kioslave/cgi/kcmcgi/kcmcgi.cpp
index d1a798aa2..9c8a8df5e 100644
--- a/kioslave/cgi/kcmcgi/kcmcgi.cpp
+++ b/kioslave/cgi/kcmcgi/kcmcgi.cpp
@@ -67,10 +67,10 @@ KCMCgi::KCMCgi(TQWidget *parent, const char *name)
 
   load();
   updateButton();
-  KAboutData *about =
-    new KAboutData( I18N_NOOP("kcmcgi"),
+  TDEAboutData *about =
+    new TDEAboutData( I18N_NOOP("kcmcgi"),
                     I18N_NOOP("CGI KIO Slave Control Module"),
-                    0, 0, KAboutData::License_GPL,
+                    0, 0, TDEAboutData::License_GPL,
                     I18N_NOOP("(c) 2002 Cornelius Schumacher") );
 
   about->addAuthor( "Cornelius Schumacher", 0, "schumacher@kde.org" );
diff --git a/kioslave/filter/filter.cc b/kioslave/filter/filter.cc
index 8392dd160..7db846d17 100644
--- a/kioslave/filter/filter.cc
+++ b/kioslave/filter/filter.cc
@@ -36,7 +36,7 @@ extern "C" { KDE_EXPORT int kdemain(int argc, char **argv); }
 
 int kdemain( int argc, char ** argv)
 {
-  KInstance instance( "kio_filter" );
+  TDEInstance instance( "kio_filter" );
 
   kdDebug(7110) << "Starting " << getpid() << endl;
 
diff --git a/kioslave/finger/kio_finger.cpp b/kioslave/finger/kio_finger.cpp
index 4e62b6bb5..356d35c9d 100644
--- a/kioslave/finger/kio_finger.cpp
+++ b/kioslave/finger/kio_finger.cpp
@@ -45,7 +45,7 @@ extern "C"
 {
   KDE_EXPORT int kdemain( int argc, char **argv )
   {
-    KInstance instance( "kio_finger" );
+    TDEInstance instance( "kio_finger" );
 
     //kdDebug() << "*** Starting kio_finger " << getpid() << endl;
 
diff --git a/kioslave/fish/fish.cpp b/kioslave/fish/fish.cpp
index 95c91dc2c..ccd815048 100644
--- a/kioslave/fish/fish.cpp
+++ b/kioslave/fish/fish.cpp
@@ -127,7 +127,7 @@ static void ripper(int)
 int KDE_EXPORT kdemain( int argc, char **argv )
 {
     KLocale::setMainCatalogue("kio_fish");
-    KInstance instance("fish");
+    TDEInstance instance("fish");
 
     myDebug( << "*** Starting fish " << endl);
     if (argc != 4) {
diff --git a/kioslave/floppy/kio_floppy.cpp b/kioslave/floppy/kio_floppy.cpp
index a0c68a9d2..c9f8daa80 100644
--- a/kioslave/floppy/kio_floppy.cpp
+++ b/kioslave/floppy/kio_floppy.cpp
@@ -53,7 +53,7 @@ extern "C" { KDE_EXPORT int kdemain(int argc, char **argv); }
 
 int kdemain( int argc, char **argv )
 {
-  KInstance instance( "kio_floppy" );
+  TDEInstance instance( "kio_floppy" );
 
   if (argc != 4)
   {
diff --git a/kioslave/info/info.cc b/kioslave/info/info.cc
index ab35f282b..f220da589 100644
--- a/kioslave/info/info.cc
+++ b/kioslave/info/info.cc
@@ -244,7 +244,7 @@ extern "C" { int KDE_EXPORT kdemain( int argc, char **argv ); }
 
 int kdemain( int argc, char **argv )
 {
-  KInstance instance( "kio_info" );
+  TDEInstance instance( "kio_info" );
 
   kdDebug() << "kio_info starting " << getpid() << endl;
 
diff --git a/kioslave/ldap/kio_ldap.cpp b/kioslave/ldap/kio_ldap.cpp
index 46ce2e090..fe958c35c 100644
--- a/kioslave/ldap/kio_ldap.cpp
+++ b/kioslave/ldap/kio_ldap.cpp
@@ -34,7 +34,7 @@ extern "C" { int KDE_EXPORT kdemain(int argc, char **argv); }
  */
 int kdemain( int argc, char **argv )
 {
-  KInstance instance( "kio_ldap" );
+  TDEInstance instance( "kio_ldap" );
 
   kdDebug(7125) << "Starting " << getpid() << endl;
 
diff --git a/kioslave/mac/kio_mac.cpp b/kioslave/mac/kio_mac.cpp
index e64d22d65..d13b59f71 100644
--- a/kioslave/mac/kio_mac.cpp
+++ b/kioslave/mac/kio_mac.cpp
@@ -36,7 +36,7 @@ using namespace KIO;
 
 extern "C" {
     int KDE_EXPORT kdemain(int, char **argv) {
-        KInstance instance("kio_mac");
+        TDEInstance instance("kio_mac");
         MacProtocol slave(argv[2], argv[3]);
         slave.dispatchLoop();
         return 0;
diff --git a/kioslave/man/kio_man.cpp b/kioslave/man/kio_man.cpp
index 12c13d601..67778aaca 100644
--- a/kioslave/man/kio_man.cpp
+++ b/kioslave/man/kio_man.cpp
@@ -692,7 +692,7 @@ extern "C"
 
     int KDE_EXPORT kdemain( int argc, char **argv ) {
 
-        KInstance instance("kio_man");
+        TDEInstance instance("kio_man");
 
         kdDebug(7107) <<  "STARTING " << getpid() << endl;
 
diff --git a/kioslave/man/kmanpart.cpp b/kioslave/man/kmanpart.cpp
index a8d08908e..06ced93ec 100644
--- a/kioslave/man/kmanpart.cpp
+++ b/kioslave/man/kmanpart.cpp
@@ -36,8 +36,8 @@ extern "C"
    }
 }
 
-KInstance* KManPartFactory::s_instance = 0L;
-KAboutData* KManPartFactory::s_about = 0L;
+TDEInstance* KManPartFactory::s_instance = 0L;
+TDEAboutData* KManPartFactory::s_about = 0L;
 
 KManPartFactory::KManPartFactory( TQObject* parent, const char* name )
    : KParts::Factory( parent, name )
@@ -57,13 +57,13 @@ KParts::Part* KManPartFactory::createPartObject( TQWidget * parentWidget, const
    return part;
 }
 
-KInstance* KManPartFactory::instance()
+TDEInstance* KManPartFactory::instance()
 {
    if( !s_instance )
    {
-      s_about = new KAboutData( "kmanpart",
+      s_about = new TDEAboutData( "kmanpart",
                                 I18N_NOOP( "KMan" ), TDE_VERSION_STRING );
-      s_instance = new KInstance( s_about );
+      s_instance = new TDEInstance( s_about );
    }
    return s_instance;
 }
@@ -73,7 +73,7 @@ KManPart::KManPart( TQWidget * parent, const char * name )
 : KHTMLPart( parent, name )
 ,m_job(0)
 {
-   KInstance * instance = new KInstance( "kmanpart" );
+   TDEInstance * instance = new TDEInstance( "kmanpart" );
    setInstance( instance );
    m_extension=new KParts::BrowserExtension(this);
 }
diff --git a/kioslave/man/kmanpart.h b/kioslave/man/kmanpart.h
index f2d9e3891..2f39af11f 100644
--- a/kioslave/man/kmanpart.h
+++ b/kioslave/man/kmanpart.h
@@ -30,8 +30,8 @@
 
 #include <tqcstring.h>
 
-class KInstance;
-class KAboutData;
+class TDEInstance;
+class TDEAboutData;
 
 /**
  * Man Page Viewer
@@ -48,11 +48,11 @@ class KManPartFactory: public KParts::Factory
                                 TQObject* parent, const char* name, const char * classname,
                                 const TQStringList &args);
 
-      static KInstance * instance();
+      static TDEInstance * instance();
 
    private:
-      static KInstance * s_instance;
-      static KAboutData * s_about;
+      static TDEInstance * s_instance;
+      static TDEAboutData * s_about;
 
 };
 
@@ -70,7 +70,7 @@ class KManPart : public KHTMLPart
       void jobDone( KIO::Job *);
    protected:
       virtual bool openFile();
-      KInstance *m_instance;
+      TDEInstance *m_instance;
       KParts::BrowserExtension * m_extension;
       KIO::TransferJob *m_job;
 };
diff --git a/kioslave/media/kcmodule/main.cpp b/kioslave/media/kcmodule/main.cpp
index 48cee7ddf..6760b4e8f 100644
--- a/kioslave/media/kcmodule/main.cpp
+++ b/kioslave/media/kcmodule/main.cpp
@@ -59,11 +59,11 @@ MediaModule::MediaModule( TQWidget *parent, const char *name, const TQStringList
 
 
 
-	KAboutData * about = new KAboutData("kcmmedia",
+	TDEAboutData * about = new TDEAboutData("kcmmedia",
 	                                    I18N_NOOP("Storage Media"),
 	                                    "0.6",
 	                                    I18N_NOOP("Storage Media Control Panel Module"),
-	                                    KAboutData::License_GPL_V2,
+	                                    TDEAboutData::License_GPL_V2,
 	                                    I18N_NOOP("(c) 2005 Jean-Remy Falleri"));
 	about->addAuthor("Jean-Remy Falleri", I18N_NOOP("Maintainer"), "jr.falleri@laposte.net");
 	about->addAuthor("Kevin Ottens", 0, "ervin ipsquad net");
diff --git a/kioslave/nfs/kio_nfs.cpp b/kioslave/nfs/kio_nfs.cpp
index 6e6d5b312..b8ae1aa76 100644
--- a/kioslave/nfs/kio_nfs.cpp
+++ b/kioslave/nfs/kio_nfs.cpp
@@ -113,7 +113,7 @@ extern "C" { int KDE_EXPORT kdemain(int argc, char **argv); }
 
 int kdemain( int argc, char **argv )
 {
-  KInstance instance( "kio_nfs" );
+  TDEInstance instance( "kio_nfs" );
 
   if (argc != 4)
   {
diff --git a/kioslave/nntp/nntp.cpp b/kioslave/nntp/nntp.cpp
index b109bb58a..1169415b8 100644
--- a/kioslave/nntp/nntp.cpp
+++ b/kioslave/nntp/nntp.cpp
@@ -39,7 +39,7 @@ extern "C" { int KDE_EXPORT kdemain(int argc, char **argv); }
 
 int kdemain(int argc, char **argv) {
 
-  KInstance instance ("kio_nntp");
+  TDEInstance instance ("kio_nntp");
   if (argc != 4) {
     fprintf(stderr, "Usage: kio_nntp protocol domain-socket1 domain-socket2\n");
     exit(-1);
diff --git a/kioslave/pop3/pop3.cc b/kioslave/pop3/pop3.cc
index fe91a0747..f4a061521 100644
--- a/kioslave/pop3/pop3.cc
+++ b/kioslave/pop3/pop3.cc
@@ -104,7 +104,7 @@ int kdemain(int argc, char **argv)
   }
 #endif
 
-  KInstance instance("kio_pop3");
+  TDEInstance instance("kio_pop3");
   POP3Protocol *slave;
 
   // Are we looking to use SSL?
diff --git a/kioslave/settings/kio_settings.cc b/kioslave/settings/kio_settings.cc
index c508762c9..26e04d9e5 100644
--- a/kioslave/settings/kio_settings.cc
+++ b/kioslave/settings/kio_settings.cc
@@ -52,7 +52,7 @@ extern "C" {
 	KDE_EXPORT int kdemain( int, char **argv )
 	{
 	  kdDebug() << "kdemain for settings kioslave" << endl;
-	  KInstance instance( "kio_settings" );
+	  TDEInstance instance( "kio_settings" );
 	  SettingsProtocol slave(argv[1], argv[2], argv[3]);
 	  slave.dispatchLoop();
 	  return 0;
diff --git a/kioslave/sftp/kio_sftp.cpp b/kioslave/sftp/kio_sftp.cpp
index 04a2b331c..ac747fa02 100644
--- a/kioslave/sftp/kio_sftp.cpp
+++ b/kioslave/sftp/kio_sftp.cpp
@@ -79,7 +79,7 @@ extern "C"
 {
   int KDE_EXPORT kdemain( int argc, char **argv )
   {
-    KInstance instance( "kio_sftp" );
+    TDEInstance instance( "kio_sftp" );
 
     kdDebug(KIO_SFTP_DB) << "*** Starting kio_sftp " << endl;
 
diff --git a/kioslave/smb/kio_smb.cpp b/kioslave/smb/kio_smb.cpp
index fd86ebadb..8895588dd 100644
--- a/kioslave/smb/kio_smb.cpp
+++ b/kioslave/smb/kio_smb.cpp
@@ -59,7 +59,7 @@ SMBSlave* G_TheSlave;
 int KDE_EXPORT kdemain( int argc, char **argv )
 {
 
-    KInstance instance( "kio_smb" );
+    TDEInstance instance( "kio_smb" );
     if( argc != 4 )
     {
         kdDebug(KIO_SMB) << "Usage: kio_smb protocol domain-socket1 domain-socket2"
diff --git a/kioslave/smtp/smtp.cc b/kioslave/smtp/smtp.cc
index b9eb94d62..55352aed6 100644
--- a/kioslave/smtp/smtp.cc
+++ b/kioslave/smtp/smtp.cc
@@ -95,7 +95,7 @@ extern "C" {
 
 int kdemain(int argc, char **argv)
 {
-  KInstance instance("kio_smtp");
+  TDEInstance instance("kio_smtp");
 
   if (argc != 4) {
     fprintf(stderr,
diff --git a/kioslave/tar/ktartest.cpp b/kioslave/tar/ktartest.cpp
index bfbb216d4..efb1e42fe 100644
--- a/kioslave/tar/ktartest.cpp
+++ b/kioslave/tar/ktartest.cpp
@@ -35,7 +35,7 @@ int main( int argc, char** argv )
     usage();
     return 1;
   }
-  KInstance instance("ktartest");
+  TDEInstance instance("ktartest");
 
   TQString command = argv[1];
   kdDebug() << "main: command=" << command << endl;
diff --git a/kioslave/tar/tar.cc b/kioslave/tar/tar.cc
index 2c3de0215..9af5062ab 100644
--- a/kioslave/tar/tar.cc
+++ b/kioslave/tar/tar.cc
@@ -32,7 +32,7 @@ extern "C" { int KDE_EXPORT kdemain(int argc, char **argv); }
 
 int kdemain( int argc, char **argv )
 {
-  KInstance instance( "kio_tar" );
+  TDEInstance instance( "kio_tar" );
 
   kdDebug(7109) << "Starting " << getpid() << endl;
 
diff --git a/kioslave/thumbnail/thumbnail.cpp b/kioslave/thumbnail/thumbnail.cpp
index b73528610..29c3c8620 100644
--- a/kioslave/thumbnail/thumbnail.cpp
+++ b/kioslave/thumbnail/thumbnail.cpp
@@ -53,7 +53,7 @@
 #include "thumbnail.h"
 #include <kio/thumbcreator.h>
 
-// Use correctly KInstance instead of TDEApplication (but then no TQPixmap)
+// Use correctly TDEInstance instead of TDEApplication (but then no TQPixmap)
 #undef USE_KINSTANCE
 // Fix thumbnail: protocol
 #define THUMBNAIL_HACK (1)
@@ -96,7 +96,7 @@ int kdemain(int argc, char **argv)
 #endif
 
 #ifdef USE_KINSTANCE
-    KInstance instance("kio_thumbnail");
+    TDEInstance instance("kio_thumbnail");
 #else
     // creating TDEApplication in a slave in not a very good idea,
     // as dispatchLoop() doesn't allow it to process its messages,
diff --git a/kioslave/trash/kio_trash.cpp b/kioslave/trash/kio_trash.cpp
index edd0c372e..8b033abd4 100644
--- a/kioslave/trash/kio_trash.cpp
+++ b/kioslave/trash/kio_trash.cpp
@@ -52,7 +52,7 @@ static const KCmdLineOptions options[] =
 extern "C" {
     int KDE_EXPORT kdemain( int argc, char **argv )
     {
-        //KInstance instance( "kio_trash" );
+        //TDEInstance instance( "kio_trash" );
         // TDEApplication is necessary to use kio_file
         putenv(strdup("SESSION_MANAGER="));
         TDEApplication::disableAutoDcopRegistration();