Various fixes after code review

VSRonin · VSRonin · commit e113790bbea0 · 2019-01-25T16:28:36.000Z
Minimum required Qt lowered to 5.5.0
Added CI for Qt 5.5.1 build
Increased C++ standard to C++14
Fixed use of spaces instead of tabs
Removed duplicate constructors
diff --git a/.travis.yml b/.travis.yml
@@ -8,6 +8,30 @@ git:
 matrix:
   fast_finish: true
   include:
+  - name: Ubuntu qmake Qt5.5.1
+    os: linux
+    dist: trusty
+    group: stable
+    addons:
+      apt:
+        sources:
+        - ubuntu-toolchain-r-test
+        - sourceline: 'ppa:beineri/opt-qt551-trusty'
+        update: true
+        packages:
+        - qt55base
+        - qt55tools
+        - gcc-6
+        - g++-6
+        - libc6-i386
+    script:
+        - PATH="/opt/qt55/bin:$PATH"
+        - CXX="g++-6"
+        - CC="gcc-6"
+        - qt55-env.sh
+        - qmake
+        - make
+        - make install
   - name: Ubuntu qmake dll
     os: linux
     dist: xenial
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,14 +1,14 @@
 cmake_minimum_required(VERSION 3.3)
 set(ads_VERSION "2.3.2")
-set(CMAKE_CXX_STANDARD 11)
+set(CMAKE_CXX_STANDARD 14)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 set(CMAKE_CXX_EXTENSIONS OFF)
 set(CMAKE_AUTOMOC ON)
 set(CMAKE_AUTORCC ON)
 project(QtAdvancedDockingSystem VERSION ${ads_VERSION})
 option(BUILD_STATIC "Build the static library" OFF)
 option(BUILD_EXAMPLES "Build the examples" ON)
-set(REQUIRED_QT_VERSION 5.7.0)
+set(REQUIRED_QT_VERSION 5.5.0)
 find_package(Qt5Core ${REQUIRED_QT_VERSION} REQUIRED)
 find_package(Qt5Gui ${REQUIRED_QT_VERSION} REQUIRED)
 find_package(Qt5Widgets ${REQUIRED_QT_VERSION} REQUIRED)
diff --git a/demo/CMakeLists.txt b/demo/CMakeLists.txt
@@ -1,12 +1,12 @@
 cmake_minimum_required(VERSION 3.3)
-set (CMAKE_CXX_STANDARD 11)
+set (CMAKE_CXX_STANDARD 14)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 set(CMAKE_CXX_EXTENSIONS OFF)
 set(CMAKE_AUTOMOC ON)
 set(CMAKE_AUTOUIC ON)
 set(CMAKE_AUTORCC ON)
 project(ads_demo VERSION "1.0") 
-set(REQUIRED_QT_VERSION 5.7.0)
+set(REQUIRED_QT_VERSION 5.5.0)
 find_package(Qt5Core ${REQUIRED_QT_VERSION} REQUIRED)
 find_package(Qt5Gui ${REQUIRED_QT_VERSION} REQUIRED)
 find_package(Qt5Widgets ${REQUIRED_QT_VERSION} REQUIRED)
diff --git a/demo/demo.pro b/demo/demo.pro
@@ -3,7 +3,7 @@ ADS_OUT_ROOT = $${OUT_PWD}/..
 TARGET = AdvancedDockingSystemDemo
 DESTDIR = $${ADS_OUT_ROOT}/lib
 QT += core gui widgets
-CONFIG += c++11
+CONFIG += c++14
 CONFIG += debug_and_release
 DEFINES += QT_DEPRECATED_WARNINGS
 
diff --git a/example/CMakeLists.txt b/example/CMakeLists.txt
@@ -1,11 +1,11 @@
 cmake_minimum_required(VERSION 3.3)
-set (CMAKE_CXX_STANDARD 11)
+set (CMAKE_CXX_STANDARD 14)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 set(CMAKE_CXX_EXTENSIONS OFF)
 set(CMAKE_AUTOMOC ON)
 set(CMAKE_AUTOUIC ON)
 project(ads_example VERSION "1.0") 
