imports/imhex
1
0
Fork 0
mirror of https://github.com/WerWolv/ImHex.git synced 2026-04-02 13:37:42 -05:00
Code Issues Packages Projects Releases Wiki Activity

fix: Various clang / clang-tidy warnings (#764)

Browse Source
This commit is contained in:
Nik
2022-10-02 17:30:26 +02:00
committed by GitHub
parent b365e16cc9
commit 9c484e7b57
24 changed files with 72 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
plugins/builtin/source/content/data_visualizers.cpp
View File

@@ -107,7 +107,7 @@ namespace hex::plugin::builtin {
const static inline auto FormattingUpperCase = hex::format("%0{}X", CharCount);
const static inline auto FormattingLowerCase = hex::format("%0{}x", CharCount);
const char *getFormatString(bool upperCase) {
static const char *getFormatString(bool upperCase) {
if (upperCase)
return FormattingUpperCase.c_str();
else
@@ -237,7 +237,7 @@ namespace hex::plugin::builtin {
const static inline auto FormatStringUpperCase = hex::format("%{}G", CharCount);
const static inline auto FormatStringLowerCase = hex::format("%{}g", CharCount);
const char *getFormatString(bool upperCase) {
static const char *getFormatString(bool upperCase) {
if (upperCase)
return FormatStringUpperCase.c_str();
else

2
plugins/builtin/source/content/helpers/pattern_drawer.cpp
View File

@@ -430,4 +430,4 @@ namespace hex {
auto [value, success] = this->m_displayEnd.emplace(&pattern, DisplayEndDefault);
return value->second;
}
};
}

9
plugins/builtin/source/content/settings_entries.cpp
View File

@@ -14,8 +14,10 @@
#include <nlohmann/json.hpp>
namespace {
static std::vector<std::fs::path> userFolders;
static void loadUserFoldersFromSetting(nlohmann::json &setting) {
std::vector<std::fs::path> userFolders;
void loadUserFoldersFromSetting(nlohmann::json &setting) {
userFolders.clear();
std::vector<std::string> paths = setting;
for (const auto &path : paths) {
@@ -24,7 +26,8 @@ namespace {
userFolders.emplace_back(uString);
}
}
};
}
namespace hex::plugin::builtin {

2
plugins/builtin/source/content/views/view_find.cpp
View File

@@ -183,7 +183,7 @@ namespace hex::plugin::builtin {
case F64: return parseNumericValue<double, double>(input);
default: return { false, { }, 0 };
}
};
}
template<typename T>
static std::string formatBytes(const std::vector<u8> &bytes) {

4
plugins/builtin/source/content/views/view_hex_editor.cpp
View File

@@ -1016,13 +1016,13 @@ namespace hex::plugin::builtin {
if ((ImGui::IsMouseDown(ImGuiMouseButton_Left) && providerData.selectionStart != providerData.selectionEnd)) {
auto fractionPerLine = 1.0 / (this->m_visibleRowCount + 1);
if (y == u64(clipper.DisplayStart + 3)) {
if (y == (u64(clipper.DisplayStart) + 3)) {
if (i128(*providerData.selectionEnd - provider->getBaseAddress() - provider->getCurrentPageAddress()) <= (i64(clipper.DisplayStart + 3) * this->m_bytesPerRow)) {
this->m_shouldScrollToSelection = false;
ImGui::SetScrollHereY(fractionPerLine * 5);
}
} else if (y == u64(clipper.DisplayEnd - 3)) {
} else if (y == (u64(clipper.DisplayStart) - 3)) {
if (i128(*providerData.selectionEnd - provider->getBaseAddress() - provider->getCurrentPageAddress()) >= (i64(clipper.DisplayEnd - 3) * this->m_bytesPerRow)) {
this->m_shouldScrollToSelection = false;
ImGui::SetScrollHereY(fractionPerLine * (this->m_visibleRowCount - 1));

2
plugins/builtin/source/content/views/view_information.cpp
View File

@@ -35,7 +35,7 @@ namespace hex::plugin::builtin {
EventManager::subscribe<EventRegionSelected>(this, [this](Region region) {
if (this->m_blockSize != 0)
this->m_entropyHandlePosition = region.getStartAddress() / this->m_blockSize;
this->m_entropyHandlePosition = region.getStartAddress() / double(this->m_blockSize);
});
EventManager::subscribe<EventProviderDeleted>(this, [this](const auto*) {

4
plugins/builtin/source/content/views/view_pattern_editor.cpp
View File

@@ -642,11 +642,11 @@ namespace hex::plugin::builtin {
ImGui::InputScalar(label.c_str(), ImGuiDataType_U64, &value);
variable.value = u128(value);
} else if (pl::core::Token::isFloatingPoint(variable.type)) {
double value = hex::get_or<double>(variable.value, 0.0);
auto value = hex::get_or<double>(variable.value, 0.0);
ImGui::InputScalar(label.c_str(), ImGuiDataType_Double, &value);
variable.value = value;
} else if (variable.type == pl::core::Token::ValueType::Boolean) {
bool value = hex::get_or<bool>(variable.value, false);
auto value = hex::get_or<bool>(variable.value, false);
ImGui::Checkbox(label.c_str(), &value);
variable.value = value;
} else if (variable.type == pl::core::Token::ValueType::Character) {

9
plugins/builtin/source/content/views/view_settings.cpp
View File

@@ -50,10 +50,11 @@ namespace hex::plugin::builtin {
for (auto &it : sortedCategories) {
auto &[category, settings] = *it;
if (ImGui::BeginTabItem(LangEntry(category))) {
const std::string &categoryDesc = descriptions.count(category) ? descriptions.at(category) : category.name;
if (ImGui::BeginTabItem(LangEntry(category.name))) {
const std::string &categoryDesc = descriptions.contains(category.name) ? descriptions.at(category.name) : category.name;
LangEntry descriptionEntry{categoryDesc};
ImGui::TextWrapped("%s", static_cast<const char*>(descriptionEntry));
ImGui::TextFormattedWrapped("{}", descriptionEntry);
ImGui::InfoTooltip(descriptionEntry);
ImGui::Separator();
@@ -85,7 +86,7 @@ namespace hex::plugin::builtin {
} else
this->getWindowOpenState() = false;
if (this->getWindowOpenState() == false && this->m_restartRequested) {
if (!this->getWindowOpenState() && this->m_restartRequested) {
View::showYesNoQuestionPopup("hex.builtin.view.settings.restart_question"_lang, ImHexApi::Common::restartImHex, [] {});
}
}