From 28edc0aa2ab09297288186f5bc15765eb7be58c0 Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Thu, 24 Jan 2013 13:47:22 -0600
Subject: Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4

---
 khtml/misc/loader.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'khtml/misc/loader.cpp')

diff --git a/khtml/misc/loader.cpp b/khtml/misc/loader.cpp
index 7b085aab9..b9400f229 100644
--- a/khtml/misc/loader.cpp
+++ b/khtml/misc/loader.cpp
@@ -194,7 +194,7 @@ TQTextCodec* CachedObject::codecForBuffer( const TQString& charset, const TQByte
     // Link or @charset
     if(!charset.isEmpty())
     {
-	TQTextCodec* c = KGlobal::charsets()->codecForName(charset);
+	TQTextCodec* c = TDEGlobal::charsets()->codecForName(charset);
         if(c->mibEnum() == 11)  {
             // iso8859-8 (visually ordered)
             c = TQTextCodec::codecForName("iso8859-8-i");
@@ -256,7 +256,7 @@ void CachedCSSStyleSheet::data( TQBuffer &buffer, bool eof )
 //     TQString charset = checkCharset( buffer.buffer() );
     TQTextCodec* c = 0;
     if (!m_charset.isEmpty()) {
-        c = KGlobal::charsets()->codecForName(m_charset);
+        c = TDEGlobal::charsets()->codecForName(m_charset);
         if(c->mibEnum() == 11)  c = TQTextCodec::codecForName("iso8859-8-i");
     }
     else {
@@ -469,7 +469,7 @@ static TQString buildAcceptHeader()
 CachedImage::CachedImage(DocLoader* dl, const DOMString &url, KIO::CacheControl _cachePolicy, const char*)
     : TQObject(), CachedObject(url, Image, _cachePolicy, 0)
 {
-    static const TQString &acceptHeader = KGlobal::staticQString( buildAcceptHeader() );
+    static const TQString &acceptHeader = TDEGlobal::staticQString( buildAcceptHeader() );
 
     m = 0;
     p = 0;
-- 
cgit v1.2.1