From 3f411709672277eadec7ae3cb9bb52d8fcb1ea06 Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Fri, 25 Jan 2013 00:18:05 -0600
Subject: Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid
 conflicts with KDE4

---
 libkipi/libkipi/imagecollectionselector.cpp | 2 +-
 libkipi/libkipi/imagedialog.cpp             | 4 ++--
 libkipi/libkipi/pluginloader.cpp            | 4 ++--
 libkipi/libkipi/uploadwidget.cpp            | 8 ++++----
 libkipi/libkipi/uploadwidget.h              | 2 +-
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/libkipi/libkipi/imagecollectionselector.cpp b/libkipi/libkipi/imagecollectionselector.cpp
index 7c98990..004ec22 100644
--- a/libkipi/libkipi/imagecollectionselector.cpp
+++ b/libkipi/libkipi/imagecollectionselector.cpp
@@ -265,7 +265,7 @@ void ImageCollectionSelector::slotSelectionChanged(TQListViewItem* listItem)
         KURL::List images(imcollItem->imageCollection().images());
         if (!images.isEmpty())
         {
-            KIO::PreviewJob* thumbJob = KIO::filePreview(images.first(), 128);
+            TDEIO::PreviewJob* thumbJob = TDEIO::filePreview(images.first(), 128);
             connect( thumbJob, TQT_SIGNAL(gotPreview(const KFileItem*, const TQPixmap&)),
                      TQT_SLOT(slotGotPreview(const KFileItem* , const TQPixmap&)));
         }
diff --git a/libkipi/libkipi/imagedialog.cpp b/libkipi/libkipi/imagedialog.cpp
index 75009e1..1d209ce 100644
--- a/libkipi/libkipi/imagedialog.cpp
+++ b/libkipi/libkipi/imagedialog.cpp
@@ -245,7 +245,7 @@ void ImageDialog::slotImageSelected(TQListViewItem* item) {
     d->_url=static_cast<ImageLVI*>(item)->_url;
     d->_preview->clear();
 
-    KIO::PreviewJob* thumbJob = KIO::filePreview(d->_url, PREVIEW_SIZE);
+    TDEIO::PreviewJob* thumbJob = TDEIO::filePreview(d->_url, PREVIEW_SIZE);
     connect( thumbJob, TQT_SIGNAL(gotPreview(const KFileItem*, const TQPixmap&)),
              TQT_SLOT(slotGotPreview(const KFileItem* , const TQPixmap&)));
 }
@@ -283,7 +283,7 @@ void ImageDialog::slotImagesSelected()
     {
         d->_url = d->_urls.first();
 
-        KIO::PreviewJob* thumbJob = KIO::filePreview(d->_url, PREVIEW_SIZE);
+        TDEIO::PreviewJob* thumbJob = TDEIO::filePreview(d->_url, PREVIEW_SIZE);
         connect( thumbJob, TQT_SIGNAL(gotPreview(const KFileItem*, const TQPixmap&)),
                  TQT_SLOT(slotGotPreview(const KFileItem* , const TQPixmap&)));
     }
diff --git a/libkipi/libkipi/pluginloader.cpp b/libkipi/libkipi/pluginloader.cpp
index ec8845d..9173fa5 100644
--- a/libkipi/libkipi/pluginloader.cpp
+++ b/libkipi/libkipi/pluginloader.cpp
@@ -205,7 +205,7 @@ PluginLoader::PluginLoader( const TQStringList& ignores, Interface* interface )
     d->m_ignores = ignores;
 
     KTrader::OfferList offers = KTrader::self()->query("KIPI/Plugin");
-    KConfig* config = TDEGlobal::config();
+    TDEConfig* config = TDEGlobal::config();
     config->setGroup( TQString::fromLatin1( "KIPI/EnabledPlugin" ) );
 
     KTrader::OfferList::ConstIterator iter;
@@ -359,7 +359,7 @@ ConfigWidget::~ConfigWidget()
 
 void ConfigWidget::apply()
 {
-    KConfig* config = TDEGlobal::config();
+    TDEConfig* config = TDEGlobal::config();
     config->setGroup( TQString::fromLatin1( "KIPI/EnabledPlugin" ) );
     bool changes = false;
 
diff --git a/libkipi/libkipi/uploadwidget.cpp b/libkipi/libkipi/uploadwidget.cpp
index 4166f4d..84b6e56 100644
--- a/libkipi/libkipi/uploadwidget.cpp
+++ b/libkipi/libkipi/uploadwidget.cpp
@@ -187,13 +187,13 @@ void KIPI::UploadWidget::mkdir()
     KURL url = path();
     url.addPath( dir );
 
-    KIO::SimpleJob* job = KIO::mkdir(url);
+    TDEIO::SimpleJob* job = TDEIO::mkdir(url);
     
-    connect(job, TQT_SIGNAL(result(KIO::Job*)), 
-            this, TQT_SLOT(slotAlbumCreated(KIO::Job*)));
+    connect(job, TQT_SIGNAL(result(TDEIO::Job*)), 
+            this, TQT_SLOT(slotAlbumCreated(TDEIO::Job*)));
 }
 
-void KIPI::UploadWidget::slotAlbumCreated(KIO::Job* job)
+void KIPI::UploadWidget::slotAlbumCreated(TDEIO::Job* job)
 {
     int code = job->error();
     
diff --git a/libkipi/libkipi/uploadwidget.h b/libkipi/libkipi/uploadwidget.h
index dd1b7fd..9ac6ae8 100644
--- a/libkipi/libkipi/uploadwidget.h
+++ b/libkipi/libkipi/uploadwidget.h
@@ -60,7 +60,7 @@ namespace KIPI
         
     protected slots:
         void load();
-        void slotAlbumCreated(KIO::Job* job);
+        void slotAlbumCreated(TDEIO::Job* job);
         void slotFolderSelected(TQListViewItem *);
 
     private slots:
-- 
cgit v1.2.3