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

11 files changed, 62 insertions, 62 deletions

diff --git a/ark/ark_part.cpp b/ark/ark_part.cpp
index 77d329b..afd416f 100644
--- a/ark/ark_part.cpp
+++ b/ark/ark_part.cpp
@@ -102,7 +102,7 @@ ArkPart::ArkPart( TQWidget *parentWidget, const char * /*widgetName*/, TQObject
                  TQT_SLOT( slotSetBusy( const TQString & ) ) );
     connect( awidget, TQT_SIGNAL( setReady() ), m_bar,
                  TQT_SLOT( slotSetReady() ) );
-    connect( this, TQT_SIGNAL( started(KIO::Job*) ), TQT_SLOT( transferStarted(KIO::Job*) ) );
+    connect( this, TQT_SIGNAL( started(TDEIO::Job*) ), TQT_SLOT( transferStarted(TDEIO::Job*) ) );
     connect( this, TQT_SIGNAL( completed() ), TQT_SLOT( transferCompleted() ) );
     connect( this, TQT_SIGNAL( canceled(const TQString&) ),
              TQT_SLOT( transferCanceled(const TQString&) ) );
@@ -246,7 +246,7 @@ void ArkPart::disableActions()
 bool ArkPart::openURL( const KURL & url )
 {
     awidget->setRealURL( url );
-    return KParts::ReadWritePart::openURL( KIO::NetAccess::mostLocalURL( url, awidget ) );
+    return KParts::ReadWritePart::openURL( TDEIO::NetAccess::mostLocalURL( url, awidget ) );
 }
 
 bool ArkPart::openFile()
@@ -322,7 +322,7 @@ void ArkPart::slotFilePopup( const TQPoint &pPoint )
         static_cast<KPopupMenu *>(factory()->container("file_popup", this))->popup(pPoint);
 }
 
-void ArkPart::transferStarted( KIO::Job *job )
+void ArkPart::transferStarted( TDEIO::Job *job )
 {
     m_job = job;
 
@@ -332,8 +332,8 @@ void ArkPart::transferStarted( KIO::Job *job )
     if ( job )
     {
         disableActions();
-        connect( job, TQT_SIGNAL( percent(KIO::Job*, unsigned long) ),
-                 TQT_SLOT( progressInformation(KIO::Job*, unsigned long) ) );
+        connect( job, TQT_SIGNAL( percent(TDEIO::Job*, unsigned long) ),
+                 TQT_SLOT( progressInformation(TDEIO::Job*, unsigned long) ) );
         connect( m_bar->cancelButton(), TQT_SIGNAL( clicked() ),
                  TQT_SLOT( cancelTransfer() ) );
     }
@@ -343,8 +343,8 @@ void ArkPart::transferCompleted()
 {
     if ( m_job )
     {
-        disconnect( m_job, TQT_SIGNAL( percent(KIO::Job*, unsigned long) ),
-                    this, TQT_SLOT( progressInformation(KIO::Job*, unsigned long) ) );
+        disconnect( m_job, TQT_SIGNAL( percent(TDEIO::Job*, unsigned long) ),
+                    this, TQT_SLOT( progressInformation(TDEIO::Job*, unsigned long) ) );
         m_job = 0;
     }
 
@@ -362,7 +362,7 @@ void ArkPart::transferCanceled( const TQString& errMsg )
     m_bar->slotSetReady();
 }
 
-void ArkPart::progressInformation( KIO::Job *, unsigned long progress )
+void ArkPart::progressInformation( TDEIO::Job *, unsigned long progress )
 {
     m_bar->setProgress( progress );
 }
diff --git a/ark/ark_part.h b/ark/ark_part.h
index 5dce97c..6ec3202 100644
--- a/ark/ark_part.h
+++ b/ark/ark_part.h
@@ -37,7 +37,7 @@ class KPushButton;
 
 class ArkWidget;
 
-namespace KIO
+namespace TDEIO
 {
 	class Job;
 }
@@ -104,10 +104,10 @@ public slots:
     bool saveFile();
     bool openURL( const KURL & url );
     bool closeURL();
-    void transferStarted( KIO::Job * );
+    void transferStarted( TDEIO::Job * );
     void transferCompleted();
     void transferCanceled( const TQString& errMsg );
-    void progressInformation( KIO::Job *, unsigned long );
+    void progressInformation( TDEIO::Job *, unsigned long );
     void cancelTransfer();
 
 signals:
@@ -146,7 +146,7 @@ private:
     KAction *popupOpenWithAction;
     KToggleAction *showSearchBar;
 
-    KIO::Job *m_job;
+    TDEIO::Job *m_job;
 };
 
 #endif // ARK_PART_H
