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

87 files changed, 350 insertions, 350 deletions

diff --git a/ChangeLog b/ChangeLog
index c57a935..736cb84 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -10131,7 +10131,7 @@ v 0.1.3-beta1 - 2006-11-29
 	* [r585881] rawconverter/batchdialog.cpp,
 	  rawconverter/savesettingswidget.cpp,
 	  rawconverter/singledialog.cpp:
-	  kipi-plugins from trunk : Raw Converter : using KIO::renameDlg
+	  kipi-plugins from trunk : Raw Converter : using TDEIO::renameDlg
 	  instead KFileDialog.
 
 2006-09-15 13:50  cgilles
@@ -11698,7 +11698,7 @@ v0.1.0-rc2 - Last Changed Rev: 538177 - 2006-05-03
 	  trunk/extragear/libs/kipi-plugins/htmlexport/theme.cpp,
 	  trunk/extragear/libs/kipi-plugins/htmlexport/theme.h,
 	  trunk/extragear/libs/kipi-plugins/htmlexport/wizard.cpp: Use
-	  KConfigXT to store settings of the htmlexport plugin.
+	  TDEConfigXT to store settings of the htmlexport plugin.
 
 2006-04-23 15:28  blackie
 
@@ -12451,7 +12451,7 @@ v0.1.0-rc1                                                        2005-02-08
 
 	* trunk/extragear/libs/kipi-plugins/cdarchiving/cdarchiving.cpp,
 	  trunk/extragear/libs/kipi-plugins/cdarchiving/cdarchiving.h: -
-	  Create KConfig objects on the stack. - No need to keep a pointer
+	  Create TDEConfig objects on the stack. - No need to keep a pointer
 	  on it in the object.
 
 2005-09-03 15:51  gateau
@@ -13169,7 +13169,7 @@ v0.1.0-beta2                                                      2005-02-08
 
 	* imagesgallery/: imagesgallery.cpp, imagesgallery.h: - Do not
 	  append a file extension if the file already ends with that
-	  extension.  - Use a locally declared KConfig object whenever it
+	  extension.  - Use a locally declared TDEConfig object whenever it
 	  is short lived, i.e. deleted at   the end of the function.  - "if
 	  (object) delete object;" is not necessary if the object is
 	  already initialized properly.
@@ -14865,7 +14865,7 @@ v0.1.0-beta1                                                      2004-09-06
 	    // PENDING (Gilles) : Using kipirc file!
 	    // Read File Filter settings in digikamrc file.
 
