Merge remote-tracking branch 'origin/Applications/17.12'

[dolphin.git] / src / dolphindockwidget.cpp

diff --git a/src/dolphindockwidget.cpp b/src/dolphindockwidget.cpp
index 1e83ef841b379ed8a389e89c83964fcdb172d1a3..726338377daae192dd0f6bd70e47fd3344eefdaf 100644 (file)
--- a/src/dolphindockwidget.cpp
+++ b/src/dolphindockwidget.cpp
@@ -32,17 +32,19 @@ namespace {
  // Empty titlebar for the dock widgets when "Lock Layout" has been activated.
 class DolphinDockTitleBar : public QWidget
 {
  // Empty titlebar for the dock widgets when "Lock Layout" has been activated.
 class DolphinDockTitleBar : public QWidget
 {

+    Q_OBJECT
+

 public:
 public:

-    DolphinDockTitleBar(QWidget* parent = 0) : QWidget(parent) {}
-    virtual ~DolphinDockTitleBar() {}
+    explicit DolphinDockTitleBar(QWidget* parent = nullptr) : QWidget(parent) {}
+    ~DolphinDockTitleBar() override {}

 
 

-    virtual QSize minimumSizeHint() const
+    QSize minimumSizeHint() const override

     {
         const int border = style()->pixelMetric(QStyle::PM_DockWidgetTitleBarButtonMargin);
         return QSize(border, border);
     }
 
     {
         const int border = style()->pixelMetric(QStyle::PM_DockWidgetTitleBarButtonMargin);
         return QSize(border, border);
     }
 

-    virtual QSize sizeHint() const
+    QSize sizeHint() const override

     {
         return minimumSizeHint();
     }
     {
         return minimumSizeHint();
     }


@@ -51,7 +53,7 @@ public:
 DolphinDockWidget::DolphinDockWidget(const QString& title, QWidget* parent, Qt::WindowFlags flags) :
     QDockWidget(title, parent, flags),
     m_locked(false),
 DolphinDockWidget::DolphinDockWidget(const QString& title, QWidget* parent, Qt::WindowFlags flags) :
     QDockWidget(title, parent, flags),
     m_locked(false),

-    m_dockTitleBar(0)
+    m_dockTitleBar(nullptr)

 {
     setFeatures(DefaultDockWidgetFeatures);
 }
 {
     setFeatures(DefaultDockWidgetFeatures);
 }


@@ -59,7 +61,7 @@ DolphinDockWidget::DolphinDockWidget(const QString& title, QWidget* parent, Qt::
 DolphinDockWidget::DolphinDockWidget(QWidget* parent, Qt::WindowFlags flags) :
     QDockWidget(parent, flags),
     m_locked(false),
 DolphinDockWidget::DolphinDockWidget(QWidget* parent, Qt::WindowFlags flags) :
     QDockWidget(parent, flags),
     m_locked(false),

-    m_dockTitleBar(0)
+    m_dockTitleBar(nullptr)

 {
     setFeatures(DefaultDockWidgetFeatures);
 }
 {
     setFeatures(DefaultDockWidgetFeatures);
 }


@@ -80,7 +82,7 @@ void DolphinDockWidget::setLocked(bool lock)
             setTitleBarWidget(m_dockTitleBar);
             setFeatures(QDockWidget::NoDockWidgetFeatures);
         } else {
             setTitleBarWidget(m_dockTitleBar);
             setFeatures(QDockWidget::NoDockWidgetFeatures);
         } else {

-            setTitleBarWidget(0);
+            setTitleBarWidget(nullptr);

             setFeatures(DefaultDockWidgetFeatures);
         }
     }
             setFeatures(DefaultDockWidgetFeatures);
         }
     }


@@ -91,3 +93,4 @@ bool DolphinDockWidget::isLocked() const
     return m_locked;
 }
 
     return m_locked;
 }
 

+#include "dolphindockwidget.moc"