diff options
| author | Mikaƫl Capelle <capelle.mikael@gmail.com> | 2024-05-25 13:14:46 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-05-25 13:14:46 +0200 |
| commit | fa82d1cca1544c401bc06c341ce265a346a498b9 (patch) | |
| tree | e67f24433b315b71729d2e8bea12c72c32244d83 /src/envshell.cpp | |
| parent | 9ee4c5afe18eb887acf4ea843b56da9a267d34b0 (diff) | |
Switch from fmtlib to std::format. (#2031)
* Switch from fmtlib to std::format.
* Remove libffi from dependencies in Github action.
Diffstat (limited to 'src/envshell.cpp')
| -rw-r--r-- | src/envshell.cpp | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/src/envshell.cpp b/src/envshell.cpp index 3d0f774e..94c089b3 100644 --- a/src/envshell.cpp +++ b/src/envshell.cpp @@ -1,8 +1,12 @@ -#include "envshell.h" + +#include <format> + #include <log.h> #include <utility.h> #include <windowsx.h> +#include "envshell.h" + namespace env { @@ -16,7 +20,7 @@ class MenuFailed : public std::runtime_error public: MenuFailed(HRESULT r, const std::string& what) : runtime_error( - fmt::format("{}, {}", what, + std::format("{}, {}", what, QString::fromStdWString(formatSystemMessage(r)).toStdString())) {} }; @@ -478,7 +482,7 @@ void ShellMenu::invoke(const QPoint& p, int cmd) const auto r = m_cm->InvokeCommand((CMINVOKECOMMANDINFO*)&info); if (FAILED(r)) { - throw MenuFailed(r, fmt::format("InvokeCommand failed, verb={}", cmd)); + throw MenuFailed(r, std::format("InvokeCommand failed, verb={}", cmd)); } } @@ -568,7 +572,7 @@ void ShellMenuCollection::exec(const QPoint& pos) } if (!m_active) { - log::debug("SMC: command {} selected without active submenu"); + log::debug("SMC: command {} selected without active submenu", cmd); return; } |