diff --git a/ark/arkutils.cpp b/ark/arkutils.cpp
index 210f9bb..52049d0 100644
--- a/ark/arkutils.cpp
+++ b/ark/arkutils.cpp
@@ -186,7 +186,7 @@ ArkUtils::haveDirPermissions( const TQString &strFile )
 }
 
 bool
-ArkUtils::diskHasSpace(const TQString &dir, KIO::filesize_t size)
+ArkUtils::diskHasSpace(const TQString &dir, TDEIO::filesize_t size)
   // check if disk has enough space to accommodate (a) new file(s) of
   // the given size in the partition containing the given directory
 {
@@ -211,10 +211,10 @@ ArkUtils::diskHasSpace(const TQString &dir, KIO::filesize_t size)
   return true;
 }
 
-KIO::filesize_t
+TDEIO::filesize_t
 ArkUtils::getSizes(TQStringList *list)
 {
-  KIO::filesize_t sum = 0;
+  TDEIO::filesize_t sum = 0;
   TQString str;
   KDE_struct_stat st;
 
diff --git a/ark/arkutils.h b/ark/arkutils.h
index b8a040c..baed64b 100644
--- a/ark/arkutils.h
+++ b/ark/arkutils.h
@@ -49,8 +49,8 @@ namespace ArkUtils
                        const TQString &day,
                        const TQString &year);
   bool haveDirPermissions(const TQString &strFile);
-  bool diskHasSpace(const TQString &dir, KIO::filesize_t size);
-  KIO::filesize_t getSizes(TQStringList *list);
+  bool diskHasSpace(const TQString &dir, TDEIO::filesize_t size);
+  TDEIO::filesize_t getSizes(TQStringList *list);
 }
 
 #endif
diff --git a/ark/arkwidget.cpp b/ark/arkwidget.cpp
index 6a40e4a..5931f8b 100644
--- a/ark/arkwidget.cpp
+++ b/ark/arkwidget.cpp
@@ -199,7 +199,7 @@ ArkWidget::updateStatusTotals()
     m_nSizeOfFiles = m_fileListView->totalSize();
 
     TQString strInfo = i18n( "%n file  %1", "%n files  %1", m_nNumFiles )
-                          .arg( KIO::convertSize( m_nSizeOfFiles ) );
+                          .arg( TDEIO::convertSize( m_nSizeOfFiles ) );
     emit setStatusBarText(strInfo);
 }
 
