From e0e6d1fd3eab5aa3e5a117553e8278ab9d109ccf Mon Sep 17 00:00:00 2001 From: Sergio Martins Date: Thu, 24 Mar 2022 16:59:50 +0000 Subject: [PATCH] Merge both Logging_p.cpp into the same one the multisplitter abstraction is no longer the way we want to abstract the framework --- src/CMakeLists.txt | 2 -- src/controllers/Separator.cpp | 1 - src/private/Logging.cpp | 1 + src/private/Logging_p.h | 1 + src/private/multisplitter/Logging.cpp | 14 -------------- src/private/multisplitter/Logging_p.h | 20 -------------------- src/views_qtwidgets/Separator_qtwidgets.cpp | 2 +- 7 files changed, 3 insertions(+), 38 deletions(-) delete mode 100644 src/private/multisplitter/Logging.cpp delete mode 100644 src/private/multisplitter/Logging_p.h diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 730e1ae1..beb7498e 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -77,8 +77,6 @@ set(DOCKSLIBS_SRCS private/multisplitter/Item_p.h private/multisplitter/ItemFreeContainer.cpp private/multisplitter/ItemFreeContainer_p.h - private/multisplitter/Logging.cpp - private/multisplitter/Logging_p.h private/multisplitter/MultiSplitterConfig.cpp private/multisplitter/MultiSplitterConfig.h diff --git a/src/controllers/Separator.cpp b/src/controllers/Separator.cpp index a5618226..29cd93d6 100644 --- a/src/controllers/Separator.cpp +++ b/src/controllers/Separator.cpp @@ -11,7 +11,6 @@ #include "Separator.h" #include "private/multisplitter/MultiSplitterConfig.h" -#include "private/multisplitter/Logging_p.h" #include "private/multisplitter/Item_p.h" #include "View.h" #include "private/Logging_p.h" diff --git a/src/private/Logging.cpp b/src/private/Logging.cpp index a9efb135..d18fa44e 100644 --- a/src/private/Logging.cpp +++ b/src/private/Logging.cpp @@ -23,3 +23,4 @@ Q_LOGGING_CATEGORY(dropping, "kdab.docks.dropping", QtWarningMsg) Q_LOGGING_CATEGORY(sizing, "kdab.multisplitter.sizing", QtWarningMsg) Q_LOGGING_CATEGORY(addwidget, "kdab.multisplitter.addwidget", QtWarningMsg) Q_LOGGING_CATEGORY(placeholder, "kdab.multisplitter.placeholder", QtWarningMsg) +Q_LOGGING_CATEGORY(separators, "kdab.docks.separators", QtWarningMsg) diff --git a/src/private/Logging_p.h b/src/private/Logging_p.h index 1da75261..caf0be6d 100644 --- a/src/private/Logging_p.h +++ b/src/private/Logging_p.h @@ -34,5 +34,6 @@ Q_DECLARE_LOGGING_CATEGORY(anchors) Q_DECLARE_LOGGING_CATEGORY(item) Q_DECLARE_LOGGING_CATEGORY(placeholder) Q_DECLARE_LOGGING_CATEGORY(toplevels) +Q_DECLARE_LOGGING_CATEGORY(separators) #endif diff --git a/src/private/multisplitter/Logging.cpp b/src/private/multisplitter/Logging.cpp deleted file mode 100644 index fbf58883..00000000 --- a/src/private/multisplitter/Logging.cpp +++ /dev/null @@ -1,14 +0,0 @@ -/* - This file is part of KDDockWidgets. - - SPDX-FileCopyrightText: 2020-2022 Klarälvdalens Datakonsult AB, a KDAB Group company - Author: Sérgio Martins - - SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only - - Contact KDAB at for commercial licensing options. -*/ - -#include "Logging_p.h" - -Q_LOGGING_CATEGORY(separators, "kdab.docks.separators", QtWarningMsg) diff --git a/src/private/multisplitter/Logging_p.h b/src/private/multisplitter/Logging_p.h deleted file mode 100644 index baef9206..00000000 --- a/src/private/multisplitter/Logging_p.h +++ /dev/null @@ -1,20 +0,0 @@ -/* - This file is part of KDDockWidgets. - - SPDX-FileCopyrightText: 2020-2022 Klarälvdalens Datakonsult AB, a KDAB Group company - Author: Sérgio Martins - - SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only - - Contact KDAB at for commercial licensing options. -*/ - -#ifndef KD_DOCKWIDGETS_MULTISPLITTER_LOGGING_P_H -#define KD_DOCKWIDGETS_MULTISPLITTER_LOGGING_P_H - -#include - -Q_DECLARE_LOGGING_CATEGORY(separators) - - -#endif diff --git a/src/views_qtwidgets/Separator_qtwidgets.cpp b/src/views_qtwidgets/Separator_qtwidgets.cpp index 4fe5197b..942f9fc1 100644 --- a/src/views_qtwidgets/Separator_qtwidgets.cpp +++ b/src/views_qtwidgets/Separator_qtwidgets.cpp @@ -13,7 +13,7 @@ #include "View_qtwidgets.h" #include "Config.h" -#include "private/multisplitter/Logging_p.h" // TODOv2: Normalize Logging_p.h +#include "private/Logging_p.h" #include "controllers/Separator.h" #include