diff options
| author | Timothy Pearson <[email protected]> | 2013-01-24 13:43:14 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2013-01-24 13:43:14 -0600 |
| commit | 79b21d47bce1ee428affc97534cd8b257232a871 (patch) | |
| tree | 0df1fa0109d9f2bcef932eda8b5c25b2e06669ed /kappfinder/common.cpp | |
| parent | 9a898d493f493adbc404f7223043c85f3817472b (diff) | |
| download | tdebase-79b21d47bce1ee428affc97534cd8b257232a871.tar.gz tdebase-79b21d47bce1ee428affc97534cd8b257232a871.zip | |
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'kappfinder/common.cpp')
| -rw-r--r-- | kappfinder/common.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/kappfinder/common.cpp b/kappfinder/common.cpp index 71ae2319e..9fb00f9df 100644 --- a/kappfinder/common.cpp +++ b/kappfinder/common.cpp @@ -55,7 +55,7 @@ bool scanDesktopFile( TQPtrList<AppLnkCache> &appCache, const TQString &templ, // find out where to put the .desktop files TQString destName; if ( destDir.isNull() ) - destDir = KGlobal::dirs()->saveLocation( "apps" ); + destDir = TDEGlobal::dirs()->saveLocation( "apps" ); else destDir += "/"; @@ -82,7 +82,7 @@ bool scanDesktopFile( TQPtrList<AppLnkCache> &appCache, const TQString &templ, exec = exec.left( pos ); // try to locate the binary - TQString pexec = KGlobal::dirs()->findExe( exec, + TQString pexec = TDEGlobal::dirs()->findExe( exec, TQString( ::getenv( "PATH" ) ) + ":/usr/X11R6/bin:/usr/games" ); if ( pexec.isEmpty() ) { kdDebug(DBG_CODE) << "looking for " << exec.local8Bit() @@ -134,11 +134,11 @@ void decorateDirs( TQString destDir ) { // find out where to put the .directory files if ( destDir.isNull() ) - destDir = KGlobal::dirs()->saveLocation( "apps" ); + destDir = TDEGlobal::dirs()->saveLocation( "apps" ); else destDir += "/"; - TQStringList dirs = KGlobal::dirs()->findAllResources( "data", "kappfinder/apps/*.directory", true ); + TQStringList dirs = TDEGlobal::dirs()->findAllResources( "data", "kappfinder/apps/*.directory", true ); TQStringList::Iterator it; for ( it = dirs.begin(); it != dirs.end(); ++it ) { |