| Revision | 29280 (tree) |
|---|---|
| Time | 2021-10-30 16:39:17 |
| Author | stefankueng |
use the numerical stringtok
trunk/src/Utils/DarkModeHelper.cpp (diff) trunk/src/Utils/Theme.cpp (diff)| @@ -118,14 +118,14 @@ | ||
| 118 | 118 | m_bCanHaveDarkMode = false; |
| 119 | 119 | long micro = 0; |
| 120 | 120 | { |
| 121 | - auto version = CPathUtils::GetVersionFromFile(L"uxtheme.dll"); | |
| 122 | - std::vector<std::wstring> tokens; | |
| 121 | + auto version = CPathUtils::GetVersionFromFile(L"uxtheme.dll"); | |
| 122 | + std::vector<long> tokens; | |
| 123 | 123 | stringtok(tokens, version, false, L"."); |
| 124 | 124 | if (tokens.size() == 4) |
| 125 | 125 | { |
| 126 | - auto major = std::stol(tokens[0]); | |
| 127 | - auto minor = std::stol(tokens[1]); | |
| 128 | - micro = std::stol(tokens[2]); | |
| 126 | + auto major = tokens[0]; | |
| 127 | + auto minor = tokens[1]; | |
| 128 | + micro = tokens[2]; | |
| 129 | 129 | //auto build = std::stol(tokens[3]); |
| 130 | 130 | |
| 131 | 131 | // the windows 10 update 1809 has the version |
| @@ -1032,13 +1032,13 @@ | ||
| 1032 | 1032 | // because on earlier versions it would look really, really ugly! |
| 1033 | 1033 | m_bDarkModeIsAllowed = false; |
| 1034 | 1034 | auto version = CPathUtils::GetVersionFromFile(L"uiribbon.dll"); |
| 1035 | - std::vector<std::wstring> tokens; | |
| 1035 | + std::vector<long> tokens; | |
| 1036 | 1036 | stringtok(tokens, version, false, L"."); |
| 1037 | 1037 | if (tokens.size() == 4) |
| 1038 | 1038 | { |
| 1039 | - auto major = std::stol(tokens[0]); | |
| 1040 | - auto minor = std::stol(tokens[1]); | |
| 1041 | - auto micro = std::stol(tokens[2]); | |
| 1039 | + auto major = tokens[0]; | |
| 1040 | + auto minor = tokens[1]; | |
| 1041 | + auto micro = tokens[2]; | |
| 1042 | 1042 | //auto build = std::stol(tokens[3]); |
| 1043 | 1043 | |
| 1044 | 1044 | // the windows 10 update 1809 has the version |
TortoiseSVN