[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    playground/edu/step/stepcore
From:       Vladimir Kuznetsov <ks.vladimir () gmail ! com>
Date:       2007-12-01 10:59:05
Message-ID: 1196506745.704613.2414.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 743551 by ksvladimir:

Don't use __STRING since it's GCC-specific.


 M  +5 -3      object.h  
 M  +3 -0      util.h  


--- trunk/playground/edu/step/stepcore/object.h #743550:743551
@@ -27,6 +27,8 @@
 #include <QVariant>
 #include <QBitArray>
 
+#include "util.h"
+
 namespace StepCore {
 
 class MetaObject;
@@ -316,7 +318,7 @@
     const StepCore::MetaProperty _className::_classProperties[] = { \
                _STEPCORE_PROPERTY_NULL, __properties }; \
     const StepCore::MetaObject*  _className::_superClasses[] = { 0, __superClasses \
}; \  const StepCore::MetaObject   _className::_metaObject = { \
-        QString(__STRING(_className)), QString(_description), _flags, \
+        QString(STEPCORE_STRINGIFY(_className)), QString(_description), _flags, \
         StepCore::MetaObjectHelper<_className, _flags & \
                StepCore::MetaObject::ABSTRACT>::newObjectHelper, \
         StepCore::MetaObjectHelper<_className, _flags & \
                StepCore::MetaObject::ABSTRACT>::cloneObjectHelper, \
         _superClasses+1, sizeof(_superClasses)/sizeof(*_superClasses)-1, \
@@ -325,7 +327,7 @@
 #define STEPCORE_SUPER_CLASS(_className) _className::staticMetaObject(),
 
 #define STEPCORE_PROPERTY_RF(_type, _name, _units, _description, _flags, _read) \
-    { __STRING(_name), _units, _description, \
+    { STEPCORE_STRINGIFY(_name), _units, _description, \
       StepCore::MetaProperty::READABLE | _flags, qMetaTypeId<_type>(), \
       StepCore::MetaPropertyHelper<_thisType, _type>::read<&_thisType::_read>, \
       StepCore::MetaPropertyHelper<_thisType, _type>::writeNull, \
@@ -333,7 +335,7 @@
       StepCore::MetaPropertyHelper<_thisType, _type>::writeStringNull },
 
 #define STEPCORE_PROPERTY_RWF(_type, _name, _units, _description, _flags, _read, \
                _write) \
-    { __STRING(_name), _units, _description, \
+    { STEPCORE_STRINGIFY(_name), _units, _description, \
       StepCore::MetaProperty::READABLE | StepCore::MetaProperty::WRITABLE | _flags, \
\  qMetaTypeId<_type>(), \
       StepCore::MetaPropertyHelper<_thisType, _type>::read<&_thisType::_read>, \
--- trunk/playground/edu/step/stepcore/util.h #743550:743551
@@ -48,6 +48,9 @@
 #define STEPCORE_UNUSED
 #endif
 
+#define STEPCORE_STRINGIFY(x) _STEPCORE_STRINGIFY(x)
+#define _STEPCORE_STRINGIFY(x) #x
+
 #ifdef NDEBUG
 #define STEPCORE_ASSERT_NOABORT(expr)
 #else // NDEBUG


[prev in list] [next in list] [prev in thread] [next in thread]