summaryrefslogtreecommitdiffstats
path: root/kioslave/settings
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-22 20:15:55 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-22 20:15:55 -0600
commit1d061b286a8b183b39be60fe531f2b1c2915f03a (patch)
tree0a4c6ee79918e366077094fb59e9c1196d7f4156 /kioslave/settings
parent1e0a98b8623428064963b1627e4e09ea02c1e87e (diff)
downloadtdebase-1d061b286a8b183b39be60fe531f2b1c2915f03a.tar.gz
tdebase-1d061b286a8b183b39be60fe531f2b1c2915f03a.zip
Rename KInstance and KAboutData to avoid conflicts with KDE4
Diffstat (limited to 'kioslave/settings')
-rw-r--r--kioslave/settings/kio_settings.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/kioslave/settings/kio_settings.cc b/kioslave/settings/kio_settings.cc
index c508762c9..26e04d9e5 100644
--- a/kioslave/settings/kio_settings.cc
+++ b/kioslave/settings/kio_settings.cc
@@ -52,7 +52,7 @@ extern "C" {
KDE_EXPORT int kdemain( int, char **argv )
{
kdDebug() << "kdemain for settings kioslave" << endl;
- KInstance instance( "kio_settings" );
+ TDEInstance instance( "kio_settings" );
SettingsProtocol slave(argv[1], argv[2], argv[3]);
slave.dispatchLoop();
return 0;