Skip to content

Commit e71884b

Browse files
Replaced configFlags().testFlag() with testConfigFlag() to improve code readibility
1 parent d04c386 commit e71884b

11 files changed

+29
-27
lines changed

demo/MainWindow.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -424,7 +424,7 @@ void MainWindowPrivate::createContent()
424424
DockWidget->connect(Action, SIGNAL(triggered()), SLOT(raise()));
425425

426426
#ifdef Q_OS_WIN
427-
if (!DockManager->configFlags().testFlag(ads::CDockManager::OpaqueUndocking))
427+
if (!ads::CDockManager::testConfigFlag(ads::CDockManager::OpaqueUndocking))
428428
{
429429
DockManager->addDockWidget(ads::CenterDockWidgetArea, createActiveXWidget(ViewMenu), RighDockArea);
430430
}

src/DockAreaTitleBar.cpp

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -103,10 +103,11 @@ struct DockAreaTitleBarPrivate
103103

104104
/**
105105
* Returns true if the given config flag is set
106+
* Convenience function to ease config flag testing
106107
*/
107108
static bool testConfigFlag(CDockManager::eConfigFlag Flag)
108109
{
109-
return CDockManager::configFlags().testFlag(Flag);
110+
return CDockManager::testConfigFlag(Flag);
110111
}
111112

112113
/**
@@ -212,7 +213,7 @@ IFloatingWidget* DockAreaTitleBarPrivate::makeAreaFloating(const QPoint& Offset,
212213
{
213214
QSize Size = DockArea->size();
214215
this->DragState = DragState;
215-
bool OpaqueUndocking = CDockManager::configFlags().testFlag(CDockManager::OpaqueUndocking) ||
216+
bool OpaqueUndocking = CDockManager::testConfigFlag(CDockManager::OpaqueUndocking) ||
216217
(DraggingFloatingWidget != DragState);
217218
CFloatingDockContainer* FloatingDockContainer = nullptr;
218219
IFloatingWidget* FloatingWidget;
@@ -466,7 +467,7 @@ void CDockAreaTitleBar::mousePressEvent(QMouseEvent* ev)
466467
d->DragStartMousePos = ev->pos();
467468
d->DragState = DraggingMousePressed;
468469

469-
if (CDockManager::configFlags().testFlag(CDockManager::FocusHighlighting))
470+
if (CDockManager::testConfigFlag(CDockManager::FocusHighlighting))
470471
{
471472
d->TabBar->currentTab()->setFocus(Qt::OtherFocusReason);
472473
}
@@ -600,9 +601,10 @@ int CDockAreaTitleBar::indexOf(QWidget *widget) const
600601
}
601602

602603
//============================================================================
603-
CTitleBarButton::CTitleBarButton(bool visible /*= true*/, QWidget* parent /*= nullptr*/) : tTitleBarButton(parent),
604-
Visible(visible),
605-
HideWhenDisabled(DockAreaTitleBarPrivate::testConfigFlag(CDockManager::DockAreaHideDisabledButtons))
604+
CTitleBarButton::CTitleBarButton(bool visible, QWidget* parent)
605+
: tTitleBarButton(parent),
606+
Visible(visible),
607+
HideWhenDisabled(CDockManager::testConfigFlag(CDockManager::DockAreaHideDisabledButtons))
606608
{
607609

608610
}

src/DockAreaWidget.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -731,15 +731,15 @@ void CDockAreaWidget::updateTitleBarVisibility()
731731
return;
732732
}
733733

734-
if (CDockManager::configFlags().testFlag(CDockManager::AlwaysShowTabs))
734+
if (CDockManager::testConfigFlag(CDockManager::AlwaysShowTabs))
735735
{
736736
return;
737737
}
738738

739739
if (d->TitleBar)
740740
{
741741
bool Hidden = Container->hasTopLevelDockWidget() && (Container->isFloating()
742-
|| CDockManager::configFlags().testFlag(CDockManager::HideSingleCentralWidgetTitleBar));
742+
|| CDockManager::testConfigFlag(CDockManager::HideSingleCentralWidgetTitleBar));
743743
d->TitleBar->setVisible(!Hidden);
744744
}
745745
}

src/DockContainerWidget.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -299,7 +299,7 @@ class DockContainerWidgetPrivate
299299
CDockSplitter* newSplitter(Qt::Orientation orientation, QWidget* parent = nullptr)
300300
{
301301
CDockSplitter* s = new CDockSplitter(orientation, parent);
302-
s->setOpaqueResize(CDockManager::configFlags().testFlag(CDockManager::OpaqueSplitterResize));
302+
s->setOpaqueResize(CDockManager::testConfigFlag(CDockManager::OpaqueSplitterResize));
303303
s->setChildrenCollapsible(false);
304304
return s;
305305
}