-	      m_config = new KConfig("digikamrc");
+	      m_config = new TDEConfig("digikamrc");
 	      m_config->setGroup("Album Settings");
 	      QString Temp = m_config->readEntry("File Filter", "*.jpg
 	  *.jpeg *.tif *.tiff *.gif *.png *.bmp");
diff --git a/kipi-plugins/ChangeLog b/kipi-plugins/ChangeLog
index b6d14a9..b1e70ec 100644
--- a/kipi-plugins/ChangeLog
+++ b/kipi-plugins/ChangeLog
@@ -10257,7 +10257,7 @@ v 0.1.3-beta1 - 2006-11-29
 	* [r585881] rawconverter/batchdialog.cpp,
 	  rawconverter/savesettingswidget.cpp,
 	  rawconverter/singledialog.cpp:
-	  kipi-plugins from trunk : Raw Converter : using KIO::renameDlg
+	  kipi-plugins from trunk : Raw Converter : using TDEIO::renameDlg
 	  instead KFileDialog.
 
 2006-09-15 13:50  cgilles
@@ -11824,7 +11824,7 @@ v0.1.0-rc2 - Last Changed Rev: 538177 - 2006-05-03
 	  trunk/extragear/libs/kipi-plugins/htmlexport/theme.cpp,
 	  trunk/extragear/libs/kipi-plugins/htmlexport/theme.h,
 	  trunk/extragear/libs/kipi-plugins/htmlexport/wizard.cpp: Use
-	  KConfigXT to store settings of the htmlexport plugin.
+	  TDEConfigXT to store settings of the htmlexport plugin.
 
 2006-04-23 15:28  blackie
 
@@ -12577,7 +12577,7 @@ v0.1.0-rc1                                                        2005-02-08
 
 	* trunk/extragear/libs/kipi-plugins/cdarchiving/cdarchiving.cpp,
 	  trunk/extragear/libs/kipi-plugins/cdarchiving/cdarchiving.h: -
-	  Create KConfig objects on the stack. - No need to keep a pointer
+	  Create TDEConfig objects on the stack. - No need to keep a pointer
 	  on it in the object.
 
 2005-09-03 15:51  gateau
@@ -13295,7 +13295,7 @@ v0.1.0-beta2                                                      2005-02-08
 
 	* imagesgallery/: imagesgallery.cpp, imagesgallery.h: - Do not
 	  append a file extension if the file already ends with that
-	  extension.  - Use a locally declared KConfig object whenever it
+	  extension.  - Use a locally declared TDEConfig object whenever it
 	  is short lived, i.e. deleted at   the end of the function.  - "if
 	  (object) delete object;" is not necessary if the object is
 	  already initialized properly.
@@ -14991,7 +14991,7 @@ v0.1.0-beta1                                                      2004-09-06
 	    // PENDING (Gilles) : Using kipirc file!
 	    // Read File Filter settings in digikamrc file.
 
-	      m_config = new KConfig("digikamrc");
+	      m_config = new TDEConfig("digikamrc");
 	      m_config->setGroup("Album Settings");
 	      QString Temp = m_config->readEntry("File Filter", "*.jpg
 	  *.jpeg *.tif *.tiff *.gif *.png *.bmp");
diff --git a/kipi-plugins/acquireimages/acquireimagedialog.cpp b/kipi-plugins/acquireimages/acquireimagedialog.cpp
index 5068bc4..cac0997 100644
--- a/kipi-plugins/acquireimages/acquireimagedialog.cpp
+++ b/kipi-plugins/acquireimages/acquireimagedialog.cpp
@@ -147,7 +147,7 @@ void AcquireImageDialog::readSettings(void)
 {
     // Read all settings from configuration file.
 
-    m_config = new KConfig("kipirc");
+    m_config = new TDEConfig("kipirc");
     m_config->setGroup("AcquireImages Settings");
     m_FileName->setText(m_config->readPathEntry("DefaultImageFileName", i18n("image")));
     m_imageCompression->setValue(m_config->readNumEntry("ImageCompression", 75));
@@ -164,7 +164,7 @@ void AcquireImageDialog::writeSettings(void)
 {
     // Write all settings in configuration file.
 
-    m_config = new KConfig("kipirc");
+    m_config = new TDEConfig("kipirc");
     m_config->setGroup("AcquireImages Settings");
     m_config->writePathEntry("DefaultImageFileName", m_FileName->text());
     m_config->writeEntry("ImageCompression", m_imageCompression->value());
@@ -428,14 +428,14 @@ void AcquireImageDialog::slotOk()
     TQString ext = extension(imageFormat);
     url.setFileName(fileName + ext);
 
-    if (KIO::NetAccess::exists(url, false NETACCESS_WIDGET)) 
+    if (TDEIO::NetAccess::exists(url, false NETACCESS_WIDGET)) 
     {
         for (int idx = 1; idx < 100 ; ++idx) 
         {
             url.setFileName(TQString("%1_%2%3").arg(fileName).arg(idx).arg(ext));
             kdDebug(51001) << "File already exist. Try to fixed target Url to: " << url.prettyURL() << endl;
             
-            if (!KIO::NetAccess::exists(url, false NETACCESS_WIDGET)) 
+            if (!TDEIO::NetAccess::exists(url, false NETACCESS_WIDGET)) 
                break;
         }
     }
@@ -478,7 +478,7 @@ void AcquireImageDialog::slotOk()
     // Upload the image if necessary
     if ( !url.isLocalFile()) 
     {
-        if (!KIO::NetAccess::upload(imagePath, url NETACCESS_WIDGET)) 
+        if (!TDEIO::NetAccess::upload(imagePath, url NETACCESS_WIDGET)) 
         {
            KMessageBox::error(this, i18n("Could not upload image to \"%1\".").arg(url.prettyURL()));
            return;
diff --git a/kipi-plugins/acquireimages/acquireimagedialog.h b/kipi-plugins/acquireimages/acquireimagedialog.h
index e826058..990ff23 100644
--- a/kipi-plugins/acquireimages/acquireimagedialog.h
+++ b/kipi-plugins/acquireimages/acquireimagedialog.h
@@ -54,7 +54,7 @@ class TQFrame;
 class TQPushButton;
 
 class KListBox;
-class KConfig;
+class TDEConfig;
 class KIntNumInput;
 class KSqueezedTextLabel;
 
@@ -86,7 +86,7 @@ private:
    TQPushButton        *m_addNewAlbumButton;
    TQPushButton        *m_helpButton;
 
-   KConfig            *m_config;
+   TDEConfig            *m_config;
 
    TQString             m_newDir;
    TQString             m_ImagesFilesSort;
diff --git a/kipi-plugins/acquireimages/screenshotdialog.cpp b/kipi-plugins/acquireimages/screenshotdialog.cpp
index 91db602..3a4ec1c 100644
--- a/kipi-plugins/acquireimages/screenshotdialog.cpp
+++ b/kipi-plugins/acquireimages/screenshotdialog.cpp
@@ -130,7 +130,7 @@ ScreenGrabDialog::ScreenGrabDialog( KIPI::Interface* interface, TQWidget *parent
 
     // Read all settings from configuration file.
 
-    m_config = new KConfig("kipirc");
+    m_config = new TDEConfig("kipirc");
     m_config->setGroup("ScreenshotImages Settings");
 
     if (m_config->readEntry("GrabDesktop", "true") == "true")
@@ -181,7 +181,7 @@ void ScreenGrabDialog::slotClose( void )
 {
     // Write all settings in configuration file.
 
-    m_config = new KConfig("kipirc");
+    m_config = new TDEConfig("kipirc");
     m_config->setGroup("ScreenshotImages Settings");
     m_config->writeEntry("GrabDesktop", m_desktopCB->isChecked());
     m_config->writeEntry("HideHostWin", m_hideCB->isChecked());
diff --git a/kipi-plugins/acquireimages/screenshotdialog.h b/kipi-plugins/acquireimages/screenshotdialog.h
index 86c5d84..c737838 100644
--- a/kipi-plugins/acquireimages/screenshotdialog.h
+++ b/kipi-plugins/acquireimages/screenshotdialog.h
@@ -52,7 +52,7 @@ class TQWidget;
 class TQCheckBox;
 class TQPushButton;
 
-class KConfig;
+class TDEConfig;
 class KIntNumInput;
 
 namespace KIPIAcquireImagesPlugin
@@ -98,7 +98,7 @@ private:
     
     TQImage                  m_screenshotImage;
     
-    KConfig                *m_config;
+    TDEConfig                *m_config;
     
     TQWidget                *m_grabber;
     
diff --git a/kipi-plugins/batchprocessimages/batchprocessimagesdialog.cpp b/kipi-plugins/batchprocessimages/batchprocessimagesdialog.cpp
index 23afe13..bc0bc0a 100644
--- a/kipi-plugins/batchprocessimages/batchprocessimagesdialog.cpp
+++ b/kipi-plugins/batchprocessimages/batchprocessimagesdialog.cpp
@@ -327,7 +327,7 @@ void BatchProcessImagesDialog::slotImageSelected( TQListViewItem * item )
 
     KURL url(IdemIndexed);
 
-    KIO::PreviewJob* m_thumbJob = KIO::filePreview( url, m_imageLabel->height() );
+    TDEIO::PreviewJob* m_thumbJob = TDEIO::filePreview( url, m_imageLabel->height() );
 
     connect(m_thumbJob, TQT_SIGNAL(gotPreview(const KFileItem*, const TQPixmap&)),
             this, TQT_SLOT(slotGotPreview(const KFileItem*, const TQPixmap&)));
@@ -476,9 +476,9 @@ bool BatchProcessImagesDialog::startProcess(void)
     KURL desturl(targetAlbum + "/" + item->nameDest());
 
 #if TDE_VERSION >= 0x30200
-    if ( KIO::NetAccess::exists( desturl, false, TQT_TQWIDGET(kapp->activeWindow()) ) == true )
+    if ( TDEIO::NetAccess::exists( desturl, false, TQT_TQWIDGET(kapp->activeWindow()) ) == true )
 #else
-    if ( KIO::NetAccess::exists( desturl ) == true )
+    if ( TDEIO::NetAccess::exists( desturl ) == true )
 #endif
     {
        switch (overwriteMode())
@@ -715,9 +715,9 @@ void BatchProcessImagesDialog::slotProcessDone(TDEProcess* proc)
                 KURL deleteImage(item->pathSrc());
     
 #if TDE_VERSION >= 0x30200
-                if ( KIO::NetAccess::del( deleteImage, TQT_TQWIDGET(kapp->activeWindow()) ) == false )
+                if ( TDEIO::NetAccess::del( deleteImage, TQT_TQWIDGET(kapp->activeWindow()) ) == false )
 #else
-                if ( KIO::NetAccess::del( deleteImage ) == false )
+                if ( TDEIO::NetAccess::del( deleteImage ) == false )
 #endif
                 {
                     item->changeResult(i18n("Warning:"));
@@ -868,9 +868,9 @@ void BatchProcessImagesDialog::slotPreviewProcessDone(TDEProcess* proc)
        KURL deletePreviewImage(m_tmpFolder + "/" + TQString::number(getpid()) + "preview.PNG");
 
 #if TDE_VERSION >= 0x30200
-       KIO::NetAccess::del( deletePreviewImage, TQT_TQWIDGET(kapp->activeWindow()) );
+       TDEIO::NetAccess::del( deletePreviewImage, TQT_TQWIDGET(kapp->activeWindow()) );
 #else
-       KIO::NetAccess::del( deletePreviewImage );
+       TDEIO::NetAccess::del( deletePreviewImage );
 #endif
     }
     else
@@ -1029,11 +1029,11 @@ void BatchProcessImagesDialog::processAborted(bool removeFlag)
        deleteImage.addPath(item->nameDest());
 
 #if TDE_VERSION >= 0x30200
-       if ( KIO::NetAccess::exists( deleteImage, false, TQT_TQWIDGET(kapp->activeWindow()) ) == true )
-          KIO::NetAccess::del( deleteImage, TQT_TQWIDGET(kapp->activeWindow()) );
+       if ( TDEIO::NetAccess::exists( deleteImage, false, TQT_TQWIDGET(kapp->activeWindow()) ) == true )
+          TDEIO::NetAccess::del( deleteImage, TQT_TQWIDGET(kapp->activeWindow()) );
 #else
-       if ( KIO::NetAccess::exists( deleteImage ) == true )
-          KIO::NetAccess::del( deleteImage );
+       if ( TDEIO::NetAccess::exists( deleteImage ) == true )
+          TDEIO::NetAccess::del( deleteImage );
 #endif
     }
 
@@ -1067,9 +1067,9 @@ TQString BatchProcessImagesDialog::RenameTargetImageFile(TQFileInfo *fi)
     }
     while ( Enumerator < 100 &&
 #if TDE_VERSION >= 0x30200
-            KIO::NetAccess::exists( NewDestUrl, true, TQT_TQWIDGET(kapp->activeWindow()) )
+            TDEIO::NetAccess::exists( NewDestUrl, true, TQT_TQWIDGET(kapp->activeWindow()) )
 #else
-            KIO::NetAccess::exists( NewDestUrl )
+            TDEIO::NetAccess::exists( NewDestUrl )
 #endif
             == true );
 
diff --git a/kipi-plugins/batchprocessimages/batchprocessimagesdialog.h b/kipi-plugins/batchprocessimages/batchprocessimagesdialog.h
index 5ddf675..0353942 100644
--- a/kipi-plugins/batchprocessimages/batchprocessimagesdialog.h
+++ b/kipi-plugins/batchprocessimages/batchprocessimagesdialog.h
@@ -65,7 +65,7 @@ class TQListViewItem;
 class TQGroupBox;
 
 class TDEProcess;
-class KConfig;
+class TDEConfig;
 class KProgress;
 class KURL;
 class KURLRequester;
@@ -155,7 +155,7 @@ private slots:
    TQPushButton            *m_remImagesButton;
    TQPushButton            *m_helpButton;
    
-   KConfig                *m_config;
+   TDEConfig                *m_config;
 
    int                     m_convertStatus;
    int                     m_progressStatus;
diff --git a/kipi-plugins/batchprocessimages/borderimagesdialog.cpp b/kipi-plugins/batchprocessimages/borderimagesdialog.cpp
index c6e1b3c..bfedb4a 100644
--- a/kipi-plugins/batchprocessimages/borderimagesdialog.cpp
+++ b/kipi-plugins/batchprocessimages/borderimagesdialog.cpp
@@ -180,7 +180,7 @@ void BorderImagesDialog::readSettings(void)
 {
     // Read all settings from configuration file.
 
-    m_config = new KConfig("kipirc");
+    m_config = new TDEConfig("kipirc");
     m_config->setGroup("BorderImages Settings");
 
     m_Type->setCurrentItem(m_config->readNumEntry("BorderType", 1));     // Niepce per default.
@@ -221,7 +221,7 @@ void BorderImagesDialog::saveSettings(void)
 {
     // Write all settings in configuration file.
 
-    m_config = new KConfig("kipirc");
+    m_config = new TDEConfig("kipirc");
     m_config->setGroup("BorderImages Settings");
     m_config->writeEntry("BorderType", m_Type->currentItem());
 
diff --git a/kipi-plugins/batchprocessimages/colorimagesdialog.cpp b/kipi-plugins/batchprocessimages/colorimagesdialog.cpp
index 392172c..8e7a01d 100644
--- a/kipi-plugins/batchprocessimages/colorimagesdialog.cpp
+++ b/kipi-plugins/batchprocessimages/colorimagesdialog.cpp
@@ -191,7 +191,7 @@ void ColorImagesDialog::readSettings(void)
 {
     // Read all settings from configuration file.
 
-    m_config = new KConfig("kipirc");
+    m_config = new TDEConfig("kipirc");
     m_config->setGroup("ColorImages Settings");
 
     m_Type->setCurrentItem(m_config->readNumEntry("ColorType", 8)); // Normalize per default.
@@ -219,7 +219,7 @@ void ColorImagesDialog::saveSettings(void)
 {
     // Write all settings in configuration file.
 
-    m_config = new KConfig("kipirc");
+    m_config = new TDEConfig("kipirc");
     m_config->setGroup("ColorImages Settings");
 
     m_config->writeEntry("ColorType", m_Type->currentItem());
diff --git a/kipi-plugins/batchprocessimages/convertimagesdialog.cpp b/kipi-plugins/batchprocessimages/convertimagesdialog.cpp
index 7382023..78ea95c 100644
--- a/kipi-plugins/batchprocessimages/convertimagesdialog.cpp
+++ b/kipi-plugins/batchprocessimages/convertimagesdialog.cpp
@@ -200,7 +200,7 @@ void ConvertImagesDialog::readSettings(void)
 {
     // Read all settings from configuration file.
 
-    m_config = new KConfig("kipirc");
+    m_config = new TDEConfig("kipirc");
     m_config->setGroup("ConvertImages Settings");
 
     m_Type->setCurrentItem(m_config->readNumEntry("ImagesFormat", 0));  // JPEG per default
@@ -227,7 +227,7 @@ void ConvertImagesDialog::saveSettings(void)
 {
     // Write all settings in configuration file.
 
-    m_config = new KConfig("kipirc");
+    m_config = new TDEConfig("kipirc");
     m_config->setGroup("ConvertImages Settings");
 
     m_config->writeEntry("ImagesFormat", m_Type->currentItem());
diff --git a/kipi-plugins/batchprocessimages/effectimagesdialog.cpp b/kipi-plugins/batchprocessimages/effectimagesdialog.cpp
index 97f391f..5e9aa22 100644
--- a/kipi-plugins/batchprocessimages/effectimagesdialog.cpp
+++ b/kipi-plugins/batchprocessimages/effectimagesdialog.cpp
@@ -250,7 +250,7 @@ void EffectImagesDialog::slotOptionsClicked(void)
 
 void EffectImagesDialog::readSettings(void)
 {
-m_config = new KConfig("kipirc");
+m_config = new TDEConfig("kipirc");
     m_config->setGroup("EffectImages Settings");
 
     m_Type->setCurrentItem(m_config->readNumEntry("EffectType", 3));   // Emboss per default.
@@ -291,7 +291,7 @@ void EffectImagesDialog::saveSettings(void)
 {
     // Write all settings in configuration file.
 
-    m_config = new KConfig("kipirc");
+    m_config = new TDEConfig("kipirc");
     m_config->setGroup("EffectImages Settings");
     m_config->writeEntry("EffectType", m_Type->currentItem());
 
diff --git a/kipi-plugins/batchprocessimages/filterimagesdialog.cpp b/kipi-plugins/batchprocessimages/filterimagesdialog.cpp
index fbcb3d3..5a1d441 100644
--- a/kipi-plugins/batchprocessimages/filterimagesdialog.cpp
+++ b/kipi-plugins/batchprocessimages/filterimagesdialog.cpp
@@ -209,7 +209,7 @@ void FilterImagesDialog::readSettings(void)
 {
     // Read all settings from configuration file.
 
-    m_config = new KConfig("kipirc");
+    m_config = new TDEConfig("kipirc");
     m_config->setGroup("FilterImages Settings");
 
     m_Type->setCurrentItem(m_config->readNumEntry("FilterType", 7));      // Sharpen per default
@@ -244,7 +244,7 @@ void FilterImagesDialog::saveSettings(void)
 {
     // Write all settings in configuration file.
 
-    m_config = new KConfig("kipirc");
+    m_config = new TDEConfig("kipirc");
     m_config->setGroup("FilterImages Settings");
 
     m_config->writeEntry("FilterType", m_Type->currentItem());
diff --git a/kipi-plugins/batchprocessimages/imagepreview.cpp b/kipi-plugins/batchprocessimages/imagepreview.cpp
index 1cfcca9..930d255 100644
--- a/kipi-plugins/batchprocessimages/imagepreview.cpp
+++ b/kipi-plugins/batchprocessimages/imagepreview.cpp
@@ -309,9 +309,9 @@ void PixmapView::PreviewProcessDone(TDEProcess* proc)
           KURL deletePreviewImage( m_previewFileName );
 
 #if TDE_VERSION >= 0x30200
-          KIO::NetAccess::del( deletePreviewImage, TQT_TQWIDGET(kapp->activeWindow()) );
+          TDEIO::NetAccess::del( deletePreviewImage, TQT_TQWIDGET(kapp->activeWindow()) );
 #else
-          KIO::NetAccess::del( deletePreviewImage );
+          TDEIO::NetAccess::del( deletePreviewImage );
 #endif
           }
        else
diff --git a/kipi-plugins/batchprocessimages/recompressimagesdialog.cpp b/kipi-plugins/batchprocessimages/recompressimagesdialog.cpp
index f228a80..68efb0a 100644
--- a/kipi-plugins/batchprocessimages/recompressimagesdialog.cpp
+++ b/kipi-plugins/batchprocessimages/recompressimagesdialog.cpp
@@ -129,7 +129,7 @@ void RecompressImagesDialog::readSettings(void)
 {
     // Read all settings from configuration file.
 
-    m_config = new KConfig("kipirc");
+    m_config = new TDEConfig("kipirc");
     m_config->setGroup("RecompressImages Settings");
 
     m_JPEGCompression = m_config->readNumEntry("JPEGCompression", 75);
@@ -157,7 +157,7 @@ void RecompressImagesDialog::saveSettings(void)
 {
     // Write all settings in configuration file.
 
-    m_config = new KConfig("kipirc");
+    m_config = new TDEConfig("kipirc");
     m_config->setGroup("RecompressImages Settings");
 
     m_config->writeEntry("JPEGCompression", m_JPEGCompression);
diff --git a/kipi-plugins/batchprocessimages/renameimageswidget.cpp b/kipi-plugins/batchprocessimages/renameimageswidget.cpp
index 4606cde..cbe4bfb 100644
--- a/kipi-plugins/batchprocessimages/renameimageswidget.cpp
+++ b/kipi-plugins/batchprocessimages/renameimageswidget.cpp
@@ -162,7 +162,7 @@ RenameImagesWidget::~RenameImagesWidget()
 
 void RenameImagesWidget::readSettings()
 {
-    KConfig config("kipirc");
+    TDEConfig config("kipirc");
     config.setGroup("RenameImages Settings");
 
     m_prefixEdit->setText(config.readEntry("PrefixString", ""));
@@ -178,7 +178,7 @@ void RenameImagesWidget::readSettings()
 
 void RenameImagesWidget::saveSettings()
 {
-    KConfig config("kipirc");
+    TDEConfig config("kipirc");
     config.setGroup("RenameImages Settings");
 
     config.writeEntry("PrefixString", m_prefixEdit->text());
@@ -218,7 +218,7 @@ void RenameImagesWidget::slotImageSelected(TQListViewItem* item)
     m_pixLabel->clear();
     
     BatchProcessImagesItem* it = static_cast<BatchProcessImagesItem*>(item);
-    KIO::PreviewJob* thumbJob = KIO::filePreview(KURL(it->pathSrc()),
+    TDEIO::PreviewJob* thumbJob = TDEIO::filePreview(KURL(it->pathSrc()),
                                                  m_pixLabel->height() );
 
     connect(thumbJob, TQT_SIGNAL(gotPreview(const KFileItem*, const TQPixmap&)),
@@ -439,37 +439,37 @@ void RenameImagesWidget::slotNext()
                 break;
             }
 
-            KIO::RenameDlg dlg(this, i18n("Rename File"), src.path(), dst.path(),
-                               KIO::RenameDlg_Mode(KIO::M_MULTI |
-                                                   KIO::M_OVERWRITE |
-                                                   KIO::M_SKIP));
+            TDEIO::RenameDlg dlg(this, i18n("Rename File"), src.path(), dst.path(),
+                               TDEIO::RenameDlg_Mode(TDEIO::M_MULTI |
+                                                   TDEIO::M_OVERWRITE |
+                                                   TDEIO::M_SKIP));
             int result = dlg.exec();
             dst        = dlg.newDestURL();
 
             switch (result)
             {
-            case KIO::R_CANCEL:
+            case TDEIO::R_CANCEL:
             {
                 slotAbort();
                 return;
             }
-            case KIO::R_SKIP:
+            case TDEIO::R_SKIP:
             {
                 skip = true;
                 break;
             }
-            case KIO::R_AUTO_SKIP:
+            case TDEIO::R_AUTO_SKIP:
             {
                 m_autoSkip = true;
                 skip       = true;
                 break;
             }
-            case KIO::R_OVERWRITE:
+            case TDEIO::R_OVERWRITE:
             {
                 overwrite       = true;
                 break;
             }
-            case KIO::R_OVERWRITE_ALL:
+            case TDEIO::R_OVERWRITE_ALL:
             {
                 m_overwriteAll = true;
                 overwrite      = true;
diff --git a/kipi-plugins/batchprocessimages/resizeimagesdialog.cpp b/kipi-plugins/batchprocessimages/resizeimagesdialog.cpp
index 605efe2..58c2025 100644
--- a/kipi-plugins/batchprocessimages/resizeimagesdialog.cpp
+++ b/kipi-plugins/batchprocessimages/resizeimagesdialog.cpp
@@ -216,7 +216,7 @@ void ResizeImagesDialog::readSettings(void)
 
     TQColor *ColorWhite = new TQColor( 255, 255, 255 );
     TQColor *ColorBlack = new TQColor( 0, 0, 0 );
-    m_config = new KConfig("kipirc");
+    m_config = new TDEConfig("kipirc");
     m_config->setGroup("ResizeImages Settings");
 
     m_Type->setCurrentItem(m_config->readNumEntry("ResiseType", 3)); // Prepare to print per default.
@@ -262,7 +262,7 @@ void ResizeImagesDialog::saveSettings(void)
 {
     // Write all settings in configuration file.
 
-    m_config = new KConfig("kipirc");
+    m_config = new TDEConfig("kipirc");
     m_config->setGroup("ResizeImages Settings");
     m_config->writeEntry("ResiseType", m_Type->currentItem());
     m_config->writeEntry("Size", m_size);
diff --git a/kipi-plugins/calendar/monthwidget.cpp b/kipi-plugins/calendar/monthwidget.cpp
index 447c747..e3542bf 100644
--- a/kipi-plugins/calendar/monthwidget.cpp
+++ b/kipi-plugins/calendar/monthwidget.cpp
@@ -135,8 +135,8 @@ void MonthWidget::setImage( const KURL &url )
     KURL::List urls;
     urls << url;
 
-    KIO::PreviewJob* thumbJob_ =
-            KIO::filePreview( urls,64);
+    TDEIO::PreviewJob* thumbJob_ =
+            TDEIO::filePreview( urls,64);
     connect(thumbJob_, TQT_SIGNAL(gotPreview(const KFileItem*, const TQPixmap&)),
             TQT_SLOT(slotGotThumbnaiL(const KFileItem*, const TQPixmap&)));
 }
diff --git a/kipi-plugins/cdarchiving/cdarchiving.cpp b/kipi-plugins/cdarchiving/cdarchiving.cpp
index 3962373..37c0cc2 100644
--- a/kipi-plugins/cdarchiving/cdarchiving.cpp
+++ b/kipi-plugins/cdarchiving/cdarchiving.cpp
@@ -102,7 +102,7 @@ CDArchiving::~CDArchiving()
 
 void CDArchiving::writeSettings(void)
 {
-    KConfig config("kipirc");
+    TDEConfig config("kipirc");
     config.setGroup("CDArchiving Settings");
 
     // Albums selection dialogbox setup tab
@@ -149,7 +149,7 @@ void CDArchiving::writeSettings(void)
 
 void CDArchiving::readSettings(void)
 {
-    KConfig config("kipirc");
+    TDEConfig config("kipirc");
     config.setGroup("CDArchiving Settings");
 
     // Albums selection dialogbox setup tab
@@ -521,7 +521,7 @@ bool CDArchiving::buildHTMLInterface (void)
     dir = dir + "gohome.png";
     KURL srcURL(dir);
     KURL destURL( MainTPath + "/gohome.png");
-    KIO::file_copy(srcURL, destURL, -1, true, false, false);
+    TDEIO::file_copy(srcURL, destURL, -1, true, false, false);
 
     // Adding up icon
     TDEGlobal::dirs()->addResourceType("kipi_data", TDEGlobal::dirs()->kde_default("data") + "kipi");
@@ -529,7 +529,7 @@ bool CDArchiving::buildHTMLInterface (void)
     dir = dir + "up.png";
     srcURL = dir;
     destURL = MainTPath + TQString::fromLatin1("/up.png");
-    KIO::file_copy(srcURL, destURL, -1, true, false, false);
+    TDEIO::file_copy(srcURL, destURL, -1, true, false, false);
 
     //clear the temporary list for unique names
     m_collection_name_list.clear();
@@ -953,7 +953,7 @@ void CDArchiving::createBody(TQTextStream& stream,
 
     KURL srcURL(dir);
     KURL destURL(imgGalleryDir + TQString::fromLatin1("/thumbs/valid-html401.png"));
-    KIO::file_copy(srcURL, destURL, -1, true, false, false);
+    TDEIO::file_copy(srcURL, destURL, -1, true, false, false);
 
     stream << "<p>"  << endl;
     Temp = i18n("Valid HTML 4.01.");
@@ -993,7 +993,7 @@ void CDArchiving::createBodyMainPage(TQTextStream& stream, KURL& url)
 
     KURL srcURL(dir);
     KURL destURL(url.directory() + TQString::fromLatin1("/valid-html401.png"));
-    KIO::file_copy(srcURL, destURL, -1, true, false, false);
+    TDEIO::file_copy(srcURL, destURL, -1, true, false, false);
 
     stream << "<p>"  << endl;
     Temp = i18n("Valid HTML 4.01.");
@@ -1768,7 +1768,7 @@ void CDArchiving::removeTmpFiles(void)
 
 
 /////////////////////////////////////////////////////////////////////////////////////////////////////
-// This code can be multithreaded (in opposite to KIO::netaccess::delete().
+// This code can be multithreaded (in opposite to TDEIO::netaccess::delete().
 
 bool CDArchiving::DeleteDir(TQString dirname)
 {
@@ -1795,7 +1795,7 @@ bool CDArchiving::DeleteDir(TQString dirname)
 
 
 /////////////////////////////////////////////////////////////////////////////////////////////////////
-// This code can be multithreaded (in opposite to KIO::netaccess::delete().
+// This code can be multithreaded (in opposite to TDEIO::netaccess::delete().
 
 bool CDArchiving::deldir(TQString dirname)
 {
diff --git a/kipi-plugins/cdarchiving/cdarchivingdialog.cpp b/kipi-plugins/cdarchiving/cdarchivingdialog.cpp
index 6f5b4bc..7f285e2 100644
--- a/kipi-plugins/cdarchiving/cdarchivingdialog.cpp
+++ b/kipi-plugins/cdarchiving/cdarchivingdialog.cpp
@@ -82,7 +82,7 @@
 namespace KIPICDArchivingPlugin
 {
 
-KIO::filesize_t TargetMediaSize;
+TDEIO::filesize_t TargetMediaSize;
 
 CDArchivingDialog::CDArchivingDialog( KIPI::Interface* interface, TQWidget *parent)
         : KDialogBase( IconList, i18n("Configure Archive to CD"), Help|Ok|Cancel, Ok,
@@ -621,8 +621,8 @@ void CDArchivingDialog::ShowMediaCapacity(void)
         Color = "<font color=\"red\">";
 
     m_mediaSize->setText( i18n("Total size: ") + Color +
-                          i18n("<b>%1</b></font> / <b>%2</b>").arg(KIO::convertSizeFromKB(TargetMediaSize))
-                          .arg(KIO::convertSizeFromKB (MaxMediaSize)) );
+                          i18n("<b>%1</b></font> / <b>%2</b>").arg(TDEIO::convertSizeFromKB(TargetMediaSize))
+                          .arg(TDEIO::convertSizeFromKB (MaxMediaSize)) );
 }
 
 void CDArchivingDialog::slotOk()
diff --git a/kipi-plugins/cdarchiving/cdarchivingdialog.h b/kipi-plugins/cdarchiving/cdarchivingdialog.h
index e2dacd3..d11ae64 100644
--- a/kipi-plugins/cdarchiving/cdarchivingdialog.h
+++ b/kipi-plugins/cdarchiving/cdarchivingdialog.h
@@ -170,7 +170,7 @@ private:
     KColorButton                        *m_bordersImagesColor;
     KColorButton                        *m_foregroundColor;
 
-    KIO::filesize_t                      MaxMediaSize;
+    TDEIO::filesize_t                      MaxMediaSize;
 
     KIPI::ImageCollectionSelector       *m_imageCollectionSelector;
 
diff --git a/kipi-plugins/findimages/displaycompare.cpp b/kipi-plugins/findimages/displaycompare.cpp
index e24ec6f..605ca46 100644
--- a/kipi-plugins/findimages/displaycompare.cpp
+++ b/kipi-plugins/findimages/displaycompare.cpp
@@ -307,7 +307,7 @@ void DisplayCompare::slotDelete( void )
            itemTmp = (FindDuplicateItem*)item->nextSibling();
            KURL deleteImage(item->fullpath());
 
-           if ( KIO::NetAccess::del(deleteImage) == false )
+           if ( TDEIO::NetAccess::del(deleteImage) == false )
               KMessageBox::error(this, i18n("Cannot remove duplicate file:\n%1").arg(item->fullpath()));
            else
               m_interface->delImage( deleteImage );
@@ -328,7 +328,7 @@ void DisplayCompare::slotDelete( void )
            {
            KURL deleteImage(item->fullpath());
 
-           if ( KIO::NetAccess::del(deleteImage) == false )
+           if ( TDEIO::NetAccess::del(deleteImage) == false )
               KMessageBox::error(this, i18n("Cannot remove original file:\n%1").arg(item->fullpath()));
 
            item->setOn( false );
@@ -365,7 +365,7 @@ void DisplayCompare::slotDisplayLeft(TQListViewItem * item)
     TQString IdemIndexed = "file:" + pitem->fullpath();
     KURL url(IdemIndexed);
 
-    KIO::PreviewJob* thumbJob1 = KIO::filePreview( url, preview1->height() );
+    TDEIO::PreviewJob* thumbJob1 = TDEIO::filePreview( url, preview1->height() );
 
     connect(thumbJob1, TQT_SIGNAL(gotPreview(const KFileItem*, const TQPixmap&)),
             TQT_SLOT(slotGotPreview1(const KFileItem*, const TQPixmap&)));
@@ -442,7 +442,7 @@ void DisplayCompare::slotDisplayRight(TQListViewItem * item)
     TQString IdemIndexed = "file:" + pitem->fullpath();
     KURL url(IdemIndexed);
 
-    KIO::PreviewJob* thumbJob2 = KIO::filePreview( url, preview2->height() );
+    TDEIO::PreviewJob* thumbJob2 = TDEIO::filePreview( url, preview2->height() );
 
     connect(thumbJob2, TQT_SIGNAL(gotPreview(const KFileItem*, const TQPixmap&)),
             TQT_SLOT(slotGotPreview2(const KFileItem*, const TQPixmap&)));
diff --git a/kipi-plugins/findimages/finddupplicateimages.cpp b/kipi-plugins/findimages/finddupplicateimages.cpp
index 4a1c8a2..86d146d 100644
--- a/kipi-plugins/findimages/finddupplicateimages.cpp
+++ b/kipi-plugins/findimages/finddupplicateimages.cpp
@@ -97,7 +97,7 @@ FindDuplicateImages::~FindDuplicateImages()
 
 void FindDuplicateImages::writeSettings(void)
 {
-    config = new KConfig("kipirc");
+    config = new TDEConfig("kipirc");
     config->setGroup("FindDuplicateImages Settings");
 
     // Method dialogbox setup tab
@@ -114,7 +114,7 @@ void FindDuplicateImages::writeSettings(void)
 
 void FindDuplicateImages::readSettings(void)
 {
-    config = new KConfig("kipirc");
+    config = new TDEConfig("kipirc");
     config->setGroup("FindDuplicateImages Settings");
 
     // Method dialogbox setup tab
diff --git a/kipi-plugins/findimages/finddupplicateimages.h b/kipi-plugins/findimages/finddupplicateimages.h
index b277c27..f8a6a54 100644
--- a/kipi-plugins/findimages/finddupplicateimages.h
+++ b/kipi-plugins/findimages/finddupplicateimages.h
@@ -44,7 +44,7 @@ class TQFile;
 class TQCustomEvent;
 class TQMutex;
 
-class KConfig;
+class TDEConfig;
 
 namespace KIPIFindDupplicateImagesPlugin
 {
@@ -75,7 +75,7 @@ public slots:
     void slotClearAllCache(void);
 
 protected:
-    KConfig              *config;
+    TDEConfig              *config;
     TQString               m_imagesFileFilter;
     TQProgressDialog      *pdCache;
     FindDuplicateDialog  *m_findDuplicateDialog;
diff --git a/kipi-plugins/flickrexport/flickrtalker.cpp b/kipi-plugins/flickrexport/flickrtalker.cpp
index 4ab0df9..f05b65f 100644
--- a/kipi-plugins/flickrexport/flickrtalker.cpp
+++ b/kipi-plugins/flickrexport/flickrtalker.cpp
@@ -130,15 +130,15 @@ void FlickrTalker::getFrob()
     url.addQueryItem("api_sig", md5);
     kdDebug() << "Get frob url: " << url << endl;
     TQByteArray tmp;
-    KIO::TransferJob* job = KIO::http_post(url, tmp, false);
+    TDEIO::TransferJob* job = TDEIO::http_post(url, tmp, false);
 
     job->addMetaData("content-type", "Content-Type: application/x-www-form-urlencoded");
 
-    connect(job, TQT_SIGNAL(data(KIO::Job*, const TQByteArray&)),
-            this, TQT_SLOT(data(KIO::Job*, const TQByteArray&)));
+    connect(job, TQT_SIGNAL(data(TDEIO::Job*, const TQByteArray&)),
+            this, TQT_SLOT(data(TDEIO::Job*, const TQByteArray&)));
 
-    connect(job, TQT_SIGNAL(result(KIO::Job *)),
-            this, TQT_SLOT(slotResult(KIO::Job *)));
+    connect(job, TQT_SIGNAL(result(TDEIO::Job *)),
+            this, TQT_SLOT(slotResult(TDEIO::Job *)));
 
     m_state = FE_GETFROB;
     m_authProgressDlg->setLabelText(i18n("Getting the Frob"));
@@ -164,15 +164,15 @@ void FlickrTalker::checkToken(const TQString& token)
     url.addQueryItem("api_sig", md5);
     kdDebug() << "Check token url: " << url << endl;
     TQByteArray tmp;
-    KIO::TransferJob* job = KIO::http_post(url, tmp, false);
+    TDEIO::TransferJob* job = TDEIO::http_post(url, tmp, false);
 
     job->addMetaData("content-type", "Content-Type: application/x-www-form-urlencoded");
 
-    connect(job, TQT_SIGNAL(data(KIO::Job*, const TQByteArray&)),
-            this, TQT_SLOT(data(KIO::Job*, const TQByteArray&)));
+    connect(job, TQT_SIGNAL(data(TDEIO::Job*, const TQByteArray&)),
+            this, TQT_SLOT(data(TDEIO::Job*, const TQByteArray&)));
 
-    connect(job, TQT_SIGNAL(result(KIO::Job *)),
-            this, TQT_SLOT(slotResult(KIO::Job *)));
+    connect(job, TQT_SIGNAL(result(TDEIO::Job *)),
+            this, TQT_SLOT(slotResult(TDEIO::Job *)));
 
     m_state = FE_CHECKTOKEN;
     m_authProgressDlg->setLabelText(i18n("Checking if previous token is still valid"));
@@ -234,14 +234,14 @@ void FlickrTalker::getToken()
     url.addQueryItem("api_sig", md5);
     kdDebug() << "Get token url: " << url << endl;
     TQByteArray tmp;
-    KIO::TransferJob* job = KIO::http_post(url, tmp, false);
+    TDEIO::TransferJob* job = TDEIO::http_post(url, tmp, false);
     job->addMetaData("content-type", "Content-Type: application/x-www-form-urlencoded");
 
-    connect(job, TQT_SIGNAL(data(KIO::Job*, const TQByteArray&)),
-            this, TQT_SLOT(data(KIO::Job*, const TQByteArray&)));
+    connect(job, TQT_SIGNAL(data(TDEIO::Job*, const TQByteArray&)),
+            this, TQT_SLOT(data(TDEIO::Job*, const TQByteArray&)));
 
-    connect(job, TQT_SIGNAL(result(KIO::Job *)),
-            this, TQT_SLOT(slotResult(KIO::Job *)));
+    connect(job, TQT_SIGNAL(result(TDEIO::Job *)),
+            this, TQT_SLOT(slotResult(TDEIO::Job *)));
 
     m_state = FE_GETTOKEN;
     m_job   = job;
@@ -261,14 +261,14 @@ void FlickrTalker::listPhotoSets()
     url.addQueryItem("api_sig", md5);
     kdDebug() << "List photo sets url: " << url << endl;
     TQByteArray tmp;
-    KIO::TransferJob* job = KIO::http_post(url, tmp, false);
+    TDEIO::TransferJob* job = TDEIO::http_post(url, tmp, false);
     job->addMetaData("content-type", "Content-Type: application/x-www-form-urlencoded" );
 
-    connect(job, TQT_SIGNAL(data(KIO::Job*, const TQByteArray&)),
-            this, TQT_SLOT(data(KIO::Job*, const TQByteArray&)));
+    connect(job, TQT_SIGNAL(data(TDEIO::Job*, const TQByteArray&)),
+            this, TQT_SLOT(data(TDEIO::Job*, const TQByteArray&)));
 
-    connect(job, TQT_SIGNAL(result(KIO::Job *)),
-            this, TQT_SLOT(slotResult(KIO::Job *)));
+    connect(job, TQT_SIGNAL(result(TDEIO::Job *)),
+            this, TQT_SLOT(slotResult(TDEIO::Job *)));
 
     m_state = FE_LISTPHOTOSETS;
     m_job   = job;
@@ -299,14 +299,14 @@ void FlickrTalker::getPhotoProperty(const TQString& method, const TQStringList&
     url.addQueryItem("api_sig", md5);
     kdDebug() << "Get photo property url: " << url << endl;
     TQByteArray tmp;
-    KIO::TransferJob* job = KIO::http_post(url, tmp, false);
+    TDEIO::TransferJob* job = TDEIO::http_post(url, tmp, false);
     job->addMetaData("content-type", "Content-Type: application/x-www-form-urlencoded" );
 
-    connect(job, TQT_SIGNAL(data(KIO::Job*, const TQByteArray&)),
-            this, TQT_SLOT(data(KIO::Job*, const TQByteArray&)));
+    connect(job, TQT_SIGNAL(data(TDEIO::Job*, const TQByteArray&)),
+            this, TQT_SLOT(data(TDEIO::Job*, const TQByteArray&)));
 
-    connect(job, TQT_SIGNAL(result(KIO::Job *)),
-            this, TQT_SLOT(slotResult(KIO::Job *)));
+    connect(job, TQT_SIGNAL(result(TDEIO::Job *)),
+            this, TQT_SLOT(slotResult(TDEIO::Job *)));
 
     m_state = FE_GETPHOTOPROPERTY;
     m_job   = job;
@@ -433,14 +433,14 @@ bool FlickrTalker::addPhoto(const TQString& photoPath, const FPhotoInfo& info,
 
     form.finish();
 
-    KIO::TransferJob* job = KIO::http_post(url, form.formData(), false);
+    TDEIO::TransferJob* job = TDEIO::http_post(url, form.formData(), false);
     job->addMetaData("content-type", form.contentType());
 
-    connect(job, TQT_SIGNAL(data(KIO::Job*, const TQByteArray&)),
-            this, TQT_SLOT(data(KIO::Job*, const TQByteArray&)));
+    connect(job, TQT_SIGNAL(data(TDEIO::Job*, const TQByteArray&)),
+            this, TQT_SLOT(data(TDEIO::Job*, const TQByteArray&)));
 
-    connect(job, TQT_SIGNAL(result(KIO::Job *)),
-            this, TQT_SLOT(slotResult(KIO::Job *)));
+    connect(job, TQT_SIGNAL(result(TDEIO::Job *)),
+            this, TQT_SLOT(slotResult(TDEIO::Job *)));
 
     m_state = FE_ADDPHOTO;
     m_job   = job;
@@ -471,7 +471,7 @@ void FlickrTalker::cancel()
         m_authProgressDlg->hide();
 }
 
-void FlickrTalker::data(KIO::Job*, const TQByteArray& data)
+void FlickrTalker::data(TDEIO::Job*, const TQByteArray& data)
 {
     if (data.isEmpty())
         return;
@@ -547,7 +547,7 @@ void FlickrTalker::slotError(const TQString& error)
 //  kdDebug() << "Not handling the error now will see it later" << endl;
 }
 
-void FlickrTalker::slotResult(KIO::Job *job)
+void FlickrTalker::slotResult(TDEIO::Job *job)
 {
     m_job = 0;
     emit signalBusy(false);
diff --git a/kipi-plugins/flickrexport/flickrtalker.h b/kipi-plugins/flickrexport/flickrtalker.h
index 485483a..a4aa65e 100644
--- a/kipi-plugins/flickrexport/flickrtalker.h
+++ b/kipi-plugins/flickrexport/flickrtalker.h
@@ -125,8 +125,8 @@ private slots:
 
     void slotError(const TQString& msg);
     void slotAuthenticate();
-    void data(KIO::Job *job, const TQByteArray& data);
-    void slotResult(KIO::Job *job);
+    void data(TDEIO::Job *job, const TQByteArray& data);
+    void slotResult(TDEIO::Job *job);
 
 private:
 
@@ -142,7 +142,7 @@ private:
     TQString    m_username;
     TQString    m_userId;
 
-    KIO::Job*  m_job;
+    TDEIO::Job*  m_job;
 
     State      m_state;
 };
diff --git a/kipi-plugins/flickrexport/flickrwindow.cpp b/kipi-plugins/flickrexport/flickrwindow.cpp
index cc997d4..61e0d27 100644
--- a/kipi-plugins/flickrexport/flickrwindow.cpp
+++ b/kipi-plugins/flickrexport/flickrwindow.cpp
@@ -220,7 +220,7 @@ FlickrWindow::~FlickrWindow()
 
 void FlickrWindow::readSettings()
 {
-    KConfig config("kipirc");
+    TDEConfig config("kipirc");
     config.setGroup("FlickrExport Settings");
     m_token = config.readEntry("token");
 
@@ -256,7 +256,7 @@ void FlickrWindow::readSettings()
 
 void FlickrWindow::writeSettings()
 {
-    KConfig config("kipirc");
+    TDEConfig config("kipirc");
     config.setGroup("FlickrExport Settings");
     config.writeEntry("token", m_token);
     config.writeEntry("Resize", m_resizeCheckBox->isChecked());
diff --git a/kipi-plugins/flickrexport/imageslist.cpp b/kipi-plugins/flickrexport/imageslist.cpp
index b19aac4..8da8f03 100644
--- a/kipi-plugins/flickrexport/imageslist.cpp
+++ b/kipi-plugins/flickrexport/imageslist.cpp
@@ -248,7 +248,7 @@ void ImagesList::slotAddImages(const KURL::List& list)
 
     emit signalImageListChanged(imageUrls().isEmpty());
 
-    KIO::PreviewJob *thumbnailJob = KIO::filePreview(urls, ICONSIZE);
+    TDEIO::PreviewJob *thumbnailJob = TDEIO::filePreview(urls, ICONSIZE);
 
     connect(thumbnailJob, TQT_SIGNAL(gotPreview(const KFileItem*, const TQPixmap&)),
             this, TQT_SLOT(slotGotThumbnail(const KFileItem*, const TQPixmap&)));
diff --git a/kipi-plugins/galleryexport/galleries.cpp b/kipi-plugins/galleryexport/galleries.cpp
index 5accc6c..269b61c 100644
--- a/kipi-plugins/galleryexport/galleries.cpp
+++ b/kipi-plugins/galleryexport/galleries.cpp
@@ -142,7 +142,7 @@ void Galleries::Load()
 
 
   // read config
-  KConfig config("kipirc");
+  TDEConfig config("kipirc");
   config.setGroup("GallerySync Settings");
   TQValueList<int> gallery_ids = config.readIntListEntry("Galleries");
 
@@ -188,7 +188,7 @@ void Galleries::Remove(Gallery* pGallery)
 void Galleries::Save()
 {
   TQValueList<int> gallery_ids;
-  KConfig config("kipirc");
+  TDEConfig config("kipirc");
   config.deleteGroup("GallerySync Galleries");
   config.setGroup("GallerySync Galleries");
 
diff --git a/kipi-plugins/galleryexport/gallerytalker.cpp b/kipi-plugins/galleryexport/gallerytalker.cpp
index 3d7a03c..2c97a9a 100644
--- a/kipi-plugins/galleryexport/gallerytalker.cpp
+++ b/kipi-plugins/galleryexport/gallerytalker.cpp
@@ -77,13 +77,13 @@ void GalleryTalker::login( const KURL& url, const TQString& name,
     form.addPair("password",         passwd);
     form.finish();
 
-    KIO::TransferJob* job = KIO::http_post(m_url, form.formData(), false);
+    TDEIO::TransferJob* job = TDEIO::http_post(m_url, form.formData(), false);
     job->addMetaData("content-type", form.contentType() );
     job->addMetaData("cookies", "manual");
-    connect(job, TQT_SIGNAL(data(KIO::Job*, const TQByteArray&)),
-            TQT_SLOT(data(KIO::Job*, const TQByteArray&)));
-    connect(job, TQT_SIGNAL(result(KIO::Job *)),
-            TQT_SLOT(slotResult(KIO::Job *)));
+    connect(job, TQT_SIGNAL(data(TDEIO::Job*, const TQByteArray&)),
+            TQT_SLOT(data(TDEIO::Job*, const TQByteArray&)));
+    connect(job, TQT_SIGNAL(result(TDEIO::Job *)),
+            TQT_SLOT(slotResult(TDEIO::Job *)));
 
     m_state = GE_LOGIN;
     m_job   = job;
@@ -103,14 +103,14 @@ void GalleryTalker::listAlbums()
     form.addPair("protocol_version", "2.11");
     form.finish();
 
-    KIO::TransferJob* job = KIO::http_post(m_url, form.formData(), false);
+    TDEIO::TransferJob* job = TDEIO::http_post(m_url, form.formData(), false);
     job->addMetaData("content-type", form.contentType() );
     job->addMetaData("cookies", "manual");
     job->addMetaData("setcookies", m_cookie);
-    connect(job, TQT_SIGNAL(data(KIO::Job*, const TQByteArray&)),
-            TQT_SLOT(data(KIO::Job*, const TQByteArray&)));
-    connect(job, TQT_SIGNAL(result(KIO::Job *)),
-            TQT_SLOT(slotResult(KIO::Job *)));
+    connect(job, TQT_SIGNAL(data(TDEIO::Job*, const TQByteArray&)),
+            TQT_SLOT(data(TDEIO::Job*, const TQByteArray&)));
+    connect(job, TQT_SIGNAL(result(TDEIO::Job *)),
+            TQT_SLOT(slotResult(TDEIO::Job *)));
 
     m_state = GE_LISTALBUMS;
     m_job   = job;
@@ -133,14 +133,14 @@ void GalleryTalker::listPhotos( const TQString& albumName )
     form.addPair("set_albumName",    albumName);
     form.finish();
 
-    KIO::TransferJob* job = KIO::http_post(m_url, form.formData(), false);
+    TDEIO::TransferJob* job = TDEIO::http_post(m_url, form.formData(), false);
     job->addMetaData("content-type", form.contentType() );
     job->addMetaData("cookies", "manual");
     job->addMetaData("setcookies", m_cookie);
-    connect(job, TQT_SIGNAL(data(KIO::Job*, const TQByteArray&)),
-            TQT_SLOT(data(KIO::Job*, const TQByteArray&)));
-    connect(job, TQT_SIGNAL(result(KIO::Job *)),
-            TQT_SLOT(slotResult(KIO::Job *)));
+    connect(job, TQT_SIGNAL(data(TDEIO::Job*, const TQByteArray&)),
+            TQT_SLOT(data(TDEIO::Job*, const TQByteArray&)));
+    connect(job, TQT_SIGNAL(result(TDEIO::Job *)),
+            TQT_SLOT(slotResult(TDEIO::Job *)));
 
     m_state = GE_LISTPHOTOS;
     m_job   = job;
@@ -172,14 +172,14 @@ void GalleryTalker::createAlbum( const TQString& parentAlbumName,
         form.addPair("newAlbumDesc", albumCaption);
     form.finish();
 
-    KIO::TransferJob* job = KIO::http_post(m_url, form.formData(), false);
+    TDEIO::TransferJob* job = TDEIO::http_post(m_url, form.formData(), false);
     job->addMetaData("content-type", form.contentType() );
     job->addMetaData("cookies", "manual");
     job->addMetaData("setcookies", m_cookie);
-    connect(job, TQT_SIGNAL(data(KIO::Job*, const TQByteArray&)),
-            TQT_SLOT(data(KIO::Job*, const TQByteArray&)));
-    connect(job, TQT_SIGNAL(result(KIO::Job *)),
-            TQT_SLOT(slotResult(KIO::Job *)));
+    connect(job, TQT_SIGNAL(data(TDEIO::Job*, const TQByteArray&)),
+            TQT_SLOT(data(TDEIO::Job*, const TQByteArray&)));
+    connect(job, TQT_SIGNAL(result(TDEIO::Job *)),
+            TQT_SLOT(slotResult(TDEIO::Job *)));
 
     m_state = GE_CREATEALBUM;
     m_job   = job;
@@ -247,14 +247,14 @@ bool GalleryTalker::addPhoto( const TQString& albumName,
 
     form.finish();
 
-    KIO::TransferJob* job = KIO::http_post(m_url, form.formData(), false);
+    TDEIO::TransferJob* job = TDEIO::http_post(m_url, form.formData(), false);
     job->addMetaData("content-type", form.contentType());
     job->addMetaData("cookies", "manual");
     job->addMetaData("setcookies", m_cookie);
-    connect(job, TQT_SIGNAL(data(KIO::Job*, const TQByteArray&)),
-            TQT_SLOT(data(KIO::Job*, const TQByteArray&)));
-    connect(job, TQT_SIGNAL(result(KIO::Job *)),
-            TQT_SLOT(slotResult(KIO::Job *)));
+    connect(job, TQT_SIGNAL(data(TDEIO::Job*, const TQByteArray&)),
+            TQT_SLOT(data(TDEIO::Job*, const TQByteArray&)));
+    connect(job, TQT_SIGNAL(result(TDEIO::Job *)),
+            TQT_SLOT(slotResult(TDEIO::Job *)));
 
     m_state = GE_ADDPHOTO;
     m_job   = job;
@@ -273,7 +273,7 @@ void GalleryTalker::cancel()
     }
 }
 
-void GalleryTalker::data(KIO::Job*, const TQByteArray& data)
+void GalleryTalker::data(TDEIO::Job*, const TQByteArray& data)
 {
     if (data.isEmpty())
         return;
@@ -283,7 +283,7 @@ void GalleryTalker::data(KIO::Job*, const TQByteArray& data)
     memcpy(m_buffer.data()+oldSize, data.data(), data.size());
 }
 
-void GalleryTalker::slotResult(KIO::Job *job)
+void GalleryTalker::slotResult(TDEIO::Job *job)
 {
     m_job = 0;
     emit signalBusy( false );
diff --git a/kipi-plugins/galleryexport/gallerytalker.h b/kipi-plugins/galleryexport/gallerytalker.h
index 12cfaa1..70f1427 100644
--- a/kipi-plugins/galleryexport/gallerytalker.h
+++ b/kipi-plugins/galleryexport/gallerytalker.h
@@ -22,7 +22,7 @@
 #include <tqobject.h>
 #include <kurl.h>
 
-namespace KIO
+namespace TDEIO
 {
     class Job;
 }
@@ -83,7 +83,7 @@ private:
     State      m_state;
     TQString    m_cookie;
     KURL       m_url;
-    KIO::Job*  m_job;
+    TDEIO::Job*  m_job;
     bool       m_loggedIn;
     TQByteArray m_buffer;
 
@@ -110,8 +110,8 @@ signals:
 
 private slots:
 
-    void data(KIO::Job *job, const TQByteArray &data);
-    void slotResult (KIO::Job *job);
+    void data(TDEIO::Job *job, const TQByteArray &data);
+    void slotResult (TDEIO::Job *job);
 };
 
 }
diff --git a/kipi-plugins/galleryexport/gallerywindow.cpp b/kipi-plugins/galleryexport/gallerywindow.cpp
index d5623e0..917367f 100644
--- a/kipi-plugins/galleryexport/gallerywindow.cpp
+++ b/kipi-plugins/galleryexport/gallerywindow.cpp
@@ -130,7 +130,7 @@ GalleryWindow::GalleryWindow(KIPI::Interface* interface, TQWidget *parent, Galle
     connect(m_addPhotoBtn, TQT_SIGNAL(clicked()), TQT_SLOT( slotAddPhotos()));
 
     // read config
-    KConfig config("kipirc");
+    TDEConfig config("kipirc");
     config.setGroup("GallerySync Settings");
 
     m_talker = new GalleryTalker( this );
@@ -178,7 +178,7 @@ GalleryWindow::GalleryWindow(KIPI::Interface* interface, TQWidget *parent, Galle
 GalleryWindow::~GalleryWindow()
 {
     // write config
-    KConfig config("kipirc");
+    TDEConfig config("kipirc");
     config.setGroup("GallerySync Settings");
     config.writeEntry("Resize", m_resizeCheckBox->isChecked());
     config.writeEntry("Set title", m_captTitleCheckBox->isChecked());
diff --git a/kipi-plugins/gpssync/gpseditdialog.cpp b/kipi-plugins/gpssync/gpseditdialog.cpp
index a5e3628..24d4c33 100644
--- a/kipi-plugins/gpssync/gpseditdialog.cpp
+++ b/kipi-plugins/gpssync/gpseditdialog.cpp
@@ -237,7 +237,7 @@ void GPSEditDialog::slotCancel()
 
 void GPSEditDialog::readSettings()
 {
-    KConfig config("kipirc");
+    TDEConfig config("kipirc");
     config.setGroup("GPS Sync Settings");
     resize(configDialogSize(config, TQString("GPS Edit Dialog")));
 
@@ -271,7 +271,7 @@ void GPSEditDialog::readSettings()
 
 void GPSEditDialog::saveSettings()
 {
-    KConfig config("kipirc");
+    TDEConfig config("kipirc");
     config.setGroup("GPS Sync Settings");
     saveDialogSize(config, TQString("GPS Edit Dialog"));
     config.writeEntry("GPS Last Latitude", d->latitudeInput->text().toDouble());
diff --git a/kipi-plugins/gpssync/gpssyncdialog.cpp b/kipi-plugins/gpssync/gpssyncdialog.cpp
index 7d86706..7a90d9c 100644
--- a/kipi-plugins/gpssync/gpssyncdialog.cpp
+++ b/kipi-plugins/gpssync/gpssyncdialog.cpp
@@ -290,7 +290,7 @@ void GPSSyncDialog::setImages( const KURL::List& images )
     for( KURL::List::ConstIterator it = images.begin(); it != images.end(); ++it )
         new GPSListViewItem(d->listView, d->listView->lastItem(), *it);
 
-    KIO::PreviewJob *thumbnailJob = KIO::filePreview(images, 64);
+    TDEIO::PreviewJob *thumbnailJob = TDEIO::filePreview(images, 64);
 
     connect(thumbnailJob, TQT_SIGNAL(gotPreview(const KFileItem*, const TQPixmap&)),
             this, TQT_SLOT(slotGotThumbnail(const KFileItem*, const TQPixmap&)));
@@ -382,7 +382,7 @@ bool GPSSyncDialog::promptUserClose()
 
 void GPSSyncDialog::readSettings()
 {
-    KConfig config("kipirc");
+    TDEConfig config("kipirc");
     config.setGroup("GPS Sync Settings");
     d->maxGapInput->setValue(config.readNumEntry("Max Gap Time", 30));
     d->timeZoneCB->setCurrentItem(config.readNumEntry("Time Zone", 16));  // GMT+00:00
@@ -396,7 +396,7 @@ void GPSSyncDialog::readSettings()
 
 void GPSSyncDialog::saveSettings()
 {
-    KConfig config("kipirc");
+    TDEConfig config("kipirc");
     config.setGroup("GPS Sync Settings");
     config.writeEntry("Max Gap Time", d->maxGapInput->value() );
     config.writeEntry("Time Zone", d->timeZoneCB->currentItem() );
diff --git a/kipi-plugins/gpssync/kmlexport.cpp b/kipi-plugins/gpssync/kmlexport.cpp
index bc594cf..206e7c4 100644
--- a/kipi-plugins/gpssync/kmlexport.cpp
+++ b/kipi-plugins/gpssync/kmlexport.cpp
@@ -465,7 +465,7 @@ void kmlExport::generate()
 
     delete kmlDocument;
 
-    KIO::moveAs(m_tempDestDir,m_baseDestDir,false);
+    TDEIO::moveAs(m_tempDestDir,m_baseDestDir,false);
     logInfo(i18n("Move to final directory"));
     m_progressDialog->close();
 }
@@ -475,7 +475,7 @@ void kmlExport::generate()
  */
 int kmlExport::getConfig()
 {
-    KConfig config("kipirc");
+    TDEConfig config("kipirc");
     config.setGroup("KMLExport Settings");
 
     m_localTarget           = config.readBoolEntry("localTarget");
diff --git a/kipi-plugins/gpssync/kmlexportconfig.cpp b/kipi-plugins/gpssync/kmlexportconfig.cpp
index e5fb03b..276aa91 100644
--- a/kipi-plugins/gpssync/kmlexportconfig.cpp
+++ b/kipi-plugins/gpssync/kmlexportconfig.cpp
@@ -295,7 +295,7 @@ KMLExportConfig::KMLExportConfig( TQWidget* parent, const char* name)
     // --------------------------------------------------------------
     // Configuration file management 
 
-    config_ = new KConfig("kipirc");
+    config_ = new TDEConfig("kipirc");
     config_->setGroup("KMLExport Settings");
 
     readSettings();
diff --git a/kipi-plugins/gpssync/kmlexportconfig.h b/kipi-plugins/gpssync/kmlexportconfig.h
index 6cd269a..deb8e8a 100644
--- a/kipi-plugins/gpssync/kmlexportconfig.h
+++ b/kipi-plugins/gpssync/kmlexportconfig.h
@@ -118,7 +118,7 @@ protected:
     TQGridLayout              *TargetPreferenceGroupBoxLayout;
     TQGridLayout              *buttonGroupTargetTypeLayout;
 
-    KConfig                  *config_;
+    TDEConfig                  *config_;
 
     KIPIPlugins::KPAboutData *m_about;
 
diff --git a/kipi-plugins/htmlexport/abstractthemeparameter.cpp b/kipi-plugins/htmlexport/abstractthemeparameter.cpp
index 2ba5e3f..90b84f9 100644
--- a/kipi-plugins/htmlexport/abstractthemeparameter.cpp
+++ b/kipi-plugins/htmlexport/abstractthemeparameter.cpp
@@ -45,7 +45,7 @@ AbstractThemeParameter::~AbstractThemeParameter() {
 }
 
 
-void AbstractThemeParameter::init(const TQCString& internalName, const KConfigBase* configFile) {
+void AbstractThemeParameter::init(const TQCString& internalName, const TDEConfigBase* configFile) {
 	d->mInternalName = internalName;
 	d->mName = configFile->readEntry(NAME_KEY);
 	d->mDefaultValue = configFile->readEntry(DEFAULT_VALUE_KEY);
diff --git a/kipi-plugins/htmlexport/abstractthemeparameter.h b/kipi-plugins/htmlexport/abstractthemeparameter.h
index 97d8a88..4388d00 100644
--- a/kipi-plugins/htmlexport/abstractthemeparameter.h
+++ b/kipi-plugins/htmlexport/abstractthemeparameter.h
@@ -24,7 +24,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Cambridge, MA 02110-1301, USA
 class TQCString;
 class TQString;
 class TQWidget;
-class KConfigBase;
+class TDEConfigBase;
 
 namespace KIPIHTMLExport {
 
@@ -42,7 +42,7 @@ public:
 	 * Reads theme parameters from configFile. Initializes the internalName,
 	 * name and defaultValue fields.
 	 */
-	virtual void init(const TQCString& internalName, const KConfigBase* configFile);
+	virtual void init(const TQCString& internalName, const TDEConfigBase* configFile);
 
 	TQCString internalName() const;
 
diff --git a/kipi-plugins/htmlexport/galleryinfo.cpp b/kipi-plugins/htmlexport/galleryinfo.cpp
index e529213..e84c008 100644
--- a/kipi-plugins/htmlexport/galleryinfo.cpp
+++ b/kipi-plugins/htmlexport/galleryinfo.cpp
@@ -38,7 +38,7 @@ TQString GalleryInfo::getThemeParameterValue(
 	const TQString& defaultValue) const
 {
 	TQString groupName = THEME_GROUP_PREFIX + theme;
-	KConfigGroupSaver saver(config(), groupName);
+	TDEConfigGroupSaver saver(config(), groupName);
 	return config()->readEntry(parameter, defaultValue);
 }
 
@@ -49,10 +49,10 @@ void GalleryInfo::setThemeParameterValue(
 	const TQString& value)
 {
 	// FIXME: This is hackish, but config() is const :'(
-	KConfig* localConfig = const_cast<KConfig*>(config());
+	TDEConfig* localConfig = const_cast<TDEConfig*>(config());
 
 	TQString groupName = THEME_GROUP_PREFIX + theme;
-	KConfigGroupSaver saver(localConfig, groupName);
+	TDEConfigGroupSaver saver(localConfig, groupName);
 	return localConfig->writeEntry(parameter, value);
 }
 
diff --git a/kipi-plugins/htmlexport/galleryinfo.h b/kipi-plugins/htmlexport/galleryinfo.h
index f4c4a4b..e0c6095 100644
--- a/kipi-plugins/htmlexport/galleryinfo.h
+++ b/kipi-plugins/htmlexport/galleryinfo.h
@@ -66,21 +66,21 @@ public:
 private:
 
 	/**
-	 * KConfigXT enums are mapped to ints.
+	 * TDEConfigXT enums are mapped to ints.
 	 * This method returns the string associated to the enum value.
 	 */
 	TQString getEnumString(const TQString& itemName) const {
 		// findItem is not marked const :-(
 		GalleryInfo* that=const_cast<GalleryInfo*>(this);
-		KConfigSkeletonItem* tmp=that->findItem(itemName);
+		TDEConfigSkeletonItem* tmp=that->findItem(itemName);
 
-		KConfigSkeleton::ItemEnum* item=dynamic_cast<KConfigSkeleton::ItemEnum*>(tmp);
+		TDEConfigSkeleton::ItemEnum* item=dynamic_cast<TDEConfigSkeleton::ItemEnum*>(tmp);
 		Q_ASSERT(item);
 		if (!item) return TQString();
 
 		int value=item->value();
-		TQValueList<KConfigSkeleton::ItemEnum::Choice> lst=item->choices();
-		TQValueList<KConfigSkeleton::ItemEnum::Choice>::ConstIterator
+		TQValueList<TDEConfigSkeleton::ItemEnum::Choice> lst=item->choices();
+		TQValueList<TDEConfigSkeleton::ItemEnum::Choice>::ConstIterator
 			it=lst.begin(), end=lst.end();
 
 		for (int pos=0; it!=end; ++it, pos++) {
diff --git a/kipi-plugins/htmlexport/generator.cpp b/kipi-plugins/htmlexport/generator.cpp
index d1bbe1c..96dd4c2 100644
--- a/kipi-plugins/htmlexport/generator.cpp
+++ b/kipi-plugins/htmlexport/generator.cpp
@@ -187,9 +187,9 @@ struct Generator::Private {
 		destURL.addPath(srcURL.filename());
 		
 		if (TQFile::exists(destURL.path())) {
-			KIO::NetAccess::del(destURL, mProgressDialog);
+			TDEIO::NetAccess::del(destURL, mProgressDialog);
 		}
-		bool ok=KIO::NetAccess::dircopy(srcURL, destURL, mProgressDialog);
+		bool ok=TDEIO::NetAccess::dircopy(srcURL, destURL, mProgressDialog);
 		if (!ok) {
 			logError(i18n("Could not copy theme"));
 			return false;
diff --git a/kipi-plugins/htmlexport/intthemeparameter.cpp b/kipi-plugins/htmlexport/intthemeparameter.cpp
index 17388e2..cf5b2f5 100644
--- a/kipi-plugins/htmlexport/intthemeparameter.cpp
+++ b/kipi-plugins/htmlexport/intthemeparameter.cpp
@@ -51,7 +51,7 @@ IntThemeParameter::~IntThemeParameter() {
 }
 
 
-void IntThemeParameter::init(const TQCString& internalName, const KConfigBase* configFile) {
+void IntThemeParameter::init(const TQCString& internalName, const TDEConfigBase* configFile) {
 	AbstractThemeParameter::init(internalName, configFile);
 
 	d->mMinValue = configFile->readNumEntry(MIN_VALUE_KEY, 0);
diff --git a/kipi-plugins/htmlexport/intthemeparameter.h b/kipi-plugins/htmlexport/intthemeparameter.h
index 4aa354c..b70f23c 100644
--- a/kipi-plugins/htmlexport/intthemeparameter.h
+++ b/kipi-plugins/htmlexport/intthemeparameter.h
@@ -39,7 +39,7 @@ public:
 	IntThemeParameter();
 	~IntThemeParameter();
 
-	virtual void init(const TQCString& internalName, const KConfigBase* configFile);
+	virtual void init(const TQCString& internalName, const TDEConfigBase* configFile);
 	virtual TQWidget* createWidget(TQWidget* parent, const TQString& value) const;
 	virtual TQString valueFromWidget(TQWidget*) const;
 
diff --git a/kipi-plugins/htmlexport/listthemeparameter.cpp b/kipi-plugins/htmlexport/listthemeparameter.cpp
index e2bb23e..27111a1 100644
--- a/kipi-plugins/htmlexport/listthemeparameter.cpp
+++ b/kipi-plugins/htmlexport/listthemeparameter.cpp
@@ -45,7 +45,7 @@ ListThemeParameter::~ListThemeParameter() {
 	delete d;
 }
 
-void ListThemeParameter::init(const TQCString& internalName, const KConfigBase* configFile) {
+void ListThemeParameter::init(const TQCString& internalName, const TDEConfigBase* configFile) {
 	AbstractThemeParameter::init(internalName, configFile);
 
 	for (int pos=0;; ++pos) {
diff --git a/kipi-plugins/htmlexport/listthemeparameter.h b/kipi-plugins/htmlexport/listthemeparameter.h
index 8de2e1f..bb46eb5 100644
--- a/kipi-plugins/htmlexport/listthemeparameter.h
+++ b/kipi-plugins/htmlexport/listthemeparameter.h
@@ -35,7 +35,7 @@ public:
 	ListThemeParameter();
 	~ListThemeParameter();
 
-	virtual void init(const TQCString& internalName, const KConfigBase* configFile);
+	virtual void init(const TQCString& internalName, const TDEConfigBase* configFile);
 	virtual TQWidget* createWidget(TQWidget* parent, const TQString& value) const;
 	virtual TQString valueFromWidget(TQWidget*) const;
 
diff --git a/kipi-plugins/htmlexport/theme.cpp b/kipi-plugins/htmlexport/theme.cpp
index 10a1bf0..9bcd80a 100644
--- a/kipi-plugins/htmlexport/theme.cpp
+++ b/kipi-plugins/htmlexport/theme.cpp
@@ -104,7 +104,7 @@ struct Theme::Private {
 			TQString group = PARAMETER_GROUP_PREFIX + *it;
 			TQCString internalName = (*it).utf8();
 
-			KConfigGroupSaver saver(mDesktopFile, group);
+			TDEConfigGroupSaver saver(mDesktopFile, group);
 			TQString type = mDesktopFile->readEntry(PARAMETER_TYPE_KEY);
 			AbstractThemeParameter* parameter;
 			if (type == STRING_PARAMETER_TYPE) {
@@ -192,13 +192,13 @@ TQString Theme::directory() const {
 
 
 TQString Theme::authorName() const {
-	KConfigGroupSaver saver(d->mDesktopFile, AUTHOR_GROUP);
+	TDEConfigGroupSaver saver(d->mDesktopFile, AUTHOR_GROUP);
 	return d->mDesktopFile->readEntry("Name");
 }
 
 
 TQString Theme::authorUrl() const {
-	KConfigGroupSaver saver(d->mDesktopFile, AUTHOR_GROUP);
+	TDEConfigGroupSaver saver(d->mDesktopFile, AUTHOR_GROUP);
 	return d->mDesktopFile->readEntry("Url");
 }
 
diff --git a/kipi-plugins/htmlexport/wizard.cpp b/kipi-plugins/htmlexport/wizard.cpp
index 28ee474..0ff604f 100644
--- a/kipi-plugins/htmlexport/wizard.cpp
+++ b/kipi-plugins/htmlexport/wizard.cpp
@@ -76,7 +76,7 @@ public:
 
 struct Wizard::Private {
 	GalleryInfo* mInfo;
-	KConfigDialogManager* mConfigManager;
+	TDEConfigDialogManager* mConfigManager;
 	
 	KIPI::ImageCollectionSelector* mCollectionSelector;
 	ThemePage* mThemePage;
@@ -209,7 +209,7 @@ Wizard::Wizard(TQWidget* parent, KIPI::Interface* interface, GalleryInfo* info)
 	connect(d->mOutputPage->kcfg_destURL, TQT_SIGNAL(textChanged(const TQString&)),
 		this, TQT_SLOT(updateFinishButton()) );
 
-	d->mConfigManager=new KConfigDialogManager(this, d->mInfo);
+	d->mConfigManager=new TDEConfigDialogManager(this, d->mInfo);
 	d->mConfigManager->updateWidgets();
 
 	// Set page states
diff --git a/kipi-plugins/ipodexport/ipodexportdialog.cpp b/kipi-plugins/ipodexport/ipodexportdialog.cpp
index b65dd57..f527d6d 100644
--- a/kipi-plugins/ipodexport/ipodexportdialog.cpp
+++ b/kipi-plugins/ipodexport/ipodexportdialog.cpp
@@ -381,7 +381,7 @@ UploadDialog::imageSelected( TQListViewItem *item )
 
     KURL url( IdemIndexed );
 
-    KIO::PreviewJob* m_thumbJob = KIO::filePreview( url, m_imagePreview->height() );
+    TDEIO::PreviewJob* m_thumbJob = TDEIO::filePreview( url, m_imagePreview->height() );
 
     connect( m_thumbJob, TQT_SIGNAL( gotPreview(const KFileItem*, const TQPixmap&) ),
                    this,   TQT_SLOT( gotImagePreview(const KFileItem*, const TQPixmap&) ) );
diff --git a/kipi-plugins/kameraklient/cameraui.cpp b/kipi-plugins/kameraklient/cameraui.cpp
index d14a2db..9a8bd20 100644
--- a/kipi-plugins/kameraklient/cameraui.cpp
+++ b/kipi-plugins/kameraklient/cameraui.cpp
@@ -642,7 +642,7 @@ void CameraUI::slotChangeDownloadDirectory() {
 }
 
 void CameraUI::writeSettings() {
-    mConfig = new KConfig("kipirc");
+    mConfig = new TDEConfig("kipirc");
     mConfig->setGroup("KameraKlient Settings");
     mConfig->writePathEntry("DownloadDirectory", mDownloadDirectoryEdit->text());
     mConfig->writeEntry("DialogSize", frameSize());
@@ -654,7 +654,7 @@ void CameraUI::writeSettings() {
 }
 
 void CameraUI::readSettings() {
-    mConfig = new KConfig("kipirc");
+    mConfig = new TDEConfig("kipirc");
     mConfig->setGroup("KameraKlient Settings");
     mDownloadDirectoryEdit->setText(mConfig->readPathEntry("DownloadDirectory", "$HOME"));
     resize(mConfig->readSizeEntry("DialogSize"));
diff --git a/kipi-plugins/kameraklient/cameraui.h b/kipi-plugins/kameraklient/cameraui.h
index 263ae0e..09faa31 100644
--- a/kipi-plugins/kameraklient/cameraui.h
+++ b/kipi-plugins/kameraklient/cameraui.h
@@ -55,7 +55,7 @@ class KToggleAction;
 
 
 
-namespace KIO {
+namespace TDEIO {
 class Job;
 }
 
@@ -161,7 +161,7 @@ private:
     
     KStatusBar        	*mStatusBar;
     
-    KConfig             *mConfig; 
+    TDEConfig             *mConfig; 
     
     GPEventFilter       *efilter_;
     
diff --git a/kipi-plugins/metadataedit/commenteditdialog.cpp b/kipi-plugins/metadataedit/commenteditdialog.cpp
index 7ce0789..8f224b9 100644
--- a/kipi-plugins/metadataedit/commenteditdialog.cpp
+++ b/kipi-plugins/metadataedit/commenteditdialog.cpp
@@ -158,7 +158,7 @@ void CommentEditDialog::slotCancel()
 
 void CommentEditDialog::readSettings()
 {
-    KConfig config("kipirc");
+    TDEConfig config("kipirc");
     config.setGroup("Comments Edit Settings");
     setCheckedSyncJFIFComment(config.readBoolEntry("Sync JFIF Comment", true));
     setCheckedSyncEXIFComment(config.readBoolEntry("Sync EXIF Comment", true));
@@ -168,7 +168,7 @@ void CommentEditDialog::readSettings()
 
 void CommentEditDialog::saveSettings()
 {
-    KConfig config("kipirc");
+    TDEConfig config("kipirc");
     config.setGroup("Comments Edit Settings");
     config.writeEntry("Sync JFIF Comment", syncJFIFCommentIsChecked());
     config.writeEntry("Sync EXIF Comment", syncEXIFCommentIsChecked());
diff --git a/kipi-plugins/metadataedit/commentremovedialog.cpp b/kipi-plugins/metadataedit/commentremovedialog.cpp
index 714b895..2573d33 100644
--- a/kipi-plugins/metadataedit/commentremovedialog.cpp
+++ b/kipi-plugins/metadataedit/commentremovedialog.cpp
@@ -149,7 +149,7 @@ void CommentRemoveDialog::slotCancel()
 
 void CommentRemoveDialog::readSettings()
 {
-    KConfig config("kipirc");
+    TDEConfig config("kipirc");
     config.setGroup("Comments Remove Settings");
     setCheckedRemoveHOSTComment(config.readBoolEntry("Remove HOST Comment", true));
     setCheckedRemoveJFIFComment(config.readBoolEntry("Remove JFIF Comment", true));
@@ -160,7 +160,7 @@ void CommentRemoveDialog::readSettings()
 
 void CommentRemoveDialog::saveSettings()
 {
-    KConfig config("kipirc");
+    TDEConfig config("kipirc");
     config.setGroup("Comments Remove Settings");
     config.writeEntry("Remove HOST Comment", removeHOSTCommentIsChecked());
     config.writeEntry("Remove JFIF Comment", removeJFIFCommentIsChecked());
diff --git a/kipi-plugins/metadataedit/exifeditdialog.cpp b/kipi-plugins/metadataedit/exifeditdialog.cpp
index f116e27..fa84cde 100644
--- a/kipi-plugins/metadataedit/exifeditdialog.cpp
+++ b/kipi-plugins/metadataedit/exifeditdialog.cpp
@@ -229,7 +229,7 @@ void EXIFEditDialog::slotClose()
 
 void EXIFEditDialog::readSettings()
 {
-    KConfig config("kipirc");
+    TDEConfig config("kipirc");
     config.setGroup("Metadata Edit Settings");
     showPage(config.readNumEntry("EXIF Edit Page", 0));
     d->captionPage->setCheckedSyncJFIFComment(config.readBoolEntry("Sync JFIF Comment", true));
@@ -242,7 +242,7 @@ void EXIFEditDialog::readSettings()
 
 void EXIFEditDialog::saveSettings()
 {
-    KConfig config("kipirc");
+    TDEConfig config("kipirc");
     config.setGroup("Metadata Edit Settings");
     config.writeEntry("EXIF Edit Page", activePageIndex());
     config.writeEntry("Sync JFIF Comment", d->captionPage->syncJFIFCommentIsChecked());
diff --git a/kipi-plugins/metadataedit/iptceditdialog.cpp b/kipi-plugins/metadataedit/iptceditdialog.cpp
index 5bf7c28..5107247 100644
--- a/kipi-plugins/metadataedit/iptceditdialog.cpp
+++ b/kipi-plugins/metadataedit/iptceditdialog.cpp
@@ -251,7 +251,7 @@ void IPTCEditDialog::slotClose()
 
 void IPTCEditDialog::readSettings()
 {
-    KConfig config("kipirc");
+    TDEConfig config("kipirc");
     config.setGroup("Metadata Edit Settings");
     showPage(config.readNumEntry("IPTC Edit Page", 0));
     d->captionPage->setCheckedSyncJFIFComment(config.readBoolEntry("Sync JFIF Comment", true));
@@ -264,7 +264,7 @@ void IPTCEditDialog::readSettings()
 
 void IPTCEditDialog::saveSettings()
 {
-    KConfig config("kipirc");
+    TDEConfig config("kipirc");
     config.setGroup("Metadata Edit Settings");
     config.writeEntry("IPTC Edit Page", activePageIndex());
     config.writeEntry("Sync JFIF Comment", d->captionPage->syncJFIFCommentIsChecked());
diff --git a/kipi-plugins/mpegencoder/checkbinprog.cpp b/kipi-plugins/mpegencoder/checkbinprog.cpp
index 8c9d455..23aeb01 100644
--- a/kipi-plugins/mpegencoder/checkbinprog.cpp
+++ b/kipi-plugins/mpegencoder/checkbinprog.cpp
@@ -45,7 +45,7 @@ namespace KIPIMPEGEncoderPlugin
 
 CheckBinProg::CheckBinProg(TQObject *parent)
 {
-  config = new KConfig("kipirc");
+  config = new TDEConfig("kipirc");
   config->setGroup("MPEGEncoder Settings");
   ImageMagickPath = config->readPathEntry("ImageMagickBinFolder");
   MjpegToolsPath = config->readPathEntry("MjpegToolsBinFolder");
diff --git a/kipi-plugins/mpegencoder/checkbinprog.h b/kipi-plugins/mpegencoder/checkbinprog.h
index 85f521f..6c38580 100644
--- a/kipi-plugins/mpegencoder/checkbinprog.h
+++ b/kipi-plugins/mpegencoder/checkbinprog.h
@@ -26,7 +26,7 @@
 #include <tqobject.h>
 #include <tqstring.h>
 
-class KConfig;
+class TDEConfig;
 
 namespace KIPIMPEGEncoderPlugin
 {
@@ -42,7 +42,7 @@ public:
     int findExecutables( void );
 
 private:
-    KConfig* config;
+    TDEConfig* config;
     TQString  ImageMagickPath;
     TQString  MjpegToolsPath;
 };
diff --git a/kipi-plugins/mpegencoder/kimg2mpg.cpp b/kipi-plugins/mpegencoder/kimg2mpg.cpp
index 0c2c89a..2763354 100644
--- a/kipi-plugins/mpegencoder/kimg2mpg.cpp
+++ b/kipi-plugins/mpegencoder/kimg2mpg.cpp
@@ -425,7 +425,7 @@ void KImg2mpgData::slotImagesFilesSelected( TQListBoxItem *item )
 
   if ( m_thumbJob ) delete m_thumbJob;
 
-  m_thumbJob = KIO::filePreview( url, m_ImageLabel->width() );
+  m_thumbJob = TDEIO::filePreview( url, m_ImageLabel->width() );
 
   connect(m_thumbJob, TQT_SIGNAL(gotPreview(const KFileItem*, const TQPixmap&)),
            TQT_SLOT(slotGotPreview(const KFileItem*, const TQPixmap&)));
@@ -1031,7 +1031,7 @@ void KImg2mpgData::reset()
 
 void KImg2mpgData::writeSettings()
 {
-  m_config = new KConfig("kipirc");
+  m_config = new TDEConfig("kipirc");
   m_config->setGroup("MPEGEncoder Settings");
 
   m_VideoFormatConfig = m_VideoFormatComboBox->currentText();
@@ -1070,7 +1070,7 @@ void KImg2mpgData::writeSettings()
 
 void KImg2mpgData::readSettings()
 {
-  m_config = new KConfig("kipirc");
+  m_config = new TDEConfig("kipirc");
   m_config->setGroup("MPEGEncoder Settings");
 
   m_VideoFormatConfig = m_config->readEntry("VideoFormat", "XVCD");
diff --git a/kipi-plugins/mpegencoder/kimg2mpg.h b/kipi-plugins/mpegencoder/kimg2mpg.h
index b9134ac..f4cc783 100644
--- a/kipi-plugins/mpegencoder/kimg2mpg.h
+++ b/kipi-plugins/mpegencoder/kimg2mpg.h
@@ -58,7 +58,7 @@ class TQLabel;
 class TQWidget;
 class TQPixmap;
 
-class KConfig;
+class TDEConfig;
 class TDEProcess;
 class KLineEdit;
 class KIconLoader;
@@ -153,9 +153,9 @@ private:
 
   TQColor                m_BackgroundColorConfig;
 
-  KConfig*              m_config;
+  TDEConfig*              m_config;
 
-  KIO::PreviewJob*      m_thumbJob;
+  TDEIO::PreviewJob*      m_thumbJob;
 
   TQTime                 m_EncodingDuration;
   TQTime                 m_DurationTime;
diff --git a/kipi-plugins/picasawebexport/picasawebtalker.cpp b/kipi-plugins/picasawebexport/picasawebtalker.cpp
index 03e22a2..edbfc72 100644
--- a/kipi-plugins/picasawebexport/picasawebtalker.cpp
+++ b/kipi-plugins/picasawebexport/picasawebtalker.cpp
@@ -178,16 +178,16 @@ void PicasawebTalker::getToken(const TQString& username, const TQString& passwor
     ts.setEncoding(TQTextStream::UnicodeUTF8);
     ts << dataParameters;
 
-    KIO::TransferJob* job = KIO::http_post(url, buffer, false);
+    TDEIO::TransferJob* job = TDEIO::http_post(url, buffer, false);
     job->addMetaData("content-type", "Content-Type: application/x-www-form-urlencoded" );	
     m_state = FE_GETTOKEN;
     authProgressDlg->setLabelText(i18n("Getting the token"));
 
-    connect(job, TQT_SIGNAL(data(KIO::Job*, const TQByteArray&)),
-            this, TQT_SLOT(data(KIO::Job*, const TQByteArray&)));
+    connect(job, TQT_SIGNAL(data(TDEIO::Job*, const TQByteArray&)),
+            this, TQT_SLOT(data(TDEIO::Job*, const TQByteArray&)));
 
-    connect(job, TQT_SIGNAL(result(KIO::Job *)),
-            this, TQT_SLOT(slotResult(KIO::Job *)));
+    connect(job, TQT_SIGNAL(result(TDEIO::Job *)),
+            this, TQT_SLOT(slotResult(TDEIO::Job *)));
 
     m_job   = job;
     m_buffer.resize(0);
@@ -220,16 +220,16 @@ void PicasawebTalker::checkToken(const TQString& /*token*/)
     TQString    url         = "https://www.google.com/accounts/ClientLogin";
     TQString    auth_string = "GoogleLogin auth=" + m_token;
     TQByteArray tmp;
-    KIO::TransferJob* job  = KIO::http_post(url, tmp, false);
+    TDEIO::TransferJob* job  = TDEIO::http_post(url, tmp, false);
     job->addMetaData("customHTTPHeader", "Authorization: " + auth_string);
 
     job->addMetaData("content-type", "Content-Type: application/x-www-form-urlencoded");
 
-    connect(job, TQT_SIGNAL(data(KIO::Job*, const TQByteArray&)),
-            this, TQT_SLOT(data(KIO::Job*, const TQByteArray&)));
+    connect(job, TQT_SIGNAL(data(TDEIO::Job*, const TQByteArray&)),
+            this, TQT_SLOT(data(TDEIO::Job*, const TQByteArray&)));
 
-    connect(job, TQT_SIGNAL(result(KIO::Job *)),
-            this, TQT_SLOT(slotResult(KIO::Job *)));
+    connect(job, TQT_SIGNAL(result(TDEIO::Job *)),
+            this, TQT_SLOT(slotResult(TDEIO::Job *)));
 
     m_state = FE_CHECKTOKEN;
     authProgressDlg->setLabelText(i18n("Checking if previous token is still valid"));
@@ -256,15 +256,15 @@ void PicasawebTalker::listAllAlbums() {
     TQString    url = "http://picasaweb.google.com/data/feed/api/user/" + m_username + "?kind=album";
     TQByteArray tmp;	
     TQString auth_string = "GoogleLogin auth=" + m_token;
-    KIO::TransferJob* job = KIO::get(url, !tmp.isNull(), false);
+    TDEIO::TransferJob* job = TDEIO::get(url, !tmp.isNull(), false);
     job->addMetaData("content-type", "Content-Type: application/x-www-form-urlencoded" );	
     job->addMetaData("customHTTPHeader", "Authorization: " + auth_string );
 
-    connect(job, TQT_SIGNAL(data(KIO::Job*, const TQByteArray&)),
-            this, TQT_SLOT(data(KIO::Job*, const TQByteArray&)));
+    connect(job, TQT_SIGNAL(data(TDEIO::Job*, const TQByteArray&)),
+            this, TQT_SLOT(data(TDEIO::Job*, const TQByteArray&)));
 
-    connect(job, TQT_SIGNAL(result(KIO::Job *)), 
-            this, TQT_SLOT(slotResult(KIO::Job *)));
+    connect(job, TQT_SIGNAL(result(TDEIO::Job *)), 
+            this, TQT_SLOT(slotResult(TDEIO::Job *)));
 
     m_state = FE_LISTALBUMS;
     m_job   = job;
@@ -292,14 +292,14 @@ void PicasawebTalker::getPhotoProperty(const TQString& method,const TQString& ar
     TQString queryStr=headers.join("&");
     TQString postUrl=url+queryStr;
     TQByteArray tmp;	
-    KIO::TransferJob* job = KIO::http_post(postUrl, tmp, false);
+    TDEIO::TransferJob* job = TDEIO::http_post(postUrl, tmp, false);
     job->addMetaData("content-type", "Content-Type: application/x-www-form-urlencoded" );	
 
-    connect(job, TQT_SIGNAL(data(KIO::Job*, const TQByteArray&)),
-            this, TQT_SLOT(data(KIO::Job*, const TQByteArray&)));
+    connect(job, TQT_SIGNAL(data(TDEIO::Job*, const TQByteArray&)),
+            this, TQT_SLOT(data(TDEIO::Job*, const TQByteArray&)));
 
-    connect(job, TQT_SIGNAL(result(KIO::Job *)), 
-            this, TQT_SLOT(slotResult(KIO::Job *)));
+    connect(job, TQT_SIGNAL(result(TDEIO::Job *)), 
+            this, TQT_SLOT(slotResult(TDEIO::Job *)));
 
     m_state = FE_GETPHOTOPROPERTY;
     m_job   = job;
@@ -328,16 +328,16 @@ void PicasawebTalker::addPhotoTag(const TQString& photoURI, const TQString& tag)
     ts << addTagXML;
 
     TQString auth_string = "GoogleLogin auth=" + m_token;
-    KIO::TransferJob* job = KIO::http_post(postUrl, buffer, false);
+    TDEIO::TransferJob* job = TDEIO::http_post(postUrl, buffer, false);
     job->addMetaData("content-type", "Content-Type: application/atom+xml");
     job->addMetaData("content-length", TQString("Content-Length: %1").arg(addTagXML.length()));
     job->addMetaData("customHTTPHeader", "Authorization: " + auth_string );
 
-    //connect(job, TQT_SIGNAL(data(KIO::Job*, const TQByteArray&)),
-    //        this, TQT_SLOT(data(KIO::Job*, const TQByteArray&)));
+    //connect(job, TQT_SIGNAL(data(TDEIO::Job*, const TQByteArray&)),
+    //        this, TQT_SLOT(data(TDEIO::Job*, const TQByteArray&)));
 
-    connect(job, TQT_SIGNAL(result(KIO::Job *)),
-            this, TQT_SLOT(slotResult(KIO::Job *)));
+    connect(job, TQT_SIGNAL(result(TDEIO::Job *)),
+            this, TQT_SLOT(slotResult(TDEIO::Job *)));
 
     m_state = FE_ADDTAG;
     m_job   = job;
@@ -390,16 +390,16 @@ void PicasawebTalker::createAlbum(const TQString& albumTitle, const TQString& al
     MPForm form;
     TQString postUrl = "http://www.picasaweb.google.com/data/feed/api/user/" + m_username ;
     TQString auth_string = "GoogleLogin auth=" + m_token;
-    KIO::TransferJob* job = KIO::http_post(postUrl, buffer, false);
+    TDEIO::TransferJob* job = TDEIO::http_post(postUrl, buffer, false);
     job->addMetaData("content-type", "Content-Type: application/atom+xml");
     job->addMetaData("content-length", TQString("Content-Length: %1").arg(newAlbumXML.length()));
     job->addMetaData("customHTTPHeader", "Authorization: " + auth_string );
 
-    connect(job, TQT_SIGNAL(data(KIO::Job*, const TQByteArray&)),
-            this, TQT_SLOT(data(KIO::Job*, const TQByteArray&)));
+    connect(job, TQT_SIGNAL(data(TDEIO::Job*, const TQByteArray&)),
+            this, TQT_SLOT(data(TDEIO::Job*, const TQByteArray&)));
 
-    connect(job, TQT_SIGNAL(result(KIO::Job *)),
-            this, TQT_SLOT(slotResult(KIO::Job *)));
+    connect(job, TQT_SIGNAL(result(TDEIO::Job *)),
+            this, TQT_SLOT(slotResult(TDEIO::Job *)));
 
     m_state = FE_CREATEALBUM;
     m_job   = job;
@@ -493,15 +493,15 @@ bool PicasawebTalker::addPhoto(const TQString& photoPath, FPhotoInfo& info,
 
     form.finish();
 
-    KIO::TransferJob* job = KIO::http_post(postUrl, form.formData(), false);
+    TDEIO::TransferJob* job = TDEIO::http_post(postUrl, form.formData(), false);
     job->addMetaData("content-type", form.contentType());	
     job->addMetaData("customHTTPHeader", "Authorization: " + auth_string );
 
-    connect(job, TQT_SIGNAL(data(KIO::Job*, const TQByteArray&)),
-            this, TQT_SLOT(data(KIO::Job*, const TQByteArray&)));
+    connect(job, TQT_SIGNAL(data(TDEIO::Job*, const TQByteArray&)),
+            this, TQT_SLOT(data(TDEIO::Job*, const TQByteArray&)));
 
-    connect(job, TQT_SIGNAL(result(KIO::Job *)),
-            this, TQT_SLOT(slotResult(KIO::Job *)));
+    connect(job, TQT_SIGNAL(result(TDEIO::Job *)),
+            this, TQT_SLOT(slotResult(TDEIO::Job *)));
 
     m_state = FE_ADDPHOTO;
     m_job   = job;
@@ -532,11 +532,11 @@ void PicasawebTalker::cancel()
         authProgressDlg->hide();
 }
 
-void PicasawebTalker::info(KIO::Job* /*job*/, const TQString& /*str*/)
+void PicasawebTalker::info(TDEIO::Job* /*job*/, const TQString& /*str*/)
 {
 }
 
-void PicasawebTalker::data(KIO::Job*, const TQByteArray& data)
+void PicasawebTalker::data(TDEIO::Job*, const TQByteArray& data)
 {
     if (data.isEmpty())
         return;
@@ -597,7 +597,7 @@ void PicasawebTalker::slotError(const TQString & error)
     //kdDebug()<<"Not handling the error now will see it later"<<endl;
 }
 
-void PicasawebTalker::slotResult(KIO::Job *job)
+void PicasawebTalker::slotResult(TDEIO::Job *job)
 {
     m_job = 0;
     emit signalBusy(false);
diff --git a/kipi-plugins/picasawebexport/picasawebtalker.h b/kipi-plugins/picasawebexport/picasawebtalker.h
index d767939..26d1be8 100644
--- a/kipi-plugins/picasawebexport/picasawebtalker.h
+++ b/kipi-plugins/picasawebexport/picasawebtalker.h
@@ -36,7 +36,7 @@
 #include <kurl.h>
 #include <kio/jobclasses.h>
 
-namespace KIO
+namespace TDEIO
 {
     class Job;
 }
@@ -131,9 +131,9 @@ private slots:
 
     void slotError( const TQString& msg );
 //  void slotAuthenticate() ;	    
-    void data(KIO::Job *job, const TQByteArray &data);
-    void info(KIO::Job *job, const TQString& str);
-    void slotResult (KIO::Job *job);
+    void data(TDEIO::Job *job, const TQByteArray &data);
+    void info(TDEIO::Job *job, const TQString& str);
+    void slotResult (TDEIO::Job *job);
 
 private:
 
@@ -155,7 +155,7 @@ private:
     TQMap<TQString, TQStringList > tags_map;
 
 //  KURL       m_url;
-    KIO::Job*  m_job;
+    TDEIO::Job*  m_job;
 
     State      m_state;
 
diff --git a/kipi-plugins/rawconverter/batchdialog.cpp b/kipi-plugins/rawconverter/batchdialog.cpp
index 82ff60c..f1b818e 100644
--- a/kipi-plugins/rawconverter/batchdialog.cpp
+++ b/kipi-plugins/rawconverter/batchdialog.cpp
@@ -207,7 +207,7 @@ void BatchDialog::slotDefault()
 
 void BatchDialog::readSettings()
 {
-    KConfig config("kipirc");
+    TDEConfig config("kipirc");
     config.setGroup("RawConverter Settings");
 
     m_decodingSettingsBox->setWhiteBalance((KDcrawIface::RawDecodingSettings::WhiteBalance)
@@ -253,7 +253,7 @@ void BatchDialog::readSettings()
 
 void BatchDialog::saveSettings()
 {
-    KConfig config("kipirc");
+    TDEConfig config("kipirc");
     config.setGroup("RawConverter Settings");
 
     config.writeEntry("White Balance", m_decodingSettingsBox->whiteBalance());
@@ -519,21 +519,21 @@ void BatchDialog::processed(const TQString& file, const TQString& tmpFile)
         struct stat statBuf;
         if (::stat(TQFile::encodeName(destFile), &statBuf) == 0) 
         {
-            KIO::RenameDlg dlg(this, i18n("Save Raw Image converted from '%1' as")
+            TDEIO::RenameDlg dlg(this, i18n("Save Raw Image converted from '%1' as")
                                      .arg(m_currentConvertItem->src),
                                tmpFile, destFile,
-                               KIO::RenameDlg_Mode(KIO::M_SINGLE | KIO::M_OVERWRITE | KIO::M_SKIP));
+                               TDEIO::RenameDlg_Mode(TDEIO::M_SINGLE | TDEIO::M_OVERWRITE | TDEIO::M_SKIP));
 
             switch (dlg.exec())
             {
-                case KIO::R_CANCEL:
-                case KIO::R_SKIP:
+                case TDEIO::R_CANCEL:
+                case TDEIO::R_SKIP:
                 {
                     destFile = TQString();
                     m_currentConvertItem->viewItem->setPixmap(1, SmallIcon("cancel"));
                     break;
                 }
-                case KIO::R_RENAME:
+                case TDEIO::R_RENAME:
                 {
                     destFile = dlg.newDestURL().path();
                     break;
diff --git a/kipi-plugins/rawconverter/singledialog.cpp b/kipi-plugins/rawconverter/singledialog.cpp
index fdea7bd..13f4c2d 100644
--- a/kipi-plugins/rawconverter/singledialog.cpp
+++ b/kipi-plugins/rawconverter/singledialog.cpp
@@ -196,7 +196,7 @@ void SingleDialog::slotDefault()
 
 void SingleDialog::readSettings()
 {
-    KConfig config("kipirc");
+    TDEConfig config("kipirc");
     config.setGroup("RawConverter Settings");
 
     m_decodingSettingsBox->setWhiteBalance((KDcrawIface::RawDecodingSettings::WhiteBalance)
@@ -242,7 +242,7 @@ void SingleDialog::readSettings()
 
 void SingleDialog::saveSettings()
 {
-    KConfig config("kipirc");
+    TDEConfig config("kipirc");
     config.setGroup("RawConverter Settings");
 
     config.writeEntry("White Balance", m_decodingSettingsBox->whiteBalance());
@@ -433,19 +433,19 @@ void SingleDialog::processed(const TQString&, const TQString& tmpFile)
         struct stat statBuf;
         if (::stat(TQFile::encodeName(destFile), &statBuf) == 0) 
         {
-            KIO::RenameDlg dlg(this, i18n("Save Raw Image converted from '%1' as").arg(fi.fileName()),
+            TDEIO::RenameDlg dlg(this, i18n("Save Raw Image converted from '%1' as").arg(fi.fileName()),
                                tmpFile, destFile,
-                               KIO::RenameDlg_Mode(KIO::M_SINGLE | KIO::M_OVERWRITE | KIO::M_SKIP));
+                               TDEIO::RenameDlg_Mode(TDEIO::M_SINGLE | TDEIO::M_OVERWRITE | TDEIO::M_SKIP));
 
             switch (dlg.exec())
             {
-                case KIO::R_CANCEL:
-                case KIO::R_SKIP:
+                case TDEIO::R_CANCEL:
+                case TDEIO::R_SKIP:
                 {
                     destFile = TQString();
                     break;
                 }
-                case KIO::R_RENAME:
+                case TDEIO::R_RENAME:
                 {
                     destFile = dlg.newDestURL().path();
                     break;
diff --git a/kipi-plugins/sendimages/sendimagesdialog.cpp b/kipi-plugins/sendimages/sendimagesdialog.cpp
index 4d3c3c3..5e9ade4 100644
--- a/kipi-plugins/sendimages/sendimagesdialog.cpp
+++ b/kipi-plugins/sendimages/sendimagesdialog.cpp
@@ -191,7 +191,7 @@ void SendImagesDialog::readSettings(void)
 {
     // Read all settings from configuration file.
     
-    KConfig config("kipirc");
+    TDEConfig config("kipirc");
     config.setGroup("SendImages Settings");
 
     TQString t = config.readEntry("MailAgentName", "Default");
@@ -230,7 +230,7 @@ void SendImagesDialog::writeSettings(void)
 {
     // Write all settings in configuration file.
 
-    KConfig config("kipirc");
+    TDEConfig config("kipirc");
     config.setGroup("SendImages Settings");
     config.writeEntry("MailAgentName", m_mailAgentName->currentText());
     config.writeEntry("ThunderbirdBinPath", m_ThunderbirdBinPath->url());
@@ -627,7 +627,7 @@ void SendImagesDialog::slotImageSelected( TQListBoxItem * item )
     if ( m_thumbJob ) 
         delete m_thumbJob;
 
-    m_thumbJob = KIO::filePreview( pitem->url(), m_imageLabel->height() );
+    m_thumbJob = TDEIO::filePreview( pitem->url(), m_imageLabel->height() );
 
     connect(m_thumbJob, TQT_SIGNAL(gotPreview(const KFileItem*, const TQPixmap&)),
             TQT_SLOT(slotGotPreview(const KFileItem*, const TQPixmap&)));
diff --git a/kipi-plugins/sendimages/sendimagesdialog.h b/kipi-plugins/sendimages/sendimagesdialog.h
index 547309a..4817d4a 100644
--- a/kipi-plugins/sendimages/sendimagesdialog.h
+++ b/kipi-plugins/sendimages/sendimagesdialog.h
@@ -164,7 +164,7 @@ private:
    KSqueezedTextLabel       *m_ImageAlbum;
    
    KIPI::Interface          *m_interface;
-   KIO::PreviewJob          *m_thumbJob;
+   TDEIO::PreviewJob          *m_thumbJob;
 
    KIPIPlugins::KPAboutData *m_about;
    ListImageItems           *m_ImagesFilesListBox;
diff --git a/kipi-plugins/simpleviewerexport/simpleviewerexport.cpp b/kipi-plugins/simpleviewerexport/simpleviewerexport.cpp
index 9f148d2..1d16148 100644
--- a/kipi-plugins/simpleviewerexport/simpleviewerexport.cpp
+++ b/kipi-plugins/simpleviewerexport/simpleviewerexport.cpp
@@ -144,7 +144,7 @@ bool SimpleViewerExport::configure()
 
         configured = true;
 
-        if(KIO::NetAccess::exists(m_configDlg->exportURL(), false, TQT_TQWIDGET(kapp->activeWindow())))
+        if(TDEIO::NetAccess::exists(m_configDlg->exportURL(), false, TQT_TQWIDGET(kapp->activeWindow())))
         {
             int ret = KMessageBox::warningYesNoCancel(TQT_TQWIDGET(kapp->activeWindow()),
                                                       i18n("Target folder %1 already exists.\n"
@@ -154,7 +154,7 @@ bool SimpleViewerExport::configure()
             switch(ret)
             {
                 case KMessageBox::Yes:
-                    if(!KIO::NetAccess::del(m_configDlg->exportURL(), TQT_TQWIDGET(kapp->activeWindow())))
+                    if(!TDEIO::NetAccess::del(m_configDlg->exportURL(), TQT_TQWIDGET(kapp->activeWindow())))
                     {
                         KMessageBox::error(TQT_TQWIDGET(kapp->activeWindow()), i18n("Could not delete %1\n"
                                 "Please choose another export folder").arg(m_configDlg->exportURL()));
@@ -270,7 +270,7 @@ void SimpleViewerExport::slotProcess()
                                             .arg(m_configDlg->exportURL()));
         if(ret == KMessageBox::Yes)
         {
-            KIO::NetAccess::del(m_configDlg->exportURL(), TQT_TQWIDGET(kapp->activeWindow()));
+            TDEIO::NetAccess::del(m_configDlg->exportURL(), TQT_TQWIDGET(kapp->activeWindow()));
         }
     }
 
@@ -286,7 +286,7 @@ bool SimpleViewerExport::createExportDirectories()
     m_progressDlg->addedAction(i18n("Creating directories..."), KIPI::StartingMessage);
 
     KURL root = m_configDlg->exportURL();
-    if(!KIO::NetAccess::mkdir(root, TQT_TQWIDGET(kapp->activeWindow())))
+    if(!TDEIO::NetAccess::mkdir(root, TQT_TQWIDGET(kapp->activeWindow())))
     {
         m_progressDlg->addedAction(i18n("Could not create folder '%1'").arg(root.url()),
                                    KIPI::ErrorMessage);
@@ -295,7 +295,7 @@ bool SimpleViewerExport::createExportDirectories()
 
     KURL thumbsDir = m_tempDir->name();
     thumbsDir.addPath("/thumbs");
-    if(!KIO::NetAccess::mkdir(thumbsDir, TQT_TQWIDGET(kapp->activeWindow())))
+    if(!TDEIO::NetAccess::mkdir(thumbsDir, TQT_TQWIDGET(kapp->activeWindow())))
     {
         m_progressDlg->addedAction(i18n("Could not create folder '%1'").arg(thumbsDir.url()),
                                    KIPI::ErrorMessage);
@@ -304,7 +304,7 @@ bool SimpleViewerExport::createExportDirectories()
 
     KURL imagesDir = m_tempDir->name();
     imagesDir.addPath("/images");
-    if(!KIO::NetAccess::mkdir(imagesDir, TQT_TQWIDGET(kapp->activeWindow())))
+    if(!TDEIO::NetAccess::mkdir(imagesDir, TQT_TQWIDGET(kapp->activeWindow())))
     {
         m_progressDlg->addedAction(i18n("Could not create folder '%1'").arg(imagesDir.url()),
                                    KIPI::ErrorMessage);
@@ -599,7 +599,7 @@ bool SimpleViewerExport::copySimpleViewer()
         files.append(dir.absPath() + "/" + *it);
     }
     // TODO: catch errors
-    KIO::CopyJob *copyJob = KIO::copy(files, m_configDlg->exportURL(), true);
+    TDEIO::CopyJob *copyJob = TDEIO::copy(files, m_configDlg->exportURL(), true);
 
     m_progressDlg->addedAction(i18n("flash files copied..."), KIPI::SuccessMessage);
 
@@ -613,7 +613,7 @@ bool SimpleViewerExport::upload()
 
     m_progressDlg->addedAction(i18n("Uploading gallery..."), KIPI::StartingMessage);
 
-    if(!KIO::NetAccess::dircopy(m_tempDir->name() + "./", m_configDlg->exportURL(), 0))
+    if(!TDEIO::NetAccess::dircopy(m_tempDir->name() + "./", m_configDlg->exportURL(), 0))
         return false;
 
     m_progressDlg->addedAction(i18n("Gallery uploaded..."), KIPI::SuccessMessage);
diff --git a/kipi-plugins/simpleviewerexport/svedialog.cpp b/kipi-plugins/simpleviewerexport/svedialog.cpp
index d23e42b..1bb0467 100644
--- a/kipi-plugins/simpleviewerexport/svedialog.cpp
+++ b/kipi-plugins/simpleviewerexport/svedialog.cpp
@@ -122,7 +122,7 @@ void SVEDialog::slotHelp()
 
 void SVEDialog::readConfig()
 {
-    KConfig config("kipirc");
+    TDEConfig config("kipirc");
 
     setThumbnailRows(config.readNumEntry("thumbnailRows", 3));
     setThumbnailColumns(config.readNumEntry("thumbnailColumns", 3));
@@ -145,7 +145,7 @@ void SVEDialog::readConfig()
 
 void SVEDialog::writeConfig()
 {
-    KConfig config("kipirc");
+    TDEConfig config("kipirc");
     config.writeEntry("thumbnailRows", thumbnailRows());
     config.writeEntry("thumbnailColumns", thumbnailColumns());
     config.writeEntry("navPosition", m_navPosition->currentItem());
diff --git a/kipi-plugins/simpleviewerexport/svedialog.h b/kipi-plugins/simpleviewerexport/svedialog.h
index d1ec07a..d85faf8 100644
--- a/kipi-plugins/simpleviewerexport/svedialog.h
+++ b/kipi-plugins/simpleviewerexport/svedialog.h
@@ -44,7 +44,7 @@ class KLineEdit;
 class KIntNumInput;
 class KColorButton;
 class KURLRequester;
-class KConfig;
+class TDEConfig;
 
 namespace KIPI
 {
diff --git a/kipi-plugins/slideshow/plugin_slideshow.cpp b/kipi-plugins/slideshow/plugin_slideshow.cpp
index 428f2da..b8ebf3b 100644
--- a/kipi-plugins/slideshow/plugin_slideshow.cpp
+++ b/kipi-plugins/slideshow/plugin_slideshow.cpp
@@ -176,7 +176,7 @@ void Plugin_SlideShow::slotSlideShow()
            return;
     }
 
-    KConfig config("kipirc");
+    TDEConfig config("kipirc");
      
     bool    opengl;
     bool    shuffle;
diff --git a/kipi-plugins/slideshow/slideshow.cpp b/kipi-plugins/slideshow/slideshow.cpp
index 2860081..335d250 100644
--- a/kipi-plugins/slideshow/slideshow.cpp
+++ b/kipi-plugins/slideshow/slideshow.cpp
@@ -120,7 +120,7 @@ SlideShow::SlideShow(const FileList& fileList, const TQStringList& commentsList,
     m_commentsList      = commentsList;
     m_ImagesHasComments = ImagesHasComments; 
 
-    m_config = new KConfig("kipirc");
+    m_config = new TDEConfig("kipirc");
     m_config->setGroup("SlideShow Settings");
 
     readSettings();
diff --git a/kipi-plugins/slideshow/slideshow.h b/kipi-plugins/slideshow/slideshow.h
index 30fdd0c..6f01feb 100644
--- a/kipi-plugins/slideshow/slideshow.h
+++ b/kipi-plugins/slideshow/slideshow.h
@@ -132,7 +132,7 @@ private:
 
     // config ------------------
     
-    KConfig*    m_config;
+    TDEConfig*    m_config;
     
     int         m_delay;
     bool        m_printName;
diff --git a/kipi-plugins/slideshow/slideshowconfig.cpp b/kipi-plugins/slideshow/slideshowconfig.cpp
index 80ee37f..ac01a78 100644
--- a/kipi-plugins/slideshow/slideshowconfig.cpp
+++ b/kipi-plugins/slideshow/slideshowconfig.cpp
@@ -143,7 +143,7 @@ SlideShowConfig::SlideShowConfig(bool allowSelectedOnly, KIPI::Interface * inter
     
     // Configuration file management 
 
-    m_config = new KConfig("kipirc");
+    m_config = new TDEConfig("kipirc");
     m_config->setGroup("SlideShow Settings");
 
     readSettings();
@@ -607,7 +607,7 @@ void SlideShowConfig::slotImagesFilesSelected( TQListBoxItem *item )
 
     if ( m_thumbJob ) delete m_thumbJob;
 
-    m_thumbJob = KIO::filePreview( url, m_ImageLabel->width() );
+    m_thumbJob = TDEIO::filePreview( url, m_ImageLabel->width() );
 
     connect(m_thumbJob, TQT_SIGNAL(gotPreview(const KFileItem*, const TQPixmap&)),
             TQT_SLOT(slotGotPreview(const KFileItem*, const TQPixmap&)));
diff --git a/kipi-plugins/slideshow/slideshowconfig.h b/kipi-plugins/slideshow/slideshowconfig.h
index af67034..a75e2cd 100644
--- a/kipi-plugins/slideshow/slideshowconfig.h
+++ b/kipi-plugins/slideshow/slideshowconfig.h
@@ -106,12 +106,12 @@ private:
     
     uint             m_cacheSize;
     
-    KConfig*         m_config;
+    TDEConfig*         m_config;
     
     TQString          m_effectName;
     TQString          m_effectNameGL;
     
-    KIO::PreviewJob* m_thumbJob;
+    TDEIO::PreviewJob* m_thumbJob;
     KURL::List*      m_urlList;
     
     KIPI::Interface* m_interface;
diff --git a/kipi-plugins/slideshow/slideshowgl.cpp b/kipi-plugins/slideshow/slideshowgl.cpp
index 51fc366..e5fc13a 100644
--- a/kipi-plugins/slideshow/slideshowgl.cpp
+++ b/kipi-plugins/slideshow/slideshowgl.cpp
@@ -98,7 +98,7 @@ SlideShowGL::SlideShowGL(const TQValueList<TQPair<TQString, int> >& fileList,
 
     m_imagesHasComments   = ImagesHasComments;
 
-    m_config = new KConfig("kipirc");
+    m_config = new TDEConfig("kipirc");
     m_config->setGroup("SlideShow Settings");
 
     readSettings();
diff --git a/kipi-plugins/slideshow/slideshowgl.h b/kipi-plugins/slideshow/slideshowgl.h
index dd8163d..606ca76 100644
--- a/kipi-plugins/slideshow/slideshowgl.h
+++ b/kipi-plugins/slideshow/slideshowgl.h
@@ -75,7 +75,7 @@ namespace KIPISlideShowPlugin
     
         // config ------------------
     
-        KConfig*    m_config;
+        TDEConfig*    m_config;
         
         int         m_delay;
         TQString     m_effectName;
diff --git a/kipi-plugins/slideshow/slideshowkb.cpp b/kipi-plugins/slideshow/slideshowkb.cpp
index 1be1c86..80c256b 100644
--- a/kipi-plugins/slideshow/slideshowkb.cpp
+++ b/kipi-plugins/slideshow/slideshowkb.cpp
@@ -168,7 +168,7 @@ namespace KIPISlideShowPlugin
 
       srand(TQTime::currentTime().msec());
 
-      m_config = new KConfig("kipirc");
+      m_config = new TDEConfig("kipirc");
       m_config->setGroup("SlideShow Settings");
       readSettings();
 
diff --git a/kipi-plugins/slideshow/slideshowkb.h b/kipi-plugins/slideshow/slideshowkb.h
index 756e7c5..2f24600 100644
--- a/kipi-plugins/slideshow/slideshowkb.h
+++ b/kipi-plugins/slideshow/slideshowkb.h
@@ -157,7 +157,7 @@ namespace KIPISlideShowPlugin
       int m_deskWidth;
       int m_deskHeight;
 
-      KConfig* m_config;
+      TDEConfig* m_config;
       
       bool m_imagesHasComments;
       TQStringList  m_commentsList;
diff --git a/kipi-plugins/sync/gallerywindow.cpp b/kipi-plugins/sync/gallerywindow.cpp
index b7dfbe6..166f6cd 100644
--- a/kipi-plugins/sync/gallerywindow.cpp
+++ b/kipi-plugins/sync/gallerywindow.cpp
@@ -128,7 +128,7 @@ GalleryWindow::GalleryWindow(KIPI::Interface* interface, TQWidget *parent, Galle
     connect(m_addPhotoBtn, TQT_SIGNAL(clicked()), TQT_SLOT( slotAddPhotos()));
 
     // read config
-    KConfig config("kipirc");
+    TDEConfig config("kipirc");
     config.setGroup("GallerySync Settings");
 
     m_talker = new GalleryTalker( this );
@@ -165,7 +165,7 @@ GalleryWindow::GalleryWindow(KIPI::Interface* interface, TQWidget *parent, Galle
 GalleryWindow::~GalleryWindow()
 {
     // write config
-    KConfig config("kipirc");
+    TDEConfig config("kipirc");
     config.setGroup("GallerySync Settings");
     config.writeEntry("Resize", m_resizeCheckBox->isChecked());
     config.writeEntry("Maximum Width",  m_dimensionSpinBox->value());
diff --git a/kipi-plugins/sync/sink.cpp b/kipi-plugins/sync/sink.cpp
index 2c2dfec..00f59b8 100644
--- a/kipi-plugins/sync/sink.cpp
+++ b/kipi-plugins/sync/sink.cpp
@@ -23,7 +23,7 @@
 namespace KIPISyncPlugin
 {
 
-Sink::Sink(unsigned int sinkId, TQString name, KConfig*, KWallet::Wallet*)
+Sink::Sink(unsigned int sinkId, TQString name, TDEConfig*, KWallet::Wallet*)
  : mSinkId(sinkId),
    mName(name)
 {
@@ -80,7 +80,7 @@ void Sink::asTQListViewItem(TQListView* pParent)
 */
 
 // Pretend sink (just for testin the structure - will be removed!)
-Sink2::Sink2(unsigned int sinkId, TQString name, KConfig* pConfig, KWallet::Wallet* pWallet)
+Sink2::Sink2(unsigned int sinkId, TQString name, TDEConfig* pConfig, KWallet::Wallet* pWallet)
  : Sink(sinkId, name, pConfig, pWallet)
 {
   mName = "Sink2";
@@ -95,7 +95,7 @@ KIPI2::CollectionList* Sink2::getCollections()
   return (KIPI2::CollectionList*) NULL;
 }
 
-void Sink2::Save(KConfig*, KWallet::Wallet*)
+void Sink2::Save(TDEConfig*, KWallet::Wallet*)
 {
   
 }
diff --git a/kipi-plugins/sync/sink.h b/kipi-plugins/sync/sink.h
index a8f9b25..bfdddc8 100644
--- a/kipi-plugins/sync/sink.h
+++ b/kipi-plugins/sync/sink.h
@@ -41,7 +41,7 @@ namespace KIPISyncPlugin
 class Sink : public KIPI2::Interface
 {
 public:
-  Sink(unsigned int sinkId, TQString name, KConfig* pConfig, KWallet::Wallet* pWallet);
+  Sink(unsigned int sinkId, TQString name, TDEConfig* pConfig, KWallet::Wallet* pWallet);
 
   unsigned int SinkId();
 
@@ -56,7 +56,7 @@ public:
   
   virtual const KIPI2::CollectionList* getCollections() = 0;
 
-  virtual void Save(KConfig* pConfig, KWallet::Wallet* pWallet) = 0;
+  virtual void Save(TDEConfig* pConfig, KWallet::Wallet* pWallet) = 0;
   
   // As some Sinks are remote, we have the concept of connect/disconnect
   virtual bool Connect() { return true; };
@@ -77,11 +77,11 @@ protected:
 class Sink2 : Sink
 {
 public:
-  Sink2(unsigned int sinkId, TQString name, KConfig* pConfig, KWallet::Wallet* pWallet);
+  Sink2(unsigned int sinkId, TQString name, TDEConfig* pConfig, KWallet::Wallet* pWallet);
   TQString Type();
   TQString TypeDescription();
   KIPI2::CollectionList* getCollections();
-  void Save(KConfig* pConfig, KWallet::Wallet* pWallet);
+  void Save(TDEConfig* pConfig, KWallet::Wallet* pWallet);
 };
 
 
diff --git a/kipi-plugins/sync/sinkfactory.cpp b/kipi-plugins/sync/sinkfactory.cpp
index 3a528ee..fb4c06c 100644
--- a/kipi-plugins/sync/sinkfactory.cpp
+++ b/kipi-plugins/sync/sinkfactory.cpp
@@ -35,7 +35,7 @@ bool SinkFactory::Register(TQString type, SinkProxy* pSinkProxy)
 }
 
 // The main creation method
-Sink* SinkFactory::Create(TQString type, unsigned int sinkId, TQString name, KConfig* pConfig, KWallet::Wallet* pWallet)
+Sink* SinkFactory::Create(TQString type, unsigned int sinkId, TQString name, TDEConfig* pConfig, KWallet::Wallet* pWallet)
 {
   if (!mSinkProxies.contains(type))
     return NULL;
diff --git a/kipi-plugins/sync/sinkfactory.h b/kipi-plugins/sync/sinkfactory.h
index dd0bd0d..e570e78 100644
--- a/kipi-plugins/sync/sinkfactory.h
+++ b/kipi-plugins/sync/sinkfactory.h
@@ -21,7 +21,7 @@
 
 #include <tqmap.h>
 class TQListView;
-class KConfig;
+class TDEConfig;
 namespace KWallet
 {
 class Wallet;
@@ -35,13 +35,13 @@ class Sink;
 // Create a templated creator function to allow our "sinks" to
 // register themselves with the factory.
 template <class T>
-Sink* SinkCreator(unsigned int sinkId, TQString name, KConfig* pConfig, KWallet::Wallet* pWallet)
+Sink* SinkCreator(unsigned int sinkId, TQString name, TDEConfig* pConfig, KWallet::Wallet* pWallet)
 {
   return (Sink*) new T(sinkId, name, pConfig, pWallet);
 }
 
 // Define a type that is a pointer to the templated function above.
-typedef Sink* SinkProxy(unsigned int sinkId, TQString name, KConfig* pConfig, KWallet::Wallet* pWallet);
+typedef Sink* SinkProxy(unsigned int sinkId, TQString name, TDEConfig* pConfig, KWallet::Wallet* pWallet);
 
 // And define a type that is a Map of names to creator functions.
 typedef TQMap<TQString, SinkProxy*> SinkMap;
@@ -51,7 +51,7 @@ class SinkFactory
 {
 public:
   static bool Register(TQString name, SinkProxy* pSinkProxy);
-  static Sink* Create(TQString name, unsigned int sinkId, TQString name, KConfig* pConfig, KWallet::Wallet* pWallet);
+  static Sink* Create(TQString name, unsigned int sinkId, TQString name, TDEConfig* pConfig, KWallet::Wallet* pWallet);
 
 private:
   static SinkMap mSinkProxies;
diff --git a/kipi-plugins/sync/sinks.cpp b/kipi-plugins/sync/sinks.cpp
index 7acd734..ea6d9ed 100644
--- a/kipi-plugins/sync/sinks.cpp
+++ b/kipi-plugins/sync/sinks.cpp
@@ -83,7 +83,7 @@ Sinks::Sinks()
 #endif
 
   // Read config
-  KConfig config("kipirc");
+  TDEConfig config("kipirc");
   config.setGroup("Sync Settings");
   TQValueList<int> sink_ids = config.readIntListEntry("Sinks");
 
@@ -145,7 +145,7 @@ void Sinks::Remove(Sink* pSink)
 void Sinks::Save()
 {
   TQValueList<int> sink_ids;
-  KConfig config("kipirc");
+  TDEConfig config("kipirc");
   config.deleteGroup("Sync Sinks");
   config.setGroup("Sync Sinks");
 
diff --git a/kipi-plugins/sync/sinks/gallery/gallerysink.cpp b/kipi-plugins/sync/sinks/gallery/gallerysink.cpp
index c40b725..ab26a2d 100644
--- a/kipi-plugins/sync/sinks/gallery/gallerysink.cpp
+++ b/kipi-plugins/sync/sinks/gallery/gallerysink.cpp
@@ -44,7 +44,7 @@
 namespace KIPISyncPlugin
 {
 
-GallerySink::GallerySink(unsigned int sinkId, TQString name, KConfig* pConfig, KWallet::Wallet* pWallet, GalleryVersion version)
+GallerySink::GallerySink(unsigned int sinkId, TQString name, TDEConfig* pConfig, KWallet::Wallet* pWallet, GalleryVersion version)
   : Sink(sinkId, name, pConfig, pWallet),
     mVersion(version), 
     mAuthToken(""), 
@@ -70,7 +70,7 @@ const KIPI2::CollectionList* GallerySink::getCollections()
   return NULL;
 }
   
-void GallerySink::Save(KConfig* pConfig, KWallet::Wallet* pWallet)
+void GallerySink::Save(TDEConfig* pConfig, KWallet::Wallet* pWallet)
 {
   pConfig->writeEntry(TQString("Name%1").arg(mSinkId), mName);
   pConfig->writeEntry(TQString("Type%1").arg(mSinkId), Type());
@@ -97,13 +97,13 @@ bool GallerySink::Connect()
     form.addPair("uname",            mUsername);
     form.addPair("password",         mPassword);
 
-    KIO::TransferJob* job = KIO::http_post(mURL, form.formData(), false);
+    TDEIO::TransferJob* job = TDEIO::http_post(mURL, form.formData(), false);
     job->addMetaData("content-type", form.contentType() );
     job->addMetaData("cookies", "manual");
-    connect(job, TQT_SIGNAL(data(KIO::Job*, const TQByteArray&)),
-            TQT_SLOT(data(KIO::Job*, const TQByteArray&)));
-    connect(job, TQT_SIGNAL(result(KIO::Job *)),
-            TQT_SLOT(slotResult(KIO::Job *)));
+    connect(job, TQT_SIGNAL(data(TDEIO::Job*, const TQByteArray&)),
+            TQT_SLOT(data(TDEIO::Job*, const TQByteArray&)));
+    connect(job, TQT_SIGNAL(result(TDEIO::Job *)),
+            TQT_SLOT(slotResult(TDEIO::Job *)));
 
     mState = GE_LOGIN;
     mpJob   = job;
@@ -122,14 +122,14 @@ void GallerySink::listAlbums()
     form.addPair("cmd",              task);
     form.addPair("protocol_version", "2.3");
 
-    KIO::TransferJob* job = KIO::http_post(m_url, form.formData(), false);
+    TDEIO::TransferJob* job = TDEIO::http_post(m_url, form.formData(), false);
     job->addMetaData("content-type", form.contentType() );
     job->addMetaData("cookies", "manual");
     job->addMetaData("setcookies", m_cookie);
-    connect(job, TQT_SIGNAL(data(KIO::Job*, const TQByteArray&)),
-            TQT_SLOT(data(KIO::Job*, const TQByteArray&)));
-    connect(job, TQT_SIGNAL(result(KIO::Job *)),
-            TQT_SLOT(slotResult(KIO::Job *)));
+    connect(job, TQT_SIGNAL(data(TDEIO::Job*, const TQByteArray&)),
+            TQT_SLOT(data(TDEIO::Job*, const TQByteArray&)));
+    connect(job, TQT_SIGNAL(result(TDEIO::Job *)),
+            TQT_SLOT(slotResult(TDEIO::Job *)));
 
     mState = GE_LISTALBUMS;
     mpJob   = job;
@@ -151,14 +151,14 @@ void GallerySink::listPhotos( const TQString& albumName )
     form.addPair("protocol_version", "2.3");
     form.addPair("set_albumName",    albumName);
 
-    KIO::TransferJob* job = KIO::http_post(m_url, form.formData(), false);
+    TDEIO::TransferJob* job = TDEIO::http_post(m_url, form.formData(), false);
     job->addMetaData("content-type", form.contentType() );
     job->addMetaData("cookies", "manual");
     job->addMetaData("setcookies", m_cookie);
-    connect(job, TQT_SIGNAL(data(KIO::Job*, const TQByteArray&)),
-            TQT_SLOT(data(KIO::Job*, const TQByteArray&)));
-    connect(job, TQT_SIGNAL(result(KIO::Job *)),
-            TQT_SLOT(slotResult(KIO::Job *)));
+    connect(job, TQT_SIGNAL(data(TDEIO::Job*, const TQByteArray&)),
+            TQT_SLOT(data(TDEIO::Job*, const TQByteArray&)));
+    connect(job, TQT_SIGNAL(result(TDEIO::Job *)),
+            TQT_SLOT(slotResult(TDEIO::Job *)));
 
     mState = GE_LISTPHOTOS;
     mpJob   = job;
@@ -189,14 +189,14 @@ void GallerySink::createAlbum( const TQString& parentAlbumName,
     if (!albumCaption.isEmpty())
         form.addPair("newAlbumDesc", albumCaption);
 
-    KIO::TransferJob* job = KIO::http_post(m_url, form.formData(), false);
+    TDEIO::TransferJob* job = TDEIO::http_post(m_url, form.formData(), false);
     job->addMetaData("content-type", form.contentType() );
     job->addMetaData("cookies", "manual");
     job->addMetaData("setcookies", m_cookie);
-    connect(job, TQT_SIGNAL(data(KIO::Job*, const TQByteArray&)),
-            TQT_SLOT(data(KIO::Job*, const TQByteArray&)));
-    connect(job, TQT_SIGNAL(result(KIO::Job *)),
-            TQT_SLOT(slotResult(KIO::Job *)));
+    connect(job, TQT_SIGNAL(data(TDEIO::Job*, const TQByteArray&)),
+            TQT_SLOT(data(TDEIO::Job*, const TQByteArray&)));
+    connect(job, TQT_SIGNAL(result(TDEIO::Job *)),
+            TQT_SLOT(slotResult(TDEIO::Job *)));
 
     mState = GE_CREATEALBUM;
     mpJob   = job;
@@ -256,14 +256,14 @@ bool GallerySink::addPhoto( const TQString& albumName,
     if (!form.addFile(path, display_filename))
         return false;
 
-    KIO::TransferJob* job = KIO::http_post(m_url, form.formData(), false);
+    TDEIO::TransferJob* job = TDEIO::http_post(m_url, form.formData(), false);
     job->addMetaData("content-type", form.contentType());
     job->addMetaData("cookies", "manual");
     job->addMetaData("setcookies", m_cookie);
-    connect(job, TQT_SIGNAL(data(KIO::Job*, const TQByteArray&)),
-            TQT_SLOT(data(KIO::Job*, const TQByteArray&)));
-    connect(job, TQT_SIGNAL(result(KIO::Job *)),
-            TQT_SLOT(slotResult(KIO::Job *)));
+    connect(job, TQT_SIGNAL(data(TDEIO::Job*, const TQByteArray&)),
+            TQT_SLOT(data(TDEIO::Job*, const TQByteArray&)));
+    connect(job, TQT_SIGNAL(result(TDEIO::Job *)),
+            TQT_SLOT(slotResult(TDEIO::Job *)));
 
     mState = GE_ADDPHOTO;
     mpJob   = job;
@@ -282,7 +282,7 @@ void GallerySink::cancel()
     }
 }
 
-void GallerySink::data(KIO::Job*, const TQByteArray& data)
+void GallerySink::data(TDEIO::Job*, const TQByteArray& data)
 {
     if (data.isEmpty())
         return;
@@ -292,7 +292,7 @@ void GallerySink::data(KIO::Job*, const TQByteArray& data)
     memcpy(mBuffer.data()+oldSize, data.data(), data.size());
 }
 
-void GallerySink::slotResult(KIO::Job *job)
+void GallerySink::slotResult(TDEIO::Job *job)
 {
     mpJob = 0;
     emit signalBusy( false );
diff --git a/kipi-plugins/sync/sinks/gallery/gallerysink.h b/kipi-plugins/sync/sinks/gallery/gallerysink.h
index 3b5cef4..096d88d 100644
--- a/kipi-plugins/sync/sinks/gallery/gallerysink.h
+++ b/kipi-plugins/sync/sinks/gallery/gallerysink.h
@@ -26,7 +26,7 @@
 #include "../../sink.h"
 #include "galleryform.h"
 
-namespace KIO
+namespace TDEIO
 {
     class Job;
 }
@@ -51,12 +51,12 @@ public:
       GE_ADDPHOTO
   };
 
-  GallerySink(unsigned int sinkId, TQString name, KConfig* pConfig, KWallet::Wallet* pWallet, GalleryVersion version);
+  GallerySink(unsigned int sinkId, TQString name, TDEConfig* pConfig, KWallet::Wallet* pWallet, GalleryVersion version);
   ~GallerySink();
 
   const KIPI2::CollectionList* getCollections();
   
-  void Save(KConfig* pConfig, KWallet::Wallet* pWallet);
+  void Save(TDEConfig* pConfig, KWallet::Wallet* pWallet);
   
   bool Connect();
 
@@ -90,7 +90,7 @@ private:
   State          mState;
   TQString    m_cookie;
   KURL       m_url;
-  KIO::Job*      mpJob;
+  TDEIO::Job*      mpJob;
   bool       m_loggedIn;
   TQByteArray     mBuffer;
   /*
@@ -110,8 +110,8 @@ signals:
   void signalAddPhotoFailed( const TQString& msg );
 
 private slots:
-  void data(KIO::Job *job, const TQByteArray &data);
-  void slotResult (KIO::Job *job);
+  void data(TDEIO::Job *job, const TQByteArray &data);
+  void slotResult (TDEIO::Job *job);
   */
 };
 
diff --git a/kipi-plugins/timeadjust/timeadjustdialog.cpp b/kipi-plugins/timeadjust/timeadjustdialog.cpp
index 0c580f3..1755486 100644
--- a/kipi-plugins/timeadjust/timeadjustdialog.cpp
+++ b/kipi-plugins/timeadjust/timeadjustdialog.cpp
@@ -319,7 +319,7 @@ void TimeAdjustDialog::slotCancel()
 
 void TimeAdjustDialog::readSettings()
 {
-    KConfig config("kipirc");
+    TDEConfig config("kipirc");
     config.setGroup("Time Adjust Settings");
 
     int adjType = config.readNumEntry("Adjustment Type", 0);   // add by default.
@@ -338,7 +338,7 @@ void TimeAdjustDialog::readSettings()
 
 void TimeAdjustDialog::saveSettings()
 {
-    KConfig config("kipirc");
+    TDEConfig config("kipirc");
     config.setGroup("Time Adjust Settings");
 
     int adjType = 0;              // add
diff --git a/kipi-plugins/wallpaper/plugin_wallpaper.cpp b/kipi-plugins/wallpaper/plugin_wallpaper.cpp
index d99868d..d1a0f25 100644
--- a/kipi-plugins/wallpaper/plugin_wallpaper.cpp
+++ b/kipi-plugins/wallpaper/plugin_wallpaper.cpp
@@ -247,9 +247,9 @@ void Plugin_WallPaper::setWallpaper(int layout)
 
       if (path.isNull()) return;
 #if TDE_VERSION > 0x30200
-      KIO::NetAccess::download(url, path, 0L);
+      TDEIO::NetAccess::download(url, path, 0L);
 #else
-      KIO::NetAccess::download(url, path);
+      TDEIO::NetAccess::download(url, path);
 #endif
       }