summaryrefslogtreecommitdiffstats
path: root/khtml/misc
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-24 13:47:22 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-24 13:47:22 -0600
commit28edc0aa2ab09297288186f5bc15765eb7be58c0 (patch)
tree7b7a01768b3781763186c825af21bb14717d2c32 /khtml/misc
parent07c48c43ff72c237e4028154f4594102b798073f (diff)
downloadtdelibs-28edc0aa2ab09297288186f5bc15765eb7be58c0.tar.gz
tdelibs-28edc0aa2ab09297288186f5bc15765eb7be58c0.zip
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'khtml/misc')
-rw-r--r--khtml/misc/decoder.cpp2
-rw-r--r--khtml/misc/loader.cpp6
2 files changed, 4 insertions, 4 deletions
diff --git a/khtml/misc/decoder.cpp b/khtml/misc/decoder.cpp
index f227f4014..f75fa411d 100644
--- a/khtml/misc/decoder.cpp
+++ b/khtml/misc/decoder.cpp
@@ -97,7 +97,7 @@ void Decoder::setEncoding(const char *_encoding, EncodingType type)
if(enc == "visual") // hebrew visually ordered
enc = "iso8859-8";
bool b;
- TQTextCodec *codec = KGlobal::charsets()->codecForName(enc, b);
+ TQTextCodec *codec = TDEGlobal::charsets()->codecForName(enc, b);
if (!b)
codec = 0;
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;