summaryrefslogtreecommitdiffstats
path: root/khtml/khtml_part.cpp
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 /khtml/khtml_part.cpp
parent5bca2e3e42d02f8fed9ffc399ea14f8a05694cb0 (diff)
downloadtdelibs-8e7816b2f9f62a2df094c5b2a7aa5abb6bc1226a.tar.gz
tdelibs-8e7816b2f9f62a2df094c5b2a7aa5abb6bc1226a.zip
Rename KApplication to TDEApplication to avoid conflicts with KDE4
Diffstat (limited to 'khtml/khtml_part.cpp')
-rw-r--r--khtml/khtml_part.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/khtml/khtml_part.cpp b/khtml/khtml_part.cpp
index a2843a53a..ffa1e0853 100644
--- a/khtml/khtml_part.cpp
+++ b/khtml/khtml_part.cpp
@@ -1136,7 +1136,7 @@ void KHTMLPart::launchJSErrorDialog() {
void KHTMLPart::launchJSConfigDialog() {
TQStringList args;
args << "khtml_java_js";
- KApplication::tdeinitExec( "kcmshell", args );
+ TDEApplication::tdeinitExec( "kcmshell", args );
}
TQVariant KHTMLPart::executeScript(const TQString& filename, int baseLine, const DOM::Node& n, const TQString& script)
@@ -7299,7 +7299,7 @@ void KHTMLPart::launchWalletManager()
{
#ifndef KHTML_NO_WALLET
if (!DCOPClient::mainClient()->isApplicationRegistered("kwalletmanager")) {
- KApplication::startServiceByDesktopName("kwalletmanager_show");
+ TDEApplication::startServiceByDesktopName("kwalletmanager_show");
} else {
DCOPRef r("kwalletmanager", "kwalletmanager-mainwindow#1");
r.send("show");