summaryrefslogtreecommitdiffstats
path: root/khtml/khtmlpart_p.h
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-25 00:35:07 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-25 00:35:07 -0600
commit703fb0c89c2eee56a1e613e67a446db9d4287929 (patch)
treedd8c5ca66075cd89c2638a2b48cf78386a9870a7 /khtml/khtmlpart_p.h
parent818e7abec3d5d3809b6b77293558678371c16b71 (diff)
downloadtdelibs-703fb0c89c2eee56a1e613e67a446db9d4287929.tar.gz
tdelibs-703fb0c89c2eee56a1e613e67a446db9d4287929.zip
Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4
Diffstat (limited to 'khtml/khtmlpart_p.h')
-rw-r--r--khtml/khtmlpart_p.h8
1 files changed, 4 insertions, 4 deletions
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;