Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4

8 files changed, 53 insertions, 53 deletions

diff --git a/kparts/browserextension.h b/kparts/browserextension.h
index bc5e9cc92..d225c8e84 100644
--- a/kparts/browserextension.h
+++ b/kparts/browserextension.h
@@ -129,7 +129,7 @@ struct KPARTS_EXPORT URLArgs
 
   /**
    * Meta-data to associate with the next KIO operation
-   * @see KIO::TransferJob etc.
+   * @see TDEIO::TransferJob etc.
    */
   TQMap<TQString, TQString> &metaData();
 
@@ -569,7 +569,7 @@ signals:
    * Since the part emits the jobid in the started() signal,
    * progress information is automatically displayed.
    *
-   * However, if you don't use a KIO::Job in the part,
+   * However, if you don't use a TDEIO::Job in the part,
    * you can use loadingProgress() and speedProgress()
    * to display progress information.
    */
diff --git a/kparts/browserrun.cpp b/kparts/browserrun.cpp
index 8bec0e790..582460c6d 100644
--- a/kparts/browserrun.cpp
+++ b/kparts/browserrun.cpp
@@ -75,7 +75,7 @@ void BrowserRun::init()
     // is either malformed, or points to a non-existing local file...
     // So we need to reimplement some of the checks, to handle m_bHideErrorDialog
     if ( !m_strURL.isValid() ) {
-        redirectToError( KIO::ERR_MALFORMED_URL, m_strURL.url() );
+        redirectToError( TDEIO::ERR_MALFORMED_URL, m_strURL.url() );
         return;
     }
     if ( !m_bIsLocalFile && !m_bFault && m_strURL.isLocalFile() )
@@ -86,7 +86,7 @@ void BrowserRun::init()
       if ( stat( TQFile::encodeName(m_strURL.path()), &buff ) == -1 )
       {
         kdDebug(1000) << "BrowserRun::init : " << m_strURL.prettyURL() << " doesn't exist." << endl;
-        redirectToError( KIO::ERR_DOES_NOT_EXIST, m_strURL.path() );
+        redirectToError( TDEIO::ERR_DOES_NOT_EXIST, m_strURL.path() );
         return;
       }
       m_mode = buff.st_mode; // while we're at it, save it for KRun::init() to use it
@@ -132,38 +132,38 @@ void BrowserRun::scanFile()
           m_args.metaData().insert("PropagateHttpHeader", "TRUE");
   }
 
-  KIO::TransferJob *job;
+  TDEIO::TransferJob *job;
   if ( m_args.doPost() && m_strURL.protocol().startsWith("http"))
   {
-      job = KIO::http_post( m_strURL, m_args.postData, false );
+      job = TDEIO::http_post( m_strURL, m_args.postData, false );
       job->addMetaData( "content-type", m_args.contentType() );
   }
   else
-      job = KIO::get(m_strURL, m_args.reload, false);
+      job = TDEIO::get(m_strURL, m_args.reload, false);
 
   if ( m_bRemoveReferrer )
      m_args.metaData().remove("referrer");
 
   job->addMetaData( m_args.metaData() );
   job->setWindow( m_window );
-  connect( job, TQT_SIGNAL( result( KIO::Job *)),
-           this, TQT_SLOT( slotBrowserScanFinished(KIO::Job *)));
-  connect( job, TQT_SIGNAL( mimetype( KIO::Job *, const TQString &)),
-           this, TQT_SLOT( slotBrowserMimetype(KIO::Job *, const TQString &)));
+  connect( job, TQT_SIGNAL( result( TDEIO::Job *)),
+           this, TQT_SLOT( slotBrowserScanFinished(TDEIO::Job *)));
+  connect( job, TQT_SIGNAL( mimetype( TDEIO::Job *, const TQString &)),
+           this, TQT_SLOT( slotBrowserMimetype(TDEIO::Job *, const TQString &)));
   m_job = job;
 }
 
