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

Merge pull request #19 from VSRonin/master

Browse Source 
Various fixes to the project files to uniform names and correctly compile static libraries.

Added configuration files for Appveyor and Travis CI, adding the project to those services should work out of the box.
This commit is contained in:
githubuser0xFFFF
2019-01-26 13:45:21 +01:00
committed by GitHub
parent e352ce559b e113790bbe
commit fd09a681c4
13 changed files with 428 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/DockAreaWidget.cpp
View File

@@ -98,7 +98,7 @@ public:
*/
void insertWidget(int index, QWidget* Widget)
{
Widget->setParent(0);
Widget->setParent(nullptr);
if (index < 0)
{
index = m_Widgets.count();
@@ -127,7 +127,7 @@ public:
auto LayoutItem = m_ParentLayout->takeAt(1);
if (LayoutItem)
{
LayoutItem->widget()->setParent(0);
LayoutItem->widget()->setParent(nullptr);
}
m_CurrentWidget = nullptr;
m_CurrentIndex = -1;
@@ -167,7 +167,7 @@ public:
auto LayoutItem = m_ParentLayout->takeAt(1);
if (LayoutItem)
{
LayoutItem->widget()->setParent(0);
LayoutItem->widget()->setParent(nullptr);
}
m_ParentLayout->addWidget(next);
@@ -315,12 +315,9 @@ void DockAreaWidgetPrivate::createTitleBar()
{
TitleBar = new CDockAreaTitleBar(_this);
Layout->addWidget(TitleBar);
_this->connect(tabBar(), SIGNAL(tabCloseRequested(int)),
SLOT(onTabCloseRequested(int)));
_this->connect(TitleBar, SIGNAL(tabBarClicked(int)),
SLOT(setCurrentIndex(int)));
_this->connect(tabBar(), SIGNAL(tabMoved(int, int)),
SLOT(reorderDockWidget(int, int)));
QObject::connect(tabBar(), &CDockAreaTabBar::tabCloseRequested, _this, &CDockAreaWidget::onTabCloseRequested);
QObject::connect(TitleBar, &CDockAreaTitleBar::tabBarClicked, _this, &CDockAreaWidget::setCurrentIndex);
QObject::connect(tabBar(), &CDockAreaTabBar::tabMoved, _this, &CDockAreaWidget::reorderDockWidget);
}