summaryrefslogtreecommitdiffstats
path: root/kutils
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-20 00:21:02 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-20 00:21:02 -0600
commit8e7816b2f9f62a2df094c5b2a7aa5abb6bc1226a (patch)
tree19ff5ecf5e6b5168e5503677f18b85f3dfa91f95 /kutils
parent5bca2e3e42d02f8fed9ffc399ea14f8a05694cb0 (diff)
downloadtdelibs-8e7816b2f9f62a2df094c5b2a7aa5abb6bc1226a.tar.gz
tdelibs-8e7816b2f9f62a2df094c5b2a7aa5abb6bc1226a.zip
Rename KApplication to TDEApplication to avoid conflicts with KDE4
Diffstat (limited to 'kutils')
-rw-r--r--kutils/kcmoduleloader.cpp2
-rw-r--r--kutils/tests/kfindtest.cpp2
-rw-r--r--kutils/tests/kreplacetest.cpp2
3 files changed, 3 insertions, 3 deletions
diff --git a/kutils/kcmoduleloader.cpp b/kutils/kcmoduleloader.cpp
index c8327a25e..2238616c2 100644
--- a/kutils/kcmoduleloader.cpp
+++ b/kutils/kcmoduleloader.cpp
@@ -177,7 +177,7 @@ KCModule* KCModuleLoader::loadModule(const KCModuleInfo &mod, ErrorReporting rep
*/
if(withfallback)
{
- KApplication::startServiceByDesktopPath(mod.fileName(), TQString::null);
+ TDEApplication::startServiceByDesktopPath(mod.fileName(), TQString::null);
}
else
{
diff --git a/kutils/tests/kfindtest.cpp b/kutils/tests/kfindtest.cpp
index 29710c070..6c64245dc 100644
--- a/kutils/tests/kfindtest.cpp
+++ b/kutils/tests/kfindtest.cpp
@@ -124,7 +124,7 @@ void KFindTest::slotHighlight(int id, int index, int matchedLength)
int main(int argc, char **argv)
{
TDECmdLineArgs::init(argc, argv, "kfindtest", "KFindTest", 0, 0, false);
- KApplication app;
+ TDEApplication app;
TQString text = "This file is part of the KDE project.\n"
"This library is free software; you can redistribute it and/or\n"
diff --git a/kutils/tests/kreplacetest.cpp b/kutils/tests/kreplacetest.cpp
index d7d6d6e6e..26b0f7c9e 100644
--- a/kutils/tests/kreplacetest.cpp
+++ b/kutils/tests/kreplacetest.cpp
@@ -253,7 +253,7 @@ static void testReplacementHistory()
int main( int argc, char **argv )
{
TDECmdLineArgs::init(argc, argv, "kreplacetest", 0, 0);
- KApplication app;
+ TDEApplication app;
testReplacementHistory(); // #130831