diff --git a/cmake/modules/ImHexPlugin.cmake b/cmake/modules/ImHexPlugin.cmake index eed1ad0bd..a5a4b2691 100644 --- a/cmake/modules/ImHexPlugin.cmake +++ b/cmake/modules/ImHexPlugin.cmake @@ -36,8 +36,8 @@ macro(add_imhex_plugin) # Add include directories and link libraries target_include_directories(${IMHEX_PLUGIN_NAME} PUBLIC ${IMHEX_PLUGIN_INCLUDES}) - target_link_libraries(${IMHEX_PLUGIN_NAME} PUBLIC libimhex) - target_link_libraries(${IMHEX_PLUGIN_NAME} PRIVATE ${FMT_LIBRARIES} imgui_all_includes libwolv ${IMHEX_PLUGIN_LIBRARIES}) + target_link_libraries(${IMHEX_PLUGIN_NAME} PUBLIC ${IMHEX_PLUGIN_LIBRARIES}) + target_link_libraries(${IMHEX_PLUGIN_NAME} PRIVATE libimhex ${FMT_LIBRARIES} imgui_all_includes libwolv) addIncludesFromLibrary(${IMHEX_PLUGIN_NAME} libpl) addIncludesFromLibrary(${IMHEX_PLUGIN_NAME} libpl-gen) diff --git a/lib/libimhex/include/hex/api/content_registry.hpp b/lib/libimhex/include/hex/api/content_registry.hpp index 871c3b055..a8575732f 100644 --- a/lib/libimhex/include/hex/api/content_registry.hpp +++ b/lib/libimhex/include/hex/api/content_registry.hpp @@ -576,7 +576,7 @@ namespace hex { namespace impl { void add(std::unique_ptr &&view); - const std::map>& getEntries(); + const std::map>& getEntries(); } @@ -1110,9 +1110,9 @@ namespace hex { [[nodiscard]] const UnlocalizedString& getUnlocalizedName() const { return m_unlocalizedName; } - protected: - const static int TextInputFlags; + [[nodiscard]] static int DefaultTextInputFlags(); + protected: bool drawDefaultScalarEditingTextBox(u64 address, const char *format, ImGuiDataType dataType, u8 *data, ImGuiInputTextFlags flags) const; bool drawDefaultTextEditingTextBox(u64 address, std::string &data, ImGuiInputTextFlags flags) const; diff --git a/lib/libimhex/include/hex/helpers/opengl.hpp b/lib/libimhex/include/hex/helpers/opengl.hpp index bb6cfe093..16c008e3f 100644 --- a/lib/libimhex/include/hex/helpers/opengl.hpp +++ b/lib/libimhex/include/hex/helpers/opengl.hpp @@ -189,43 +189,43 @@ namespace hex::gl { T &getElement(int row,int col) { - return this->mat[row*Columns+col]; + return this->mat[row * Columns+col]; } Vector getColumn(int col) { Vector result; for (size_t i = 0; i < Rows; i++) - result[i] = this->mat[i*Columns+col]; + result[i] = this->mat[i * Columns + col]; return result; } Vector getRow(int row) { Vector result; for (size_t i = 0; i < Columns; i++) - result[i] = this->mat[row*Columns+i]; + result[i] = this->mat[row * Columns+i]; return result; } void updateRow(int row, Vector values) { for (size_t i = 0; i < Columns; i++) - this->mat[row*Columns+i] = values[i]; + this->mat[row * Columns + i] = values[i]; } void updateColumn(int col, Vector values) { for (size_t i = 0; i < Rows; i++) - this->mat[i*Columns+col] = values[i]; + this->mat[i * Columns + col] = values[i]; } - void updateElement( int row,int col, T value) { - this->mat[row*Columns + col] = value; + void updateElement(int row, int col, T value) { + this->mat[row * Columns + col] = value; } - T &operator()( const unsigned&row, const unsigned&col) { - return this->mat[row*Columns + col]; + T &operator()(const unsigned &row, const unsigned &col) { + return this->mat[row * Columns + col]; } - const T &operator()(const unsigned& row, const unsigned& col) const { - return this->mat[row*Columns + col]; + const T &operator()(const unsigned &row, const unsigned &col) const { + return this->mat[row * Columns + col]; } Matrix& operator=(const Matrix& A) { @@ -243,7 +243,7 @@ namespace hex::gl { for (size_t i = 0; i < Rows; i++) for (size_t j = 0; j < Columns; j++) - result(i, j) = this->mat[i*Columns+j] + A(i, j); + result(i, j) = this->mat[i * Columns + j] + A(i, j); return result; } @@ -252,7 +252,7 @@ namespace hex::gl { for (size_t i = 0; i < Rows; i++) for (size_t j = 0; j < Columns; j++) - result(i, j) = this->mat[i*Columns+j] - A(i, j); + result(i, j) = this->mat[i * Columns + j] - A(i, j); return result; } @@ -269,7 +269,7 @@ namespace hex::gl { Matrix t(0); for (size_t i = 0; i < Columns; i++) for (size_t j = 0; j < Rows; j++) - t.updateElement(i, j, this->mat[j*Rows+i]); + t.updateElement(i, j, this->mat[j * Rows + i]); return t; } diff --git a/lib/third_party/imgui/backend/include/opengl_support.h b/lib/third_party/imgui/backend/include/opengl_support.h index c7697cf24..8e77b3230 100644 --- a/lib/third_party/imgui/backend/include/opengl_support.h +++ b/lib/third_party/imgui/backend/include/opengl_support.h @@ -2,7 +2,10 @@ #if !defined(WINGDIAPI) #define WINGDIAPI extern "C" -#define APIENTRY +#endif + +#if !defined(APIENTRY) + #define APIENTRY #endif #if defined(OS_WEB) diff --git a/plugins/builtin/include/content/popups/popup_docs_question.hpp b/plugins/builtin/include/content/popups/popup_docs_question.hpp index c71fb2f9e..6c085fba0 100644 --- a/plugins/builtin/include/content/popups/popup_docs_question.hpp +++ b/plugins/builtin/include/content/popups/popup_docs_question.hpp @@ -85,7 +85,7 @@ namespace hex::plugin::builtin { private: void executeQuery() { - m_requestTask = TaskManager::createBackgroundTask("hex.builtin.task.query_docs"_lang, [this, input = m_inputBuffer](Task &) { + m_requestTask = TaskManager::createBackgroundTask("hex.builtin.task.query_docs", [this, input = m_inputBuffer](Task &) { m_noAnswer = false; for (auto space : { "xj7sbzGbHH260vbpZOu1", "WZzDdGjxmgMSIE3xly6o" }) { m_answer.clear(); diff --git a/plugins/builtin/source/content/init_tasks.cpp b/plugins/builtin/source/content/init_tasks.cpp index 476c1d3a7..45e5c51de 100644 --- a/plugins/builtin/source/content/init_tasks.cpp +++ b/plugins/builtin/source/content/init_tasks.cpp @@ -57,7 +57,7 @@ namespace hex::plugin::builtin { ContentRegistry::Settings::write("hex.builtin.setting.general", "hex.builtin.setting.general.uuid", uuid); } - TaskManager::createBackgroundTask("hex.builtin.task.sending_statistics"_lang, [uuid](auto&) { + TaskManager::createBackgroundTask("hex.builtin.task.sending_statistics", [uuid](auto&) { // To avoid potentially flooding our database with lots of dead users // from people just visiting the website, don't send telemetry data from // the web version @@ -93,7 +93,7 @@ namespace hex::plugin::builtin { } bool checkForUpdates() { - TaskManager::createBackgroundTask("hex.builtin.task.check_updates"_lang, [](auto&) { checkForUpdatesSync(); }); + TaskManager::createBackgroundTask("hex.builtin.task.check_updates", [](auto&) { checkForUpdatesSync(); }); return true; } diff --git a/plugins/builtin/source/content/popups/hex_editor/popup_hex_editor_find.cpp b/plugins/builtin/source/content/popups/hex_editor/popup_hex_editor_find.cpp index 428853ea0..66b0faaa2 100644 --- a/plugins/builtin/source/content/popups/hex_editor/popup_hex_editor_find.cpp +++ b/plugins/builtin/source/content/popups/hex_editor/popup_hex_editor_find.cpp @@ -86,7 +86,7 @@ namespace hex::plugin::builtin { this->processInputString(); if (!m_searchTask.isRunning() && !m_searchByteSequence.empty()) { - m_searchTask = TaskManager::createTask("hex.ui.common.processing"_lang, + m_searchTask = TaskManager::createTask("hex.ui.common.processing", ImHexApi::Provider::get()->getActualSize(), doSearch); } diff --git a/plugins/builtin/source/content/providers/file_provider.cpp b/plugins/builtin/source/content/providers/file_provider.cpp index b7ebae987..c53a9a263 100644 --- a/plugins/builtin/source/content/providers/file_provider.cpp +++ b/plugins/builtin/source/content/providers/file_provider.cpp @@ -367,7 +367,7 @@ namespace hex::plugin::builtin { } m_changeEventAcknowledgementPending = true; - ui::BannerButton::open(ICON_VS_INFO, "hex.builtin.provider.file.reload_changes"_lang, ImColor(66, 104, 135), "hex.builtin.provider.file.reload_changes.reload", [this] { + ui::BannerButton::open(ICON_VS_INFO, "hex.builtin.provider.file.reload_changes", ImColor(66, 104, 135), "hex.builtin.provider.file.reload_changes.reload", [this] { this->close(); (void)this->open(!m_loadedIntoMemory); diff --git a/plugins/builtin/source/content/recent.cpp b/plugins/builtin/source/content/recent.cpp index 50aee8488..fda3c24c4 100644 --- a/plugins/builtin/source/content/recent.cpp +++ b/plugins/builtin/source/content/recent.cpp @@ -151,7 +151,7 @@ namespace hex::plugin::builtin::recent { } void updateRecentEntries() { - TaskManager::createBackgroundTask("hex.builtin.task.updating_recents"_lang, [](auto&) { + TaskManager::createBackgroundTask("hex.builtin.task.updating_recents", [](auto&) { if (s_recentEntriesUpdating) return; diff --git a/plugins/builtin/source/content/tools/file_tool_combiner.cpp b/plugins/builtin/source/content/tools/file_tool_combiner.cpp index 519cec3e2..523d6865d 100644 --- a/plugins/builtin/source/content/tools/file_tool_combiner.cpp +++ b/plugins/builtin/source/content/tools/file_tool_combiner.cpp @@ -110,7 +110,7 @@ namespace hex::plugin::builtin { ImGuiExt::TextSpinner("hex.builtin.tools.file_tools.combiner.combining"_lang); } else { if (ImGui::Button("hex.builtin.tools.file_tools.combiner.combine"_lang)) { - combinerTask = TaskManager::createTask("hex.builtin.tools.file_tools.combiner.combining"_lang, 0, [](auto &task) { + combinerTask = TaskManager::createTask("hex.builtin.tools.file_tools.combiner.combining", 0, [](auto &task) { wolv::io::File output(outputPath, wolv::io::File::Mode::Create); if (!output.isValid()) { diff --git a/plugins/builtin/source/content/tools/file_tool_shredder.cpp b/plugins/builtin/source/content/tools/file_tool_shredder.cpp index 18173ef84..c9a49d17b 100644 --- a/plugins/builtin/source/content/tools/file_tool_shredder.cpp +++ b/plugins/builtin/source/content/tools/file_tool_shredder.cpp @@ -48,7 +48,7 @@ namespace hex::plugin::builtin { ImGui::BeginDisabled(selectedFile.empty()); { if (ImGui::Button("hex.builtin.tools.file_tools.shredder.shred"_lang)) { - shredderTask = TaskManager::createTask("hex.builtin.tools.file_tools.shredder.shredding"_lang, 0, [](auto &task) { + shredderTask = TaskManager::createTask("hex.builtin.tools.file_tools.shredder.shredding", 0, [](auto &task) { ON_SCOPE_EXIT { selectedFile.clear(); }; diff --git a/plugins/builtin/source/content/tools/file_tool_splitter.cpp b/plugins/builtin/source/content/tools/file_tool_splitter.cpp index b52f41ae3..a52961cee 100644 --- a/plugins/builtin/source/content/tools/file_tool_splitter.cpp +++ b/plugins/builtin/source/content/tools/file_tool_splitter.cpp @@ -93,7 +93,7 @@ namespace hex::plugin::builtin { ImGuiExt::TextSpinner("hex.builtin.tools.file_tools.splitter.picker.splitting"_lang); } else { if (ImGui::Button("hex.builtin.tools.file_tools.splitter.picker.split"_lang)) { - splitterTask = TaskManager::createTask("hex.builtin.tools.file_tools.splitter.picker.splitting"_lang, 0, [](auto &task) { + splitterTask = TaskManager::createTask("hex.builtin.tools.file_tools.splitter.picker.splitting", 0, [](auto &task) { ON_SCOPE_EXIT { selectedFile.clear(); baseOutputPath.clear(); diff --git a/plugins/builtin/source/content/views/view_data_inspector.cpp b/plugins/builtin/source/content/views/view_data_inspector.cpp index 5b831d7e3..56dc204ab 100644 --- a/plugins/builtin/source/content/views/view_data_inspector.cpp +++ b/plugins/builtin/source/content/views/view_data_inspector.cpp @@ -59,7 +59,7 @@ namespace hex::plugin::builtin { } void ViewDataInspector::updateInspectorRows() { - m_updateTask = TaskManager::createBackgroundTask("hex.builtin.task.updating_inspector"_lang, [this](auto &) { + m_updateTask = TaskManager::createBackgroundTask("hex.builtin.task.updating_inspector", [this](auto &) { this->updateInspectorRowsTask(); }); } diff --git a/plugins/builtin/source/content/views/view_data_processor.cpp b/plugins/builtin/source/content/views/view_data_processor.cpp index 84eae8023..6e8e6adf3 100644 --- a/plugins/builtin/source/content/views/view_data_processor.cpp +++ b/plugins/builtin/source/content/views/view_data_processor.cpp @@ -537,7 +537,7 @@ namespace hex::plugin::builtin { // Reset any potential node errors workspace.currNodeError.reset(); - m_evaluationTask = TaskManager::createTask("hex.builtin.task.evaluating_nodes"_lang, 0, [this, workspace = &workspace](Task& task) { + m_evaluationTask = TaskManager::createTask("hex.builtin.task.evaluating_nodes", 0, [this, workspace = &workspace](Task& task) { task.setInterruptCallback([]{ dp::Node::interrupt(); }); diff --git a/plugins/builtin/source/content/views/view_find.cpp b/plugins/builtin/source/content/views/view_find.cpp index 9bf92cb8d..48978ce86 100644 --- a/plugins/builtin/source/content/views/view_find.cpp +++ b/plugins/builtin/source/content/views/view_find.cpp @@ -550,7 +550,7 @@ namespace hex::plugin::builtin { m_occurrenceTree->clear(); EventHighlightingChanged::post(); - m_searchTask = TaskManager::createTask("hex.builtin.view.find.searching"_lang, searchRegion.getSize(), [this, settings = m_searchSettings, searchRegion](auto &task) { + m_searchTask = TaskManager::createTask("hex.builtin.view.find.searching", searchRegion.getSize(), [this, settings = m_searchSettings, searchRegion](auto &task) { auto provider = ImHexApi::Provider::get(); switch (settings.mode) { @@ -974,7 +974,7 @@ namespace hex::plugin::builtin { m_filterTask.interrupt(); if (!m_currFilter->empty()) { - m_filterTask = TaskManager::createTask("hex.builtin.task.filtering_data"_lang, currOccurrences.size(), [this, provider, &currOccurrences](Task &task) { + m_filterTask = TaskManager::createTask("hex.builtin.task.filtering_data", currOccurrences.size(), [this, provider, &currOccurrences](Task &task) { u64 progress = 0; std::erase_if(currOccurrences, [this, provider, &task, &progress](const auto ®ion) { task.update(progress); diff --git a/plugins/builtin/source/content/views/view_hex_editor.cpp b/plugins/builtin/source/content/views/view_hex_editor.cpp index f1c6ab966..970938e75 100644 --- a/plugins/builtin/source/content/views/view_hex_editor.cpp +++ b/plugins/builtin/source/content/views/view_hex_editor.cpp @@ -521,7 +521,7 @@ namespace hex::plugin::builtin { } [[nodiscard]] UnlocalizedString getTitle() const override { - return "hex.builtin.view.hex_editor.menu.edit.paste.popup.title"_lang; + return "hex.builtin.view.hex_editor.menu.edit.paste.popup.title"; } private: @@ -737,7 +737,7 @@ namespace hex::plugin::builtin { return; fs::openFileBrowser(fs::DialogMode::Save, {}, [provider](const auto &path) { - PopupBlockingTask::open(TaskManager::createTask("hex.builtin.task.saving_data"_lang, TaskManager::NoProgress, [=](Task &){ + PopupBlockingTask::open(TaskManager::createTask("hex.builtin.task.saving_data", TaskManager::NoProgress, [=](Task &){ provider->saveAs(path); })); }); @@ -1196,7 +1196,7 @@ namespace hex::plugin::builtin { ui::PopupFileChooser::open(basePaths, paths, std::vector{ {"Thingy Table File", "tbl"} }, false, [this](const auto &path) { - TaskManager::createTask("hex.builtin.task.loading_encoding_file"_lang, 0, [this, path](auto&) { + TaskManager::createTask("hex.builtin.task.loading_encoding_file", 0, [this, path](auto&) { auto encoding = EncodingFile(EncodingFile::Type::Thingy, path); ImHexApi::Provider::markDirty(); diff --git a/plugins/builtin/source/content/views/view_information.cpp b/plugins/builtin/source/content/views/view_information.cpp index 455e3af65..3a208fe87 100644 --- a/plugins/builtin/source/content/views/view_information.cpp +++ b/plugins/builtin/source/content/views/view_information.cpp @@ -66,7 +66,7 @@ namespace hex::plugin::builtin { } // Run analyzers for each section - analysis.task = TaskManager::createTask("hex.builtin.view.information.analyzing"_lang, analysis.informationSections.size(), [provider, &analysis](Task &task) { + analysis.task = TaskManager::createTask("hex.builtin.view.information.analyzing", analysis.informationSections.size(), [provider, &analysis](Task &task) { u32 progress = 0; for (const auto §ion : analysis.informationSections) { // Only process the section if it is enabled diff --git a/plugins/builtin/source/content/views/view_pattern_editor.cpp b/plugins/builtin/source/content/views/view_pattern_editor.cpp index a87e53f0a..d7c1735f5 100644 --- a/plugins/builtin/source/content/views/view_pattern_editor.cpp +++ b/plugins/builtin/source/content/views/view_pattern_editor.cpp @@ -592,7 +592,7 @@ namespace hex::plugin::builtin { auto code = m_textEditor.GetText(); EventPatternEditorChanged::post(code); - TaskManager::createBackgroundTask("hex.builtin.task.parsing_pattern"_lang, [this, code = std::move(code), provider](auto &){ + TaskManager::createBackgroundTask("hex.builtin.task.parsing_pattern", [this, code = std::move(code), provider](auto &){ this->parsePattern(code, provider); if (m_runAutomatically) @@ -1531,7 +1531,7 @@ namespace hex::plugin::builtin { if (m_shouldAnalyze) { m_shouldAnalyze = false; - m_analysisTask = TaskManager::createBackgroundTask("hex.builtin.task.analyzing_data"_lang, [this, provider](const Task &task) { + m_analysisTask = TaskManager::createBackgroundTask("hex.builtin.task.analyzing_data", [this, provider](const Task &task) { if (!m_autoLoadPatterns) return; @@ -1834,7 +1834,7 @@ namespace hex::plugin::builtin { m_textEditor.SetText(code); m_sourceCode.set(provider, code); - TaskManager::createBackgroundTask("hex.builtin.task.parsing_pattern"_lang, [this, code, provider](auto&) { this->parsePattern(code, provider); }); + TaskManager::createBackgroundTask("hex.builtin.task.parsing_pattern", [this, code, provider](auto&) { this->parsePattern(code, provider); }); } } @@ -1900,7 +1900,7 @@ namespace hex::plugin::builtin { EventHighlightingChanged::post(); - TaskManager::createTask("hex.builtin.view.pattern_editor.evaluating"_lang, TaskManager::NoProgress, [this, code, provider](auto &task) { + TaskManager::createTask("hex.builtin.view.pattern_editor.evaluating", TaskManager::NoProgress, [this, code, provider](auto &task) { auto lock = std::scoped_lock(ContentRegistry::PatternLanguage::getRuntimeLock()); auto &runtime = ContentRegistry::PatternLanguage::getRuntime(); diff --git a/plugins/builtin/source/content/views/view_store.cpp b/plugins/builtin/source/content/views/view_store.cpp index 5a9363e2e..363a57673 100644 --- a/plugins/builtin/source/content/views/view_store.cpp +++ b/plugins/builtin/source/content/views/view_store.cpp @@ -336,7 +336,7 @@ namespace hex::plugin::builtin { } void ViewStore::updateAll() { - m_updateAllTask = TaskManager::createTask("hex.builtin.task.updating_store"_lang, m_updateCount, [this](auto &task) { + m_updateAllTask = TaskManager::createTask("hex.builtin.task.updating_store", m_updateCount, [this](auto &task) { for (auto &category : m_categories) { for (auto &entry : category.entries) { if (entry.hasUpdate) { diff --git a/plugins/builtin/source/content/welcome_screen.cpp b/plugins/builtin/source/content/welcome_screen.cpp index 57edfba98..1d13fcc95 100644 --- a/plugins/builtin/source/content/welcome_screen.cpp +++ b/plugins/builtin/source/content/welcome_screen.cpp @@ -99,7 +99,7 @@ namespace hex::plugin::builtin { } } - TaskManager::createBackgroundTask("hex.builtin.task.uploading_crash"_lang, [path = m_logFilePath, data](auto&){ + TaskManager::createBackgroundTask("hex.builtin.task.uploading_crash", [path = m_logFilePath, data](auto&){ HttpRequest request("POST", ImHexApiURL + std::string("/crash_upload")); request.uploadFile(std::vector(data.begin(), data.end()), "file", path.filename()).wait(); }); @@ -679,7 +679,7 @@ namespace hex::plugin::builtin { auto allowNetworking = ContentRegistry::Settings::read("hex.builtin.setting.general", "hex.builtin.setting.general.network_interface", false) && ContentRegistry::Settings::read("hex.builtin.setting.general", "hex.builtin.setting.general.server_contact", 0) != 0; if (!s_infoBannerTexture->isValid() && allowNetworking) { - TaskManager::createBackgroundTask("hex.builtin.task.loading_banner"_lang, [](auto&) { + TaskManager::createBackgroundTask("hex.builtin.task.loading_banner", [](auto&) { HttpRequest request("GET", ImHexApiURL + hex::format("/info/{}/image", hex::toLower(ImHexApi::System::getOSName()))); diff --git a/plugins/diffing/source/content/views/view_diff.cpp b/plugins/diffing/source/content/views/view_diff.cpp index f814b9424..7efe0b817 100644 --- a/plugins/diffing/source/content/views/view_diff.cpp +++ b/plugins/diffing/source/content/views/view_diff.cpp @@ -94,7 +94,7 @@ namespace hex::plugin::diffing { void ViewDiff::analyze(prv::Provider *providerA, prv::Provider *providerB) { auto commonSize = std::max(providerA->getActualSize(), providerB->getActualSize()); - m_diffTask = TaskManager::createTask("hex.diffing.view.diff.task.diffing"_lang, commonSize, [this, providerA, providerB](Task &) { + m_diffTask = TaskManager::createTask("hex.diffing.view.diff.task.diffing", commonSize, [this, providerA, providerB](Task &) { auto differences = m_algorithm->analyze(providerA, providerB); auto providers = ImHexApi::Provider::getProviders(); diff --git a/plugins/disassembler/source/content/views/view_disassembler.cpp b/plugins/disassembler/source/content/views/view_disassembler.cpp index dcb74f413..32e08efb7 100644 --- a/plugins/disassembler/source/content/views/view_disassembler.cpp +++ b/plugins/disassembler/source/content/views/view_disassembler.cpp @@ -100,7 +100,7 @@ namespace hex::plugin::disasm { void ViewDisassembler::exportToFile() { const auto provider = ImHexApi::Provider::get(); - TaskManager::createTask("hex.ui.common.processing"_lang, TaskManager::NoProgress, [this, provider](auto &) { + TaskManager::createTask("hex.ui.common.processing", TaskManager::NoProgress, [this, provider](auto &) { TaskManager::doLater([this, provider] { fs::openFileBrowser(fs::DialogMode::Save, {}, [this, provider](const std::fs::path &path) { auto p = path; diff --git a/plugins/script_loader/source/plugin_script_loader.cpp b/plugins/script_loader/source/plugin_script_loader.cpp index de7060d16..a8e4078bb 100644 --- a/plugins/script_loader/source/plugin_script_loader.cpp +++ b/plugins/script_loader/source/plugin_script_loader.cpp @@ -92,7 +92,7 @@ std::vector loadAllScripts() { if (menuJustOpened) { menuJustOpened = false; if (!updaterTask.isRunning()) { - updaterTask = TaskManager::createBackgroundTask("hex.script_loader.task.updating"_lang, [] (auto&) { + updaterTask = TaskManager::createBackgroundTask("hex.script_loader.task.updating", [] (auto&) { scripts = loadAllScripts(); }); } @@ -110,7 +110,7 @@ std::vector loadAllScripts() { continue; if (ImGui::MenuItem(name.c_str(), loader->getTypeName().c_str())) { - runnerTask = TaskManager::createTask("hex.script_loader.task.running"_lang, TaskManager::NoProgress, [entryPoint](auto&) { + runnerTask = TaskManager::createTask("hex.script_loader.task.running", TaskManager::NoProgress, [entryPoint](auto&) { entryPoint(); }); } @@ -124,7 +124,7 @@ std::vector loadAllScripts() { return !runnerTask.isRunning(); }); - updaterTask = TaskManager::createBackgroundTask("hex.script_loader.task.updating"_lang, [] (auto&) { + updaterTask = TaskManager::createBackgroundTask("hex.script_loader.task.updating", [] (auto&) { scripts = loadAllScripts(); }); } diff --git a/plugins/windows/source/views/view_tty_console.cpp b/plugins/windows/source/views/view_tty_console.cpp index ca5f472ac..16f7305e2 100644 --- a/plugins/windows/source/views/view_tty_console.cpp +++ b/plugins/windows/source/views/view_tty_console.cpp @@ -299,7 +299,7 @@ namespace hex::plugin::windows { if (m_transmitting) return; - TaskManager::createBackgroundTask("hex.windows.view.tty_console.task.transmitting"_lang, [&, this](auto&) { + TaskManager::createBackgroundTask("hex.windows.view.tty_console.task.transmitting", [&, this](auto&) { OVERLAPPED overlapped = { }; overlapped.hEvent = ::CreateEvent(nullptr, true, false, nullptr);