diff options
author | Thomas Arnhold <thomas@arnhold.org> | 2011-07-21 10:50:29 +0200 |
---|---|---|
committer | Thomas Arnhold <thomas@arnhold.org> | 2011-07-21 15:42:51 +0200 |
commit | e5647de7dd26775e45af24f11ac4f82a5518bd9e (patch) | |
tree | 0cdf163e8a9a2aebd0e8c91b443b2243a8b4fe6a /tools | |
parent | ca402fa0dae85f7f289398af34aa43cf06d14e87 (diff) |
callcatcher: clean up Dir and DirEntry
Diffstat (limited to 'tools')
-rw-r--r-- | tools/inc/tools/fsys.hxx | 6 | ||||
-rw-r--r-- | tools/source/fsys/dirent.cxx | 50 | ||||
-rw-r--r-- | tools/source/fsys/tdir.cxx | 39 |
3 files changed, 0 insertions, 95 deletions
diff --git a/tools/inc/tools/fsys.hxx b/tools/inc/tools/fsys.hxx index fbcafefacd6b..a0a494f538ad 100644 --- a/tools/inc/tools/fsys.hxx +++ b/tools/inc/tools/fsys.hxx @@ -290,7 +290,6 @@ public: void SetExtension( const String& rExt, char cSep = '.' ); String GetExtension( char cSep = '.' ) const; - String CutExtension( char cSep = '.' ); void SetName( const String& rName, FSysPathStyle eFormatter = FSYS_STYLE_HOST ); inline const String GetNameDirect() const { return String(aName, osl_getThreadTextEncoding()); } String GetName( FSysPathStyle eFormatter = FSYS_STYLE_HOST ) const; @@ -336,7 +335,6 @@ public: sal_Bool operator !=( const DirEntry& rAnotherDir ) const { return !(DirEntry::operator==( rAnotherDir )); } - StringCompare NameCompare( const DirEntry &rWith ) const; inline StringCompare NameCompareDirect( const DirEntry &rWith ) const { #ifdef UNX @@ -447,12 +445,8 @@ protected: #endif public: - Dir(); Dir( const DirEntry& rDirEntry, DirEntryKind nKind = FSYS_KIND_ALL ); - Dir( const DirEntry& rDirEntry, - DirEntryKind nKind, - FSysSort nSort, ... ); ~Dir(); void Reset(); diff --git a/tools/source/fsys/dirent.cxx b/tools/source/fsys/dirent.cxx index 0e8f37ef623d..ea3db76c5c07 100644 --- a/tools/source/fsys/dirent.cxx +++ b/tools/source/fsys/dirent.cxx @@ -1135,31 +1135,6 @@ String DirEntry::CutName( FSysPathStyle eStyle ) /************************************************************************* |* -|* DirEntry::NameCompare -|* -|* Beschreibung Vergleich nur die Namen (ohne Pfad, aber mit Gross/Klein) -|* -*************************************************************************/ - -StringCompare DirEntry::NameCompare( const DirEntry &rWith ) const -{ - ByteString aThisName; - ByteString aParameterName; - -#ifdef UNX - aThisName = aName; - aParameterName = rWith.aName; -#else - aThisName = ByteString(aName).ToLowerAscii(); - aParameterName = ByteString(rWith.aName).ToLowerAscii(); -#endif - - return aThisName.CompareTo( aParameterName ); -} - - -/************************************************************************* -|* |* DirEntry::operator==() |* *************************************************************************/ @@ -1375,31 +1350,6 @@ void DirEntry::SetExtension( const String& rExtension, char cSep ) /************************************************************************* |* -|* DirEntry::CutExtension() -|* -*************************************************************************/ - -String DirEntry::CutExtension( char cSep ) -{ - DBG_CHKTHIS( DirEntry, ImpCheckDirEntry ); - - const char *p0 = ( aName.GetBuffer() ); - const char *p1 = p0 + aName.Len() - 1; - while ( p1 >= p0 && *p1 != cSep ) - p1--; - - if ( p1 >= p0 ) - { - // es wurde ein cSep an der Position p1 gefunden - aName.Erase( static_cast< xub_StrLen >(p1-p0) ); - return String(p1 + 1, osl_getThreadTextEncoding()); - } - - return String(); -} - -/************************************************************************* -|* |* DirEntry::SetName() |* *************************************************************************/ diff --git a/tools/source/fsys/tdir.cxx b/tools/source/fsys/tdir.cxx index 4fb46f201f15..db811f35e76b 100644 --- a/tools/source/fsys/tdir.cxx +++ b/tools/source/fsys/tdir.cxx @@ -386,27 +386,6 @@ sal_uInt16 Dir::Scan( sal_uInt16 nCount ) |* *************************************************************************/ -Dir::Dir( const DirEntry& rDirEntry, DirEntryKind nKindFlags, FSysSort nSort, ... ): - DirEntry( rDirEntry ), - pReader( 0 ) -{ - DBG_CTOR( Dir, NULL ); - - Construct( nKindFlags ); - - std::va_list pArgs; - va_start( pArgs, nSort ); - ImpSetSort( pArgs, nSort ); - - Reset(); -} - -/************************************************************************* -|* -|* Dir::Dir() -|* -*************************************************************************/ - Dir::Dir( const DirEntry& rDirEntry, DirEntryKind nKindFlags ): DirEntry( rDirEntry ), pReader( 0 ) @@ -419,24 +398,6 @@ Dir::Dir( const DirEntry& rDirEntry, DirEntryKind nKindFlags ): /************************************************************************* |* -|* Dir::Dir() -|* -*************************************************************************/ - -Dir::Dir(): - pReader( 0 ) -{ - DBG_CTOR( Dir, NULL ); - - pLst = NULL; - pSortLst = NULL; - pStatLst = NULL; - eAttrMask = FSYS_KIND_ALL; - aNameMask = String("*", osl_getThreadTextEncoding()); -} - -/************************************************************************* -|* |* Dir::~Dir() |* *************************************************************************/ |