summaryrefslogtreecommitdiffstats
path: root/lib/util/kscriptactionmanager.cpp
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-24 13:51:01 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-24 13:51:01 -0600
commitb9e542d0c805e9adee3a67e44532d5321032e21e (patch)
treee82d85b9035cc2ca322911e8a6e38a3bd8b1d431 /lib/util/kscriptactionmanager.cpp
parent7a392a04059bd904dab4c78910a6d34aa0b37798 (diff)
downloadtdevelop-b9e542d0c805e9adee3a67e44532d5321032e21e.tar.gz
tdevelop-b9e542d0c805e9adee3a67e44532d5321032e21e.zip
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'lib/util/kscriptactionmanager.cpp')
-rw-r--r--lib/util/kscriptactionmanager.cpp4
1 files changed, 2 insertions, 2 deletions
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<KAction> 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 );
}