From d9798a9b2beee02d586d06b3072720f1a4732091 Mon Sep 17 00:00:00 2001 From: sithlord48 Date: Thu, 20 Mar 2025 09:31:02 -0400 Subject: [PATCH] chore: remove StdPost / StdPre --- src/lib/common/CMakeLists.txt | 2 -- src/lib/common/StdDeque.h | 4 ---- src/lib/common/StdIStream.h | 4 ---- src/lib/common/StdList.h | 4 ---- src/lib/common/StdMap.h | 4 ---- src/lib/common/StdOStream.h | 4 ---- src/lib/common/StdPost.h | 12 ------------ src/lib/common/StdPre.h | 22 ---------------------- src/lib/common/StdSet.h | 4 ---- src/lib/common/StdVector.h | 4 ---- 10 files changed, 64 deletions(-) delete mode 100644 src/lib/common/StdPost.h delete mode 100644 src/lib/common/StdPre.h diff --git a/src/lib/common/CMakeLists.txt b/src/lib/common/CMakeLists.txt index 6ff5200ce..0b22c8867 100644 --- a/src/lib/common/CMakeLists.txt +++ b/src/lib/common/CMakeLists.txt @@ -12,8 +12,6 @@ add_library(common STATIC StdList.h StdMap.h StdOStream.h - StdPost.h - StdPre.h StdSet.h StdVector.h Settings.h diff --git a/src/lib/common/StdDeque.h b/src/lib/common/StdDeque.h index dd865e71a..fb790f929 100644 --- a/src/lib/common/StdDeque.h +++ b/src/lib/common/StdDeque.h @@ -6,8 +6,4 @@ */ #pragma once -#include "StdPre.h" - #include - -#include "StdPost.h" diff --git a/src/lib/common/StdIStream.h b/src/lib/common/StdIStream.h index 8b0e3f446..f24b4d084 100644 --- a/src/lib/common/StdIStream.h +++ b/src/lib/common/StdIStream.h @@ -7,12 +7,8 @@ #pragma once -#include "StdPre.h" - #if HAVE_ISTREAM #include #else #include #endif - -#include "StdPost.h" diff --git a/src/lib/common/StdList.h b/src/lib/common/StdList.h index deccc6517..8c0373795 100644 --- a/src/lib/common/StdList.h +++ b/src/lib/common/StdList.h @@ -7,8 +7,4 @@ #pragma once -#include "StdPre.h" - #include - -#include "StdPost.h" diff --git a/src/lib/common/StdMap.h b/src/lib/common/StdMap.h index c9c8a4b64..8af32d13b 100644 --- a/src/lib/common/StdMap.h +++ b/src/lib/common/StdMap.h @@ -7,8 +7,4 @@ #pragma once -#include "StdPre.h" - #include - -#include "StdPost.h" diff --git a/src/lib/common/StdOStream.h b/src/lib/common/StdOStream.h index 934cbd972..7d0cf08d0 100644 --- a/src/lib/common/StdOStream.h +++ b/src/lib/common/StdOStream.h @@ -7,12 +7,8 @@ #pragma once -#include "StdPre.h" - #if HAVE_OSTREAM #include #else #include #endif - -#include "StdPost.h" diff --git a/src/lib/common/StdPost.h b/src/lib/common/StdPost.h deleted file mode 100644 index a8362b158..000000000 --- a/src/lib/common/StdPost.h +++ /dev/null @@ -1,12 +0,0 @@ -/* - * Deskflow -- mouse and keyboard sharing utility - * SPDX-FileCopyrightText: (C) 2012 - 2016 Symless Ltd. - * SPDX-FileCopyrightText: (C) 2002 Chris Schoeneman - * SPDX-License-Identifier: GPL-2.0-only WITH LicenseRef-OpenSSL-Exception - */ - -#pragma once - -#if defined(_MSC_VER) -#pragma warning(pop) -#endif diff --git a/src/lib/common/StdPre.h b/src/lib/common/StdPre.h deleted file mode 100644 index 136e4d8b6..000000000 --- a/src/lib/common/StdPre.h +++ /dev/null @@ -1,22 +0,0 @@ -/* - * Deskflow -- mouse and keyboard sharing utility - * SPDX-FileCopyrightText: (C) 2012 - 2016 Symless Ltd. - * SPDX-FileCopyrightText: (C) 2002 Chris Schoeneman - * SPDX-License-Identifier: GPL-2.0-only WITH LicenseRef-OpenSSL-Exception - */ - -#pragma once - -#if defined(_MSC_VER) -#pragma warning(disable : 4786) // identifier truncated -#pragma warning(disable : 4514) // unreferenced inline -#pragma warning(disable : 4710) // not inlined -#pragma warning(disable : 4663) // C++ change, template specialization -#pragma warning(disable : 4503) // decorated name length too long -#pragma warning(push, 3) -#pragma warning(disable : 4018) // signed/unsigned mismatch -#pragma warning(disable : 4284) -#pragma warning(disable : 4146) // unary minus on unsigned value -#pragma warning(disable : 4127) // conditional expression is constant -#pragma warning(disable : 4701) // variable possibly used uninitialized -#endif diff --git a/src/lib/common/StdSet.h b/src/lib/common/StdSet.h index c3235ce11..1b28a6e34 100644 --- a/src/lib/common/StdSet.h +++ b/src/lib/common/StdSet.h @@ -7,8 +7,4 @@ #pragma once -#include "StdPre.h" - #include - -#include "StdPost.h" diff --git a/src/lib/common/StdVector.h b/src/lib/common/StdVector.h index f9086b3af..75f0c6304 100644 --- a/src/lib/common/StdVector.h +++ b/src/lib/common/StdVector.h @@ -7,8 +7,4 @@ #pragma once -#include "StdPre.h" - #include - -#include "StdPost.h"