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

---
 kdesktop/init.cc | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'kdesktop/init.cc')

diff --git a/kdesktop/init.cc b/kdesktop/init.cc
index 27990245c..cf45c71d4 100644
--- a/kdesktop/init.cc
+++ b/kdesktop/init.cc
@@ -134,7 +134,7 @@ static TQString realDesktopPath()
  */
 static void copyDesktopLinks()
 {
-    KConfig *config = kapp->config();
+    TDEConfig *config = kapp->config();
     config->setGroup("General");
     if (!config->readBoolEntry("CopyDesktopLinks", true))
        return;
@@ -230,8 +230,8 @@ void testLocalInstallation()
         TQByteArray packedArgs;
         TQDataStream stream( packedArgs, IO_WriteOnly );
         stream << (int)2;
-        KIO::Job* job = KIO::special( "trash:/", packedArgs );
-        (void)KIO::NetAccess::synchronousRun( job, 0 );
+        TDEIO::Job* job = TDEIO::special( "trash:/", packedArgs );
+        (void)TDEIO::NetAccess::synchronousRun( job, 0 );
 
         // OK the only thing missing is to convert the icon position...
         KSimpleConfig cfg( locateLocal("appdata", "IconPositions") );
-- 
cgit v1.2.1