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/kurldrag.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/kurldrag.cpp')
| -rw-r--r-- | tdecore/kurldrag.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/tdecore/kurldrag.cpp b/tdecore/kurldrag.cpp index 2b07c2580..5e64d09b2 100644 --- a/tdecore/kurldrag.cpp +++ b/tdecore/kurldrag.cpp @@ -24,8 +24,8 @@ #include <unistd.h> #include <tdeversion.h> -#include <kglobal.h> -#include <klocale.h> +#include <tdeglobal.h> +#include <tdelocale.h> #include <kdebug.h> class KURLDragPrivate @@ -253,7 +253,7 @@ TQByteArray KURLDrag::encodedData( const char* mime ) const KURL KURLDrag::stringToUrl(const TQCString &s) { if (strncmp(s.data(), "file:", 5) == 0) - return KURL(s, KGlobal::locale()->fileEncodingMib()); + return KURL(s, TDEGlobal::locale()->fileEncodingMib()); return KURL(s, 106); // 106 is mib enum for utf8 codec; } @@ -263,12 +263,12 @@ TQString KURLDrag::urlToString(const KURL &url) if (url.isLocalFile()) { #if 1 - return url.url(0, KGlobal::locale()->fileEncodingMib()); + return url.url(0, TDEGlobal::locale()->fileEncodingMib()); #else // According to the XDND spec, file:/ URLs for DND must have // the hostname part. But in really it just breaks many apps, // so it's disabled for now. - TQString s = url.url(0, KGlobal::locale()->fileEncodingMib()); + TQString s = url.url(0, TDEGlobal::locale()->fileEncodingMib()); if( !s.startsWith( "file://" )) { char hostname[257]; |