-void BrowserRun::slotBrowserScanFinished(KIO::Job *job)
+void BrowserRun::slotBrowserScanFinished(TDEIO::Job *job)
 {
   kdDebug(1000) << "BrowserRun::slotBrowserScanFinished" << endl;
-  if ( job->error() == KIO::ERR_IS_DIRECTORY )
+  if ( job->error() == TDEIO::ERR_IS_DIRECTORY )
   {
       // It is in fact a directory. This happens when HTTP redirects to FTP.
       // Due to the "protocol doesn't support listing" code in BrowserRun, we
       // assumed it was a file.
       kdDebug(1000) << "It is in fact a directory!" << endl;
       // Update our URL in case of a redirection
-      m_strURL = static_cast<KIO::TransferJob *>(job)->url();
+      m_strURL = static_cast<TDEIO::TransferJob *>(job)->url();
       m_job = 0;
       foundMimeType( "inode/directory" );
   }
@@ -176,10 +176,10 @@ void BrowserRun::slotBrowserScanFinished(KIO::Job *job)
   }
 }
 
-void BrowserRun::slotBrowserMimetype( KIO::Job *_job, const TQString &type )
+void BrowserRun::slotBrowserMimetype( TDEIO::Job *_job, const TQString &type )
 {
   Q_ASSERT( _job == m_job );
-  KIO::TransferJob *job = static_cast<KIO::TransferJob *>(m_job);
+  TDEIO::TransferJob *job = static_cast<TDEIO::TransferJob *>(m_job);
   // Update our URL in case of a redirection
   //kdDebug(1000) << "old URL=" << m_strURL.url() << endl;
   //kdDebug(1000) << "new URL=" << job->url().url() << endl;
@@ -242,10 +242,10 @@ BrowserRun::NonEmbeddableResult BrowserRun::handleNonEmbeddable( const TQString&
                 KTempFile tempFile( TQString::null, extension );
                 KURL destURL;
                 destURL.setPath( tempFile.name() );
-                KIO::Job *job = KIO::file_copy( m_strURL, destURL, 0600, true /*overwrite*/, false /*no resume*/, true /*progress info*/ );
+                TDEIO::Job *job = TDEIO::file_copy( m_strURL, destURL, 0600, true /*overwrite*/, false /*no resume*/, true /*progress info*/ );
                 job->setWindow (m_window);
-                connect( job, TQT_SIGNAL( result( KIO::Job *)),
-                         this, TQT_SLOT( slotCopyToTempFileResult(KIO::Job *)) );
+                connect( job, TQT_SIGNAL( result( TDEIO::Job *)),
+                         this, TQT_SLOT( slotCopyToTempFileResult(TDEIO::Job *)) );
                 return Delayed; // We'll continue after the job has finished
             }
         }
@@ -259,7 +259,7 @@ BrowserRun::NonEmbeddableResult BrowserRun::handleNonEmbeddable( const TQString&
         return Handled;
     }
 
-    KIO::SimpleJob::removeOnHold(); // Kill any slave that was put on hold.
+    TDEIO::SimpleJob::removeOnHold(); // Kill any slave that was put on hold.
     return NotHandled;
 }
 
