From e8f655c9225246c11d9290761459248299a1fb6a Mon Sep 17 00:00:00 2001 From: samelian Date: Sat, 9 Oct 2010 13:30:35 +0000 Subject: [PATCH] [dependencies/tqtinterface] prevent tqt defines for plain-C sources git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/dependencies/tqtinterface@1184224 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- qtinterface/tqt.h.cmake | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/qtinterface/tqt.h.cmake b/qtinterface/tqt.h.cmake index 6db0d61..8d71c61 100644 --- a/qtinterface/tqt.h.cmake +++ b/qtinterface/tqt.h.cmake @@ -19,6 +19,13 @@ Boston, MA 02110-1301, USA. */ +/* + I think we do not need tqtinterface definitions for + plain-C sources (samelian) +*/ + +#ifdef __cplusplus + #ifndef TQT_H #define TQT_H @@ -38,11 +45,9 @@ Boston, MA 02110-1301, USA. #undef TQT_SIGNAL #endif -#ifdef __cplusplus #define TQT_METHOD(a) METHOD(a) #define TQT_SLOT(a) SLOT(a) #define TQT_SIGNAL(a) SIGNAL(a) -#endif // __cplusplus #ifdef USE_QT3 #define qint64 long @@ -587,7 +592,6 @@ Boston, MA 02110-1301, USA. //#define TQT_QT_STRING_LIST_TYPE Q3StrList #define TQT_QT_STRING_LIST_TYPE TQStrList -#ifdef __cplusplus class TQT_QT_STRING_LIST_TYPE; class QUObject; @@ -648,7 +652,6 @@ class QUObject; #include #include -#endif // __cplusplus #define tqchildren ptrchildren #define tqaccess access() @@ -1327,3 +1330,5 @@ class QUObject; //#define TQT_EXPORT KDE_EXPORT #endif /* TQT_H */ + +#endif