resolve -Wconversion warnings / typing, avoid implicit modifying casts

Author: xamidi

__dependency_graph.dot

@@ -76,6 +76,7 @@ digraph {
 	DRuleParser -> DlFormula [color=blue]
 	DRuleParser -> "boost/algorithm/string" [color=blue]
 	DRuleParser -> iostream [color=blue]
+	DRuleParser -> cstddef [color=red]
 	DRuleParser -> map [color=red]
 	DRuleParser -> memory [color=red]
 	DRuleParser -> set [color=red]

helper/FctHelper.cpp

@@ -28,12 +28,12 @@ bool cmpStringGrow::operator()(const string& a, const string& b) const {
 
 unsigned FctHelper::digitsNum_uint32(uint32_t n) {
 	static constexpr uint32_t MaxTable[9] = { 10u, 100u, 1000u, 10000u, 100000u, 1000000u, 10000000u, 100000000u, 1000000000u };  // to_string(numeric_limits<uint32_t>::max()) = "4294967295" has length 10
-	return 1 + (upper_bound(MaxTable, MaxTable + 9, n) - MaxTable);
+	return 1 + static_cast<unsigned>(upper_bound(MaxTable, MaxTable + 9, n) - MaxTable);
 }
 
 unsigned FctHelper::digitsNum_uint64(uint64_t n) {
 	static constexpr uint64_t MaxTable[19] = { 10uLL, 100uLL, 1000uLL, 10000uLL, 100000uLL, 1000000uLL, 10000000uLL, 100000000uLL, 1000000000uLL, 10000000000uLL, 100000000000uLL, 1000000000000uLL, 10000000000000uLL, 100000000000000uLL, 1000000000000000uLL, 10000000000000000uLL, 100000000000000000uLL, 1000000000000000000uLL, 10000000000000000000uLL };  // to_string(numeric_limits<uint64_t>::max()) = "18446744073709551615" has length 20
-	return 1 + (upper_bound(MaxTable, MaxTable + 19, n) - MaxTable);
+	return 1 + static_cast<unsigned>(upper_bound(MaxTable, MaxTable + 19, n) - MaxTable);
 }
 
 string FctHelper::round(long double x, unsigned n, char separator) {
@@ -120,7 +120,7 @@ string FctHelper::durationYearsToMs(const chrono::microseconds& dur, bool innerA
 	durationUs -= minutes * minuteUs;
 	int64_t seconds = durationUs / secondUs;
 	durationUs -= seconds * secondUs;
-	double milliseconds = durationUs / 1000.0;
+	double milliseconds = static_cast<double>(durationUs) / 1000.0;
 
 	stringstream ss;
 	bool empty = true;
@@ -131,14 +131,14 @@ string FctHelper::durationYearsToMs(const chrono::microseconds& dur, bool innerA
 		if (innerAlign && !empty) {
 			if (negative)
 				indent++;
-			unsigned len = num.length();
+			string::size_type len = num.length();
 			if (indent <= len)
 				return "";
 			return string(indent - len, ' ');
 		} else
 			return "";
 	};
-	auto appendRequestedBlankIndent = [&](unsigned indent) {
+	auto appendRequestedBlankIndent = [&](string::size_type indent) {
 		if (innerAlign && !empty) {
 			if (negative)
 				indent++;
@@ -202,9 +202,9 @@ string FctHelper::durationYearsToMs(const chrono::microseconds& dur, bool innerA
 string FctHelper::durationStringMs(const chrono::microseconds& dur, bool innerAlign, unsigned round, bool showMonths, bool showWeeks, bool wolframAlphaMode, const string& yrId, const string& moId, const string& wkId, const string& dId, const string& hId, const string& minId, const string& sId, const string& msId) {
 	stringstream ss;
 	if (dur.count() >= 1000000)
-		ss << FctHelper::round(dur.count() / 1000.0, 2) << msId << " (" << durationYearsToMs(dur, innerAlign, round, showMonths, showWeeks, wolframAlphaMode, yrId, moId, wkId, dId, hId, minId, sId, msId) << ")";
+		ss << FctHelper::round(static_cast<long double>(dur.count()) / 1000.0, 2) << msId << " (" << durationYearsToMs(dur, innerAlign, round, showMonths, showWeeks, wolframAlphaMode, yrId, moId, wkId, dId, hId, minId, sId, msId) << ")";
 	else
-		ss << FctHelper::round(dur.count() / 1000.0, 2) << msId;
+		ss << FctHelper::round(static_cast<long double>(dur.count()) / 1000.0, 2) << msId;
 	return ss.str();
 }
 
@@ -293,7 +293,7 @@ wstring FctHelper::utf8toWide(const char* in) {
 
 vector<string> FctHelper::stringSplit(const string& str, const string& sep) {
 	vector<string> parts;
-	unsigned start = 0;
+	string::size_type start = 0;
 	string::size_type end = str.find(sep);
 	while (end != string::npos) {
 		parts.push_back(str.substr(start, end - start));

helper/ProgressData.cpp

@@ -17,7 +17,7 @@ ProgressData::ProgressData(unsigned percentageStepSize, uint64_t maximum, bool e
 				stepAmount--; // do not show 100% progress
 			vector<uint64_t> steps(stepAmount);
 			for (unsigned i = 0; i < stepAmount; i++)
-				steps[i] = (uint64_t) ((double) maximum * (i + 1) * percentageStepSize / 100.0);
+				steps[i] = static_cast<uint64_t>(static_cast<double>(maximum) * (i + 1) * percentageStepSize / 100.0);
 			steps.push_back(0); // to avoid bound checks and never trigger at final state
 			return steps;
 		}()) {
@@ -28,8 +28,8 @@ ProgressData& ProgressData::operator=(const ProgressData& other) {
 	maximum = other.maximum;
 	maximumEstimated = other.maximumEstimated;
 	progressSteps = other.progressSteps;
-	progress = (uint64_t) other.progress;
-	progressState = (uint64_t) other.progressState;
+	progress = static_cast<uint64_t>(other.progress);
+	progressState = static_cast<uint64_t>(other.progressState);
 	return *this;
 }