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

4 files changed, 38 insertions, 38 deletions

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&)));