summaryrefslogtreecommitdiffstats
path: root/src/app/Synchronizer
diff options
context:
space:
mode:
Diffstat (limited to 'src/app/Synchronizer')
-rw-r--r--src/app/Synchronizer/synchronizer.cpp6
-rw-r--r--src/app/Synchronizer/synchronizerdirlist.cpp8
2 files changed, 7 insertions, 7 deletions
diff --git a/src/app/Synchronizer/synchronizer.cpp b/src/app/Synchronizer/synchronizer.cpp
index 7388dd4..38c3820 100644
--- a/src/app/Synchronizer/synchronizer.cpp
+++ b/src/app/Synchronizer/synchronizer.cpp
@@ -66,7 +66,7 @@
-#if KDE_IS_VERSION(3,5,0) && defined( HAVE_POSIX_ACL )
+#if defined( HAVE_POSIX_ACL )
#include <sys/acl.h>
#ifdef HAVE_NON_POSIX_ACL_EXTENSIONS
#include <acl/libacl.h>
@@ -1076,7 +1076,7 @@ void Synchronizer::slotTaskFinished(TDEIO::Job *job )
chmod( (const char *)( leftURL.path( -1 ).local8Bit() ), item->rightMode() & 07777 );
-#if KDE_IS_VERSION(3,5,0) && defined( HAVE_POSIX_ACL )
+#if defined( HAVE_POSIX_ACL )
if( !item->rightACL().isNull() )
{
acl_t acl = acl_from_text( item->rightACL().latin1() );
@@ -1117,7 +1117,7 @@ void Synchronizer::slotTaskFinished(TDEIO::Job *job )
chmod( (const char *)( rightURL.path( -1 ).local8Bit() ), item->leftMode() & 07777 );
-#if KDE_IS_VERSION(3,5,0) && defined( HAVE_POSIX_ACL )
+#if defined( HAVE_POSIX_ACL )
if( !item->leftACL().isNull() )
{
acl_t acl = acl_from_text( item->leftACL().latin1() );
diff --git a/src/app/Synchronizer/synchronizerdirlist.cpp b/src/app/Synchronizer/synchronizerdirlist.cpp
index 95bc89a..6dfa7d2 100644
--- a/src/app/Synchronizer/synchronizerdirlist.cpp
+++ b/src/app/Synchronizer/synchronizerdirlist.cpp
@@ -41,7 +41,7 @@
#include <tdeversion.h>
-#if KDE_IS_VERSION(3,5,0) && defined( HAVE_POSIX_ACL )
+#if defined( HAVE_POSIX_ACL )
#include <sys/acl.h>
#ifdef HAVE_NON_POSIX_ACL_EXTENSIONS
#include <acl/libacl.h>
@@ -193,10 +193,10 @@ void SynchronizerDirList::slotEntries( TDEIO::Job * job, const TDEIO::UDSEntryLi
vfile *item = new vfile( kfi.text(), kfi.size(), perm, kfi.time( TDEIO::UDS_MODIFICATION_TIME ),
kfi.isLink(), kfi.user(), kfi.group(), kfi.user(),
kfi.mimetype(), kfi.linkDest(), mode, rwx
-#if KDE_IS_VERSION(3,5,0) && defined( HAVE_POSIX_ACL )
- , kfi.ACL().asString()
+#if defined( HAVE_POSIX_ACL )
+ , kfi.ACL().asString()
#endif
- );
+ );
insert( key, item );
}
++it;