@@ -377,7 +377,7 @@ void BrowserRun::simpleSave( const KURL & url, const TQString & suggestedFilenam
     // only use the downloadmanager for non-local urls
     if ( !url.isLocalFile() )
     {
-        KConfig cfg("konquerorrc", false, false);
+        TDEConfig cfg("konquerorrc", false, false);
         cfg.setGroup("HTML Settings");
         TQString downloadManger = cfg.readPathEntry("DownloadManager");
         if (!downloadManger.isEmpty())
@@ -405,7 +405,7 @@ void BrowserRun::simpleSave( const KURL & url, const TQString & suggestedFilenam
 
                 kdDebug(1000) << "Calling command  " << cmd << endl;
                 // slave is already on hold (slotBrowserMimetype())
-                KIO::Scheduler::publishSlaveOnHold();
+                TDEIO::Scheduler::publishSlaveOnHold();
                 KRun::runCommand(cmd);
                 return;
             }
@@ -424,7 +424,7 @@ void BrowserRun::simpleSave( const KURL & url, const TQString & suggestedFilenam
         KURL destURL( dlg->selectedURL() );
         if ( destURL.isValid() )
         {
-            KIO::Job *job = KIO::copy( url, destURL );
+            TDEIO::Job *job = TDEIO::copy( url, destURL );
             job->setWindow (window);
             job->setAutoErrorHandlingEnabled( true );
         }
@@ -432,7 +432,7 @@ void BrowserRun::simpleSave( const KURL & url, const TQString & suggestedFilenam
     delete dlg;
 }
 
-void BrowserRun::slotStatResult( KIO::Job *job )
+void BrowserRun::slotStatResult( TDEIO::Job *job )
 {
     if ( job->error() ) {
         kdDebug(1000) << "BrowserRun::slotStatResult : " << job->errorString() << endl;
@@ -441,14 +441,14 @@ void BrowserRun::slotStatResult( KIO::Job *job )
         KRun::slotStatResult( job );
 }
 
-void BrowserRun::handleError( KIO::Job * job )
+void BrowserRun::handleError( TDEIO::Job * job )
 {
     if ( !job ) { // Shouldn't happen, see docu.
         kdWarning(1000) << "BrowserRun::handleError called with job=0! hideErrorDialog=" << d->m_bHideErrorDialog << endl;
         return;
     }
 
-    if (d->m_bHideErrorDialog && job->error() != KIO::ERR_NO_CONTENT)
+    if (d->m_bHideErrorDialog && job->error() != TDEIO::ERR_NO_CONTENT)
     {
         redirectToError( job->error(), job->errorText() );
         return;
@@ -483,13 +483,13 @@ void BrowserRun::redirectToError( int error, const TQString& errorText )
     foundMimeType( "text/html" );
 }
 
-void BrowserRun::slotCopyToTempFileResult(KIO::Job *job)
+void BrowserRun::slotCopyToTempFileResult(TDEIO::Job *job)
 {
     if ( job->error() ) {
         job->showErrorDialog( m_window );
     } else {
         // Same as KRun::foundMimeType but with a different URL
-        (void) (KRun::runURL( static_cast<KIO::FileCopyJob *>(job)->destURL(), m_sMimeType ));
+        (void) (KRun::runURL( static_cast<TDEIO::FileCopyJob *>(job)->destURL(), m_sMimeType ));
     }
     m_bFault = true; // see above
     m_bFinished = true;
diff --git a/kparts/browserrun.h b/kparts/browserrun.h
index 79a7386c6..23709fd2b 100644
--- a/kparts/browserrun.h
+++ b/kparts/browserrun.h
@@ -47,7 +47,7 @@ namespace KParts {
          * @param url the URL we're probing
          * @param args URL args - includes data for a HTTP POST, etc.
          * @param part the part going to open this URL - can be 0L if not created yet
-         * @param window the mainwindow - passed to KIO::Job::setWindow()
+         * @param window the mainwindow - passed to TDEIO::Job::setWindow()
          * @param removeReferrer if true, the "referrer" metadata from @p args isn't passed on
          * @param trustedSource if false, a warning will be shown before launching an executable
          * Always pass false for @p trustedSource, except for local directory views.
@@ -61,7 +61,7 @@ namespace KParts {
          * @param url the URL we're probing
          * @param args URL args - includes data for a HTTP POST, etc.
          * @param part the part going to open this URL - can be 0L if not created yet
-         * @param window the mainwindow - passed to KIO::Job::setWindow()
+         * @param window the mainwindow - passed to TDEIO::Job::setWindow()
          * @param removeReferrer if true, the "referrer" metadata from @p args isn't passed on
          * @param trustedSource if false, a warning will be shown before launching an executable.
          * Always pass false for @p  trustedSource, except for local directory views.
@@ -155,7 +155,7 @@ namespace KParts {
          * It is strongly recommended to reimplement this method if
          * you passed hideErrorDialog=true.
          */
-        virtual void handleError( KIO::Job * job );
+        virtual void handleError( TDEIO::Job * job );
 
         /**
          * NotHandled means that foundMimeType should call KRun::foundMimeType,
@@ -169,10 +169,10 @@ namespace KParts {
         NonEmbeddableResult handleNonEmbeddable( const TQString& mimeType );
 
     protected slots:
-        void slotBrowserScanFinished(KIO::Job *job);
-        void slotBrowserMimetype(KIO::Job *job, const TQString &type);
-        void slotCopyToTempFileResult(KIO::Job *job);
-        virtual void slotStatResult( KIO::Job *job );
+        void slotBrowserScanFinished(TDEIO::Job *job);
+        void slotBrowserMimetype(TDEIO::Job *job, const TQString &type);
+        void slotCopyToTempFileResult(TDEIO::Job *job);
+        virtual void slotStatResult( TDEIO::Job *job );
 
     protected:
         KParts::URLArgs m_args;
diff --git a/kparts/componentfactory.h b/kparts/componentfactory.h
index 67f98a90f..da3c5c7d5 100644
--- a/kparts/componentfactory.h
+++ b/kparts/componentfactory.h
@@ -307,7 +307,7 @@ namespace KParts
          * \endcode
          *
          * @param serviceType the type of service for which to find a plugin
-         * @param constraint an optional constraint to pass to the trader (see KIO::KTrader)
+         * @param constraint an optional constraint to pass to the trader (see TDEIO::KTrader)
          * @param parent the parent object for the part itself
          * @param name the name that will be given to the part
          * @param args A list of string arguments, passed to the factory and possibly
diff --git a/kparts/part.cpp b/kparts/part.cpp
index 68e9dbbf2..b7bdc7cfa 100644
--- a/kparts/part.cpp
+++ b/kparts/part.cpp
@@ -289,8 +289,8 @@ public:
   {
   }
 
-  KIO::FileCopyJob * m_job;
-  KIO::FileCopyJob * m_uploadJob;
+  TDEIO::FileCopyJob * m_job;
+  TDEIO::FileCopyJob * m_uploadJob;
   KURL m_originalURL; // for saveAs
   TQString m_originalFilePath; // for saveAs
   bool m_showProgressInfo : 1;
@@ -364,10 +364,10 @@ bool ReadOnlyPart::openURL( const KURL &url )
 
     KURL destURL;
     destURL.setPath( m_file );
-    d->m_job = KIO::file_copy( m_url, destURL, 0600, true, false, d->m_showProgressInfo );
+    d->m_job = TDEIO::file_copy( m_url, destURL, 0600, true, false, d->m_showProgressInfo );
     d->m_job->setWindow( widget() ? widget()->topLevelWidget() : 0 );
     emit started( d->m_job );
-    connect( d->m_job, TQT_SIGNAL( result( KIO::Job * ) ), this, TQT_SLOT( slotJobFinished ( KIO::Job * ) ) );
+    connect( d->m_job, TQT_SIGNAL( result( TDEIO::Job * ) ), this, TQT_SLOT( slotJobFinished ( TDEIO::Job * ) ) );
     return true;
   }
 }
@@ -397,7 +397,7 @@ bool ReadOnlyPart::closeURL()
   return true;
 }
 
-void ReadOnlyPart::slotJobFinished( KIO::Job * job )
+void ReadOnlyPart::slotJobFinished( TDEIO::Job * job )
 {
   kdDebug(1000) << "ReadOnlyPart::slotJobFinished" << endl;
   assert( job == d->m_job );
@@ -637,14 +637,14 @@ bool ReadWritePart::saveToURL()
        // Uh oh, some error happened.
        return false;
     }
-    d->m_uploadJob = KIO::file_move( uploadUrl, m_url, -1, true /*overwrite*/ );
+    d->m_uploadJob = TDEIO::file_move( uploadUrl, m_url, -1, true /*overwrite*/ );
     d->m_uploadJob->setWindow( widget() ? widget()->topLevelWidget() : 0 );
-    connect( d->m_uploadJob, TQT_SIGNAL( result( KIO::Job * ) ), this, TQT_SLOT( slotUploadFinished (KIO::Job *) ) );
+    connect( d->m_uploadJob, TQT_SIGNAL( result( TDEIO::Job * ) ), this, TQT_SLOT( slotUploadFinished (TDEIO::Job *) ) );
     return true;
   }
 }
 
-void ReadWritePart::slotUploadFinished( KIO::Job * )
+void ReadWritePart::slotUploadFinished( TDEIO::Job * )
 {
   if (d->m_uploadJob->error())
   {
diff --git a/kparts/part.h b/kparts/part.h
index 8a58063af..7b5e39b2f 100644
--- a/kparts/part.h
+++ b/kparts/part.h
@@ -34,7 +34,7 @@ class KActionCollection;
 class TQEvent;
 struct QUnknownInterface;
 
-namespace KIO {
+namespace TDEIO {
   class Job;
 }
 
@@ -96,7 +96,7 @@ protected:
 
   /**
    * We have three different policies, whether to load new plugins or not. The
-   * value in the KConfig object of the TDEInstance object always overrides
+   * value in the TDEConfig object of the TDEInstance object always overrides
    * LoadPlugins and LoadPluginsIfEnabled.
    */
   enum PluginLoadingMode {
@@ -452,10 +452,10 @@ private: // Makes no sense for inherited classes to call those. But make it prot
 signals:
   /**
    * The part emits this when starting data.
-   * If using a KIO::Job, it sets the job in the signal, so that
+   * If using a TDEIO::Job, it sets the job in the signal, so that
    * progress information can be shown. Otherwise, job is 0.
    **/
-  void started( KIO::Job * );
+  void started( TDEIO::Job * );
 
   /**
    * Emit this when you have completed loading data.
@@ -482,7 +482,7 @@ signals:
   void canceled( const TQString &errMsg );
 
 protected slots:
-  void slotJobFinished( KIO::Job * job );
+  void slotJobFinished( TDEIO::Job * job );
 
 protected:
   /**
@@ -667,7 +667,7 @@ protected:
    * @return true on success, false on failure.
    * On failure the function should inform the user about the
    * problem with an appropriate message box. Standard error
-   * messages can be constructed using KIO::buildErrorString()
+   * messages can be constructed using TDEIO::buildErrorString()
    * in combination with the error codes defined in kio/global.h
    */
   virtual bool saveFile() = 0;
@@ -686,7 +686,7 @@ protected slots:
   /**
    * @internal
    */
-  void slotUploadFinished( KIO::Job * job );
+  void slotUploadFinished( TDEIO::Job * job );
 
 private:
   void prepareSaving();
diff --git a/kparts/plugin.cpp b/kparts/plugin.cpp
index b36d4dbc6..0dc729de1 100644
--- a/kparts/plugin.cpp
+++ b/kparts/plugin.cpp
@@ -226,7 +226,7 @@ void Plugin::setInstance( TDEInstance *instance )
 
 void Plugin::loadPlugins( TQObject *parent, KXMLGUIClient* parentGUIClient, TDEInstance* instance, bool enableNewPluginsByDefault )
 {
-    KConfigGroup cfgGroup( instance->config(), "KParts Plugins" );
+    TDEConfigGroup cfgGroup( instance->config(), "KParts Plugins" );
     TQValueList<PluginInfo> plugins = pluginInfos( instance );
     TQValueList<PluginInfo>::ConstIterator pIt = plugins.begin();
     TQValueList<PluginInfo>::ConstIterator pEnd = plugins.end();
diff --git a/kparts/plugin.h b/kparts/plugin.h
index efebf5af4..df1200ee9 100644
--- a/kparts/plugin.h
+++ b/kparts/plugin.h
@@ -111,7 +111,7 @@ public:
      * Plugin objects children of @p parent, and insert the plugin as a child GUI client
      * of @p parentGUIClient.
      *
-     * This method uses the KConfig object of the given instance, to find out which
+     * This method uses the TDEConfig object of the given instance, to find out which
      * plugins are enabled and which are disabled. What happens by default (i.e.
      * for new plugins that are not in that config file) is controlled by
      * @p enableNewPluginsByDefault. It can be overridden by the plugin if it