summaryrefslogtreecommitdiffstats
path: root/tdecore
diff options
context:
space:
mode:
authorMichele Calgaro <[email protected]>2020-12-27 19:34:50 +0900
committerMichele Calgaro <[email protected]>2020-12-27 19:34:50 +0900
commit9468d05e3d2c56d4287ef464a31f21a689ad7e14 (patch)
treeadf22710dca7ba948cfbd53e82036ea854727e64 /tdecore
parent225e0d0b0f6d86433af9ee534e3a4d298289bc1d (diff)
downloadtdelibs-9468d05e3d2c56d4287ef464a31f21a689ad7e14.tar.gz
tdelibs-9468d05e3d2c56d4287ef464a31f21a689ad7e14.zip
Fixed second pass uncrustify's code formatting offending files.
Signed-off-by: Michele Calgaro <[email protected]>
Diffstat (limited to 'tdecore')
-rw-r--r--tdecore/kdcoppropertyproxy.cpp30
-rw-r--r--tdecore/ksimpledirwatch.cpp4
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;
}