diff options
author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-22 20:15:55 -0600 |
---|---|---|
committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-22 20:15:55 -0600 |
commit | 1d061b286a8b183b39be60fe531f2b1c2915f03a (patch) | |
tree | 0a4c6ee79918e366077094fb59e9c1196d7f4156 /kioslave/mac/kio_mac.cpp | |
parent | 1e0a98b8623428064963b1627e4e09ea02c1e87e (diff) | |
download | tdebase-1d061b286a8b183b39be60fe531f2b1c2915f03a.tar.gz tdebase-1d061b286a8b183b39be60fe531f2b1c2915f03a.zip |
Rename KInstance and KAboutData to avoid conflicts with KDE4
Diffstat (limited to 'kioslave/mac/kio_mac.cpp')
-rw-r--r-- | kioslave/mac/kio_mac.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kioslave/mac/kio_mac.cpp b/kioslave/mac/kio_mac.cpp index e64d22d65..d13b59f71 100644 --- a/kioslave/mac/kio_mac.cpp +++ b/kioslave/mac/kio_mac.cpp @@ -36,7 +36,7 @@ using namespace KIO; extern "C" { int KDE_EXPORT kdemain(int, char **argv) { - KInstance instance("kio_mac"); + TDEInstance instance("kio_mac"); MacProtocol slave(argv[2], argv[3]); slave.dispatchLoop(); return 0; |