From 6e7a54d5c2237300ef8a02c8644619a434bbf3c2 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 25 Jan 2013 12:46:33 -0600 Subject: [PATCH] Rename KServer, KSocket, KIO_EXPORT, KIOInput, KIOJob, KIOConfig, KIOBuffer, and KBuffer to avoid conflicts with KDE4 --- src/kiconcanvas.h | 2 +- src/kicondialog.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/kiconcanvas.h b/src/kiconcanvas.h index 563ad0c..b177dd1 100644 --- a/src/kiconcanvas.h +++ b/src/kiconcanvas.h @@ -28,7 +28,7 @@ class TQIconLoader; /** * Icon canvas for KIconDialog. */ -class KIO_EXPORT KIconCanvas: public KIconView +class TDEIO_EXPORT KIconCanvas: public KIconView /* NOTE: Why export this? */ { Q_OBJECT diff --git a/src/kicondialog.h b/src/kicondialog.h index 7626090..3bc0133 100644 --- a/src/kicondialog.h +++ b/src/kicondialog.h @@ -41,7 +41,7 @@ class KIconLoader; * * @short An icon selection dialog. */ -class KIO_EXPORT KIconDialog: public KDialogBase +class TDEIO_EXPORT KIconDialog: public KDialogBase { Q_OBJECT @@ -216,7 +216,7 @@ private: * @see KIconDialog * @short A push button that allows selection of an icon. */ -class KIO_EXPORT KIconButton: public TQPushButton +class TDEIO_EXPORT KIconButton: public TQPushButton { Q_OBJECT