diff options
author | Daniel Wilhelm <daniel@wili.li> | 2014-04-18 17:08:06 +0200 |
---|---|---|
committer | Daniel Wilhelm <daniel@wili.li> | 2014-04-18 17:08:06 +0200 |
commit | fbe76102e941b9f1edaf236788e42678f05fdf9a (patch) | |
tree | f5f538316019fa89be8dc478103490c3a826f3ac /shared/util.h | |
parent | 3.8 (diff) | |
download | FreeFileSync-fbe76102e941b9f1edaf236788e42678f05fdf9a.tar.gz FreeFileSync-fbe76102e941b9f1edaf236788e42678f05fdf9a.tar.bz2 FreeFileSync-fbe76102e941b9f1edaf236788e42678f05fdf9a.zip |
3.9
Diffstat (limited to 'shared/util.h')
-rw-r--r-- | shared/util.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/shared/util.h b/shared/util.h index 25048132..5023c00b 100644 --- a/shared/util.h +++ b/shared/util.h @@ -10,7 +10,7 @@ #include "../shared/zstring.h" #include <wx/string.h> #include <wx/longlong.h> -#include "../shared/globalFunctions.h" +#include "../shared/global_func.h" class wxComboBox; class wxTextCtrl; @@ -18,7 +18,7 @@ class wxDirPickerCtrl; class wxScrolledWindow; -namespace FreeFileSync +namespace ffs3 { wxString formatFilesizeToShortString(const wxLongLong& filesize); wxString formatFilesizeToShortString(const wxULongLong& filesize); @@ -64,20 +64,20 @@ wxString utcTimeToLocalString(const wxLongLong& utcTime); //throw std::runtime_e //--------------- inline impelementation ------------------------------------------- //helper function! not to be used directly -namespace FreeFileSync_Impl +namespace ffs_Impl { wxString includeNumberSeparator(const wxString& number); } -namespace FreeFileSync +namespace ffs3 { //wxULongLongNative doesn't support operator<<(std::ostream&, wxULongLongNative) template <> inline wxString numberToStringSep(wxULongLongNative number) { - return FreeFileSync_Impl::includeNumberSeparator(number.ToString()); + return ffs_Impl::includeNumberSeparator(number.ToString()); } @@ -85,7 +85,7 @@ template <class NumberType> inline wxString numberToStringSep(NumberType number) { - return FreeFileSync_Impl::includeNumberSeparator(globalFunctions::numberToString(number)); + return ffs_Impl::includeNumberSeparator(common::numberToString(number)); } } |