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

3 files changed, 5 insertions, 5 deletions

diff --git a/klinkstatus/src/ui/klshistorycombo.h b/klinkstatus/src/ui/klshistorycombo.h
index 501c7474..06973616 100644
--- a/klinkstatus/src/ui/klshistorycombo.h
+++ b/klinkstatus/src/ui/klshistorycombo.h
@@ -13,7 +13,7 @@
 #define KLSHISTORYCOMBO_H
 
 #include <kcombobox.h>
-class KConfig;
+class TDEConfig;
 
 /**
 @author Paulo Moura Guedes
diff --git a/klinkstatus/src/ui/sessionwidget.cpp b/klinkstatus/src/ui/sessionwidget.cpp
index 7c611bc0..e6a96f61 100644
--- a/klinkstatus/src/ui/sessionwidget.cpp
+++ b/klinkstatus/src/ui/sessionwidget.cpp
@@ -228,7 +228,7 @@ void SessionWidget::slotCheck()
     paused_ = false;
     stopped_ = false;
     
-    slotLoadSettings(false); // it seems that KConfigDialogManager is not trigering this slot
+    slotLoadSettings(false); // it seems that TDEConfigDialogManager is not trigering this slot
 
     newSearchManager();
 
@@ -631,7 +631,7 @@ void SessionWidget::slotPauseSearch()
         search_manager_->resume();
 
         emit signalSearchStarted();
-        slotLoadSettings(isEmpty()); // it seems that KConfigDialogManager is not trigering this slot
+        slotLoadSettings(isEmpty()); // it seems that TDEConfigDialogManager is not trigering this slot
         
         resetPendingActions();
     }
@@ -716,7 +716,7 @@ void SessionWidget::slotExportAsHTML( )
     if (url.isLocalFile())
         return;
 
-    KIO::NetAccess::upload(filename, url, 0);
+    TDEIO::NetAccess::upload(filename, url, 0);
 }
 
 
diff --git a/klinkstatus/src/ui/sessionwidget.h b/klinkstatus/src/ui/sessionwidget.h
index 368a7964..111b059d 100644
--- a/klinkstatus/src/ui/sessionwidget.h
+++ b/klinkstatus/src/ui/sessionwidget.h
@@ -35,7 +35,7 @@ class TQStringList;
 class TQListViewItem;
 
 class KURL;
-class KConfig;
+class TDEConfig;
 class KToggleAction;
 
 #include <vector>