From d1bd46309ad2bee123bdf9081ae5b4e0aa7ccc7e Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 25 Jan 2013 13:15:51 -0600 Subject: Rename KServer, KSocket, KIO_EXPORT, KIOInput, KIOJob, KIOConfig, KIOBuffer, and KBuffer to avoid conflicts with KDE4 --- tdecore/tdelibs_export.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'tdecore/tdelibs_export.h') diff --git a/tdecore/tdelibs_export.h b/tdecore/tdelibs_export.h index 767752689..a226eac94 100644 --- a/tdecore/tdelibs_export.h +++ b/tdecore/tdelibs_export.h @@ -37,7 +37,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 @@ -73,8 +73,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 -- cgit v1.2.3