summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-25 12:46:33 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-25 12:46:33 -0600
commit6e7a54d5c2237300ef8a02c8644619a434bbf3c2 (patch)
tree1b1f378e9fd14ff3a8248fa0e0bf915b41a9d69a /src
parente54e867af243223a620f12bf260e1af9ac9f6dc5 (diff)
downloadbasket-6e7a54d5c2237300ef8a02c8644619a434bbf3c2.tar.gz
basket-6e7a54d5c2237300ef8a02c8644619a434bbf3c2.zip
Rename KServer, KSocket, KIO_EXPORT, KIOInput, KIOJob, KIOConfig, KIOBuffer, and KBuffer to avoid conflicts with KDE4
Diffstat (limited to 'src')
-rw-r--r--src/kiconcanvas.h2
-rw-r--r--src/kicondialog.h4
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