summaryrefslogtreecommitdiffstats
path: root/tdecore/kdcoppropertyproxy.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'tdecore/kdcoppropertyproxy.cpp')
-rw-r--r--tdecore/kdcoppropertyproxy.cpp30
1 files changed, 16 insertions, 14 deletions
diff --git a/tdecore/kdcoppropertyproxy.cpp b/tdecore/kdcoppropertyproxy.cpp
index 714e445bc..babf888fd 100644
--- a/tdecore/kdcoppropertyproxy.cpp
+++ b/tdecore/kdcoppropertyproxy.cpp
@@ -121,6 +121,22 @@ TQValueList<TQCString> KDCOPPropertyProxy::functions( TQObject *object )
return res;
}
+#define MARSHAL( type ) \
+ case TQVariant::type: \
+ { \
+ reply << prop.to##type(); \
+ break; \
+ }
+
+#define DEMARSHAL( type, val ) \
+ case TQVariant::type: \
+ { \
+ val v; \
+ stream >> v; \
+ prop = TQVariant( v ); \
+ break; \
+ }
+
bool KDCOPPropertyProxy::processPropertyRequest( const TQCString &fun, const TQByteArray &data,
TQCString &replyType, TQByteArray &replyData,
TQObject *object )
@@ -184,15 +200,6 @@ bool KDCOPPropertyProxy::processPropertyRequest( const TQCString &fun, const TQB
if ( type == TQVariant::Invalid )
return false;
-#define DEMARSHAL( type, val ) \
- case TQVariant::type: \
- { \
- val v; \
- stream >> v; \
- prop = TQVariant( v ); \
- } \
- break;
-
typedef TQValueList<TQVariant> ListType;
typedef TQStringVariantMap MapType;
@@ -251,11 +258,6 @@ bool KDCOPPropertyProxy::processPropertyRequest( const TQCString &fun, const TQB
replyType = prop.typeName();
TQDataStream reply( replyData, IO_WriteOnly );
-#define MARSHAL( type ) \
- case TQVariant::type: \
- reply << prop.to##type(); \
- break;
-
switch ( prop.type() )
{
MARSHAL( Cursor )