1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

QDockWidget: use pmf-style connect syntax

Browse Source 
Use pmf-style connect syntax for the three connections within
QDockWidgetPrivate.

Change-Id: I091a210d6a822903f0cc183f9090e03b124875e6
Reviewed-by: Axel Spoerl <axel.spoerl@qt.io>
(cherry picked from commit 7b96f3934c0a4331c4ca7bd4521b945f81a8ed21)
Reviewed-by: Christian Ehrlicher <ch.ehrlicher@gmx.de>
This commit is contained in:
Christian Ehrlicher 2023-10-31 18:35:36 +01:00 committed by Axel Spoerl
parent 66c0f88ff6
commit b1d277ddfd
3 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/widgets/widgets/qdockwidget.cpp
View File

@ -629,12 +629,13 @@ void QDockWidgetPrivate::init()
QAbstractButton *button = new QDockWidgetTitleButton(q);
button->setObjectName("qt_dockwidget_floatbutton"_L1);
QObject::connect(button, SIGNAL(clicked()), q, SLOT(_q_toggleTopLevel()));
QObjectPrivate::connect(button, &QAbstractButton::clicked,
this, &QDockWidgetPrivate::toggleTopLevel);
layout->setWidgetForRole(QDockWidgetLayout::FloatButton, button);
button = new QDockWidgetTitleButton(q);
button->setObjectName("qt_dockwidget_closebutton"_L1);
QObject::connect(button, SIGNAL(clicked()), q, SLOT(close()));
QObject::connect(button, &QAbstractButton::clicked, q, &QDockWidget::close);
layout->setWidgetForRole(QDockWidgetLayout::CloseButton, button);
font = QApplication::font("QDockWidgetTitle");
@ -645,8 +646,8 @@ void QDockWidgetPrivate::init()
toggleViewAction->setMenuRole(QAction::NoRole);
fixedWindowTitle = qt_setWindowTitle_helperHelper(q->windowTitle(), q);
toggleViewAction->setText(fixedWindowTitle);
QObject::connect(toggleViewAction, SIGNAL(triggered(bool)),
q, SLOT(_q_toggleView(bool)));
QObjectPrivate::connect(toggleViewAction, &QAction::triggered,
this, &QDockWidgetPrivate::toggleView);
#endif
updateButtons();
@ -681,7 +682,7 @@ void QDockWidget::initStyleOption(QStyleOptionDockWidget *option) const
option->verticalTitleBar = l->verticalTitleBar;
}
void QDockWidgetPrivate::_q_toggleView(bool b)
void QDockWidgetPrivate::toggleView(bool b)
{
Q_Q(QDockWidget);
if (b == q->isHidden()) {
@ -729,7 +730,7 @@ void QDockWidgetPrivate::updateButtons()
layout->invalidate();
}
void QDockWidgetPrivate::_q_toggleTopLevel()
void QDockWidgetPrivate::toggleTopLevel()
{
Q_Q(QDockWidget);
q->setFloating(!q->isFloating());
@ -959,7 +960,7 @@ bool QDockWidgetPrivate::mouseDoubleClickEvent(QMouseEvent *event)
if (event->button() == Qt::LeftButton && titleArea.contains(event->position().toPoint()) &&
hasFeature(this, QDockWidget::DockWidgetFloatable)) {
_q_toggleTopLevel();
toggleTopLevel();
return true;
}
}
@ -1123,7 +1124,7 @@ void QDockWidgetPrivate::nonClientAreaMouseEvent(QMouseEvent *event)
#endif
break;
case QEvent::NonClientAreaMouseButtonDblClick:
_q_toggleTopLevel();
toggleTopLevel();
break;
default:
break;

2
src/widgets/widgets/qdockwidget.h
View File

@ -90,8 +90,6 @@ protected:
private:
Q_DECLARE_PRIVATE(QDockWidget)
Q_DISABLE_COPY(QDockWidget)
Q_PRIVATE_SLOT(d_func(), void _q_toggleView(bool))
Q_PRIVATE_SLOT(d_func(), void _q_toggleTopLevel())
friend class QDockAreaLayout;
friend class QDockWidgetItem;
friend class QMainWindowLayout;

4
src/widgets/widgets/qdockwidget_p.h
View File

@ -62,8 +62,8 @@ public:
};
void init();
void _q_toggleView(bool); // private slot
void _q_toggleTopLevel(); // private slot
void toggleView(bool);
void toggleTopLevel();
void updateButtons();
static Qt::DockWidgetArea toDockWidgetArea(QInternal::DockPosition pos);