X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/97415005de040885cb63ea01fdb879e20226a2f2..a058c64eba30f11bfa87ac097371c04437d0471e:/src/dolphindockwidget.cpp?ds=sidebyside diff --git a/src/dolphindockwidget.cpp b/src/dolphindockwidget.cpp index ccbecb0d6..32d25702a 100644 --- a/src/dolphindockwidget.cpp +++ b/src/dolphindockwidget.cpp @@ -35,16 +35,16 @@ class DolphinDockTitleBar : public QWidget Q_OBJECT public: - DolphinDockTitleBar(QWidget* parent = 0) : QWidget(parent) {} - virtual ~DolphinDockTitleBar() {} + explicit DolphinDockTitleBar(QWidget* parent = nullptr) : QWidget(parent) {} + ~DolphinDockTitleBar() override {} - QSize minimumSizeHint() const Q_DECL_OVERRIDE + QSize minimumSizeHint() const override { const int border = style()->pixelMetric(QStyle::PM_DockWidgetTitleBarButtonMargin); return QSize(border, border); } - QSize sizeHint() const Q_DECL_OVERRIDE + QSize sizeHint() const override { return minimumSizeHint(); } @@ -53,15 +53,7 @@ public: DolphinDockWidget::DolphinDockWidget(const QString& title, QWidget* parent, Qt::WindowFlags flags) : QDockWidget(title, parent, flags), m_locked(false), - m_dockTitleBar(0) -{ - setFeatures(DefaultDockWidgetFeatures); -} - -DolphinDockWidget::DolphinDockWidget(QWidget* parent, Qt::WindowFlags flags) : - QDockWidget(parent, flags), - m_locked(false), - m_dockTitleBar(0) + m_dockTitleBar(nullptr) { setFeatures(DefaultDockWidgetFeatures); } @@ -82,7 +74,7 @@ void DolphinDockWidget::setLocked(bool lock) setTitleBarWidget(m_dockTitleBar); setFeatures(QDockWidget::NoDockWidgetFeatures); } else { - setTitleBarWidget(0); + setTitleBarWidget(nullptr); setFeatures(DefaultDockWidgetFeatures); } }