summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-25 13:20:01 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-25 13:20:01 -0600
commit93ec82602aa008218cc1ee075ff13d65b3a317ea (patch)
tree1c91bb81ee87d529d3bba8dab032fa90f8fd4032
parentf9ced3b3f13f3136ef63c33ef163042010d6e80b (diff)
downloadtdewebdev-93ec82602aa008218cc1ee075ff13d65b3a317ea.tar.gz
tdewebdev-93ec82602aa008218cc1ee075ff13d65b3a317ea.zip
Rename KServer, KSocket, KIO_EXPORT, KIOInput, KIOJob, KIOConfig, KIOBuffer, and KBuffer to avoid conflicts with KDE4
-rw-r--r--lib/compatibility/kmdi/qextmdi/tdelibs_export.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/compatibility/kmdi/qextmdi/tdelibs_export.h b/lib/compatibility/kmdi/qextmdi/tdelibs_export.h
index 8ff4bda9..57c2f0aa 100644
--- a/lib/compatibility/kmdi/qextmdi/tdelibs_export.h
+++ b/lib/compatibility/kmdi/qextmdi/tdelibs_export.h
@@ -40,7 +40,7 @@
#define TDEFX_EXPORT KDE_EXPORT
#define TDEPRINT_EXPORT KDE_EXPORT
#define KDNSSD_EXPORT KDE_EXPORT
-#define KIO_EXPORT KDE_EXPORT
+#define TDEIO_EXPORT KDE_EXPORT
#define DCOP_EXPORT KDE_EXPORT
#define KPARTS_EXPORT KDE_EXPORT
#define KTEXTEDITOR_EXPORT KDE_EXPORT
@@ -74,8 +74,8 @@
# ifndef TDECORE_EXPORT_DEPRECATED
# define TDECORE_EXPORT_DEPRECATED KDE_DEPRECATED TDECORE_EXPORT
# endif
-# ifndef KIO_EXPORT_DEPRECATED
-# define KIO_EXPORT_DEPRECATED KDE_DEPRECATED KIO_EXPORT
+# ifndef TDEIO_EXPORT_DEPRECATED
+# define TDEIO_EXPORT_DEPRECATED KDE_DEPRECATED TDEIO_EXPORT
# endif
# ifndef TDEUI_EXPORT_DEPRECATED
# define TDEUI_EXPORT_DEPRECATED KDE_DEPRECATED TDEUI_EXPORT