src/DockFocusController.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ private slots:
5454
template <class QWidgetPtr>
5555
static void setWidgetFocus(QWidgetPtr widget)
5656
{
57-
if (!CDockManager::configFlags().testFlag(CDockManager::FocusHighlighting))
57+
if (!CDockManager::testConfigFlag(CDockManager::FocusHighlighting))
5858
{
5959
return;
6060
}

src/DockManager.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -470,7 +470,7 @@ CDockManager::CDockManager(QWidget *parent) :
470470
d->Containers.append(this);
471471
d->loadStylesheet();
472472

473-
if (CDockManager::configFlags().testFlag(CDockManager::FocusHighlighting))
473+
if (CDockManager::testConfigFlag(CDockManager::FocusHighlighting))
474474
{
475475
d->FocusController = new CDockFocusController(this);
476476
}

src/DockManager.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -434,7 +434,7 @@ class ADS_EXPORT CDockManager : public CDockContainerWidget
434434
template <class QWidgetPtr>
435435
static void setWidgetFocus(QWidgetPtr widget)
436436
{
437-
if (!CDockManager::configFlags().testFlag(CDockManager::FocusHighlighting))
437+
if (!CDockManager::testConfigFlag(CDockManager::FocusHighlighting))
438438
{
439439
return;
440440
}

src/DockWidget.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -237,7 +237,7 @@ CDockWidget::CDockWidget(const QString &title, QWidget *parent) :
237237
SLOT(toggleView(bool)));
238238
setToolbarFloatingStyle(false);
239239

240-
if (CDockManager::configFlags().testFlag(CDockManager::FocusHighlighting))
240+
if (CDockManager::testConfigFlag(CDockManager::FocusHighlighting))
241241
{
242242
setFocusPolicy(Qt::ClickFocus);
243243
}

src/DockWidgetTab.cpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ struct DockWidgetTabPrivate
114114
*/
115115
bool testConfigFlag(CDockManager::eConfigFlag Flag) const
116116
{
117-
return CDockManager::configFlags().testFlag(Flag);
117+
return CDockManager::testConfigFlag(Flag);
118118
}
119119

120120
/**
@@ -243,7 +243,7 @@ bool DockWidgetTabPrivate::startFloating(eDragState DraggingState)
243243
ADS_PRINT("startFloating");
244244
DragState = DraggingState;
245245
IFloatingWidget* FloatingWidget = nullptr;
246-
bool OpaqueUndocking = CDockManager::configFlags().testFlag(CDockManager::OpaqueUndocking) ||
246+
bool OpaqueUndocking = CDockManager::testConfigFlag(CDockManager::OpaqueUndocking) ||
247247
(DraggingFloatingWidget != DraggingState);
248248

249249
// If section widget has multiple tabs, we take only one tab
@@ -285,7 +285,7 @@ CDockWidgetTab::CDockWidgetTab(CDockWidget* DockWidget, QWidget *parent) :
285285
setAttribute(Qt::WA_NoMousePropagation, true);
286286
d->DockWidget = DockWidget;
287287
d->createLayout();
288-
if (CDockManager::configFlags().testFlag(CDockManager::FocusHighlighting))
288+
if (CDockManager::testConfigFlag(CDockManager::FocusHighlighting))
289289
{
290290
setFocusPolicy(Qt::ClickFocus);
291291
}
@@ -399,7 +399,7 @@ void CDockWidgetTab::mouseMoveEvent(QMouseEvent* ev)
399399
{
400400
// If we undock, we need to restore the initial position of this
401401
// tab because it looks strange if it remains on its dragged position
402-
if (d->isDraggingState(DraggingTab) && !CDockManager::configFlags().testFlag(CDockManager::OpaqueUndocking))
402+
if (d->isDraggingState(DraggingTab) && !CDockManager::testConfigFlag(CDockManager::OpaqueUndocking))
403403
{
404404
parentWidget()->layout()->update();
405405
}
@@ -468,7 +468,7 @@ void CDockWidgetTab::setActiveTab(bool active)
468468
d->CloseButton->setVisible(DockWidgetClosable && TabHasCloseButton);
469469

470470
// Focus related stuff
471-
if (CDockManager::configFlags().testFlag(CDockManager::FocusHighlighting) && !d->DockWidget->dockManager()->isRestoringState())
471+
if (CDockManager::testConfigFlag(CDockManager::FocusHighlighting) && !d->DockWidget->dockManager()->isRestoringState())
472472
{
473473
bool UpdateFocusStyle = false;
474474
if (active && !hasFocus())

src/FloatingDockContainer.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -391,7 +391,7 @@ struct FloatingDockContainerPrivate
391391
*/
392392
static bool testConfigFlag(CDockManager::eConfigFlag Flag)
393393
{
394-
return CDockManager::configFlags().testFlag(Flag);
394+
return CDockManager::testConfigFlag(Flag);
395395
}
396396

397397
/**

0 commit comments

Comments
 (0)