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

---
 parts/documentation/plugins/chm/docchmplugin.cpp | 4 ++--
 parts/documentation/plugins/qt/docqtplugin.h     | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'parts/documentation/plugins')

diff --git a/parts/documentation/plugins/chm/docchmplugin.cpp b/parts/documentation/plugins/chm/docchmplugin.cpp
index 09b81d72..7293d985 100644
--- a/parts/documentation/plugins/chm/docchmplugin.cpp
+++ b/parts/documentation/plugins/chm/docchmplugin.cpp
@@ -82,7 +82,7 @@ TQString DocCHMPlugin::getSpecialData(const TQString& name, KURL url) {
     
     url.addPath("/:" + name);
     TQString tmpFile;
-    if( KIO::NetAccess::download( url, tmpFile, 0 ) )
+    if( TDEIO::NetAccess::download( url, tmpFile, 0 ) )
     {
         std::filebuf fb;
         fb.open (tmpFile.ascii(), std::ios::in);
@@ -93,7 +93,7 @@ TQString DocCHMPlugin::getSpecialData(const TQString& name, KURL url) {
             ret += buf; ret += "\n";
         }
         fb.close();
-        KIO::NetAccess::removeTempFile( tmpFile );
+        TDEIO::NetAccess::removeTempFile( tmpFile );
     } else {
         kdDebug(9002) << "DocCHMPlugin::getSpecialData could not download data from " << url.url() << endl;
     }
diff --git a/parts/documentation/plugins/qt/docqtplugin.h b/parts/documentation/plugins/qt/docqtplugin.h
index 4712dc14..53dd6740 100644
--- a/parts/documentation/plugins/qt/docqtplugin.h
+++ b/parts/documentation/plugins/qt/docqtplugin.h
@@ -23,7 +23,7 @@
 #include <kdevdocumentationplugin.h>
 #include <tqdom.h>
 
-class KConfig;
+class TDEConfig;
 
 class DocQtPlugin : public DocumentationPlugin
 {
-- 
cgit v1.2.3