Remove the automoc noise

[dolphin.git] / src / dolphindockwidget.cpp

diff --git a/src/dolphindockwidget.cpp b/src/dolphindockwidget.cpp
index 72e06a656bce71c4ffc83871c0f7d8dcea30bbee..1e83ef841b379ed8a389e89c83964fcdb172d1a3 100644 (file)
--- a/src/dolphindockwidget.cpp
+++ b/src/dolphindockwidget.cpp
@@ -21,6 +21,14 @@
 
 #include <QStyle>
 
 
 #include <QStyle>
 

+namespace {
+    // Disable the 'Floatable' feature, i.e., the possibility to drag the
+    // dock widget out of the main window. This works around problems like
+    // https://bugs.kde.org/show_bug.cgi?id=288629
+    // https://bugs.kde.org/show_bug.cgi?id=322299
+    const QDockWidget::DockWidgetFeatures DefaultDockWidgetFeatures = QDockWidget::DockWidgetMovable | QDockWidget::DockWidgetClosable;
+}
+

  // 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
 {


@@ -45,6 +53,7 @@ DolphinDockWidget::DolphinDockWidget(const QString& title, QWidget* parent, Qt::
     m_locked(false),
     m_dockTitleBar(0)
 {
     m_locked(false),
     m_dockTitleBar(0)
 {

+    setFeatures(DefaultDockWidgetFeatures);

 }
 
 DolphinDockWidget::DolphinDockWidget(QWidget* parent, Qt::WindowFlags flags) :
 }
 
 DolphinDockWidget::DolphinDockWidget(QWidget* parent, Qt::WindowFlags flags) :


@@ -52,6 +61,7 @@ DolphinDockWidget::DolphinDockWidget(QWidget* parent, Qt::WindowFlags flags) :
     m_locked(false),
     m_dockTitleBar(0)
 {
     m_locked(false),
     m_dockTitleBar(0)
 {

+    setFeatures(DefaultDockWidgetFeatures);

 }
 
 DolphinDockWidget::~DolphinDockWidget()
 }
 
 DolphinDockWidget::~DolphinDockWidget()


@@ -68,8 +78,10 @@ void DolphinDockWidget::setLocked(bool lock)
                 m_dockTitleBar = new DolphinDockTitleBar(this);
             }
             setTitleBarWidget(m_dockTitleBar);
                 m_dockTitleBar = new DolphinDockTitleBar(this);
             }
             setTitleBarWidget(m_dockTitleBar);

+            setFeatures(QDockWidget::NoDockWidgetFeatures);

         } else {
             setTitleBarWidget(0);
         } else {
             setTitleBarWidget(0);

+            setFeatures(DefaultDockWidgetFeatures);

         }
     }
 }
         }
     }
 }


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

-#include "dolphindockwidget.moc"