Scarfski/Qt-Advanced-Docking-System
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Better compatible with qt4.

Browse Source 
* Q_PROPERTY MEMBER wasn't available, use READ and WRITE instead
* Disables namespace with qt4
* Updates default stylesheet to work with qt4 (no namespaces)

Unifies include/forward-declaration style in header files.
README status updates
This commit is contained in:
mfreiholz
2016-02-15 12:27:23 +01:00
parent 2d1a3b8665
commit 2513ab1f2b
10 changed files with 22 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
AdvancedDockingSystem/include/ads/API.h
View File

@@ -7,12 +7,9 @@
#include <QSharedPointer>
class QSplitter;
/*
* ADS - Advanced Docking System for Qt
* Developed by Manuel Freiholz
*/
#if 1
// Use namespace
// Disabled with Qt4!
#ifdef ADS_NAMESPACE_ENABLED
#define ADS_NAMESPACE_BEGIN namespace ads {
#define ADS_NAMESPACE_END }
#define ADS_NS ads

4
AdvancedDockingSystem/include/ads/FloatingWidget.h
View File

@@ -3,14 +3,12 @@
#include <QWidget>
#include <QFrame>
class QBoxLayout;
#include "ads/API.h"
#include "ads/SectionContent.h"
class QBoxLayout;
ADS_NAMESPACE_BEGIN
class ContainerWidget;
class SectionTitleWidget;
class SectionContentWidget;

1
AdvancedDockingSystem/include/ads/SectionContentWidget.h
View File

@@ -7,7 +7,6 @@
#include "ads/SectionContent.h"
ADS_NAMESPACE_BEGIN
class ContainerWidget;
class SectionWidget;

2
AdvancedDockingSystem/include/ads/SectionTitleWidget.h
View File

@@ -15,7 +15,7 @@ class FloatingWidget;
class SectionTitleWidget : public QFrame
{
Q_OBJECT
Q_PROPERTY(bool activeTab MEMBER _activeTab NOTIFY activeTabChanged)
Q_PROPERTY(bool activeTab READ isActiveTab WRITE setActiveTab NOTIFY activeTabChanged)
friend class ContainerWidget;
friend class SectionWidget;

7
AdvancedDockingSystem/include/ads/SectionWidget.h
View File

@@ -5,15 +5,13 @@
#include <QList>
#include <QHash>
#include <QFrame>
class QBoxLayout;
class QStackedLayout;
#include "ads/API.h"
#include "ads/SectionContent.h"
class QBoxLayout;
class QStackedLayout;
ADS_NAMESPACE_BEGIN
class ContainerWidget;
class SectionTitleWidget;
class SectionContentWidget;
@@ -33,7 +31,6 @@ public:
virtual ~SectionWidget();
int uid() const;
ContainerWidget* containerWidget() const;
QRect titleAreaGeometry() const;
QRect contentAreaGeometry() const;