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/kdesktopfile.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/kdesktopfile.cpp')
| -rw-r--r-- | tdecore/kdesktopfile.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/tdecore/kdesktopfile.cpp b/tdecore/kdesktopfile.cpp index 02dfb1d5f..29c30f9d9 100644 --- a/tdecore/kdesktopfile.cpp +++ b/tdecore/kdesktopfile.cpp @@ -67,7 +67,7 @@ TQString KDesktopFile::locateLocal(const TQString &path) if (!TQDir::isRelativePath(local)) { // Relative wrt apps? - local = KGlobal::dirs()->relativeLocation("apps", path); + local = TDEGlobal::dirs()->relativeLocation("apps", path); } if (TQDir::isRelativePath(local)) @@ -78,7 +78,7 @@ TQString KDesktopFile::locateLocal(const TQString &path) { // XDG Desktop menu items come with absolute paths, we need to // extract their relative path and then build a local path. - local = KGlobal::dirs()->relativeLocation("xdgdata-dirs", local); + local = TDEGlobal::dirs()->relativeLocation("xdgdata-dirs", local); if (!TQDir::isRelativePath(local)) { // Hm, that didn't work... @@ -98,7 +98,7 @@ TQString KDesktopFile::locateLocal(const TQString &path) { // XDG Desktop menu items come with absolute paths, we need to // extract their relative path and then build a local path. - local = KGlobal::dirs()->relativeLocation("xdgdata-apps", path); + local = TDEGlobal::dirs()->relativeLocation("xdgdata-apps", path); if (!TQDir::isRelativePath(local)) { // What now? Use filename only and hope for the best. @@ -133,7 +133,7 @@ bool KDesktopFile::isAuthorizedDesktopFile(const TQString& path) if (TQDir::isRelativePath(path)) return true; // Relative paths are ok. - KStandardDirs *dirs = KGlobal::dirs(); + KStandardDirs *dirs = TDEGlobal::dirs(); if (TQDir::isRelativePath( dirs->relativeLocation("apps", path) )) return true; if (TQDir::isRelativePath( dirs->relativeLocation("xdgdata-apps", path) )) @@ -157,7 +157,7 @@ TQString KDesktopFile::translatedEntry(const char* key) const TQString fName = fileName(); fName = fName.mid(fName.findRev('/')+1); TQString po_lookup_key = TQString::fromLatin1(key) + "(" + fName + "): " + value; - TQString po_value = KGlobal::locale()->translate(po_lookup_key.utf8().data()); + TQString po_value = TDEGlobal::locale()->translate(po_lookup_key.utf8().data()); if (po_value == po_lookup_key) return value; |