From 79b21d47bce1ee428affc97534cd8b257232a871 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Thu, 24 Jan 2013 13:43:14 -0600 Subject: Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4 --- kappfinder/common.cpp | 8 ++++---- kappfinder/main_install.cpp | 2 +- kappfinder/toplevel.cpp | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) (limited to 'kappfinder') 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 &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 &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 ) { diff --git a/kappfinder/main_install.cpp b/kappfinder/main_install.cpp index d120a024c..b6749b191 100644 --- a/kappfinder/main_install.cpp +++ b/kappfinder/main_install.cpp @@ -42,7 +42,7 @@ int main( int argc, char *argv[] ) return -1; } - TQStringList templates = KGlobal::dirs()->findAllResources( "data", "kappfinder/apps/*.desktop", true ); + TQStringList templates = TDEGlobal::dirs()->findAllResources( "data", "kappfinder/apps/*.desktop", true ); TQString dir = TQString( argv[ 1 ] ) + "/"; diff --git a/kappfinder/toplevel.cpp b/kappfinder/toplevel.cpp index 9f67b6ede..931845b16 100644 --- a/kappfinder/toplevel.cpp +++ b/kappfinder/toplevel.cpp @@ -161,9 +161,9 @@ TQListViewItem* TopLevel::addGroupItem( TQListViewItem *parent, const TQString & void TopLevel::slotScan() { - KIconLoader* loader = KGlobal::iconLoader(); + KIconLoader* loader = TDEGlobal::iconLoader(); - mTemplates = KGlobal::dirs()->findAllResources( "data", "kappfinder/apps/*.desktop", true ); + mTemplates = TDEGlobal::dirs()->findAllResources( "data", "kappfinder/apps/*.desktop", true ); mAppCache.clear(); -- cgit v1.2.3