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

2 files changed, 18 insertions, 18 deletions

diff --git a/konq-plugins/sidebar/delicious/mainWidget.cpp b/konq-plugins/sidebar/delicious/mainWidget.cpp
index 20aaa26..8a591b4 100644
--- a/konq-plugins/sidebar/delicious/mainWidget.cpp
+++ b/konq-plugins/sidebar/delicious/mainWidget.cpp
@@ -42,7 +42,7 @@
 #include <kconfig.h>
 #include <kinputdialog.h>
 
-MainWidget::MainWidget( KConfig * config, TQWidget * parent )
+MainWidget::MainWidget( TDEConfig * config, TQWidget * parent )
     : MainWidget_base( parent ), m_config( config )
 {
     loadTags();
@@ -93,12 +93,12 @@ void MainWidget::slotGetTags()
 {
     kdDebug() << k_funcinfo << endl;
 
-    KIO::StoredTransferJob * job = KIO::storedGet( "http://del.icio.us/api/tags/get" );
-    connect( job, TQT_SIGNAL( result( KIO::Job * ) ),
-             this, TQT_SLOT( slotFillTags( KIO::Job * ) ) );
+    TDEIO::StoredTransferJob * job = TDEIO::storedGet( "http://del.icio.us/api/tags/get" );
+    connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ),
+             this, TQT_SLOT( slotFillTags( TDEIO::Job * ) ) );
 }
 
-void MainWidget::slotFillTags( KIO::Job * job )
+void MainWidget::slotFillTags( TDEIO::Job * job )
 {
     kdDebug() << k_funcinfo << endl;
 
@@ -113,7 +113,7 @@ void MainWidget::slotFillTags( KIO::Job * job )
 
     // fill lvTags with job->data()
     TQDomDocument doc;
-    doc.setContent( static_cast<KIO::StoredTransferJob *>( job )->data() );
+    doc.setContent( static_cast<TDEIO::StoredTransferJob *>( job )->data() );
     TQDomNodeList tags = doc.elementsByTagName( "tag" );
     for ( uint i = 0; i < tags.length(); ++i )
     {
@@ -134,12 +134,12 @@ void MainWidget::slotGetBookmarks()
 
     kdDebug() << k_funcinfo << url.url() << endl;
 
-    KIO::StoredTransferJob * job = KIO::storedGet( url );
-    connect( job, TQT_SIGNAL( result( KIO::Job * ) ),
-             this, TQT_SLOT( slotFillBookmarks( KIO::Job * ) ) );
+    TDEIO::StoredTransferJob * job = TDEIO::storedGet( url );
+    connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ),
+             this, TQT_SLOT( slotFillBookmarks( TDEIO::Job * ) ) );
 }
 
-void MainWidget::slotFillBookmarks( KIO::Job * job )
+void MainWidget::slotFillBookmarks( TDEIO::Job * job )
 {
     kdDebug() << k_funcinfo << endl;
 
@@ -153,7 +153,7 @@ void MainWidget::slotFillBookmarks( KIO::Job * job )
 
     // fill lvBookmarks with job->data()
     TQDomDocument doc;
-    doc.setContent( static_cast<KIO::StoredTransferJob *>( job )->data() );
+    doc.setContent( static_cast<TDEIO::StoredTransferJob *>( job )->data() );
     TQDomNodeList posts = doc.elementsByTagName( "post" );
 
     for ( uint i = 0; i < posts.length(); ++i )
@@ -308,7 +308,7 @@ void MainWidget::slotRenameTag()
             KURL url( "http://del.icio.us/api/tags/rename" );
             url.addQueryItem( "old", oldName );
             url.addQueryItem( "new", newName );
-            KIO::get( url );    // rename the tag
+            TDEIO::get( url );    // rename the tag
 
             tag->setName( newName );
         }
@@ -342,7 +342,7 @@ void MainWidget::slotDeleteBookmark()
             KURL url( "http://del.icio.us/api/posts/delete" );
             url.addQueryItem( "url", bookmark->url().url() );
             kdDebug() << k_funcinfo << url << endl;
-            KIO::get( url );
+            TDEIO::get( url );
 
             delete bookmark;
 
diff --git a/konq-plugins/sidebar/delicious/mainWidget.h b/konq-plugins/sidebar/delicious/mainWidget.h
index 62d77bf..2621671 100644
--- a/konq-plugins/sidebar/delicious/mainWidget.h
+++ b/konq-plugins/sidebar/delicious/mainWidget.h
@@ -30,7 +30,7 @@
 
 class TQStringList;
 class KURL;
-class KConfig;
+class TDEConfig;
 
 /**
  * Main widget of the del.icio.us bookmarks panel
@@ -40,7 +40,7 @@ class MainWidget: public MainWidget_base
     Q_OBJECT
   
 public:
-    MainWidget( KConfig * config, TQWidget * parent );
+    MainWidget( TDEConfig * config, TQWidget * parent );
     ~MainWidget();
 
     /**
@@ -76,7 +76,7 @@ private slots:
      * Fill the Tags listview with job->data()
      * (parses the XML returned by the server)
      */
-    void slotFillTags( KIO::Job * job );
+    void slotFillTags( TDEIO::Job * job );
 
     /**
      * Start the job to get the list of bookmarks
@@ -88,7 +88,7 @@ private slots:
      * Fill the Bookmarks listview with job->data()
      * (parses the XML returned by the server)
      */
-    void slotFillBookmarks( KIO::Job * job );
+    void slotFillBookmarks( TDEIO::Job * job );
 
     /**
      * Handle clicking on a bookmark (KDE mode)
@@ -170,7 +170,7 @@ private:
     TQTimer *m_updateTimer;
     KURL m_currentURL;
     TQStringList m_tags;
-    KConfig * m_config;
+    TDEConfig * m_config;
 };
 
 #endif