Remove use of KDE_IS_VERSIONremove/kde-is-version

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>

6 files changed, 8 insertions, 34 deletions

diff --git a/src/app/VFS/ftp_vfs.cpp b/src/app/VFS/ftp_vfs.cpp
index 2da0665..0e48ba2 100644
--- a/src/app/VFS/ftp_vfs.cpp
+++ b/src/app/VFS/ftp_vfs.cpp
@@ -113,25 +113,17 @@ void ftp_vfs::slotAddFiles( TDEIO::Job *, const TDEIO::UDSEntryList& entries ) {
 					currentUser = ""; // empty, but not TQString()
 				}
 			}
-#if KDE_IS_VERSION(3,5,0)
 			temp = new vfile( name, size, perm, mtime, symLink,
 			                  kfi.user(), kfi.group(), currentUser, 
 			                  mime, symDest, mode, rwx, kfi.ACL().asString(),
 			                  kfi.defaultACL().asString() );
-#else
-			temp = new vfile( name, size, perm, mtime, symLink, kfi.user(), kfi.group(), currentUser, mime, symDest, mode, rwx );
-#endif
 		}
 
-#if KDE_IS_VERSION(3,4,0)
 		if( !kfi.localPath().isEmpty() ){
 			temp->vfile_setUrl( kfi.localPath() );
 		} else {
 			temp->vfile_setUrl( kfi.url() );
 		}
-#else
-		temp->vfile_setUrl( kfi.url() );
-#endif
 		temp->vfile_setIcon( kfi.iconName() );
 		foundVfile( temp );
 	}
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 )
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() );
diff --git a/src/app/VFS/vfile.cpp b/src/app/VFS/vfile.cpp
index c333f45..35dba93 100644
--- a/src/app/VFS/vfile.cpp
+++ b/src/app/VFS/vfile.cpp
@@ -234,7 +234,6 @@ const TDEIO::UDSEntry vfile::vfile_getEntry() {
 		entry.append(atom);
 	}
 
-#if KDE_IS_VERSION(3,5,0)
 	if( !vfile_acl_loaded )
 		vfile_loadACL();
 	if( vfile_has_acl ) {
@@ -256,7 +255,6 @@ const TDEIO::UDSEntry vfile::vfile_getEntry() {
 			entry.append(atom);
 		}
 	}
-#endif
 
 	return entry;
 }
diff --git a/src/app/VFS/vfs.cpp b/src/app/VFS/vfs.cpp
index e6804e6..9785283 100644
--- a/src/app/VFS/vfs.cpp
+++ b/src/app/VFS/vfs.cpp
@@ -35,6 +35,7 @@
 #include <time.h>
 #include <tqeventloop.h>
 #include <tdeapplication.h>
+#include <kdirsize.h>
 #include <klargefile.h>
 #include <tqdir.h>
 #include "vfs.h"
@@ -286,9 +287,6 @@ void vfs::vfs_requestDelete() {
 	deleteRequested = true;
 }
 
-/// to be implemented
-#if KDE_IS_VERSION(3,3,0)
-#include <kdirsize.h>
 void vfs::slotKdsResult( TDEIO::Job* job){
 	if( job && !job->error() ){
 		KDirSize* kds = static_cast<KDirSize*>(job);
@@ -377,10 +375,6 @@ void vfs::slotStatResultArrived( TDEIO::Job* job ) {
 	stat_busy = false;
 }
         
-#else
-void vfs::slotKdsResult(TDEIO::Job *job){/* empty */}
-void vfs::vfs_calcSpace( TQString /*name*/ , TDEIO::filesize_t* /*totalSize*/, unsigned long* /*totalFiles*/, unsigned long* /*totalDirs*/, bool* /*stop*/ ) {/* empty*/}
-#endif
 
 TQValueList<vfile*> vfs::vfs_search(const KRQuery& filter) {
 	TQValueList<vfile*> result;
diff --git a/src/app/VFS/virt_vfs.cpp b/src/app/VFS/virt_vfs.cpp
index 2b40c38..4592221 100644
--- a/src/app/VFS/virt_vfs.cpp
+++ b/src/app/VFS/virt_vfs.cpp
@@ -121,11 +121,7 @@ void virt_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* ) ), krApp, TQ_SLOT( changeTrashIcon() ) );
 	} else
 		job = new TDEIO::DeleteJob( filesUrls, false, true );