From 1798d7e4e6e796c6d8318aceb5d65750684276f3 Mon Sep 17 00:00:00 2001 From: sithlord48 Date: Thu, 20 Mar 2025 19:01:11 -0400 Subject: [PATCH] chore: remove StdOStream and include ostream directly where needed --- src/lib/common/CMakeLists.txt | 1 - src/lib/common/StdOStream.h | 14 -------------- src/lib/server/Config.cpp | 4 ++-- 3 files changed, 2 insertions(+), 17 deletions(-) delete mode 100644 src/lib/common/StdOStream.h diff --git a/src/lib/common/CMakeLists.txt b/src/lib/common/CMakeLists.txt index 434b7b7ea..4747c4e6b 100644 --- a/src/lib/common/CMakeLists.txt +++ b/src/lib/common/CMakeLists.txt @@ -7,7 +7,6 @@ add_library(common STATIC Common.h IInterface.h StdExcept.h - StdOStream.h Settings.h Settings.cpp QSettingsProxy.cpp diff --git a/src/lib/common/StdOStream.h b/src/lib/common/StdOStream.h deleted file mode 100644 index 7d0cf08d0..000000000 --- a/src/lib/common/StdOStream.h +++ /dev/null @@ -1,14 +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 HAVE_OSTREAM -#include -#else -#include -#endif diff --git a/src/lib/server/Config.cpp b/src/lib/server/Config.cpp index c701b3a92..20a3b3596 100644 --- a/src/lib/server/Config.cpp +++ b/src/lib/server/Config.cpp @@ -8,8 +8,6 @@ #include "server/Config.h" #include "base/IEventQueue.h" -#include "common/StdIStream.h" -#include "common/StdOStream.h" #include "deskflow/KeyMap.h" #include "deskflow/KeyTypes.h" #include "deskflow/OptionTypes.h" @@ -18,6 +16,8 @@ #include "server/Server.h" #include +#include +#include using namespace deskflow::string;