mirrors/Qt-Advanced-Docking-System
1
0
Fork 0
mirror of https://github.com/githubuser0xFFFF/Qt-Advanced-Docking-System.git synced 2024-12-26 08:01:32 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/githubuser0xFFFF/Qt-Advanced-Docking-System

Browse Source
This commit is contained in:
Uwe Kindler 2020-05-14 06:46:47 +02:00
commit 3011c0c030
9 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
examples/sidebar/MainWindow.h
View File

@ -4,10 +4,11 @@
#include <QMainWindow> #include <QMainWindow>
#include "DockManager.h" #include "DockManager.h"
QT_BEGIN_NAMESPACE
namespace Ui { namespace Ui {
class MainWindow; class MainWindow;
} }
QT_END_NAMESPACE
/** /**
* This example shows, how to place a dock widget container and a static * This example shows, how to place a dock widget container and a static

2
examples/simple/MainWindow.h
View File

@ -4,9 +4,11 @@
#include <QMainWindow> #include <QMainWindow>
#include "DockManager.h" #include "DockManager.h"
QT_BEGIN_NAMESPACE
namespace Ui { namespace Ui {
class MainWindow; class MainWindow;
} }
QT_END_NAMESPACE
class MainWindow : public QMainWindow class MainWindow : public QMainWindow
{ {

2
src/DockAreaTitleBar.h
View File

@ -34,7 +34,7 @@
#include "ads_globals.h" #include "ads_globals.h"
class QAbstractButton; QT_FORWARD_DECLARE_CLASS(QAbstractButton);
namespace ads namespace ads
{ {

4
src/DockAreaWidget.h
View File

@ -35,8 +35,8 @@
#include "ads_globals.h" #include "ads_globals.h"
#include "DockWidget.h" #include "DockWidget.h"
class QXmlStreamWriter; QT_FORWARD_DECLARE_CLASS(QXmlStreamWriter);
class QAbstractButton; QT_FORWARD_DECLARE_CLASS(QAbstractButton);
namespace ads namespace ads
{ {

2
src/DockContainerWidget.h
View File

@ -35,7 +35,7 @@
#include "ads_globals.h" #include "ads_globals.h"
#include "DockWidget.h" #include "DockWidget.h"
class QXmlStreamWriter; QT_FORWARD_DECLARE_CLASS(QXmlStreamWriter);
namespace ads namespace ads

4
src/DockManager.h
View File

@ -36,8 +36,8 @@
#include "FloatingDockContainer.h" #include "FloatingDockContainer.h"
class QSettings; QT_FORWARD_DECLARE_CLASS(QSettings);
class QMenu; QT_FORWARD_DECLARE_CLASS(QMenu);
namespace ads namespace ads
{ {

2
src/DockOverlay.h
View File

@ -26,7 +26,7 @@
#include <QHash> #include <QHash>
#include <QRect> #include <QRect>
#include <QFrame> #include <QFrame>
class QGridLayout; QT_FORWARD_DECLARE_CLASS(QGridLayout);
#include "ads_globals.h" #include "ads_globals.h"

4
src/DockWidget.h
View File

@ -34,8 +34,8 @@
#include "ads_globals.h" #include "ads_globals.h"
class QToolBar; QT_FORWARD_DECLARE_CLASS(QToolBar);
class QXmlStreamWriter; QT_FORWARD_DECLARE_CLASS(QXmlStreamWriter);
namespace ads namespace ads
{ {

4
src/ads_globals.h
View File

@ -37,7 +37,7 @@
#include <QDebug> #include <QDebug>
#include <QStyle> #include <QStyle>
class QAbstractButton; QT_FORWARD_DECLARE_CLASS(QAbstractButton);
#ifndef ADS_STATIC #ifndef ADS_STATIC
#ifdef ADS_SHARED_EXPORT #ifdef ADS_SHARED_EXPORT
@ -60,7 +60,7 @@ class QAbstractButton;
// dumps to qDebug and std::cout after layout changes // dumps to qDebug and std::cout after layout changes
#define ADS_DEBUG_LEVEL 0 #define ADS_DEBUG_LEVEL 0
class QSplitter; QT_FORWARD_DECLARE_CLASS(QSplitter);
namespace ads namespace ads
{ {