diff options
| author | Darrell Anderson <humanreadable@yahoo.com> | 2013-03-02 15:57:34 -0600 |
|---|---|---|
| committer | Darrell Anderson <humanreadable@yahoo.com> | 2013-03-02 15:57:34 -0600 |
| commit | 7c0b0c9dc9fcbe9c198925bdc7ee18ac6be49f4f (patch) | |
| tree | c76702a7f6310fbe9d437e347535422e836e94e9 /tdecore/kstringhandler.cpp | |
| parent | a2a38be7600e2a2c2b49c66902d912ca036a2c0f (diff) | |
| parent | 27bbee9a5f9dcda53d8eb23863ee670ad1360e41 (diff) | |
| download | tdelibs-7c0b0c9dc9fcbe9c198925bdc7ee18ac6be49f4f.tar.gz tdelibs-7c0b0c9dc9fcbe9c198925bdc7ee18ac6be49f4f.zip | |
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tdelibs
Diffstat (limited to 'tdecore/kstringhandler.cpp')
| -rw-r--r-- | tdecore/kstringhandler.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tdecore/kstringhandler.cpp b/tdecore/kstringhandler.cpp index d33c3c924..b19c5b875 100644 --- a/tdecore/kstringhandler.cpp +++ b/tdecore/kstringhandler.cpp @@ -18,7 +18,7 @@ */ #include "kstringhandler.h" -#include "kglobal.h" +#include "tdeglobal.h" static void parsePythonRange( const TQCString &range, uint &start, uint &end ) { @@ -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 ) ? |