From 618dfb51d93898632830f1b87443d3f748780871 Mon Sep 17 00:00:00 2001 From: Daniel Wilhelm Date: Fri, 18 Apr 2014 17:05:53 +0200 Subject: 3.5 --- library/statistics.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'library/statistics.cpp') diff --git a/library/statistics.cpp b/library/statistics.cpp index ac968d1f..6e64be1c 100644 --- a/library/statistics.cpp +++ b/library/statistics.cpp @@ -10,7 +10,7 @@ #include "../shared/globalFunctions.h" #include "statusHandler.h" //#include "../algorithm.h" -#include "../ui/util.h" +#include "../shared/util.h" #include #include #include @@ -31,11 +31,11 @@ RetrieveStatistics::~RetrieveStatistics() for (std::vector::const_iterator i = data.begin(); i != data.end(); ++i) { - outputFile.Write(globalFunctions::numberToWxString(int(i->time))); + outputFile.Write(FreeFileSync::numberToWxString(static_cast(i->time), false)); outputFile.Write(wxT(";")); - outputFile.Write(globalFunctions::numberToWxString(i->objects)); + outputFile.Write(FreeFileSync::numberToWxString(i->objects, false)); outputFile.Write(wxT(";")); - outputFile.Write(globalFunctions::numberToWxString(float(i->value))); + outputFile.Write(FreeFileSync::numberToWxString(static_cast(i->value), false)); outputFile.Write(wxT("\n")); } } @@ -104,7 +104,7 @@ wxString Statistics::formatRemainingTime(const double timeInMs) const } remainingTimeLast = formattedTime; - return globalFunctions::numberToWxString(formattedTime) + unit; + return FreeFileSync::numberToWxString(formattedTime, false) + unit; //+ wxT("(") + globalFunctions::numberToWxString(globalFunctions::round(timeInMs / 1000)) + wxT(")"); } -- cgit