diff options
| author | David Lönnhager <david.l@mullvad.net> | 2020-01-20 19:03:48 +0100 |
|---|---|---|
| committer | David Lönnhager <david.l@mullvad.net> | 2020-01-20 19:03:48 +0100 |
| commit | feaff7f3e7585f073b241eb87e31740b138dc714 (patch) | |
| tree | 67353ac90f69ea7bf810c0c7b341f8f77867be4a /windows/nsis-plugins/src | |
| parent | b746ee3c93454482d02fb8f64393350a79587b99 (diff) | |
| parent | a64020b195a83b0960fe79ff11904c4f35348ec8 (diff) | |
| download | mullvadvpn-feaff7f3e7585f073b241eb87e31740b138dc714.tar.xz mullvadvpn-feaff7f3e7585f073b241eb87e31740b138dc714.zip | |
Merge branch 'win-refactor'
Diffstat (limited to 'windows/nsis-plugins/src')
| -rw-r--r-- | windows/nsis-plugins/src/cleanup/cleaningops.cpp | 2 | ||||
| -rw-r--r-- | windows/nsis-plugins/src/driverlogic/driverlogic.cpp | 15 | ||||
| -rw-r--r-- | windows/nsis-plugins/src/tray/tray.cpp | 2 |
3 files changed, 7 insertions, 12 deletions
diff --git a/windows/nsis-plugins/src/cleanup/cleaningops.cpp b/windows/nsis-plugins/src/cleanup/cleaningops.cpp index 671ff3c73d..88cf20ad55 100644 --- a/windows/nsis-plugins/src/cleanup/cleaningops.cpp +++ b/windows/nsis-plugins/src/cleanup/cleaningops.cpp @@ -5,7 +5,7 @@ #include <libcommon/string.h> #include <libcommon/memory.h> #include <libcommon/security.h> -#include <libcommon/process.h> +#include <libcommon/process/process.h> #include <filesystem> #include <utility> #include <functional> diff --git a/windows/nsis-plugins/src/driverlogic/driverlogic.cpp b/windows/nsis-plugins/src/driverlogic/driverlogic.cpp index e57b08327b..d82cde2f4d 100644 --- a/windows/nsis-plugins/src/driverlogic/driverlogic.cpp +++ b/windows/nsis-plugins/src/driverlogic/driverlogic.cpp @@ -127,16 +127,11 @@ void __declspec(dllexport) NSISCALL EstablishBaseline try { - using value_type = common::ValueMapper<Context::BaselineStatus, EstablishBaselineStatus>::value_type; - - const common::ValueMapper<Context::BaselineStatus, EstablishBaselineStatus> mapper = - { - value_type(Context::BaselineStatus::NO_TAP_ADAPTERS_PRESENT, EstablishBaselineStatus::NO_TAP_ADAPTERS_PRESENT), - value_type(Context::BaselineStatus::SOME_TAP_ADAPTERS_PRESENT, EstablishBaselineStatus::SOME_TAP_ADAPTERS_PRESENT), - value_type(Context::BaselineStatus::MULLVAD_ADAPTER_PRESENT, EstablishBaselineStatus::MULLVAD_ADAPTER_PRESENT) - }; - - const auto status = mapper.map(g_context->establishBaseline()); + const auto status = common::ValueMapper::Map(g_context->establishBaseline(), { + std::make_pair(Context::BaselineStatus::NO_TAP_ADAPTERS_PRESENT, EstablishBaselineStatus::NO_TAP_ADAPTERS_PRESENT), + std::make_pair(Context::BaselineStatus::SOME_TAP_ADAPTERS_PRESENT, EstablishBaselineStatus::SOME_TAP_ADAPTERS_PRESENT), + std::make_pair(Context::BaselineStatus::MULLVAD_ADAPTER_PRESENT, EstablishBaselineStatus::MULLVAD_ADAPTER_PRESENT) + }); pushstring(L""); pushint(status); diff --git a/windows/nsis-plugins/src/tray/tray.cpp b/windows/nsis-plugins/src/tray/tray.cpp index dc5c02ea91..e86162e0fa 100644 --- a/windows/nsis-plugins/src/tray/tray.cpp +++ b/windows/nsis-plugins/src/tray/tray.cpp @@ -9,7 +9,7 @@ #include <libcommon/registry/registry.h> #include <libcommon/resourcedata.h> #include <libcommon/filesystem.h> -#include <libcommon/process.h> +#include <libcommon/process/process.h> #include <libcommon/security.h> #include <nsis/pluginapi.h> #include <stdexcept> |