diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:49:30 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:49:30 -0600 |
| commit | a9bde819f2b421dcc44741156e75eca4bb5fb4f4 (patch) | |
| tree | d087071b1e8fcf79698938efec19f8e48bab0799 /libkmime/kmime_util.cpp | |
| parent | 5c4a80ead2b1fe57dc6a8c29d0368792344cd61e (diff) | |
| download | tdepim-a9bde819f2b421dcc44741156e75eca4bb5fb4f4.tar.gz tdepim-a9bde819f2b421dcc44741156e75eca4bb5fb4f4.zip | |
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'libkmime/kmime_util.cpp')
| -rw-r--r-- | libkmime/kmime_util.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
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 ); |