Rename KInstance and KAboutData to avoid conflicts with KDE4

22 files changed, 48 insertions, 48 deletions

diff --git a/kio/kfile/knotifydialog.cpp b/kio/kfile/knotifydialog.cpp
index b3242e905..ebaadaa76 100644
--- a/kio/kfile/knotifydialog.cpp
+++ b/kio/kfile/knotifydialog.cpp
@@ -152,14 +152,14 @@ namespace KNotify
 
 
 int KNotifyDialog::configure( TQWidget *parent, const char *name,
-                              const KAboutData *aboutData )
+                              const TDEAboutData *aboutData )
 {
     KNotifyDialog dialog( parent, name, true, aboutData );
     return dialog.exec();
 }
 
 KNotifyDialog::KNotifyDialog( TQWidget *parent, const char *name, bool modal,
-                              const KAboutData *aboutData )
+                              const TDEAboutData *aboutData )
     : KDialogBase(parent, name, modal, i18n("Notification Settings"),
                   Ok | Apply | Cancel | Default, Ok, true )
 {
diff --git a/kio/kfile/knotifydialog.h b/kio/kfile/knotifydialog.h
index 2adb2b15a..1f758a01b 100644
--- a/kio/kfile/knotifydialog.h
+++ b/kio/kfile/knotifydialog.h
@@ -63,14 +63,14 @@ public:
      * @param parent The parent widget for the dialog
      * @param name The widget name
      * @param modal If true, this will be a modal dialog, otherwise non-modal.
-     * @param aboutData A pointer to a KAboutData object. KAboutData::appName()
+     * @param aboutData A pointer to a TDEAboutData object. TDEAboutData::appName()
      *                  will be used to find the KNotify events (in the eventsrc file).
      *                  Set this to 0L if you want to add all events yourself with
      * addApplicationEvents().
      */
     KNotifyDialog( TQWidget *parent = 0, const char *name = 0,
                    bool modal = true,
-                   const KAboutData *aboutData =
+                   const TDEAboutData *aboutData =
                    KGlobal::instance()->aboutData() );
     /**
      * Destroys the KNotifyDialog
@@ -82,13 +82,13 @@ public:
      *
      * @param parent The parent widget for the dialog
      * @param name The widget name
-     * @param aboutData A pointer to a KAboutData object. KAboutData::appName()
+     * @param aboutData A pointer to a TDEAboutData object. TDEAboutData::appName()
      *                  will be used to find the KNotify events (in the eventsrc file).
      * @see exec for the return values.
      * @return The value of TQDialog::exec()
      */
     static int configure( TQWidget *parent = 0, const char *name = 0,
-                          const KAboutData *aboutData = KGlobal::instance()->aboutData() );
+                          const TDEAboutData *aboutData = KGlobal::instance()->aboutData() );
 
     /**
      * With this method, you can add the KNotify events of one eventsrc
@@ -96,7 +96,7 @@ public:
      * KNotifyDialog can handle events for multiple applications (i.e. eventsrc files).
      * Successive calls with a different @p appName will add them.
      * @param appName The application's name, i.e. the name passed to the 
-     *                TDEApplication constructor or KAboutData.
+     *                TDEApplication constructor or TDEAboutData.
      * @see clearApplicationEvents()
      */
     virtual void addApplicationEvents( const char *appName );
