summaryrefslogtreecommitdiffstats
path: root/konqueror/client
diff options
context:
space:
mode:
authorTimothy Pearson <[email protected]>2013-01-22 20:15:55 -0600
committerTimothy Pearson <[email protected]>2013-01-22 20:15:55 -0600
commit1d061b286a8b183b39be60fe531f2b1c2915f03a (patch)
tree0a4c6ee79918e366077094fb59e9c1196d7f4156 /konqueror/client
parent1e0a98b8623428064963b1627e4e09ea02c1e87e (diff)
downloadtdebase-1d061b286a8b183b39be60fe531f2b1c2915f03a.tar.gz
tdebase-1d061b286a8b183b39be60fe531f2b1c2915f03a.zip
Rename KInstance and KAboutData to avoid conflicts with KDE4
Diffstat (limited to 'konqueror/client')
-rw-r--r--konqueror/client/kfmclient.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/konqueror/client/kfmclient.cc b/konqueror/client/kfmclient.cc
index 30f5b9c6a..566bb543d 100644
--- a/konqueror/client/kfmclient.cc
+++ b/konqueror/client/kfmclient.cc
@@ -459,7 +459,7 @@ bool clientApp::doIt()
if ( command == "openURL" || command == "newTab" )
{
- KInstance inst(appName);
+ TDEInstance inst(appName);
if( !TDEApplication::dcopClient()->attach())
{
TDEApplication::startKdeinit();
@@ -484,7 +484,7 @@ bool clientApp::doIt()
}
else if ( command == "openProfile" )
{
- KInstance inst(appName);
+ TDEInstance inst(appName);
if( !TDEApplication::dcopClient()->attach())
{
TDEApplication::startKdeinit();