diff options
Diffstat (limited to 'src/app/VFS/normal_vfs.cpp')
| -rw-r--r-- | src/app/VFS/normal_vfs.cpp | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/src/app/VFS/normal_vfs.cpp b/src/app/VFS/normal_vfs.cpp index f81ab9a..bc9c930 100644 --- a/src/app/VFS/normal_vfs.cpp +++ b/src/app/VFS/normal_vfs.cpp @@ -55,14 +55,12 @@ #include "../krslots.h" // header files for ACL -#if KDE_IS_VERSION(3,5,0) #ifdef HAVE_POSIX_ACL #include <sys/acl.h> #ifdef HAVE_NON_POSIX_ACL_EXTENSIONS #include <acl/libacl.h> #endif #endif -#endif normal_vfs::normal_vfs(TQObject* panel):vfs(panel), watcher(0) { vfs_type=NORMAL; @@ -185,11 +183,7 @@ void normal_vfs::vfs_delFiles(TQStringList *fileNames){ // delete of move to trash ? krConfig->setGroup("General"); if( krConfig->readBoolEntry("Move To Trash",_MoveToTrash) ){ -#if KDE_IS_VERSION(3,4,0) job = TDEIO::trash(filesUrls, true ); -#else - job = new TDEIO::CopyJob(filesUrls,TDEGlobalSettings::trashPath(),TDEIO::CopyJob::Move,false,true ); -#endif connect(job,TQ_SIGNAL(result(TDEIO::Job*)),SLOTS,TQ_SLOT(changeTrashIcon())); } else @@ -283,7 +277,7 @@ vfile* normal_vfs::vfileFromName(const TQString& name){ void normal_vfs::getACL( vfile *file, TQString &acl, TQString &defAcl ) { acl = defAcl = TQString(); -#if KDE_IS_VERSION(3,5,0) && defined( HAVE_POSIX_ACL ) +#if defined( HAVE_POSIX_ACL ) TQCString fileName = file->vfile_getUrl().path( -1 ).local8Bit(); #if HAVE_NON_POSIX_ACL_EXTENSIONS if ( acl_extended_file( fileName.data() ) ) @@ -300,7 +294,7 @@ void normal_vfs::getACL( vfile *file, TQString &acl, TQString &defAcl ) TQString normal_vfs::getACL( const TQString & path, int type ) { -#if KDE_IS_VERSION(3,5,0) && defined( HAVE_POSIX_ACL ) +#if defined( HAVE_POSIX_ACL ) acl_t acl = 0; // do we have an acl for the file, and/or a default acl for the dir, if it is one? if ( ( acl = acl_get_file( path.ascii(), type ) ) != 0 ) |