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

---
 kcontrol/konq/rootopts.h | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'kcontrol/konq/rootopts.h')

diff --git a/kcontrol/konq/rootopts.h b/kcontrol/konq/rootopts.h
index 7af18f1ae..d4429c1dd 100644
--- a/kcontrol/konq/rootopts.h
+++ b/kcontrol/konq/rootopts.h
@@ -23,17 +23,17 @@ class TQCheckBox;
 class TQComboBox;
 class TQPushButton;
 
-class KConfig;
+class TDEConfig;
 class KListView;
 class KURLRequester;
 
-namespace KIO { class Job; }
+namespace TDEIO { class Job; }
 
 //-----------------------------------------------------------------------------
 // The "Path" Tab contains :
 // The paths for Desktop, Autostart and Documents
 
-class DesktopPathConfig : public KCModule
+class DesktopPathConfig : public TDECModule
 {
         Q_OBJECT
 public:
@@ -44,7 +44,7 @@ public:
         virtual void defaults();
 
 private slots:
-    void slotEntries( KIO::Job * job, const KIO::UDSEntryList& list);
+    void slotEntries( TDEIO::Job * job, const TDEIO::UDSEntryList& list);
 
 private:
         // Desktop Paths
@@ -58,7 +58,7 @@ private:
         KURL m_copyFromSrc;
 
 private slots:
-        void slotResult( KIO::Job * job );
+        void slotResult( TDEIO::Job * job );
 };
 
 #endif // __ROOT_OPTIONS_H
-- 
cgit v1.2.1