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

---
 khtml/khtmlpart_p.h | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'khtml/khtmlpart_p.h')

diff --git a/khtml/khtmlpart_p.h b/khtml/khtmlpart_p.h
index cebee9455..f914ef296 100644
--- a/khtml/khtmlpart_p.h
+++ b/khtml/khtmlpart_p.h
@@ -60,7 +60,7 @@ class KURLLabel;
 class KJavaAppletContext;
 class KJSErrorDlg;
 
-namespace KIO
+namespace TDEIO
 {
   class Job;
   class TransferJob;
@@ -198,7 +198,7 @@ public:
     m_job = 0L;
     m_bComplete = true;
     m_bLoadEventEmitted = true;
-    m_cachePolicy = KIO::CC_Verify;
+    m_cachePolicy = TDEIO::CC_Verify;
     m_manager = 0L;
     m_settings = new KHTMLSettings(*KHTMLFactory::defaultHTMLSettings());
     m_bClearing = false;
@@ -356,7 +356,7 @@ public:
 
   KHTMLSettings *m_settings;
 
-  KIO::TransferJob * m_job;
+  TDEIO::TransferJob * m_job;
 
   TQString m_statusBarText[3];
   unsigned long m_jobspeed;
@@ -387,7 +387,7 @@ public:
 
   KURL m_workingURL;
 
-  KIO::CacheControl m_cachePolicy;
+  TDEIO::CacheControl m_cachePolicy;
   TQTimer m_redirectionTimer;
   TQTime m_parsetime;
   int m_delayRedirect;
-- 
cgit v1.2.1