[Libreoffice-commits] core.git: tools/inc tools/source

[Jiri Blecha]

 tools/inc/tools/fsys.hxx     |    8 ++------
 tools/source/fsys/dirent.cxx |   26 +++++++-------------------
 tools/source/fsys/fstat.cxx  |    3 +--
 tools/source/fsys/wntmsc.cxx |    4 ++--
 4 files changed, 12 insertions(+), 29 deletions(-)

New commits:
commit 66f426b8fa1ceff10ac26319796af73ab0ef198d
Author: Jiri Blecha <blechji4 at fel.cvut.cz>
Date:   Sat Mar 2 17:25:06 2013 +0100

    The macro FEAT_FSYS_DOUBLESPEED has been removed and the related #if / #endif have been removed too.
    
    Bug: 61516
    Change-Id: Id347e87a8789ddbe550dde7d7281d9c1cad0c199

diff --git a/tools/inc/tools/fsys.hxx b/tools/inc/tools/fsys.hxx
index 293fea9..b710080 100644
--- a/tools/inc/tools/fsys.hxx
+++ b/tools/inc/tools/fsys.hxx
@@ -30,8 +30,6 @@
 #include <cstdarg>
 #include <vector>
 
-#define FEAT_FSYS_DOUBLESPEED
-
 // FSys-Types
 class DirEntry;
 class FileStat;
@@ -188,9 +186,8 @@ class TOOLS_DLLPUBLIC DirEntry
 friend struct DirReader_Impl;
 friend class FileCopier;
 
-#ifdef FEAT_FSYS_DOUBLESPEED
     FileStat*           pStat;      // optional
-#endif
+
     rtl::OString        aName;
     DirEntry*           pParent;
     sal_uIntPtr         nError;
@@ -214,10 +211,9 @@ protected:
     DirEntryFlag        ImpTheFlag() const { return eFlag; };
     DirEntry*           ImpChangeParent( DirEntry* pNewParent, sal_Bool bNormalize = sal_True );
     DirEntry*           ImpGetParent() { return pParent; }
-#ifdef FEAT_FSYS_DOUBLESPEED
+
     FileStat*           ImpGetStat() const { return pStat; }
     void                ImpSetStat( FileStat *p ) { pStat = p; }
-#endif
 
 protected:
     void                SetError( sal_uIntPtr nErr ) { nError = nErr; }
diff --git a/tools/source/fsys/dirent.cxx b/tools/source/fsys/dirent.cxx
index d00ed7c..e0231d4 100644
--- a/tools/source/fsys/dirent.cxx
+++ b/tools/source/fsys/dirent.cxx
@@ -547,9 +547,7 @@ void DirEntry::ImpTrim()
 }
 
 DirEntry::DirEntry( const rtl::OString& rName, DirEntryFlag eDirFlag ) :
-#ifdef FEAT_FSYS_DOUBLESPEED
             pStat( 0 ),
-#endif
             aName( rName )
 {
     DBG_CTOR( DirEntry, ImpCheckDirEntry );
@@ -562,9 +560,7 @@ DirEntry::DirEntry( const rtl::OString& rName, DirEntryFlag eDirFlag ) :
 }
 
 DirEntry::DirEntry( const DirEntry& rOrig ) :
-#ifdef FEAT_FSYS_DOUBLESPEED
             pStat( rOrig.pStat ? new FileStat(*rOrig.pStat) : 0 ),
-#endif
             aName( rOrig.aName )
 {
     DBG_CTOR( DirEntry, ImpCheckDirEntry );
@@ -582,10 +578,8 @@ DirEntry::DirEntry( const DirEntry& rOrig ) :
     }
 }
 
-DirEntry::DirEntry( const String& rInitName, FSysPathStyle eStyle )
-#ifdef FEAT_FSYS_DOUBLESPEED
-            : pStat( 0 )
-#endif
+DirEntry::DirEntry( const String& rInitName, FSysPathStyle eStyle ) :
+            pStat( 0 )
 {
     DBG_CTOR( DirEntry, ImpCheckDirEntry );
 
@@ -636,10 +630,8 @@ DirEntry::DirEntry( const String& rInitName, FSysPathStyle eStyle )
         eFlag = FSYS_FLAG_INVALID;
 }
 
-DirEntry::DirEntry( const rtl::OString& rInitName, FSysPathStyle eStyle )
-#ifdef FEAT_FSYS_DOUBLESPEED
-            : pStat( 0 )
-#endif
+DirEntry::DirEntry( const rtl::OString& rInitName, FSysPathStyle eStyle ) :
+            pStat( 0 )
 {
     DBG_CTOR( DirEntry, ImpCheckDirEntry );
 
@@ -682,10 +674,8 @@ DirEntry::DirEntry( const rtl::OString& rInitName, FSysPathStyle eStyle )
         eFlag = FSYS_FLAG_INVALID;
 }
 
-DirEntry::DirEntry( DirEntryFlag eDirFlag )
-#ifdef FEAT_FSYS_DOUBLESPEED
-            : pStat( 0 )
-#endif
+DirEntry::DirEntry( DirEntryFlag eDirFlag ) :
+            pStat( 0 )
 {
     DBG_CTOR( DirEntry, ImpCheckDirEntry );
 
@@ -699,10 +689,8 @@ DirEntry::~DirEntry()
     DBG_DTOR( DirEntry, ImpCheckDirEntry );
 
     delete pParent;
-#ifdef FEAT_FSYS_DOUBLESPEED
-    delete pStat;
-#endif
 
+    delete pStat;
 }
 
 const DirEntry* DirEntry::ImpGetTopPtr() const
diff --git a/tools/source/fsys/fstat.cxx b/tools/source/fsys/fstat.cxx
index bf1c6b7..a0bbae1 100644
--- a/tools/source/fsys/fstat.cxx
+++ b/tools/source/fsys/fstat.cxx
@@ -39,7 +39,6 @@ FileStat::FileStat( const DirEntry& rDirEntry, FSysAccess nAccess )
     sal_Bool bCached = FSYS_ACCESS_CACHED == (nAccess & FSYS_ACCESS_CACHED);
     sal_Bool bFloppy = FSYS_ACCESS_FLOPPY == (nAccess & FSYS_ACCESS_FLOPPY);
 
-#ifdef FEAT_FSYS_DOUBLESPEED
     const FileStat *pStatFromDir = bCached ? rDirEntry.ImpGetStat() : 0;
     if ( pStatFromDir )
     {
@@ -56,7 +55,7 @@ FileStat::FileStat( const DirEntry& rDirEntry, FSysAccess nAccess )
         aTimeAccessed = pStatFromDir->aTimeAccessed;
     }
     else
-#endif
+
         Update( rDirEntry, bFloppy );
 }
 
diff --git a/tools/source/fsys/wntmsc.cxx b/tools/source/fsys/wntmsc.cxx
index f6c9e0e..b1c416c 100644
--- a/tools/source/fsys/wntmsc.cxx
+++ b/tools/source/fsys/wntmsc.cxx
@@ -275,9 +275,9 @@ USHORT DirReader_Impl::Read()
                 :   FSYS_FLAG_NORMAL;
             DirEntry *pTemp = new DirEntry( rtl::OString(pDosEntry->d_name),
                                             eFlag );
-#ifdef FEAT_FSYS_DOUBLESPEED
+
             pTemp->ImpSetStat( new FileStat( (void*) pDosDir ) );
-#endif
+
             if ( pParent )
                 pTemp->ImpChangeParent( new DirEntry( *pParent ), sal_False );
             if ( pDir->pStatLst ) // Status required by sorting criteria?