diff options
Diffstat (limited to 'tdecore')
| -rw-r--r-- | tdecore/kdcoppropertyproxy.cpp | 30 | ||||
| -rw-r--r-- | tdecore/ksimpledirwatch.cpp | 4 |
2 files changed, 20 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 ) diff --git a/tdecore/ksimpledirwatch.cpp b/tdecore/ksimpledirwatch.cpp index 3861b52d2..cbb4ce682 100644 --- a/tdecore/ksimpledirwatch.cpp +++ b/tdecore/ksimpledirwatch.cpp @@ -1501,10 +1501,14 @@ void KSimpleDirWatchPrivate::checkFAMEvent(FAMEvent* fe) removeEntry(0,e->path,sub_entry); // <e> can be invalid here!! sub_entry->m_status = Normal; if (!useFAM(sub_entry)) + { #ifdef HAVE_INOTIFY if (!useINotify(sub_entry )) #endif + { useStat(sub_entry); + } + } } break; } |