[Kde-bindings] KDE/kdebindings

[Richard Dale]

SVN commit 634246 by rdale:

* Use the Q_DECL_EXPORT macro instead of the KDE_EXPORT one to avoid kde
  dependencies in the qt-only part of qtruby and the smoke library.

CCMAIL: kde-bindings at kde.org



 M  +4 -4      qtruby/rubylib/qtruby/Qt.cpp  
 M  +5 -3      smoke/qt/qt_smoke.h  


--- trunk/KDE/kdebindings/qtruby/rubylib/qtruby/Qt.cpp #634245:634246
@@ -77,13 +77,13 @@
 #include "smokeruby.h"
 #include "smoke.h"
 #include "marshall_types.h"
-#include <kdemacros.h>
 // #define DEBUG
 
 #define QTRUBY_VERSION "1.4.7"
 
-extern KDE_EXPORT Smoke *qt_Smoke;
-extern KDE_EXPORT void init_qt_Smoke();
+// Don't use kdemacros.h/KDE_EXPORT here as it needs to be free of KDE dependencies
+extern Q_DECL_EXPORT Smoke *qt_Smoke;
+extern Q_DECL_EXPORT void init_qt_Smoke();
 extern void smokeruby_mark(void * ptr);
 extern void smokeruby_free(void * ptr);
 extern VALUE qchar_to_s(VALUE self);
@@ -3292,7 +3292,7 @@
 	return Qnil;
 }
 
-extern KDE_EXPORT void
+extern Q_DECL_EXPORT void
 Init_qtruby4()
 {
 	if (qt_Smoke != 0L) {
--- trunk/KDE/kdebindings/smoke/qt/qt_smoke.h #634245:634246
@@ -1,9 +1,11 @@
 #ifndef QT_SMOKE_H
 #define QT_SMOKE_H
-#include <kdemacros.h>
+
+// Don't use kdemacros.h/KDE_EXPORT here as it needs to be free of KDE dependencies
+#include <QtCore/qglobal.h>
 // Defined in smokedata.cpp, initialized by init_qt_Smoke(), used by all .cpp files
-extern KDE_EXPORT Smoke* qt_Smoke;
-extern KDE_EXPORT void init_qt_Smoke();
+extern Q_DECL_EXPORT Smoke* qt_Smoke;
+extern Q_DECL_EXPORT void init_qt_Smoke();
 
 class QGlobalSpace { };