summaryrefslogtreecommitdiffstats
path: root/kappfinder
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-24 13:43:14 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-24 13:43:14 -0600
commit79b21d47bce1ee428affc97534cd8b257232a871 (patch)
tree0df1fa0109d9f2bcef932eda8b5c25b2e06669ed /kappfinder
parent9a898d493f493adbc404f7223043c85f3817472b (diff)
downloadtdebase-79b21d47bce1ee428affc97534cd8b257232a871.tar.gz
tdebase-79b21d47bce1ee428affc97534cd8b257232a871.zip
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'kappfinder')
-rw-r--r--kappfinder/common.cpp8
-rw-r--r--kappfinder/main_install.cpp2
-rw-r--r--kappfinder/toplevel.cpp4
3 files changed, 7 insertions, 7 deletions
diff --git a/kappfinder/common.cpp b/kappfinder/common.cpp
index 71ae2319..9fb00f9d 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 ) {
diff --git a/kappfinder/main_install.cpp b/kappfinder/main_install.cpp
index d120a024..b6749b19 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 9f67b6ed..931845b1 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();