diff --git a/kio/kio/dataprotocol.cpp b/kio/kio/dataprotocol.cpp
index 161c82296..0ee463d87 100644
--- a/kio/kio/dataprotocol.cpp
+++ b/kio/kio/dataprotocol.cpp
@@ -47,7 +47,7 @@ using namespace KIO;
 extern "C" {
 
   int kdemain( int argc, char **argv ) {
-    KInstance instance( "kio_data" );
+    TDEInstance instance( "kio_data" );
 
     kdDebug(7101) << "*** Starting kio_data " << endl;
 
diff --git a/kio/kio/kdatatool.cpp b/kio/kio/kdatatool.cpp
index c5e04537e..76cf7836b 100644
--- a/kio/kio/kdatatool.cpp
+++ b/kio/kio/kdatatool.cpp
@@ -42,7 +42,7 @@ KDataToolInfo::KDataToolInfo()
     m_service = 0;
 }
 
-KDataToolInfo::KDataToolInfo( const KService::Ptr& service, KInstance* instance )
+KDataToolInfo::KDataToolInfo( const KService::Ptr& service, TDEInstance* instance )
 {
     m_service = service;
     m_instance = instance;
@@ -159,7 +159,7 @@ KService::Ptr KDataToolInfo::service() const
     return m_service;
 }
 
-TQValueList<KDataToolInfo> KDataToolInfo::query( const TQString& datatype, const TQString& mimetype, KInstance* instance )
+TQValueList<KDataToolInfo> KDataToolInfo::query( const TQString& datatype, const TQString& mimetype, TDEInstance* instance )
 {
     TQValueList<KDataToolInfo> lst;
 
@@ -271,7 +271,7 @@ KDataTool::KDataTool( TQObject* parent, const char* name )
 {
 }
 
-KInstance* KDataTool::instance() const
+TDEInstance* KDataTool::instance() const
 {
    return m_instance;
 }
diff --git a/kio/kio/kdatatool.h b/kio/kio/kdatatool.h
index 573bf809e..46005ada3 100644
--- a/kio/kio/kdatatool.h
+++ b/kio/kio/kdatatool.h
@@ -30,7 +30,7 @@
 class KDataTool;
 class TQPixmap;
 class TQStringList;
-class KInstance;
+class TDEInstance;
 
 // If you're only looking at implementing a data-tool, skip directly to the last
 // class definition, KDataTool.
@@ -56,7 +56,7 @@ public:
      * @param service the corresponding service
      * @param instance the instance to use
      */
-    KDataToolInfo( const KService::Ptr& service, KInstance* instance );
+    KDataToolInfo( const KService::Ptr& service, TDEInstance* instance );
     /**
      * Copy constructor.
      */
@@ -154,7 +154,7 @@ public:
      * The instance of the service.
      * @return the instance
      */
-    KInstance* instance() const { return m_instance; }
+    TDEInstance* instance() const { return m_instance; }
 
     /**
      * A DataToolInfo may be invalid if the KService passed to its constructor does
@@ -171,11 +171,11 @@ public:
      * and also used if the tool wants to read its configuration in the app's config file).
      * @return the list of results
      */
-    static TQValueList<KDataToolInfo> query( const TQString& datatype, const TQString& mimetype, KInstance * instance );
+    static TQValueList<KDataToolInfo> query( const TQString& datatype, const TQString& mimetype, TDEInstance * instance );
 
 private:
     KService::Ptr m_service;
-    KInstance* m_instance;
+    TDEInstance* m_instance;
 private:
     class KDataToolInfoPrivate* d;
 };
@@ -267,14 +267,14 @@ public:
     /**
      * @internal. Do not use under any circumstance (including bad weather).
      */
-    void setInstance( KInstance* instance ) { m_instance = instance; }
+    void setInstance( TDEInstance* instance ) { m_instance = instance; }
 
     /**
      * Returns the instance of the part that created this tool.
      * Usually used if the tool wants to read its configuration in the app's config file.
      * @return the instance of the part that created this tool.
      */
-    KInstance* instance() const;
+    TDEInstance* instance() const;
 
     /**
      * Interface for 'running' this tool.
@@ -292,7 +292,7 @@ public:
     virtual bool run( const TQString& command, void* data, const TQString& datatype, const TQString& mimetype) = 0;
 
 private:
-    KInstance * m_instance;
+    TDEInstance * m_instance;
 protected:
     virtual void virtual_hook( int id, void* data );
 private:
diff --git a/kio/kio/kscan.h b/kio/kio/kscan.h
index 5306156ac..755d4972a 100644
--- a/kio/kio/kscan.h
+++ b/kio/kio/kscan.h
@@ -213,17 +213,17 @@ protected:
      */
     void setName( const TQCString& instanceName ) {
 	delete m_instance;
-	m_instance = new KInstance( instanceName );
+	m_instance = new TDEInstance( instanceName );
     }
 
     /**
      * Returns the instance.
-     * @return the KInstance
+     * @return the TDEInstance
      */
-    KInstance *instance() const { return m_instance; }
+    TDEInstance *instance() const { return m_instance; }
 
 private:
-    KInstance *m_instance;
+    TDEInstance *m_instance;
 protected:
     virtual void virtual_hook( int id, void* data );
 private:
@@ -349,17 +349,17 @@ protected:
      */
     void setName( const TQCString& instanceName ) {
 	delete m_instance;
-	m_instance = new KInstance( instanceName );
+	m_instance = new TDEInstance( instanceName );
     }
 
     /**
      * Returns the instance.
-     * @return the KInstance
+     * @return the TDEInstance
      */
-    KInstance *instance() const { return m_instance; }
+    TDEInstance *instance() const { return m_instance; }
 
 private:
-    KInstance *m_instance;
+    TDEInstance *m_instance;
 protected:
     virtual void virtual_hook( int id, void* data );
 private:
diff --git a/kio/kioexec/main.cpp b/kio/kioexec/main.cpp
index 18014f08f..2a1494043 100644
--- a/kio/kioexec/main.cpp
+++ b/kio/kioexec/main.cpp
@@ -271,8 +271,8 @@ void KIOExec::slotRunApp()
 
 int main( int argc, char **argv )
 {
-    KAboutData aboutData( "kioexec", I18N_NOOP("KIOExec"),
-        VERSION, description, KAboutData::License_GPL,
+    TDEAboutData aboutData( "kioexec", I18N_NOOP("KIOExec"),
+        VERSION, description, TDEAboutData::License_GPL,
         "(c) 1998-2000,2003 The KFM/Konqueror Developers");
     aboutData.addAuthor("David Faure",0, "faure@kde.org");
     aboutData.addAuthor("Stephan Kulow",0, "coolo@kde.org");
diff --git a/kio/misc/kfile/fileprops.cpp b/kio/misc/kfile/fileprops.cpp
index cba281cc7..bbd34a2a4 100644
--- a/kio/misc/kfile/fileprops.cpp
+++ b/kio/misc/kfile/fileprops.cpp
@@ -406,10 +406,10 @@ static void processMetaDataOptions( const TQPtrList<FileProps> propList,
 
 int main( int argc, char **argv )
 {
-    KAboutData about(
+    TDEAboutData about(
 	  "kfile", I18N_NOOP( "kfile" ), KFILEVERSION,
 	  I18N_NOOP("A commandline tool to read and modify metadata of files." ),
-	  KAboutData::License_LGPL, "(c) 2002, Carsten Pfeiffer",
+	  TDEAboutData::License_LGPL, "(c) 2002, Carsten Pfeiffer",
 	  0 /*text*/, "http://devel-home.kde.org/~pfeiffer/",
 	  "pfeiffer@kde.org" );
 
diff --git a/kio/misc/kpac/proxyscout.cpp b/kio/misc/kpac/proxyscout.cpp
index 5d8b008bf..b651e2313 100644
--- a/kio/misc/kpac/proxyscout.cpp
+++ b/kio/misc/kpac/proxyscout.cpp
@@ -41,7 +41,7 @@ namespace KPAC
 
     ProxyScout::ProxyScout( const TQCString& name )
         : KDEDModule( name ),
-          m_instance( new KInstance( "proxyscout" ) ),
+          m_instance( new TDEInstance( "proxyscout" ) ),
           m_downloader( 0 ),
           m_script( 0 ),
           m_suspendTime( 0 )
diff --git a/kio/misc/kpac/proxyscout.h b/kio/misc/kpac/proxyscout.h
index c18e5173d..78c8fc237 100644
--- a/kio/misc/kpac/proxyscout.h
+++ b/kio/misc/kpac/proxyscout.h
@@ -29,7 +29,7 @@
 #include <time.h>
 
 class DCOPClientTransaction;
-class KInstance;
+class TDEInstance;
 
 namespace KPAC
 {
@@ -56,7 +56,7 @@ namespace KPAC
         bool startDownload();
         TQString handleRequest( const KURL& url );
 
-        KInstance* m_instance;
+        TDEInstance* m_instance;
         Downloader* m_downloader;
         Script* m_script;
 
diff --git a/kio/misc/ksendbugmail/main.cpp b/kio/misc/ksendbugmail/main.cpp
index 527d8545f..be1eb8b96 100644
--- a/kio/misc/ksendbugmail/main.cpp
+++ b/kio/misc/ksendbugmail/main.cpp
@@ -59,9 +59,9 @@ void BugMailer::slotSend() {
 int main(int argc, char **argv) {
 
     KLocale::setMainCatalogue("tdelibs");
-    KAboutData d("ksendbugmail", I18N_NOOP("KSendBugMail"), "1.0",
+    TDEAboutData d("ksendbugmail", I18N_NOOP("KSendBugMail"), "1.0",
                  I18N_NOOP("Sends a short bug report to submit@bugs.kde.org"),
-                 KAboutData::License_GPL, "(c) 2000 Stephan Kulow");
+                 TDEAboutData::License_GPL, "(c) 2000 Stephan Kulow");
     d.addAuthor("Stephan Kulow", I18N_NOOP("Author"), "coolo@kde.org");
 
     TDECmdLineArgs::init(argc, argv, &d);
diff --git a/kio/misc/uiserver.cpp b/kio/misc/uiserver.cpp
index 919676fc4..3e890c553 100644
--- a/kio/misc/uiserver.cpp
+++ b/kio/misc/uiserver.cpp
@@ -1380,9 +1380,9 @@ extern "C" KDE_EXPORT int kdemain(int argc, char **argv)
     KLocale::setMainCatalogue("tdelibs");
     //  GS 5/2001 - I changed the name to "TDE" to make it look better
     //              in the titles of dialogs which are displayed.
-    KAboutData aboutdata("kio_uiserver", I18N_NOOP("TDE"),
+    TDEAboutData aboutdata("kio_uiserver", I18N_NOOP("TDE"),
                          "0.8", I18N_NOOP("TDE Progress Information UI Server"),
-                         KAboutData::License_GPL, "(C) 2000, David Faure & Matt Koss");
+                         TDEAboutData::License_GPL, "(C) 2000, David Faure & Matt Koss");
     // Who's the maintainer ? :)
     aboutdata.addAuthor("David Faure",I18N_NOOP("Developer"),"faure@kde.org");
     aboutdata.addAuthor("Matej Koss",I18N_NOOP("Developer"),"koss@miesto.sk");
diff --git a/kio/tests/kfiltertest.cpp b/kio/tests/kfiltertest.cpp
index e070418e4..1922e207e 100644
--- a/kio/tests/kfiltertest.cpp
+++ b/kio/tests/kfiltertest.cpp
@@ -88,7 +88,7 @@ void test_textstream(  const TQString & fileName )
 
 int main()
 {
-    KInstance instance("kfiltertest");
+    TDEInstance instance("kfiltertest");
 
     char currentdir[PATH_MAX+1];
     getcwd( currentdir, PATH_MAX );
diff --git a/kio/tests/kiopassdlgtest.cpp b/kio/tests/kiopassdlgtest.cpp
index 099ce468b..2bbdaa658 100644
--- a/kio/tests/kiopassdlgtest.cpp
+++ b/kio/tests/kiopassdlgtest.cpp
@@ -8,7 +8,7 @@
 
 int main ( int argc, char** argv )
 {
-    KAboutData aboutData("kiopassdlgtest", "KIO Password Dialog Test", "1.0");
+    TDEAboutData aboutData("kiopassdlgtest", "KIO Password Dialog Test", "1.0");
     TDECmdLineArgs::init(argc, argv, &aboutData);
     TDEApplication app;
 
diff --git a/kio/tests/kmfitest.cpp b/kio/tests/kmfitest.cpp
index df37df997..40530184d 100644
--- a/kio/tests/kmfitest.cpp
+++ b/kio/tests/kmfitest.cpp
@@ -8,7 +8,7 @@
 
 int main (int argc, char **argv)
 {
-	KInstance ins("kmfitest");
+	TDEInstance ins("kmfitest");
 
 	if (argc < 2) {
 		printf("usage: %s <file>\n", argv[0]);
diff --git a/kio/tests/kmimemagictest.cpp b/kio/tests/kmimemagictest.cpp
index eb01137c9..00c545c3c 100644
--- a/kio/tests/kmimemagictest.cpp
+++ b/kio/tests/kmimemagictest.cpp
@@ -30,7 +30,7 @@ int main( int argc, char** argv )
              "Usage : ./kmimemagictest file\n");
       return 1;
   }
-  KInstance blah("kmimemagictest");
+  TDEInstance blah("kmimemagictest");
 
   TQString file = TQString::fromLocal8Bit( argv[1] );
 
diff --git a/kio/tests/kmimetypetest.cpp b/kio/tests/kmimetypetest.cpp
index 5802a4084..5d963c81c 100644
--- a/kio/tests/kmimetypetest.cpp
+++ b/kio/tests/kmimetypetest.cpp
@@ -38,7 +38,7 @@ static void checkIcon( const KURL& url, const TQString& expectedIcon )
 
 int main( int argc, char** argv )
 {
-  KInstance blah("kmimetypetest");
+  TDEInstance blah("kmimetypetest");
 
   // Obviously those tests will need to be fixed if we ever change the name of the icons
   // but at least they unit-test KMimeType::iconForURL.
diff --git a/kio/tests/kpropsdlgtest.cpp b/kio/tests/kpropsdlgtest.cpp
index 02a4b6f37..66b02bae0 100644
--- a/kio/tests/kpropsdlgtest.cpp
+++ b/kio/tests/kpropsdlgtest.cpp
@@ -13,7 +13,7 @@ static KCmdLineOptions options[] =
 
 int main ( int argc, char** argv )
 {
-    KAboutData aboutData("kpropertiesdialogtest", "KIO Properties Dialog Test", "1.0");
+    TDEAboutData aboutData("kpropertiesdialogtest", "KIO Properties Dialog Test", "1.0");
     TDECmdLineArgs::init(argc, argv, &aboutData);
     TDECmdLineArgs::addCmdLineOptions( options );
 
diff --git a/kio/tests/kprotocolinfotest.cpp b/kio/tests/kprotocolinfotest.cpp
index 1f4dc95c6..03bbbdac6 100644
--- a/kio/tests/kprotocolinfotest.cpp
+++ b/kio/tests/kprotocolinfotest.cpp
@@ -26,7 +26,7 @@
 #include <assert.h>
 
 int main(int argc, char **argv) {
-    KAboutData aboutData("kprotocolinfotest", "KProtocolinfo Test",
+    TDEAboutData aboutData("kprotocolinfotest", "KProtocolinfo Test",
                         "1.0");
 
     TDECmdLineArgs::init(argc, argv, &aboutData);
diff --git a/kio/tests/ktartest.cpp b/kio/tests/ktartest.cpp
index 5fe4a4f1f..2c470f6e4 100644
--- a/kio/tests/ktartest.cpp
+++ b/kio/tests/ktartest.cpp
@@ -50,7 +50,7 @@ int main( int argc, char** argv )
  " ./ktartest iodevice /path/to/existing_file.tar.gz   tests KArchiveFile::device()\n");
     return 1;
   }
-  KInstance instance("ktartest");
+  TDEInstance instance("ktartest");
   TQString command = argv[1];
   if ( command == "list" )
   {
diff --git a/kio/tests/kurifiltertest.cpp b/kio/tests/kurifiltertest.cpp
index 3dbd8c648..9f4e09013 100644
--- a/kio/tests/kurifiltertest.cpp
+++ b/kio/tests/kurifiltertest.cpp
@@ -158,7 +158,7 @@ int main(int argc, char **argv)
     setenv( "TDEHOME", TQFile::encodeName( TQDir::homeDirPath() + "/.tde-kurifiltertest" ), true );
     setenv( "TDE_FORK_SLAVES", "yes", true ); // simpler, for the final cleanup
 
-    KAboutData aboutData(appName, programName, version, description);
+    TDEAboutData aboutData(appName, programName, version, description);
     TDECmdLineArgs::init(argc, argv, &aboutData);
     TDECmdLineArgs::addCmdLineOptions( options );
 
diff --git a/kio/tests/kziptest.cpp b/kio/tests/kziptest.cpp
index 5b784c40b..84d38d134 100644
--- a/kio/tests/kziptest.cpp
+++ b/kio/tests/kziptest.cpp
@@ -98,7 +98,7 @@ int main( int argc, char** argv )
  " ./kziptest iodevice /path/to/existing_file.zip   tests KArchiveFile::device()\n");
     return 1;
   }
-  KInstance instance("kziptest");
+  TDEInstance instance("kziptest");
   TQString command = argv[1];
   if ( command == "list" )
   {