No real changes, just some minor cleanup of wxDirTraverserSumSize.

Put the comment before the code it comments on, not after.

Return const reference from an accessor.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@64017 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/common/dircmn.cpp b/src/common/dircmn.cpp
index a3862feb9d516f8b029c35a6918ab1e0b6d7cdd2..89ec5076e27361ca934e250dd2a3aa43fa0f8d7c 100644 (file)
--- a/src/common/dircmn.cpp
+++ b/src/common/dircmn.cpp
@@ -300,11 +300,11 @@ public:
 
     virtual wxDirTraverseResult OnFile(const wxString& filename)
     {
 
     virtual wxDirTraverseResult OnFile(const wxString& filename)
     {

-        wxULongLong sz = wxFileName::GetSize(filename);
-

         // wxFileName::GetSize won't use this class again as
         // we're passing it a file and not a directory;
         // thus we are sure to avoid an endless loop
         // wxFileName::GetSize won't use this class again as
         // we're passing it a file and not a directory;
         // thus we are sure to avoid an endless loop

+        wxULongLong sz = wxFileName::GetSize(filename);
+

         if (sz == wxInvalidSize)
         {
             // if the GetSize() failed (this can happen because e.g. a
         if (sz == wxInvalidSize)
         {
             // if the GetSize() failed (this can happen because e.g. a


@@ -327,7 +327,7 @@ public:
 
     wxULongLong GetTotalSize() const
         { return m_sz; }
 
     wxULongLong GetTotalSize() const
         { return m_sz; }

-    wxArrayString &FilesSkipped()
+    const wxArrayString& GetSkippedFiles() const

         { return m_skippedFiles; }
 
 protected:
         { return m_skippedFiles; }
 
 protected:


@@ -352,7 +352,7 @@ wxULongLong wxDir::GetTotalSize(const wxString &dirname, wxArrayString *filesSki
         return wxInvalidSize;
 
     if (filesSkipped)
         return wxInvalidSize;
 
     if (filesSkipped)

-        *filesSkipped = traverser.FilesSkipped();
+        *filesSkipped = traverser.GetSkippedFiles();

 
     return traverser.GetTotalSize();
 }
 
     return traverser.GetTotalSize();
 }