diff options
| author | Fuwn <[email protected]> | 2022-02-03 12:19:55 -0800 |
|---|---|---|
| committer | Fuwn <[email protected]> | 2022-02-03 12:19:55 -0800 |
| commit | 60f5b92321d78656be644eb30541edfff2eda291 (patch) | |
| tree | f216796f9297738e99db0af6da2b0841823216e6 | |
| parent | fix(cmake): cmkr.cmake path (diff) | |
| download | soyuz-60f5b92321d78656be644eb30541edfff2eda291.tar.xz soyuz-60f5b92321d78656be644eb30541edfff2eda291.zip | |
fmt: preprocessor statements
| -rw-r--r-- | include/soyuz/library.hh | 1 | ||||
| -rw-r--r-- | include/soyuz/resource.hh | 1 | ||||
| -rw-r--r-- | include/soyuz/soyuz.hh | 1 | ||||
| -rw-r--r-- | include/soyuz/tray.hh | 1 | ||||
| -rw-r--r-- | include/soyuz/windows.hh | 1 | ||||
| -rw-r--r-- | soyuz/library.cc | 9 | ||||
| -rw-r--r-- | soyuz/soyuz.cc | 10 | ||||
| -rw-r--r-- | soyuz/tray.cc | 9 | ||||
| -rw-r--r-- | soyuz/windows.cc | 2 |
9 files changed, 17 insertions, 18 deletions
diff --git a/include/soyuz/library.hh b/include/soyuz/library.hh index c71fdc4..ca3b094 100644 --- a/include/soyuz/library.hh +++ b/include/soyuz/library.hh @@ -3,7 +3,6 @@ #ifndef SOYUZ_LIBRARY_HH #define SOYUZ_LIBRARY_HH - #pragma once #include <string> diff --git a/include/soyuz/resource.hh b/include/soyuz/resource.hh index 89c1242..fbb57e1 100644 --- a/include/soyuz/resource.hh +++ b/include/soyuz/resource.hh @@ -3,7 +3,6 @@ #ifndef SOYUZ_RESOURCE_HH #define SOYUZ_RESOURCE_HH - #pragma once #include <shellapi.h> diff --git a/include/soyuz/soyuz.hh b/include/soyuz/soyuz.hh index 0bfab97..3f30323 100644 --- a/include/soyuz/soyuz.hh +++ b/include/soyuz/soyuz.hh @@ -3,7 +3,6 @@ #ifndef SOYUZ_SOYUZ_HH #define SOYUZ_SOYUZ_HH - #pragma once #define LUNAR_WINDOW_NAME_BASE "Lunar Client (" diff --git a/include/soyuz/tray.hh b/include/soyuz/tray.hh index 6cca253..9d6af22 100644 --- a/include/soyuz/tray.hh +++ b/include/soyuz/tray.hh @@ -3,7 +3,6 @@ #ifndef SOYUZ_TRAY_HH #define SOYUZ_TRAY_HH - #pragma once #include <string> diff --git a/include/soyuz/windows.hh b/include/soyuz/windows.hh index f709444..7f07de7 100644 --- a/include/soyuz/windows.hh +++ b/include/soyuz/windows.hh @@ -3,7 +3,6 @@ #ifndef SOYUZ_WINDOWS_HH #define SOYUZ_WINDOWS_HH - #pragma once #include <Windows.h> diff --git a/soyuz/library.cc b/soyuz/library.cc index 022bef4..fdf9483 100644 --- a/soyuz/library.cc +++ b/soyuz/library.cc @@ -1,6 +1,8 @@ // Copyright (C) 2021-2021 Fuwn // SPDX-License-Identifier: GPL-3.0-only +#include <soyuz/library.hh> + #include <cstdio> #include <fmt/format.h> #include <fmt/os.h> @@ -8,10 +10,9 @@ #include <string> #include <Windows.h> -#include "soyuz/library.hh" -#include "soyuz/soyuz.hh" -#include "soyuz/tray.hh" -#include "soyuz/windows.hh" +#include <soyuz/soyuz.hh> +#include <soyuz/tray.hh> +#include <soyuz/windows.hh> namespace soyuz { diff --git a/soyuz/soyuz.cc b/soyuz/soyuz.cc index 24fbe4f..be181fc 100644 --- a/soyuz/soyuz.cc +++ b/soyuz/soyuz.cc @@ -1,15 +1,17 @@ // Copyright (C) 2021-2021 Fuwn // SPDX-License-Identifier: GPL-3.0-only +#include <soyuz/soyuz.hh> + #pragma comment(lib, "ntdll.lib") #include <fmt/format.h> #include <thread> #include <Windows.h> -#include "soyuz/library.hh" -#include "soyuz/resource.hh" -#include "soyuz/tray.hh" +#include <soyuz/library.hh> +#include <soyuz/resource.hh> +#include <soyuz/tray.hh> extern UINT WM_TASKBAR; extern HWND window; @@ -59,7 +61,7 @@ int WINAPI WinMain(HINSTANCE instance, HINSTANCE, LPSTR, int show) { ShowWindow(window, show); // https://medium.com/@vgasparyan1995/a-new-thread-in-c-20-jthread-ebd121ae8906 - std::jthread soyuz {[](const std::stop_token& stop) -> void { + std::jthread soyuz {[](const std::stop_token &stop) -> void { DWORD pid = soyuz::find_lunar(); if (pid == 0 || pid == 3435973836) { soyuz::log("could not locate lunar client"); diff --git a/soyuz/tray.cc b/soyuz/tray.cc index e750973..a0ad4c5 100644 --- a/soyuz/tray.cc +++ b/soyuz/tray.cc @@ -1,13 +1,14 @@ // Copyright (C) 2021-2021 Fuwn // SPDX-License-Identifier: GPL-3.0-only +#include <soyuz/tray.hh> + #include <fmt/format.h> #include <sstream> -#include "soyuz/library.hh" -#include "soyuz/resource.hh" -#include "soyuz/soyuz.hh" -#include "soyuz/tray.hh" +#include <soyuz/library.hh> +#include <soyuz/resource.hh> +#include <soyuz/soyuz.hh> UINT WM_TASKBAR = 0; HWND window; diff --git a/soyuz/windows.cc b/soyuz/windows.cc index 4cc84fc..3576675 100644 --- a/soyuz/windows.cc +++ b/soyuz/windows.cc @@ -1,4 +1,4 @@ // Copyright (C) 2021-2021 Fuwn // SPDX-License-Identifier: GPL-3.0-only -#include "soyuz/windows.hh" +#include <soyuz/windows.hh> |