From 28edc0aa2ab09297288186f5bc15765eb7be58c0 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Thu, 24 Jan 2013 13:47:22 -0600 Subject: Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4 --- tdecore/kurldrag.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'tdecore/kurldrag.cpp') diff --git a/tdecore/kurldrag.cpp b/tdecore/kurldrag.cpp index 2b07c2580..20aa6388e 100644 --- a/tdecore/kurldrag.cpp +++ b/tdecore/kurldrag.cpp @@ -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]; -- cgit v1.2.1