summaryrefslogtreecommitdiffstats
path: root/tdecore/kstringhandler.cpp
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 /tdecore/kstringhandler.cpp
parent07c48c43ff72c237e4028154f4594102b798073f (diff)
downloadtdelibs-28edc0aa2ab09297288186f5bc15765eb7be58c0.tar.gz
tdelibs-28edc0aa2ab09297288186f5bc15765eb7be58c0.zip
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'tdecore/kstringhandler.cpp')
-rw-r--r--tdecore/kstringhandler.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/tdecore/kstringhandler.cpp b/tdecore/kstringhandler.cpp
index d33c3c924..c562c539f 100644
--- a/tdecore/kstringhandler.cpp
+++ b/tdecore/kstringhandler.cpp
@@ -654,7 +654,7 @@ TQString KStringHandler::from8Bit( const char *str )
if (!str)
return TQString::null;
if (!*str) {
- static const TQString &emptyString = KGlobal::staticQString("");
+ static const TQString &emptyString = TDEGlobal::staticQString("");
return emptyString;
}
return KStringHandler::isUtf8( str ) ?