summaryrefslogtreecommitdiffstats
path: root/dcop
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-25 00:35:07 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-25 00:35:07 -0600
commit703fb0c89c2eee56a1e613e67a446db9d4287929 (patch)
treedd8c5ca66075cd89c2638a2b48cf78386a9870a7 /dcop
parent818e7abec3d5d3809b6b77293558678371c16b71 (diff)
downloadtdelibs-703fb0c89c2eee56a1e613e67a446db9d4287929.tar.gz
tdelibs-703fb0c89c2eee56a1e613e67a446db9d4287929.zip
Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4
Diffstat (limited to 'dcop')
-rw-r--r--dcop/dcopidl/dcopidl_test.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/dcop/dcopidl/dcopidl_test.h b/dcop/dcopidl/dcopidl_test.h
index 2e896fb52..6f39cab99 100644
--- a/dcop/dcopidl/dcopidl_test.h
+++ b/dcop/dcopidl/dcopidl_test.h
@@ -14,7 +14,7 @@ class Test2;
// this has to work too
#include <tqstring.h>
-typedef TQMap<KIO::Job *, KIODownload> KIODownloadMap;
+typedef TQMap<TDEIO::Job *, KIODownload> KIODownloadMap;
class Test3;
// Those namespaces are opened and closed, so they should be just ignored
@@ -78,7 +78,7 @@ private:
Test3 *doc();
struct KIODownload;
- typedef TQMap<KIO::Job *, KIODownload> KIODownloadMap;
+ typedef TQMap<TDEIO::Job *, KIODownload> KIODownloadMap;
};
class Test2 : public DCOPObject