From b9e542d0c805e9adee3a67e44532d5321032e21e Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Thu, 24 Jan 2013 13:51:01 -0600 Subject: Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4 --- lib/util/kscriptactionmanager.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'lib/util/kscriptactionmanager.cpp') diff --git a/lib/util/kscriptactionmanager.cpp b/lib/util/kscriptactionmanager.cpp index ff3204ca..28756841 100644 --- a/lib/util/kscriptactionmanager.cpp +++ b/lib/util/kscriptactionmanager.cpp @@ -135,12 +135,12 @@ TQPtrList< KAction > KScriptActionManager::scripts( TQObject * interface , const TQPtrList actions; TQStringList scripts; - scripts += KGlobal::dirs()->findAllResources("data", + scripts += TDEGlobal::dirs()->findAllResources("data", TQString(kapp->name())+"/scripts/*.desktop", false, true ); for( TQStringList::ConstIterator it = dirs.begin(); it != dirs.end(); ++it) { - scripts += KGlobal::dirs()->findAllResources("data", + scripts += TDEGlobal::dirs()->findAllResources("data", (*it)+"/*.desktop", false, true ); } -- cgit v1.2.1