more warning fixes about empty if statement in helper classes in release build

[wxWidgets.git] / include / wx / filename.h

diff --git a/include/wx/filename.h b/include/wx/filename.h
index 131b6fc51e38aa93e4d6146408837135145b9d48..5154ed057e2ee248d852f9be1bd36944fdb05921 100644 (file)
--- a/include/wx/filename.h
+++ b/include/wx/filename.h
@@ -12,15 +12,6 @@
 #ifndef   _WX_FILENAME_H_
 #define   _WX_FILENAME_H_
 
 #ifndef   _WX_FILENAME_H_
 #define   _WX_FILENAME_H_
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma interface "filename.h"
-#endif
-
-#ifndef WX_PRECOMP
-    #include  "wx/string.h"
-    #include  "wx/arrstr.h"
-#endif
-

 /*
     TODO:
 
 /*
     TODO:
 


@@ -28,16 +19,16 @@
     2. more file operations:
         a) chmod()
         b) [acm]time() - get and set
     2. more file operations:
         a) chmod()
         b) [acm]time() - get and set

-        c) file size
-        d) file permissions with readable accessors for most common bits
+        c) file permissions with readable accessors for most common bits

            such as IsReadable() &c
            such as IsReadable() &c

-        e) rename()?
+        d) rename()?

     3. SameFileAs() function to compare inodes under Unix
  */
 
     3. SameFileAs() function to compare inodes under Unix
  */
 

-// ridiculously enough, this will replace DirExists with wxDirExists etc
+#include "wx/arrstr.h"

 #include "wx/filefn.h"
 #include "wx/datetime.h"
 #include "wx/filefn.h"
 #include "wx/datetime.h"

+#include "wx/intl.h"

 
 #if wxUSE_FILE
 class WXDLLIMPEXP_BASE wxFile;
 
 #if wxUSE_FILE
 class WXDLLIMPEXP_BASE wxFile;


@@ -91,6 +82,10 @@ enum
     wxPATH_MKDIR_FULL    = 0x0001   // create directories recursively
 };
 
     wxPATH_MKDIR_FULL    = 0x0001   // create directories recursively
 };
 

+// error code of wxFileName::GetSize()
+extern wxULongLong wxInvalidSize;
+
+

 // ----------------------------------------------------------------------------
 // wxFileName: encapsulates a file path
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // wxFileName: encapsulates a file path
 // ----------------------------------------------------------------------------


@@ -186,7 +181,7 @@ public:
     bool IsOk() const
     {
         // we're fine if we have the path or the name or if we're a root dir
     bool IsOk() const
     {
         // we're fine if we have the path or the name or if we're a root dir

-        return m_dirs.size() != 0 || !m_name.IsEmpty() || !m_relative ||
+        return m_dirs.size() != 0 || !m_name.empty() || !m_relative ||

                 !m_ext.empty() || m_hasExt;
     }
 
                 !m_ext.empty() || m_hasExt;
     }
 


@@ -367,9 +362,11 @@ public:
     void RemoveLastDir() { RemoveDir(GetDirCount() - 1); }
 
     // Other accessors
     void RemoveLastDir() { RemoveDir(GetDirCount() - 1); }
 
     // Other accessors

-    void SetExt( const wxString &ext )          { m_ext = ext; }
+    void SetExt( const wxString &ext )          { m_ext = ext; m_hasExt = !m_ext.empty(); }
+    void ClearExt()                             { m_ext = wxEmptyString; m_hasExt = false; }
+    void SetEmptyExt()                          { m_ext = wxT(""); m_hasExt = true; }

     wxString GetExt() const                     { return m_ext; }
     wxString GetExt() const                     { return m_ext; }

-    bool HasExt() const                         { return !m_ext.empty(); }
+    bool HasExt() const                         { return m_hasExt; }

 
     void SetName( const wxString &name )        { m_name = name; }
     wxString GetName() const                    { return m_name; }
 
     void SetName( const wxString &name )        { m_name = name; }
     wxString GetName() const                    { return m_name; }


@@ -424,7 +421,7 @@ public:
                           wxString *path,
                           wxString *name,
                           wxString *ext,
                           wxString *path,
                           wxString *name,
                           wxString *ext,

-                          wxPathFormat format = wxPATH_NATIVE)
+                          wxPathFormat format)

     {
         SplitPath(fullpath, volume, path, name, ext, NULL, format);
     }
     {
         SplitPath(fullpath, volume, path, name, ext, NULL, format);
     }


@@ -442,6 +439,20 @@ public:
                             wxString *path,
                             wxPathFormat format = wxPATH_NATIVE);
 
                             wxString *path,
                             wxPathFormat format = wxPATH_NATIVE);
 

+    // Filesize
+
+        // returns the size of the given filename
+    wxULongLong GetSize() const;
+    static wxULongLong GetSize(const wxString &file);
+
+        // returns the size in a human readable form
+    wxString GetHumanReadableSize(const wxString &nullsize = wxGetTranslation(_T("Not available")),
+                                  int precision = 1) const;
+    static wxString GetHumanReadableSize(const wxULongLong &sz,
+                                         const wxString &nullsize = wxGetTranslation(_T("Not available")),
+                                         int precision = 1);
+
+

     // deprecated methods, don't use any more
     // --------------------------------------
 
     // deprecated methods, don't use any more
     // --------------------------------------
 


@@ -450,7 +461,7 @@ public:
         { return GetPath(withSep ? wxPATH_GET_SEPARATOR : 0, format); }
 #endif
     wxString GetPathWithSep(wxPathFormat format = wxPATH_NATIVE ) const
         { return GetPath(withSep ? wxPATH_GET_SEPARATOR : 0, format); }
 #endif
     wxString GetPathWithSep(wxPathFormat format = wxPATH_NATIVE ) const

-        { return GetPath(wxPATH_GET_SEPARATOR, format); }
+        { return GetPath(wxPATH_GET_VOLUME | wxPATH_GET_SEPARATOR, format); }

 
 private:
     // check whether this dir is valid for Append/Prepend/InsertDir()
 
 private:
     // check whether this dir is valid for Append/Prepend/InsertDir()