@@ -287,7 +287,7 @@ ArkWidget::getSaveAsFileName()
 bool
 ArkWidget::file_save_as( const KURL & u )
 {
-    bool success = KIO::NetAccess::upload( m_strArchName, u, this );
+    bool success = TDEIO::NetAccess::upload( m_strArchName, u, this );
     if ( m_modified && success )
         m_modified = false;
     return success;
@@ -388,7 +388,7 @@ ArkWidget::convertFinish()
         }
         else
         {
-            KIO::NetAccess::upload( tmpDir()
+            TDEIO::NetAccess::upload( tmpDir()
                        + m_convert_saveAsURL.fileName(), m_convert_saveAsURL, this );
             // TODO: save bandwidth - we already have a local tmp file ...
             emit openURLRequest( m_convert_saveAsURL );
@@ -427,9 +427,9 @@ ArkWidget::extractTo( const KURL & targetDirectory, const KURL & archive, bool b
         m_extractTo_targetDirectory.setPath( targetDirectory.path( 1 ) + fileName + '/' );
     }
 
-    if ( !KIO::NetAccess::exists( m_extractTo_targetDirectory, false, this ) )
+    if ( !TDEIO::NetAccess::exists( m_extractTo_targetDirectory, false, this ) )
     {
-        if ( !KIO::NetAccess::mkdir( m_extractTo_targetDirectory, this ) )
+        if ( !TDEIO::NetAccess::mkdir( m_extractTo_targetDirectory, this ) )
         {
             KMessageBox::error( 0, i18n( "Could not create the folder %1" ).arg(
                                                             targetDirectory.prettyURL() ) );
@@ -548,7 +548,7 @@ ArkWidget::addToArchive( const KURL::List & filesToAdd, const KURL & archive)
 {
     m_addToArchive_filesToAdd = filesToAdd;
     m_addToArchive_archive = archive;
-    if ( !KIO::NetAccess::exists( archive, false, this ) )
+    if ( !TDEIO::NetAccess::exists( archive, false, this ) )
     {
         if ( !m_openAsMimeType.isEmpty() )
         {
@@ -676,7 +676,7 @@ ArkWidget::addToArchiveSlotAddDone( bool success )
         KMessageBox::error( this, i18n( "An error occurred while adding the files to the archive." ) );
     }
     if ( !m_addToArchive_archive.isLocalFile() )
-        KIO::NetAccess::upload( m_strArchName, m_addToArchive_archive, this );
+        TDEIO::NetAccess::upload( m_strArchName, m_addToArchive_archive, this );
     emit request_file_quit();
     return;
 }
@@ -918,15 +918,15 @@ ArkWidget::extractRemoteInitiateMoving( const KURL & target )
 
     m_extractURL.adjustPath( 1 );
 
-    KIO::CopyJob *job = KIO::copy( srcList, target, this );
-    connect( job, TQT_SIGNAL(result(KIO::Job*)),
-            this, TQT_SLOT(slotExtractRemoteDone(KIO::Job*)) );
+    TDEIO::CopyJob *job = TDEIO::copy( srcList, target, this );
+    connect( job, TQT_SIGNAL(result(TDEIO::Job*)),
+            this, TQT_SLOT(slotExtractRemoteDone(TDEIO::Job*)) );
 
     m_extractRemote = false;
 }
 
 void
-ArkWidget::slotExtractRemoteDone(KIO::Job *job)
+ArkWidget::slotExtractRemoteDone(TDEIO::Job *job)
 {
     delete m_extractRemoteTmpDir;
     m_extractRemoteTmpDir = NULL;
@@ -1008,7 +1008,7 @@ ArkWidget::createRealArchive( const TQString & strFilename, const TQStringList &
     u1.setPath( m_compressedFile );
     m_createRealArchTmpDir = new KTempDir( tmpDir() + "create_real_arch" );
     u2.setPath( m_createRealArchTmpDir->name() + u1.fileName() );
-    KIO::NetAccess::copy( u1, u2, this );
+    TDEIO::NetAccess::copy( u1, u2, this );
     m_compressedFile = "file:" + u2.path(); // AGAIN THE 5 SPACES Hack :-(
     connect( newArch, TQT_SIGNAL( sigCreate( Arch *, bool, const TQString &, int ) ),
              this, TQT_SLOT( createRealArchiveSlotCreate( Arch *, bool,
@@ -1212,7 +1212,7 @@ ArkWidget::toLocalFile( const KURL& url )
         tempfile += strURL.right(strURL.length() - strURL.findRev("/") - 1);
         deleteAfterUse(tempfile);  // remember for deletion
         KURL tempurl; tempurl.setPath( tempfile );
-        if( !KIO::NetAccess::dircopy(url, tempurl, this) )
+        if( !TDEIO::NetAccess::dircopy(url, tempurl, this) )
             return KURL();
         localURL = tempfile;
     }
@@ -1439,7 +1439,7 @@ ArkWidget::action_extract()
     fileToExtract.setPath( arch->fileName() );
 
      //before we start, make sure the archive is still there
-    if (!KIO::NetAccess::exists( fileToExtract.prettyURL(), true, this ) )
+    if (!TDEIO::NetAccess::exists( fileToExtract.prettyURL(), true, this ) )
     {
         KMessageBox::error(0, i18n("The archive to extract from no longer exists."));
         return false;
@@ -1531,7 +1531,7 @@ ArkWidget::action_extract()
         }
         else
         {
-                KIO::filesize_t nTotalSize = 0;
+                TDEIO::filesize_t nTotalSize = 0;
                 // make a list to send to unarchFile
                 TQStringList selectedFiles = m_fileListView->selectedFilenames();
                 for ( TQStringList::const_iterator it = selectedFiles.constBegin();
@@ -1842,12 +1842,12 @@ ArkWidget::updateStatusSelection()
     {
         strInfo = i18n("%1 files selected  %2")
                   .arg(TDEGlobal::locale()->formatNumber(m_nNumSelectedFiles, 0))
-                  .arg(KIO::convertSize(m_nSizeOfSelectedFiles));
+                  .arg(TDEIO::convertSize(m_nSizeOfSelectedFiles));
     }
     else
     {
         strInfo = i18n("1 file selected  %2")
-                  .arg(KIO::convertSize(m_nSizeOfSelectedFiles));
+                  .arg(TDEIO::convertSize(m_nSizeOfSelectedFiles));
     }
 
     emit setStatusBarSelectedFiles(strInfo);
@@ -2266,10 +2266,10 @@ void ArkWidget::slotShowSearchBarToggled( bool b )
  * Show Settings dialog.
  */
 void ArkWidget::showSettings(){
-  if(KConfigDialog::showDialog("settings"))
+  if(TDEConfigDialog::showDialog("settings"))
     return;
 
-  KConfigDialog *dialog = new KConfigDialog(this, "settings", ArkSettings::self());
+  TDEConfigDialog *dialog = new TDEConfigDialog(this, "settings", ArkSettings::self());
 
   General* genPage = new General(0, "General");
   dialog->addPage(genPage, i18n("General"), "ark", i18n("General Settings"));
diff --git a/ark/arkwidget.h b/ark/arkwidget.h
index 59d3ea7..11f6a95 100644
--- a/ark/arkwidget.h
+++ b/ark/arkwidget.h
@@ -131,7 +131,7 @@ protected slots:
     void slotCreate(Arch *, bool, const TQString &, int);
     void slotDeleteDone(bool);
     void slotExtractDone(bool);
-    void slotExtractRemoteDone(KIO::Job *job);
+    void slotExtractRemoteDone(TDEIO::Job *job);
     void slotAddDone(bool);
     void slotEditFinished(TDEProcess *);
     void slotTestDone(bool);
@@ -302,8 +302,8 @@ private: // data
     ArchType m_archType;
     FileListView * m_fileListView;
 
-    KIO::filesize_t m_nSizeOfFiles;
-    KIO::filesize_t m_nSizeOfSelectedFiles;
+    TDEIO::filesize_t m_nSizeOfFiles;
+    TDEIO::filesize_t m_nSizeOfSelectedFiles;
     unsigned int m_nNumFiles;
     int m_nNumSelectedFiles;
     int m_arkInstanceId;
diff --git a/ark/compressedfile.cpp b/ark/compressedfile.cpp
index 00d6a9d..2688f6c 100644
--- a/ark/compressedfile.cpp
+++ b/ark/compressedfile.cpp
@@ -178,10 +178,10 @@ void CompressedFile::open()
   src.setPath( m_filename );
   target.setPath( m_tmpfile );
 
-  KIO::NetAccess::copy( src, target, m_gui );
+  TDEIO::NetAccess::copy( src, target, m_gui );
   kdDebug(1601) << "Temp file name is " << target << endl;
 
-  if ( !KIO::NetAccess::exists( target, true, NULL ) )
+  if ( !TDEIO::NetAccess::exists( target, true, NULL ) )
     return;
 
   TDEProcess *kp = m_currentProcess = new TDEProcess;
@@ -246,15 +246,15 @@ void CompressedFile::slotUncompressDone(TDEProcess *_kp)
   KURL url;
   url.setPath( m_tmpdir + lst.first() );
   m_tmpfile = url.path();
-  KIO::UDSEntry udsInfo;
-  KIO::NetAccess::stat( url, udsInfo, m_gui );
+  TDEIO::UDSEntry udsInfo;
+  TDEIO::NetAccess::stat( url, udsInfo, m_gui );
   KFileItem fileItem( udsInfo, url );
   TQStringList list;
   list << fileItem.name();
   list << fileItem.permissionsString();
   list << fileItem.user();
   list << fileItem.group();
-  list << KIO::number( fileItem.size() );
+  list << TDEIO::number( fileItem.size() );
   m_gui->fileList()->addItem(list); // send to GUI
 
   emit sigOpen( this, bSuccess, m_filename,
diff --git a/ark/filelistview.cpp b/ark/filelistview.cpp
index 16bcf8d..384a259 100644
--- a/ark/filelistview.cpp
+++ b/ark/filelistview.cpp
@@ -138,12 +138,12 @@ void FileLVI::setText( int column, const TQString &text )
 	else if ( colName == sizeCol )
 	{
 		m_fileSize = text.toULongLong();
-		TQListViewItem::setText( column, KIO::convertSize( m_fileSize ) );
+		TQListViewItem::setText( column, TDEIO::convertSize( m_fileSize ) );
 	}
 	else if ( colName == packedStrCol )
 	{
 		m_packedFileSize = text.toULongLong();
-		TQListViewItem::setText( column, KIO::convertSize( m_packedFileSize ) );
+		TQListViewItem::setText( column, TDEIO::convertSize( m_packedFileSize ) );
 	}
 	else if ( colName == ratioStrCol )
 	{
@@ -470,9 +470,9 @@ int FileListView::selectedFilesCount()
 	return numFiles;
 }
 
-KIO::filesize_t FileListView::totalSize()
+TDEIO::filesize_t FileListView::totalSize()
 {
-	KIO::filesize_t size = 0;
+	TDEIO::filesize_t size = 0;
 
 	TQListViewItemIterator it(this);
 	while ( it.current() )
@@ -485,9 +485,9 @@ KIO::filesize_t FileListView::totalSize()
 	return size;
 }
 
-KIO::filesize_t FileListView::selectedSize()
+TDEIO::filesize_t FileListView::selectedSize()
 {
-	KIO::filesize_t size = 0;
+	TDEIO::filesize_t size = 0;
 
 	TQListViewItemIterator it( this, TQListViewItemIterator::Selected );
 	while ( it.current() )
diff --git a/ark/filelistview.h b/ark/filelistview.h
index 88a9546..d3479f1 100644
--- a/ark/filelistview.h
+++ b/ark/filelistview.h
@@ -52,8 +52,8 @@ class FileLVI : public KListViewItem
 		FileLVI( KListViewItem* lvi );
 
 		TQString fileName() const { return m_entryName; }
-		KIO::filesize_t fileSize() const { return m_fileSize; }
-		KIO::filesize_t packedFileSize() const { return m_packedFileSize; }
+		TDEIO::filesize_t fileSize() const { return m_fileSize; }
+		TDEIO::filesize_t packedFileSize() const { return m_packedFileSize; }
 		double ratio() const { return m_ratio; }
 		TQDateTime timeStamp() const { return m_timeStamp; }
 
@@ -62,8 +62,8 @@ class FileLVI : public KListViewItem
 		virtual void setText( int column, const TQString &text );
 
 	private:
-		KIO::filesize_t m_fileSize;
-		KIO::filesize_t m_packedFileSize;
+		TDEIO::filesize_t m_fileSize;
+		TDEIO::filesize_t m_packedFileSize;
 		double    m_ratio;
 		TQDateTime m_timeStamp;
 		TQString   m_entryName;
@@ -125,12 +125,12 @@ class FileListView: public KListView
 		/**
 		 * Return the sum of the sizes of all files in the archive.
 		 */
-		KIO::filesize_t totalSize();
+		TDEIO::filesize_t totalSize();
 
 		/**
 		 * Return the sum of the sizes of the selected files.
 		 */
-		KIO::filesize_t selectedSize();
+		TDEIO::filesize_t selectedSize();
 
 		/**
 		 * Adjust the size of all columns to fit their content.
diff --git a/ark/mainwindow.cpp b/ark/mainwindow.cpp
index 7096833..2c9a957 100644
--- a/ark/mainwindow.cpp
+++ b/ark/mainwindow.cpp
@@ -344,7 +344,7 @@ MainWindow::slotSaveProperties()
 }
 
 void
-MainWindow::saveProperties( KConfig* config )
+MainWindow::saveProperties( TDEConfig* config )
 {
     //TODO: make it work for URLS
     config->writePathEntry( "SMOpenedFile",m_widget->getArchName() );
@@ -353,10 +353,10 @@ MainWindow::saveProperties( KConfig* config )
 
 
 void
-MainWindow::readProperties( KConfig* config )
+MainWindow::readProperties( TDEConfig* config )
 {
     TQString file = config->readPathEntry("SMOpenedFile");
-    kdDebug(1601) << "ArkWidget::readProperties( KConfig* config ) file=" << file << endl;
+    kdDebug(1601) << "ArkWidget::readProperties( TDEConfig* config ) file=" << file << endl;
     if ( !file.isEmpty() )
         openURL( KURL::fromPathOrURL( file ) );
 }
@@ -433,7 +433,7 @@ MainWindow::addToArchive( const KURL::List & filesToAdd, const TQString & /*cwd*
 
     startProgressDialog( i18n( "Compressing..." ) );
 
-    bool exists = KIO::NetAccess::exists( archiveFile, false, m_widget );
+    bool exists = TDEIO::NetAccess::exists( archiveFile, false, m_widget );
     kdDebug( 1601 ) << archiveFile << endl;
 
     if ( !m_widget->addToArchive( filesToAdd, archiveFile ) )
diff --git a/ark/mainwindow.h b/ark/mainwindow.h
index ca3abb2..d448e8c 100644
--- a/ark/mainwindow.h
+++ b/ark/mainwindow.h
@@ -63,8 +63,8 @@ public slots:
     void file_close();
     void slotNewToolbarConfig();
     void slotConfigureKeyBindings();
-    virtual void saveProperties( KConfig* config );
-    virtual void readProperties( KConfig* config );
+    virtual void saveProperties( TDEConfig* config );
+    virtual void readProperties( TDEConfig* config );
     void slotSaveProperties();
     void slotArchivePopup( const TQPoint &pPoint);
     void slotRemoveRecentURL( const KURL &url );