-set(REQUIRED_QT_VERSION 5.7.0)
+set(REQUIRED_QT_VERSION 5.5.0)
 find_package(Qt5Core ${REQUIRED_QT_VERSION} REQUIRED)
 find_package(Qt5Gui ${REQUIRED_QT_VERSION} REQUIRED)
 find_package(Qt5Widgets ${REQUIRED_QT_VERSION} REQUIRED)
diff --git a/example/example.pro b/example/example.pro
@@ -5,7 +5,7 @@ QT += core gui widgets
 TARGET = Example1
 DESTDIR = $${ADS_OUT_ROOT}/lib
 TEMPLATE = app
-CONFIG += c++11
+CONFIG += c++14
 CONFIG += debug_and_release
 adsBuildStatic {
     DEFINES += ADS_STATIC
diff --git a/src/DockAreaWidget.cpp b/src/DockAreaWidget.cpp
@@ -98,7 +98,7 @@ class CDockAreaLayout
 	 */
 	void insertWidget(int index, QWidget* Widget)
 	{
-        Widget->setParent(nullptr);
+		Widget->setParent(nullptr);
 		if (index < 0)
 		{
 			index = m_Widgets.count();
@@ -127,7 +127,7 @@ class CDockAreaLayout
 			auto LayoutItem = m_ParentLayout->takeAt(1);
 			if (LayoutItem)
 			{
-                LayoutItem->widget()->setParent(nullptr);
+				LayoutItem->widget()->setParent(nullptr);
 			}
 			m_CurrentWidget = nullptr;
 			m_CurrentIndex = -1;
@@ -167,7 +167,7 @@ class CDockAreaLayout
 		auto LayoutItem = m_ParentLayout->takeAt(1);
 		if (LayoutItem)
 		{
-            LayoutItem->widget()->setParent(nullptr);
+			LayoutItem->widget()->setParent(nullptr);
 		}
 
 		m_ParentLayout->addWidget(next);
@@ -315,9 +315,9 @@ void DockAreaWidgetPrivate::createTitleBar()
 {
 	TitleBar = new CDockAreaTitleBar(_this);
 	Layout->addWidget(TitleBar);
-    QObject::connect(tabBar(), &CDockAreaTabBar::tabCloseRequested, _this, &CDockAreaWidget::onTabCloseRequested);
-    QObject::connect(TitleBar, &CDockAreaTitleBar::tabBarClicked, _this, &CDockAreaWidget::setCurrentIndex);
-    QObject::connect(tabBar(), &CDockAreaTabBar::tabMoved, _this, &CDockAreaWidget::reorderDockWidget);
+	QObject::connect(tabBar(), &CDockAreaTabBar::tabCloseRequested, _this, &CDockAreaWidget::onTabCloseRequested);
+	QObject::connect(TitleBar, &CDockAreaTitleBar::tabBarClicked, _this, &CDockAreaWidget::setCurrentIndex);
+	QObject::connect(tabBar(), &CDockAreaTabBar::tabMoved, _this, &CDockAreaWidget::reorderDockWidget);
 }
 
 
diff --git a/src/DockContainerWidget.cpp b/src/DockContainerWidget.cpp
@@ -127,7 +127,7 @@ class DockContainerWidgetPrivate
 	QGridLayout* Layout = nullptr;
 	QSplitter* RootSplitter = nullptr;
 	bool isFloating = false;
-    CDockAreaWidget* LastAddedAreaCache[5];
+	CDockAreaWidget* LastAddedAreaCache[5];
 	int VisibleDockAreaCount = -1;
 	CDockAreaWidget* TopLevelDockArea = nullptr;
 
@@ -266,7 +266,7 @@ class DockContainerWidgetPrivate
 	/**
 	 * Helper function for creation of new splitter
 	 */
-    CDockSplitter* newSplitter(Qt::Orientation orientation, QWidget* parent = nullptr)
+	CDockSplitter* newSplitter(Qt::Orientation orientation, QWidget* parent = nullptr)
 	{
 		CDockSplitter* s = new CDockSplitter(orientation, parent);
 		s->setOpaqueResize(DockManager->configFlags().testFlag(CDockManager::OpaqueSplitterResize));
@@ -290,7 +290,7 @@ class DockContainerWidgetPrivate
 DockContainerWidgetPrivate::DockContainerWidgetPrivate(CDockContainerWidget* _public) :
 	_this(_public)
 {
-    std::fill(std::begin(LastAddedAreaCache),std::end(LastAddedAreaCache), nullptr);
+	std::fill(std::begin(LastAddedAreaCache),std::end(LastAddedAreaCache), nullptr);
 }
 
 
@@ -540,10 +540,10 @@ void DockContainerWidgetPrivate::appendDockAreas(const QList<CDockAreaWidget*> N
 	DockAreas.append(NewDockAreas);
 	for (auto DockArea : NewDockAreas)
 	{
-        QObject::connect(DockArea,
-            &CDockAreaWidget::viewToggled,
-            _this,
-            std::bind(&DockContainerWidgetPrivate::onDockAreaViewToggled, this, std::placeholders::_1));
+		QObject::connect(DockArea,
+			&CDockAreaWidget::viewToggled,
+			_this,
+			std::bind(&DockContainerWidgetPrivate::onDockAreaViewToggled, this, std::placeholders::_1));
 	}
 }
 
@@ -613,7 +613,7 @@ bool DockContainerWidgetPrivate::restoreSplitter(QXmlStreamReader& s,
 	QSplitter* Splitter = nullptr;
 	if (!Testing)
 	{
-        Splitter = newSplitter(static_cast<Qt::Orientation>(Orientation));
+		Splitter = newSplitter(static_cast<Qt::Orientation>(Orientation));
 	}
 	bool Visible = false;
 	QList<int> Sizes;
@@ -1054,7 +1054,7 @@ void CDockContainerWidget::removeDockArea(CDockAreaWidget* area)
 
 	// Remove are from parent splitter and recursively hide tree of parent
 	// splitters if it has no visible content
-    area->setParent(nullptr);
+	area->setParent(nullptr);
 	internal::hideEmptyParentSplitters(Splitter);
 
 	// If splitter has more than 1 widgets, we are finished and can leave
@@ -1085,7 +1085,7 @@ void CDockContainerWidget::removeDockArea(CDockAreaWidget* area)
 		}
 
 		// We replace the superfluous RootSplitter with the ChildSplitter
-        ChildSplitter->setParent(nullptr);
+		ChildSplitter->setParent(nullptr);
 		QLayoutItem* li = d->Layout->replaceWidget(Splitter, ChildSplitter);
 		d->RootSplitter = ChildSplitter;
 		delete li;
@@ -1126,14 +1126,14 @@ CDockAreaWidget* CDockContainerWidget::dockAreaAt(const QPoint& GlobalPos) const
 		}
 	}
 
-    return nullptr;
+	return nullptr;
 }
 
 
 //============================================================================
 CDockAreaWidget* CDockContainerWidget::dockArea(int Index) const
 {
-    return (Index < dockAreaCount()) ? d->DockAreas[Index] : nullptr;
+	return (Index < dockAreaCount()) ? d->DockAreas[Index] : nullptr;
 }
 
 
diff --git a/src/DockManager.cpp b/src/DockManager.cpp
@@ -72,7 +72,7 @@ struct DockManagerPrivate
 	QMenu* ViewMenu;
 	CDockManager::eViewMenuInsertionOrder MenuInsertionOrder = CDockManager::MenuAlphabeticallySorted;
 	bool RestoringState = false;
-    CDockManager::ConfigFlags ConfigFlags = CDockManager::DefaultConfig;
+	CDockManager::ConfigFlags ConfigFlags = CDockManager::DefaultConfig;
 
 	/**
 	 * Private data constructor
diff --git a/src/ads_globals.cpp b/src/ads_globals.cpp
@@ -44,7 +44,7 @@ namespace internal
 void replaceSplitterWidget(QSplitter* Splitter, QWidget* From, QWidget* To)
 {
 	int index = Splitter->indexOf(From);
-    From->setParent(nullptr);
+	From->setParent(nullptr);
 	Splitter->insertWidget(index, To);
 }
 
@@ -90,18 +90,6 @@ void hideEmptyParentSplitters(CDockSplitter* Splitter)
 	}
 }
 
-CDockInsertParam::CDockInsertParam(Qt::Orientation orient, bool bottomRight)
-    : QPair<Qt::Orientation, bool>(orient,bottomRight)
-{}
-
-CDockInsertParam::CDockInsertParam(const CDockInsertParam &p)
-    : QPair<Qt::Orientation, bool>(p)
-{}
-
-CDockInsertParam::CDockInsertParam(CDockInsertParam &&p)
-    : QPair<Qt::Orientation, bool>(std::move(p))
-{}
-
 } // namespace internal
 } // namespace ads
 
diff --git a/src/ads_globals.h b/src/ads_globals.h
@@ -110,10 +110,7 @@ void hideEmptyParentSplitters(CDockSplitter* FirstParentSplitter);
 class CDockInsertParam : public QPair<Qt::Orientation, bool>
 {
 public:
-    CDockInsertParam() = default;
-    CDockInsertParam(Qt::Orientation orient, bool append);
-    CDockInsertParam(const CDockInsertParam &p);
-    CDockInsertParam(CDockInsertParam &&p);
+	using QPair::QPair;
 	Qt::Orientation orientation() const {return this->first;}
 	bool append() const {return this->second;}
 	int insertOffset() const {return append() ? 1 : 0;}
diff --git a/src/src.pro b/src/src.pro
@@ -1,5 +1,5 @@
 ADS_OUT_ROOT = $${OUT_PWD}/..
-CONFIG += c++11
+CONFIG += c++14
 CONFIG += debug_and_release
 TARGET = $$qtLibraryTarget(qtadvanceddocking)
 DEFINES += QT_DEPRECATED_WARNINGS

Original file line number	Diff line number	Diff line change
`@@ -98,7 +98,7 @@ class CDockAreaLayout`
`98`	`98`	`*/`
`99`	`99`	`void insertWidget(int index, QWidget* Widget)`
`100`	`100`	`{`
`101`		`- Widget->setParent(nullptr);`
	`101`	`+ Widget->setParent(nullptr);`
`102`	`102`	`if (index < 0)`
`103`	`103`	`{`
`104`	`104`	`index = m_Widgets.count();`
`@@ -127,7 +127,7 @@ class CDockAreaLayout`
`127`	`127`	`auto LayoutItem = m_ParentLayout->takeAt(1);`
`128`	`128`	`if (LayoutItem)`
`129`	`129`	`{`
`130`		`- LayoutItem->widget()->setParent(nullptr);`
	`130`	`+ LayoutItem->widget()->setParent(nullptr);`
`131`	`131`	`}`
`132`	`132`	`m_CurrentWidget = nullptr;`
`133`	`133`	`m_CurrentIndex = -1;`
`@@ -167,7 +167,7 @@ class CDockAreaLayout`
`167`	`167`	`auto LayoutItem = m_ParentLayout->takeAt(1);`
`168`	`168`	`if (LayoutItem)`
`169`	`169`	`{`
`170`		`- LayoutItem->widget()->setParent(nullptr);`
	`170`	`+ LayoutItem->widget()->setParent(nullptr);`
`171`	`171`	`}`
`172`	`172`
`173`	`173`	`m_ParentLayout->addWidget(next);`
`@@ -315,9 +315,9 @@ void DockAreaWidgetPrivate::createTitleBar()`
`315`	`315`	`{`
`316`	`316`	`TitleBar = new CDockAreaTitleBar(_this);`
`317`	`317`	`Layout->addWidget(TitleBar);`
`318`		`- QObject::connect(tabBar(), &CDockAreaTabBar::tabCloseRequested, _this, &CDockAreaWidget::onTabCloseRequested);`
`319`		`- QObject::connect(TitleBar, &CDockAreaTitleBar::tabBarClicked, _this, &CDockAreaWidget::setCurrentIndex);`
`320`		`- QObject::connect(tabBar(), &CDockAreaTabBar::tabMoved, _this, &CDockAreaWidget::reorderDockWidget);`
	`318`	`+ QObject::connect(tabBar(), &CDockAreaTabBar::tabCloseRequested, _this, &CDockAreaWidget::onTabCloseRequested);`
	`319`	`+ QObject::connect(TitleBar, &CDockAreaTitleBar::tabBarClicked, _this, &CDockAreaWidget::setCurrentIndex);`
	`320`	`+ QObject::connect(tabBar(), &CDockAreaTabBar::tabMoved, _this, &CDockAreaWidget::reorderDockWidget);`
`321`	`321`	`}`
`322`	`322`
`323`	`323`
Original file line number	Diff line number	Diff line change
`@@ -127,7 +127,7 @@ class DockContainerWidgetPrivate`
`127`	`127`	`QGridLayout* Layout = nullptr;`
`128`	`128`	`QSplitter* RootSplitter = nullptr;`
`129`	`129`	`bool isFloating = false;`
`130`		`- CDockAreaWidget* LastAddedAreaCache[5];`
	`130`	`+ CDockAreaWidget* LastAddedAreaCache[5];`
`131`	`131`	`int VisibleDockAreaCount = -1;`
`132`	`132`	`CDockAreaWidget* TopLevelDockArea = nullptr;`
`133`	`133`
`@@ -266,7 +266,7 @@ class DockContainerWidgetPrivate`
`266`	`266`	`/**`
`267`	`267`	`* Helper function for creation of new splitter`
`268`	`268`	`*/`
`269`		`- CDockSplitter* newSplitter(Qt::Orientation orientation, QWidget* parent = nullptr)`
	`269`	`+ CDockSplitter* newSplitter(Qt::Orientation orientation, QWidget* parent = nullptr)`
`270`	`270`	`{`
`271`	`271`	`CDockSplitter* s = new CDockSplitter(orientation, parent);`
`272`	`272`	`s->setOpaqueResize(DockManager->configFlags().testFlag(CDockManager::OpaqueSplitterResize));`
`@@ -290,7 +290,7 @@ class DockContainerWidgetPrivate`
`290`	`290`	`DockContainerWidgetPrivate::DockContainerWidgetPrivate(CDockContainerWidget* _public) :`
`291`	`291`	`_this(_public)`
`292`	`292`	`{`
`293`		`- std::fill(std::begin(LastAddedAreaCache),std::end(LastAddedAreaCache), nullptr);`
	`293`	`+ std::fill(std::begin(LastAddedAreaCache),std::end(LastAddedAreaCache), nullptr);`
`294`	`294`	`}`
`295`	`295`
`296`	`296`
`@@ -540,10 +540,10 @@ void DockContainerWidgetPrivate::appendDockAreas(const QList<CDockAreaWidget*> N`
`540`	`540`	`DockAreas.append(NewDockAreas);`
`541`	`541`	`for (auto DockArea : NewDockAreas)`
`542`	`542`	`{`
`543`		`- QObject::connect(DockArea,`
`544`		`- &CDockAreaWidget::viewToggled,`
`545`		`- _this,`
`546`		`- std::bind(&DockContainerWidgetPrivate::onDockAreaViewToggled, this, std::placeholders::_1));`
	`543`	`+ QObject::connect(DockArea,`
	`544`	`+ &CDockAreaWidget::viewToggled,`
	`545`	`+ _this,`
	`546`	`+ std::bind(&DockContainerWidgetPrivate::onDockAreaViewToggled, this, std::placeholders::_1));`
`547`	`547`	`}`
`548`	`548`	`}`
`549`	`549`
`@@ -613,7 +613,7 @@ bool DockContainerWidgetPrivate::restoreSplitter(QXmlStreamReader& s,`
`613`	`613`	`QSplitter* Splitter = nullptr;`
`614`	`614`	`if (!Testing)`
`615`	`615`	`{`
`616`		`- Splitter = newSplitter(static_cast<Qt::Orientation>(Orientation));`
	`616`	`+ Splitter = newSplitter(static_cast<Qt::Orientation>(Orientation));`
`617`	`617`	`}`
`618`	`618`	`bool Visible = false;`
`619`	`619`	`QList<int> Sizes;`
`@@ -1054,7 +1054,7 @@ void CDockContainerWidget::removeDockArea(CDockAreaWidget* area)`
`1054`	`1054`
`1055`	`1055`	`// Remove are from parent splitter and recursively hide tree of parent`
`1056`	`1056`	`// splitters if it has no visible content`
`1057`		`- area->setParent(nullptr);`
	`1057`	`+ area->setParent(nullptr);`
`1058`	`1058`	`internal::hideEmptyParentSplitters(Splitter);`
`1059`	`1059`
`1060`	`1060`	`// If splitter has more than 1 widgets, we are finished and can leave`
`@@ -1085,7 +1085,7 @@ void CDockContainerWidget::removeDockArea(CDockAreaWidget* area)`
`1085`	`1085`	`}`
`1086`	`1086`
`1087`	`1087`	`// We replace the superfluous RootSplitter with the ChildSplitter`
`1088`		`- ChildSplitter->setParent(nullptr);`
	`1088`	`+ ChildSplitter->setParent(nullptr);`
`1089`	`1089`	`QLayoutItem* li = d->Layout->replaceWidget(Splitter, ChildSplitter);`
`1090`	`1090`	`d->RootSplitter = ChildSplitter;`
`1091`	`1091`	`delete li;`
`@@ -1126,14 +1126,14 @@ CDockAreaWidget* CDockContainerWidget::dockAreaAt(const QPoint& GlobalPos) const`
`1126`	`1126`	`}`
`1127`	`1127`	`}`
`1128`	`1128`
`1129`		`- return nullptr;`
	`1129`	`+ return nullptr;`
`1130`	`1130`	`}`
`1131`	`1131`
`1132`	`1132`
`1133`	`1133`	`//============================================================================`
`1134`	`1134`	`CDockAreaWidget* CDockContainerWidget::dockArea(int Index) const`
`1135`	`1135`	`{`
`1136`		`- return (Index < dockAreaCount()) ? d->DockAreas[Index] : nullptr;`
	`1136`	`+ return (Index < dockAreaCount()) ? d->DockAreas[Index] : nullptr;`
`1137`	`1137`	`}`
`1138`	`1138`
`1139`	`1139`
Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,7 @@ namespace internal`
`44`	`44`	`void replaceSplitterWidget(QSplitter* Splitter, QWidget* From, QWidget* To)`
`45`	`45`	`{`
`46`	`46`	`int index = Splitter->indexOf(From);`
`47`		`- From->setParent(nullptr);`
	`47`	`+ From->setParent(nullptr);`
`48`	`48`	`Splitter->insertWidget(index, To);`
`49`	`49`	`}`
`50`	`50`
`@@ -90,18 +90,6 @@ void hideEmptyParentSplitters(CDockSplitter* Splitter)`
`90`	`90`	`}`
`91`	`91`	`}`
`92`	`92`
`93`		`-CDockInsertParam::CDockInsertParam(Qt::Orientation orient, bool bottomRight)`
`94`		`- : QPair<Qt::Orientation, bool>(orient,bottomRight)`
`95`		`-{}`
`96`		`-`
`97`		`-CDockInsertParam::CDockInsertParam(const CDockInsertParam &p)`
`98`		`- : QPair<Qt::Orientation, bool>(p)`
`99`		`-{}`
`100`		`-`
`101`		`-CDockInsertParam::CDockInsertParam(CDockInsertParam &&p)`
`102`		`- : QPair<Qt::Orientation, bool>(std::move(p))`
`103`		`-{}`
`104`		`-`
`105`	`93`	`} // namespace internal`
`106`	`94`	`} // namespace ads`
`107`	`95`