philipp/KDDockWidgets
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge both Logging_p.cpp into the same one

Browse Source 
the multisplitter abstraction is no longer the way we want to
abstract the framework
This commit is contained in:
Sergio Martins
2022-03-24 16:59:50 +00:00
parent 123fcdde1f
commit e0e6d1fd3e
7 changed files with 3 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/CMakeLists.txt
View File

@@ -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

1
src/controllers/Separator.cpp
View File

@@ -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"

1
src/private/Logging.cpp
View File

@@ -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)

1
src/private/Logging_p.h
View File

@@ -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

14
src/private/multisplitter/Logging.cpp
View File

@@ -1,14 +0,0 @@
/*
This file is part of KDDockWidgets.
SPDX-FileCopyrightText: 2020-2022 Klarälvdalens Datakonsult AB, a KDAB Group company <info@kdab.com>
Author: Sérgio Martins <sergio.martins@kdab.com>
SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only
Contact KDAB at <info@kdab.com> for commercial licensing options.
*/
#include "Logging_p.h"
Q_LOGGING_CATEGORY(separators, "kdab.docks.separators", QtWarningMsg)

20
src/private/multisplitter/Logging_p.h
View File

@@ -1,20 +0,0 @@
/*
This file is part of KDDockWidgets.
SPDX-FileCopyrightText: 2020-2022 Klarälvdalens Datakonsult AB, a KDAB Group company <info@kdab.com>
Author: Sérgio Martins <sergio.martins@kdab.com>
SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only
Contact KDAB at <info@kdab.com> for commercial licensing options.
*/
#ifndef KD_DOCKWIDGETS_MULTISPLITTER_LOGGING_P_H
#define KD_DOCKWIDGETS_MULTISPLITTER_LOGGING_P_H
#include <QLoggingCategory>
Q_DECLARE_LOGGING_CATEGORY(separators)
#endif

2
src/views_qtwidgets/Separator_qtwidgets.cpp
View File

@@ -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 <QMouseEvent>