Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4

3 files changed, 15 insertions, 15 deletions

diff --git a/libkmime/kmime_content.cpp b/libkmime/kmime_content.cpp
index 5dead52af..20862496d 100644
--- a/libkmime/kmime_content.cpp
+++ b/libkmime/kmime_content.cpp
@@ -416,7 +416,7 @@ void Content::decodedText(TQString &s, bool trimText,
     return;
 
   bool ok=true;
-  TQTextCodec *codec=KGlobal::charsets()->codecForName(contentType()->charset(),ok);
+  TQTextCodec *codec=TDEGlobal::charsets()->codecForName(contentType()->charset(),ok);
 
   s=codec->toUnicode(b_ody.data(), b_ody.length());
 
@@ -442,7 +442,7 @@ void Content::decodedText(TQStringList &l, bool trimText,
   TQString unicode;
   bool ok=true;
 
-  TQTextCodec *codec=KGlobal::charsets()->codecForName(contentType()->charset(),ok);
+  TQTextCodec *codec=TDEGlobal::charsets()->codecForName(contentType()->charset(),ok);
 
   unicode=codec->toUnicode(b_ody.data(), b_ody.length());
 
@@ -464,11 +464,11 @@ void Content::decodedText(TQStringList &l, bool trimText,
 void Content::fromUnicodeString(const TQString &s)
 {
   bool ok=true;
-  TQTextCodec *codec=KGlobal::charsets()->codecForName(contentType()->charset(),ok);
+  TQTextCodec *codec=TDEGlobal::charsets()->codecForName(contentType()->charset(),ok);
 
   if(!ok) { // no suitable codec found => try local settings and hope the best ;-)
-    codec=KGlobal::locale()->codecForEncoding();
-    TQCString chset=KGlobal::locale()->encoding();
+    codec=TDEGlobal::locale()->codecForEncoding();
+    TQCString chset=TDEGlobal::locale()->encoding();
     contentType()->setCharset(chset);
   }
 
diff --git a/libkmime/kmime_header_parsing.cpp b/libkmime/kmime_header_parsing.cpp
index 32099f29e..70d0b657d 100644
--- a/libkmime/kmime_header_parsing.cpp
+++ b/libkmime/kmime_header_parsing.cpp
@@ -208,7 +208,7 @@ bool parseEncodedWord( const char* & scursor, const char * const send,
   // try if there's a (text)codec for the charset found:
   bool matchOK = false;
   TQTextCodec
-    *textCodec = KGlobal::charsets()->codecForName( maybeCharset, matchOK );
+    *textCodec = TDEGlobal::charsets()->codecForName( maybeCharset, matchOK );
 
   if ( !matchOK || !textCodec ) {
     KMIME_WARN_UNKNOWN(Charset,maybeCharset);
@@ -1250,7 +1250,7 @@ static void decodeRFC2231Value( Codec* & rfc2231Codec,
     //
 
     bool matchOK = false;
-    textcodec = KGlobal::charsets()->codecForName( charset, matchOK );
+    textcodec = TDEGlobal::charsets()->codecForName( charset, matchOK );
     if ( !matchOK ) {
       textcodec = 0;
       KMIME_WARN_UNKNOWN(Charset,charset);
diff --git a/libkmime/kmime_util.cpp b/libkmime/kmime_util.cpp
index f18a5e8d6..601401814 100644
--- a/libkmime/kmime_util.cpp
+++ b/libkmime/kmime_util.cpp
@@ -223,13 +223,13 @@ TQString decodeRFC2047String(const TQCString &src, const char **usedCS,
   TQTextCodec *codec=0;
   bool ok=true;
   if (forceCS || declaredCS.isEmpty()) {
-    codec=KGlobal::charsets()->codecForName(defaultCS);
+    codec=TDEGlobal::charsets()->codecForName(defaultCS);
     (*usedCS)=cachedCharset(defaultCS);
   }
   else {
-    codec=KGlobal::charsets()->codecForName(declaredCS, ok);
+    codec=TDEGlobal::charsets()->codecForName(declaredCS, ok);
     if(!ok) {     //no suitable codec found => use default charset
-      codec=KGlobal::charsets()->codecForName(defaultCS);
+      codec=TDEGlobal::charsets()->codecForName(defaultCS);
       (*usedCS)=cachedCharset(defaultCS);
     }
     else
@@ -254,12 +254,12 @@ TQCString encodeRFC2047String(const TQString &src, const char *charset,
   TQTextCodec *codec=0;
 
   usedCS=charset;
-  codec=KGlobal::charsets()->codecForName(usedCS, ok);
+  codec=TDEGlobal::charsets()->codecForName(usedCS, ok);
 
   if(!ok) {
     //no codec available => try local8Bit and hope the best ;-)
-    usedCS=KGlobal::locale()->encoding();
-    codec=KGlobal::charsets()->codecForName(usedCS, ok);
+    usedCS=TDEGlobal::locale()->encoding();
+    codec=TDEGlobal::charsets()->codecForName(usedCS, ok);
   }
 
   if (usedCS.find("8859-")>=0)  // use "B"-Encoding for non iso-8859-x charsets
@@ -636,7 +636,7 @@ DateFormatter::qdateToTimeT(const TQDateTime& dt) const
 TQString
 DateFormatter::fancy(time_t otime) const
 {
-  KLocale *locale = KGlobal::locale();
+  KLocale *locale = TDEGlobal::locale();
 
   if ( otime <= 0 )
     return i18n( "unknown" );
@@ -691,7 +691,7 @@ DateFormatter::localized(time_t otime, bool shortFormat, bool includeSecs,
 {
   TQDateTime tmp;
   TQString ret;
-  KLocale *locale = KGlobal::locale();
+  KLocale *locale = TDEGlobal::locale();
 
   tmp.setTime_t( otime );