summaryrefslogtreecommitdiff
path: root/shared/util.cpp
diff options
context:
space:
mode:
authorDaniel Wilhelm <daniel@wili.li>2014-04-18 17:11:09 +0200
committerDaniel Wilhelm <daniel@wili.li>2014-04-18 17:11:09 +0200
commit9cc790869ed3905c78c7eeeb0bb44f800b3f2af4 (patch)
tree1c085bbf2302be294866c4fc6e0d225f8abbc346 /shared/util.cpp
parent3.14 (diff)
downloadFreeFileSync-9cc790869ed3905c78c7eeeb0bb44f800b3f2af4.tar.gz
FreeFileSync-9cc790869ed3905c78c7eeeb0bb44f800b3f2af4.tar.bz2
FreeFileSync-9cc790869ed3905c78c7eeeb0bb44f800b3f2af4.zip
3.15
Diffstat (limited to 'shared/util.cpp')
-rw-r--r--shared/util.cpp23
1 files changed, 2 insertions, 21 deletions
diff --git a/shared/util.cpp b/shared/util.cpp
index 2af7dc5b..7ab5b4e7 100644
--- a/shared/util.cpp
+++ b/shared/util.cpp
@@ -9,7 +9,7 @@
#include <wx/textctrl.h>
#include <wx/combobox.h>
#include <wx/filepicker.h>
-#include "localization.h"
+#include "i18n.h"
#include "file_handling.h"
#include "string_conv.h"
#include <stdexcept>
@@ -157,7 +157,7 @@ wxString ffs3::utcTimeToLocalString(const wxLongLong& utcTime)
fileTimeLong += wxLongLong(2, 3054539008UL); //timeshift between ansi C time and FILETIME in seconds == 11644473600s
fileTimeLong *= 10000000;
- FILETIME lastWriteTimeUtc;
+ FILETIME lastWriteTimeUtc = {};
lastWriteTimeUtc.dwLowDateTime = fileTimeLong.GetLo(); //GetLo() returns unsigned
lastWriteTimeUtc.dwHighDateTime = static_cast<DWORD>(fileTimeLong.GetHi()); //GetHi() returns signed
@@ -212,25 +212,6 @@ wxString ffs3::utcTimeToLocalString(const wxLongLong& utcTime)
wxT("\n\n") + getLastErrorFormatted()).ToAscii()));
}
- /*
- //assemble time string (performance optimized) -> note: performance argument is not valid anymore
-
- wxString formattedTime;
- formattedTime.reserve(20);
-
- writeFourDigitNumber(time.wYear, formattedTime);
- formattedTime += wxChar('-');
- writeTwoDigitNumber(time.wMonth, formattedTime);
- formattedTime += wxChar('-');
- writeTwoDigitNumber(time.wDay, formattedTime);
- formattedTime += wxChar(' ');
- formattedTime += wxChar(' ');
- writeTwoDigitNumber(time.wHour, formattedTime);
- formattedTime += wxChar(':');
- writeTwoDigitNumber(time.wMinute, formattedTime);
- formattedTime += wxChar(':');
- writeTwoDigitNumber(time.wSecond, formattedTime);
- */
const wxDateTime localTime(systemTimeLocal.wDay,
wxDateTime::Month(systemTimeLocal.wMonth - 1),
systemTimeLocal.wYear,
bgstack15