summaryrefslogtreecommitdiffstats
path: root/src/app/VFS/preservingcopyjob.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/app/VFS/preservingcopyjob.cpp')
-rw-r--r--src/app/VFS/preservingcopyjob.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/app/VFS/preservingcopyjob.cpp b/src/app/VFS/preservingcopyjob.cpp
index 04c3195..d399049 100644
--- a/src/app/VFS/preservingcopyjob.cpp
+++ b/src/app/VFS/preservingcopyjob.cpp
@@ -41,7 +41,7 @@
#include <grp.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>
@@ -100,7 +100,7 @@ void PreservingCopyJob::slotAboutToCreate( TDEIO::Job */*job*/, const TQValueLis
KDE_lstat( (*it).uSource.path(-1).local8Bit(),&stat_p); /* getting the date information */
TQString aclStr;
-#if KDE_IS_VERSION(3,5,0) && defined( HAVE_POSIX_ACL )
+#if defined( HAVE_POSIX_ACL )
acl_t acl = acl_get_file( (*it).uSource.path(-1).local8Bit(), ACL_TYPE_ACCESS );
bool aclExtended = false;
@@ -161,7 +161,7 @@ void PreservingCopyJob::slotResult( Job *job ) {
TDEIO::UDSEntry entry = static_cast<TDEIO::StatJob*>(job)->statResult();
KFileItem kfi(entry, url );
-#if KDE_IS_VERSION(3,5,0) && defined( HAVE_POSIX_ACL )
+#if defined( HAVE_POSIX_ACL )
fileAttributes[ url ] = Attributes( kfi.time( TDEIO::UDS_MODIFICATION_TIME ), kfi.user(), kfi.group(), kfi.mode(), kfi.ACL().asString() );
#else
fileAttributes[ url ] = Attributes( kfi.time( TDEIO::UDS_MODIFICATION_TIME ), kfi.user(), kfi.group(), kfi.mode(), TQString() );
@@ -213,7 +213,7 @@ void PreservingCopyJob::slotListEntries(TDEIO::Job *job, const TDEIO::UDSEntryLi
case TDEIO::UDS_ACCESS:
mode = (*it2).m_long;
break;
-#if KDE_IS_VERSION(3,5,0) && defined( HAVE_POSIX_ACL )
+#if defined( HAVE_POSIX_ACL )
case TDEIO::UDS_ACL_STRING:
acl = (*it2).m_str;
break;
@@ -265,7 +265,7 @@ void PreservingCopyJob::slotCopyingDone( TDEIO::Job *, const KURL &from, const K
if( attrs.mode != (mode_t) -1 )
chmod( (const char *)( to.path( -1 ).local8Bit() ), attrs.mode );
-#if KDE_IS_VERSION(3,5,0) && defined( HAVE_POSIX_ACL )
+#if defined( HAVE_POSIX_ACL )
if( !attrs.acl.isNull() )
{
acl_t acl = acl_from_text( attrs.acl.latin1() );