diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:47:22 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:47:22 -0600 |
| commit | 28edc0aa2ab09297288186f5bc15765eb7be58c0 (patch) | |
| tree | 7b7a01768b3781763186c825af21bb14717d2c32 /tdecore/kurl.cpp | |
| parent | 07c48c43ff72c237e4028154f4594102b798073f (diff) | |
| download | tdelibs-28edc0aa2ab09297288186f5bc15765eb7be58c0.tar.gz tdelibs-28edc0aa2ab09297288186f5bc15765eb7be58c0.zip | |
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'tdecore/kurl.cpp')
| -rw-r--r-- | tdecore/kurl.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tdecore/kurl.cpp b/tdecore/kurl.cpp index 7817742bc..9479029a9 100644 --- a/tdecore/kurl.cpp +++ b/tdecore/kurl.cpp @@ -334,14 +334,14 @@ static TQString cleanpath(const TQString &_path, bool cleanDirSeparator, bool de if (decodeDots) { #ifndef KDE_QT_ONLY - static const TQString &encodedDot = KGlobal::staticQString("%2e"); + static const TQString &encodedDot = TDEGlobal::staticQString("%2e"); #else TQString encodedDot("%2e"); #endif if (path.find(encodedDot, 0, false) != -1) { #ifndef KDE_QT_ONLY - static const TQString &encodedDOT = KGlobal::staticQString("%2E"); // Uppercase! + static const TQString &encodedDOT = TDEGlobal::staticQString("%2E"); // Uppercase! #else TQString encodedDOT("%2E"); #endif @@ -2340,7 +2340,7 @@ KURL::URIMode KURL::uriModeForProtocol(const TQString& protocol) KURL::URIMode mode = Auto; if (protocol == fileProt) return URL; - if (KGlobal::_instance) + if (TDEGlobal::_instance) mode = KProtocolInfo::uriParseMode(protocol); if (mode == Auto ) { #else |