Change QDockWidgets to QgsDockWidgets

No benefit as yet, but future proofing for when QgsDockWidget
gains additional fixes/tweaks over QDockWidget

python/gui/qgsdockwidget.sip

@@ -14,8 +14,16 @@ class QgsDockWidget : QDockWidget
 
     /** Constructor for QgsDockWidget.
      * @param parent parent widget
+     * @param flags window flags
      */
-    explicit QgsDockWidget( QWidget* parent /TransferThis/ = nullptr );
+    explicit QgsDockWidget( QWidget* parent /TransferThis/ = nullptr, Qt::WindowFlags flags = 0 );
+
+    /** Constructor for QgsDockWidget.
+     * @param title dock title
+     * @param parent parent widget
+     * @param flags window flags
+     */
+    explicit QgsDockWidget( const QString &title, QWidget* parent /TransferThis/ = nullptr, Qt::WindowFlags flags = 0 );
 
   public slots:
 

src/app/composer/qgscomposer.cpp

@@ -572,21 +572,21 @@ QgsComposer::QgsComposer( QgisApp *qgis, const QString& title )
   int minDockWidth( 335 );
 
   setTabPosition( Qt::AllDockWidgetAreas, QTabWidget::North );
-  mGeneralDock = new QDockWidget( tr( "Composition" ), this );
+  mGeneralDock = new QgsDockWidget( tr( "Composition" ), this );
   mGeneralDock->setObjectName( "CompositionDock" );
   mGeneralDock->setMinimumWidth( minDockWidth );
   mPanelMenu->addAction( mGeneralDock->toggleViewAction() );
-  mItemDock = new QDockWidget( tr( "Item properties" ), this );
+  mItemDock = new QgsDockWidget( tr( "Item properties" ), this );
   mItemDock->setObjectName( "ItemDock" );
   mItemDock->setMinimumWidth( minDockWidth );
   mPanelMenu->addAction( mItemDock->toggleViewAction() );
-  mUndoDock = new QDockWidget( tr( "Command history" ), this );
+  mUndoDock = new QgsDockWidget( tr( "Command history" ), this );
   mUndoDock->setObjectName( "CommandDock" );
   mPanelMenu->addAction( mUndoDock->toggleViewAction() );
-  mAtlasDock = new QDockWidget( tr( "Atlas generation" ), this );
+  mAtlasDock = new QgsDockWidget( tr( "Atlas generation" ), this );
   mAtlasDock->setObjectName( "AtlasDock" );
   mPanelMenu->addAction( mAtlasDock->toggleViewAction() );
-  mItemsDock = new QDockWidget( tr( "Items" ), this );
+  mItemsDock = new QgsDockWidget( tr( "Items" ), this );
   mItemsDock->setObjectName( "ItemsDock" );
   mPanelMenu->addAction( mItemsDock->toggleViewAction() );
 

src/app/composer/qgscomposer.h

@@ -19,7 +19,7 @@
 #include "ui_qgscomposerbase.h"
 #include "qgscomposermap.h"
 #include "qgscontexthelp.h"
-#include <QDockWidget>
+#include "qgsdockwidget.h"
 
 class QgisApp;
 class QgsComposerArrow;
@@ -592,11 +592,11 @@ class QgsComposer: public QMainWindow, private Ui::QgsComposerBase
     //! We load composer map content from project xml only on demand. Therefore we need to store the real preview mode type
     QMap< QgsComposerMap*, int > mMapsToRestore;
 
-    QDockWidget* mItemDock;
-    QDockWidget* mUndoDock;
-    QDockWidget* mGeneralDock;
-    QDockWidget* mAtlasDock;
-    QDockWidget* mItemsDock;
+    QgsDockWidget* mItemDock;
+    QgsDockWidget* mUndoDock;
+    QgsDockWidget* mGeneralDock;
+    QgsDockWidget* mAtlasDock;
+    QgsDockWidget* mItemsDock;
 
     QTreeView* mItemsTreeView;
 

src/app/nodetool/qgsnodeeditor.h

@@ -19,7 +19,7 @@
 #ifndef QGSNODEEDITOR_H
 #define QGSNODEEDITOR_H
 
-#include <QDockWidget>
+#include "qgsdockwidget.h"
 #include <QAbstractTableModel>
 #include <QItemSelection>
 #include <QStyledItemDelegate>
@@ -69,7 +69,7 @@ class QgsNodeEditorModel : public QAbstractTableModel
     void featureChanged();
 };
 
-class QgsNodeEditor : public QDockWidget
+class QgsNodeEditor : public QgsDockWidget
 {
     Q_OBJECT
   public:

src/app/qgisapp.cpp

@@ -31,7 +31,6 @@
 #include <QDesktopWidget>
 #include <QDialog>
 #include <QDir>
-#include <QDockWidget>
 #include <QEvent>
 #include <QFile>
 #include <QFileInfo>
@@ -707,7 +706,7 @@ QgisApp::QgisApp( QSplashScreen *splash, bool restorePlugins, bool skipVersionCh
 
   // create undo widget
   startProfile( "Undo dock" );
-  mUndoDock = new QDockWidget( tr( "Undo/Redo Panel" ), this );
+  mUndoDock = new QgsDockWidget( tr( "Undo/Redo Panel" ), this );
   mUndoWidget = new QgsUndoWidget( mUndoDock, mMapCanvas );
   mUndoWidget->setObjectName( "Undo" );
   mUndoDock->setWidget( mUndoWidget );
@@ -813,7 +812,7 @@ QgisApp::QgisApp( QSplashScreen *splash, bool restorePlugins, bool skipVersionCh
   // create the GPS tool on starting QGIS - this is like the browser
   mpGpsWidget = new QgsGPSInformationWidget( mMapCanvas );
   //create the dock widget
-  mpGpsDock = new QDockWidget( tr( "GPS Information Panel" ), this );
+  mpGpsDock = new QgsDockWidget( tr( "GPS Information Panel" ), this );
   mpGpsDock->setObjectName( "GPSInformation" );
   mpGpsDock->setAllowedAreas( Qt::LeftDockWidgetArea | Qt::RightDockWidgetArea );
   addDockWidget( Qt::LeftDockWidgetArea, mpGpsDock );
@@ -826,7 +825,7 @@ QgisApp::QgisApp( QSplashScreen *splash, bool restorePlugins, bool skipVersionCh
 
   mLogViewer = new QgsMessageLogViewer( statusBar(), this );
 
-  mLogDock = new QDockWidget( tr( "Log Messages Panel" ), this );
+  mLogDock = new QgsDockWidget( tr( "Log Messages Panel" ), this );
   mLogDock->setObjectName( "MessageLog" );
   mLogDock->setAllowedAreas( Qt::BottomDockWidgetArea | Qt::TopDockWidgetArea );
   addDockWidget( Qt::BottomDockWidgetArea, mLogDock );
@@ -2833,7 +2832,7 @@ void QgisApp::createOverview()
 //  QVBoxLayout *myOverviewLayout = new QVBoxLayout;
 //  myOverviewLayout->addWidget(overviewCanvas);
 //  overviewFrame->setLayout(myOverviewLayout);
-  mOverviewDock = new QDockWidget( tr( "Overview Panel" ), this );
+  mOverviewDock = new QgsDockWidget( tr( "Overview Panel" ), this );
   mOverviewDock->setObjectName( "Overview" );
   mOverviewDock->setAllowedAreas( Qt::LeftDockWidgetArea | Qt::RightDockWidgetArea );
   mOverviewDock->setWidget( mOverviewCanvas );
@@ -2858,7 +2857,7 @@ void QgisApp::createOverview()
   mMapCanvas->setMapUpdateInterval( mySettings.value( "/qgis/map_update_interval", 250 ).toInt() );
 }
 
-void QgisApp::addDockWidget( Qt::DockWidgetArea theArea, QDockWidget * thepDockWidget )
+void QgisApp::addDockWidget( Qt::DockWidgetArea theArea, QDockWidget* thepDockWidget )
 {
   QMainWindow::addDockWidget( theArea, thepDockWidget );
   // Make the right and left docks consume all vertical space and top
@@ -2948,7 +2947,7 @@ void QgisApp::initLayerTreeView()
 {
   mLayerTreeView->setWhatsThis( tr( "Map legend that displays all the layers currently on the map canvas. Click on the check box to turn a layer on or off. Double click on a layer in the legend to customize its appearance and set other properties." ) );
 
-  mLayerTreeDock = new QDockWidget( tr( "Layers Panel" ), this );
+  mLayerTreeDock = new QgsDockWidget( tr( "Layers Panel" ), this );
   mLayerTreeDock->setObjectName( "Layers" );
   mLayerTreeDock->setAllowedAreas( Qt::LeftDockWidgetArea | Qt::RightDockWidgetArea );
 
@@ -3052,7 +3051,7 @@ void QgisApp::initLayerTreeView()
   mMapLayerOrder->setObjectName( "theMapLayerOrder" );
 
   mMapLayerOrder->setWhatsThis( tr( "Map layer list that displays all layers in drawing order." ) );
-  mLayerOrderDock = new QDockWidget( tr( "Layer Order Panel" ), this );
+  mLayerOrderDock = new QgsDockWidget( tr( "Layer Order Panel" ), this );
   mLayerOrderDock->setObjectName( "LayerOrder" );
   mLayerOrderDock->setAllowedAreas( Qt::LeftDockWidgetArea | Qt::RightDockWidgetArea );
 

src/app/qgisapp.h

@@ -250,7 +250,7 @@ class APP_EXPORT QgisApp : public QMainWindow, private Ui::MainWindow
      * After adding the dock widget to the ui (by delegating to the QMainWindow
      * parent class, it will also add it to the View menu list of docks.*/
     void addDockWidget( Qt::DockWidgetArea area, QDockWidget *dockwidget );
-    void removeDockWidget( QDockWidget *dockwidget );
+    void removeDockWidget( QDockWidget* dockwidget );
     /** Add a toolbar to the main window. Overloaded from QMainWindow.
      * After adding the toolbar to the ui (by delegating to the QMainWindow
      * parent class, it will also add it to the View menu list of toolbars.*/
@@ -1505,11 +1505,11 @@ class APP_EXPORT QgisApp : public QMainWindow, private Ui::MainWindow
     QMenu *mToolbarMenu;
 
     // docks ------------------------------------------
-    QDockWidget *mLayerTreeDock;
-    QDockWidget *mLayerOrderDock;
-    QDockWidget *mOverviewDock;
-    QDockWidget *mpGpsDock;
-    QDockWidget *mLogDock;
+    QgsDockWidget *mLayerTreeDock;
+    QgsDockWidget *mLayerOrderDock;
+    QgsDockWidget *mOverviewDock;
+    QgsDockWidget *mpGpsDock;
+    QgsDockWidget *mLogDock;
 
 #ifdef Q_OS_MAC
     //! Window menu action to select this window
@@ -1722,7 +1722,7 @@ class APP_EXPORT QgisApp : public QMainWindow, private Ui::MainWindow
     static QgisApp *smInstance;
 
     QgsUndoWidget *mUndoWidget;
-    QDockWidget *mUndoDock;
+    QgsDockWidget *mUndoDock;
 
     QgsBrowserDockWidget *mBrowserWidget;
     QgsBrowserDockWidget *mBrowserWidget2;

src/app/qgsattributetabledialog.cpp

@@ -14,7 +14,6 @@
  *                                                                         *
  ***************************************************************************/
 
-#include <QDockWidget>
 #include <QMessageBox>
 #include <QGridLayout>
 #include <QDialogButtonBox>
@@ -33,6 +32,7 @@
 #include "qgisapp.h"
 #include "qgsaddattrdialog.h"
 #include "qgsdelattrdialog.h"
+#include "qgsdockwidget.h"
 #include "qgssearchquerybuilder.h"
 #include "qgslogger.h"
 #include "qgsmapcanvas.h"
@@ -946,7 +946,7 @@ void QgsAttributeTableDialog::setFilterExpression( const QString& filterString,
 //
 
 QgsAttributeTableDock::QgsAttributeTableDock( const QString& title, QWidget* parent, Qt::WindowFlags flags )
-    : QDockWidget( title, parent, flags )
+    : QgsDockWidget( title, parent, flags )
 {
   setObjectName( "AttributeTable" ); // set object name so the position can be saved
 }

src/app/qgsattributetabledialog.h

@@ -30,7 +30,7 @@
 #include "qgsvectorlayer.h" //QgsFeatureIds
 #include "qgsfieldmodel.h"
 #include "qgssearchwidgetwrapper.h"
-#include <QDockWidget>
+#include "qgsdockwidget.h"
 
 class QDialogButtonBox;
 class QPushButton;
@@ -214,7 +214,7 @@ class APP_EXPORT QgsAttributeTableDialog : public QDialog, private Ui::QgsAttrib
     QMenu* mMenuActions;
     QAction* mActionToggleEditing;
 
-    QDockWidget* mDock;
+    QgsDockWidget* mDock;
     QgsDistanceArea* myDa;
 
 
@@ -235,7 +235,7 @@ class APP_EXPORT QgsAttributeTableDialog : public QDialog, private Ui::QgsAttrib
 };
 
 
-class QgsAttributeTableDock : public QDockWidget
+class QgsAttributeTableDock : public QgsDockWidget
 {
     Q_OBJECT
 

src/app/qgsbookmarks.cpp

@@ -35,7 +35,7 @@
 
 
 QgsBookmarks::QgsBookmarks( QWidget *parent )
-    : QDockWidget( parent )
+    : QgsDockWidget( parent )
 {
   setupUi( this );
   restorePosition();

src/app/qgsbookmarks.h

@@ -17,13 +17,12 @@
 #ifndef QGSBOOKMARKS_H
 #define QGSBOOKMARKS_H
 
-#include <QDockWidget>
 #include <QSqlTableModel>
 #include <QScopedPointer>
 
 #include "ui_qgsbookmarksbase.h"
 #include "qgscontexthelp.h"
-
+#include "qgsdockwidget.h"
 
 /*
  * Model for project bookmarks
@@ -100,7 +99,7 @@ class QgsMergedBookmarksTableModel: public QAbstractTableModel
 };
 
 
-class APP_EXPORT QgsBookmarks : public QDockWidget, private Ui::QgsBookmarksBase
+class APP_EXPORT QgsBookmarks : public QgsDockWidget, private Ui::QgsBookmarksBase
 {
     Q_OBJECT
 

src/app/qgsbrowserdockwidget.cpp

@@ -262,7 +262,7 @@ void QgsBrowserPropertiesDialog::setItem( QgsDataItem* item )
 }
 
 QgsBrowserDockWidget::QgsBrowserDockWidget( const QString& name, QWidget * parent )
-    : QDockWidget( parent )
+    : QgsDockWidget( parent )
     , mModel( nullptr )
     , mProxyModel( nullptr )
     , mPropertiesWidgetEnabled( false )
@@ -365,7 +365,7 @@ void QgsBrowserDockWidget::showEvent( QShowEvent * e )
     mSplitter->setSizes( sizes );
   }
 
-  QDockWidget::showEvent( e );
+  QgsDockWidget::showEvent( e );
 }
 
 void QgsBrowserDockWidget::showContextMenu( QPoint pt )

src/app/qgsbrowserdockwidget.h

@@ -15,7 +15,6 @@
 #ifndef QGSBROWSERDOCKWIDGET_H
 #define QGSBROWSERDOCKWIDGET_H
 
-#include <QDockWidget>
 #include <ui_qgsbrowserdockwidgetbase.h>
 #include <ui_qgsbrowserlayerpropertiesbase.h>
 #include <ui_qgsbrowserdirectorypropertiesbase.h>
@@ -23,6 +22,7 @@
 
 #include "qgsdataitem.h"
 #include "qgsbrowsertreeview.h"
+#include "qgsdockwidget.h"
 #include <QSortFilterProxyModel>
 
 class QgsBrowserModel;
@@ -100,7 +100,7 @@ class QgsBrowserPropertiesDialog : public QDialog , private Ui::QgsBrowserProper
     QString mSettingsSection;
 };
 
-class APP_EXPORT QgsBrowserDockWidget : public QDockWidget, private Ui::QgsBrowserDockWidgetBase
+class APP_EXPORT QgsBrowserDockWidget : public QgsDockWidget, private Ui::QgsBrowserDockWidgetBase
 {
     Q_OBJECT
   public:

src/app/qgsidentifyresultsdialog.cpp

@@ -20,6 +20,7 @@
 #include "qgsapplication.h"
 #include "qgsactionmanager.h"
 #include "qgsattributedialog.h"
+#include "qgsdockwidget.h"
 #include "qgseditorwidgetregistry.h"
 #include "qgsfeatureaction.h"
 #include "qgsgeometry.h"
@@ -44,7 +45,6 @@
 #include <QSettings>
 #include <QMenu>
 #include <QClipboard>
-#include <QDockWidget>
 #include <QMenuBar>
 #include <QPushButton>
 #include <QPrinter>
@@ -258,7 +258,7 @@ QgsIdentifyResultsDialog::QgsIdentifyResultsDialog( QgsMapCanvas *canvas, QWidge
   mOpenFormAction->setDisabled( true );
 
   QSettings mySettings;
-  mDock = new QDockWidget( tr( "Identify Results" ), QgisApp::instance() );
+  mDock = new QgsDockWidget( tr( "Identify Results" ), QgisApp::instance() );
   mDock->setObjectName( "IdentifyResultsDock" );
   mDock->setAllowedAreas( Qt::LeftDockWidgetArea | Qt::RightDockWidgetArea );
   mDock->setWidget( this );

src/app/qgsidentifyresultsdialog.h

@@ -41,7 +41,7 @@ class QgsVectorLayer;
 class QgsRasterLayer;
 class QgsHighlight;
 class QgsMapCanvas;
-class QDockWidget;
+class QgsDockWidget;
 
 class QwtPlotCurve;
 
@@ -253,7 +253,7 @@ class APP_EXPORT QgsIdentifyResultsDialog: public QDialog, private Ui::QgsIdenti
 
     void doMapLayerAction( QTreeWidgetItem *item, QgsMapLayerAction* action );
 
-    QDockWidget *mDock;
+    QgsDockWidget *mDock;
 
     QVector<QgsIdentifyPlotCurve *> mPlotCurves;
 };

src/app/qgssnappingdialog.cpp

@@ -23,12 +23,12 @@
 #include "qgisapp.h"
 #include "qgsproject.h"
 #include "qgslogger.h"
+#include "qgsdockwidget.h"
 
 #include <QCheckBox>
 #include <QDoubleValidator>
 #include <QComboBox>
 #include <QLineEdit>
-#include <QDockWidget>
 #include <QPushButton>
 #include <QDoubleSpinBox>
 
@@ -503,7 +503,7 @@ void QgsSnappingDialog::setSnappingMode()
 //
 
 QgsSnappingDock::QgsSnappingDock( const QString& title, QWidget* parent, Qt::WindowFlags flags )
-    : QDockWidget( title, parent, flags )
+    : QgsDockWidget( title, parent, flags )
 {
   setObjectName( "Snapping and Digitizing Options" ); // set object name so the position can be saved
 }

src/app/qgssnappingdialog.h

@@ -19,7 +19,7 @@
 #define QGSSNAPPINGDIALOG_H
 
 #include "qgsmaplayer.h"
-#include <QDockWidget>
+#include "qgsdockwidget.h"
 #include "ui_qgssnappingdialogbase.h"
 
 class QgsMapCanvas;
@@ -90,7 +90,7 @@ class APP_EXPORT QgsSnappingDialog: public QDialog, private Ui::QgsSnappingDialo
     /** Used to query the loaded layers*/
     QgsMapCanvas* mMapCanvas;
 
-    QDockWidget *mDock;
+    QgsDockWidget *mDock;
 
     /** Set checkbox value based on project setting*/
     void setTopologicalEditingState();
@@ -102,7 +102,7 @@ class APP_EXPORT QgsSnappingDialog: public QDialog, private Ui::QgsSnappingDialo
 };
 
 
-class QgsSnappingDock : public QDockWidget
+class QgsSnappingDock : public QgsDockWidget
 {
     Q_OBJECT
 

src/app/qgsstatisticalsummarydockwidget.cpp

@@ -74,7 +74,7 @@ static QgsExpressionContext _getExpressionContext( const void* context )
 }
 
 QgsStatisticalSummaryDockWidget::QgsStatisticalSummaryDockWidget( QWidget *parent )
-    : QDockWidget( parent )
+    : QgsDockWidget( parent )
     , mLayer( nullptr )
 {
   setupUi( this );

src/app/qgsstatisticalsummarydockwidget.h

@@ -15,13 +15,13 @@
 #ifndef QGSSTATISTICALSUMMARYDOCKWIDGET_H
 #define QGSSTATISTICALSUMMARYDOCKWIDGET_H
 
-#include <QDockWidget>
 #include <QMap>
 #include "ui_qgsstatisticalsummarybase.h"
 
 #include "qgsstatisticalsummary.h"
 #include "qgsstringstatisticalsummary.h"
 #include "qgsdatetimestatisticalsummary.h"
+#include "qgsdockwidget.h"
 
 class QgsBrowserModel;
 class QModelIndex;
@@ -32,7 +32,7 @@ class QgsBrowserTreeFilterProxyModel;
 
 /** A dock widget which displays a statistical summary of the values in a field or expression
  */
-class APP_EXPORT QgsStatisticalSummaryDockWidget : public QDockWidget, private Ui::QgsStatisticalSummaryWidgetBase
+class APP_EXPORT QgsStatisticalSummaryDockWidget : public QgsDockWidget, private Ui::QgsStatisticalSummaryWidgetBase
 {
     Q_OBJECT
 

src/app/qgsundowidget.h

@@ -15,11 +15,11 @@
 #ifndef QGSUNDOWIDGET_H
 #define QGSUNDOWIDGET_H
 
+#include "qgsdockwidget.h"
 #include <QVariant>
 #include <QAction>
 #include <QApplication>
 #include <QButtonGroup>
-#include <QDockWidget>
 #include <QGridLayout>
 #include <QPushButton>
 #include <QSpacerItem>

src/gui/attributetable/qgsorganizetablecolumnsdialog.cpp

@@ -14,13 +14,13 @@
  *                                                                         *
  ***************************************************************************/
 
-#include <QDockWidget>
 #include <QMessageBox>
 
 #include "qgsorganizetablecolumnsdialog.h"
 #include "qgsattributetablemodel.h"
 #include "qgsattributetablefiltermodel.h"
 #include "qgsattributetableview.h"
+#include "qgsdockwidget.h"
 
 #include <qgsapplication.h>
 #include <qgsvectordataprovider.h>

src/gui/qgsadvanceddigitizingdockwidget.cpp

@@ -88,7 +88,7 @@ bool QgsAdvancedDigitizingDockWidget::lineCircleIntersection( const QgsPoint& ce
 
 
 QgsAdvancedDigitizingDockWidget::QgsAdvancedDigitizingDockWidget( QgsMapCanvas* canvas, QWidget *parent )
-    : QDockWidget( parent )
+    : QgsDockWidget( parent )
     , mMapCanvas( canvas )
     , mCurrentMapToolSupportsCad( false )
     , mCadEnabled( false )

src/gui/qgsadvanceddigitizingdockwidget.h

@@ -16,8 +16,7 @@
 #ifndef QGSADVANCEDDIGITIZINGDOCK
 #define QGSADVANCEDDIGITIZINGDOCK
 
-#include <QDockWidget>
-
+#include "qgsdockwidget.h"
 #include "qgsmapmouseevent.h"
 #include "qgsmessagebaritem.h"
 
@@ -41,7 +40,7 @@ static const double SoftConstraintToleranceDegrees = 10;
  * It handles both the UI and the constraints. Constraints are applied
  * by implemeting filters called from QgsMapToolAdvancedDigitizing.
  */
-class GUI_EXPORT QgsAdvancedDigitizingDockWidget : public QDockWidget, private Ui::QgsAdvancedDigitizingDockWidgetBase
+class GUI_EXPORT QgsAdvancedDigitizingDockWidget : public QgsDockWidget, private Ui::QgsAdvancedDigitizingDockWidgetBase
 {
     Q_OBJECT
     Q_FLAGS( CadCapacities )

src/gui/qgsdockwidget.cpp

@@ -19,8 +19,15 @@
 #include "qgsdockwidget.h"
 
 
-QgsDockWidget::QgsDockWidget( QWidget* parent )
-    : QDockWidget( parent )
+QgsDockWidget::QgsDockWidget( QWidget* parent , Qt::WindowFlags flags )
+    : QDockWidget( parent, flags )
+    , mVisibleAndActive( false )
+{
+  connect( this, SIGNAL( visibilityChanged( bool ) ), this, SLOT( handleVisibilityChanged( bool ) ) );
+}
+
+QgsDockWidget::QgsDockWidget( const QString& title, QWidget* parent, Qt::WindowFlags flags )
+    : QDockWidget( title, parent, flags )
     , mVisibleAndActive( false )
 {
   connect( this, SIGNAL( visibilityChanged( bool ) ), this, SLOT( handleVisibilityChanged( bool ) ) );

src/gui/qgsdockwidget.h

@@ -14,12 +14,14 @@
  *   (at your option) any later version.                                   *
  *                                                                         *
  ***************************************************************************/
+#ifndef QGSDOCKWIDGET_H
+#define QGSDOCKWIDGET_H
 
 #include <QDockWidget>
 
 /** \ingroup gui
  * \class QgsDockWidget
- * QDockWidget subclass with more fine-grained control over how the widget is closed or opened.
+ * QgsDockWidget subclass with more fine-grained control over how the widget is closed or opened.
  * \note added in 2.16
  */
 
@@ -31,8 +33,16 @@ class GUI_EXPORT QgsDockWidget : public QDockWidget
 
     /** Constructor for QgsDockWidget.
      * @param parent parent widget
+     * @param flags window flags
      */
-    explicit QgsDockWidget( QWidget* parent = nullptr );
+    explicit QgsDockWidget( QWidget* parent = nullptr, Qt::WindowFlags flags = 0 );
+
+    /** Constructor for QgsDockWidget.
+     * @param title dock title
+     * @param parent parent widget
+     * @param flags window flags
+     */
+    explicit QgsDockWidget( const QString &title, QWidget* parent = nullptr, Qt::WindowFlags flags = 0 );
 
   public slots:
 
@@ -84,3 +94,4 @@ class GUI_EXPORT QgsDockWidget : public QDockWidget
     bool mVisibleAndActive;
 
 };
+#endif //QGSDOCKWIDGET_H

src/gui/qgsmessagelogviewer.cpp

@@ -18,6 +18,7 @@
 #include "qgsmessagelogviewer.h"
 #include "qgsmessagelog.h"
 #include "qgsapplication.h"
+#include "qgsdockwidget.h"
 
 #include <QFile>
 #include <QDateTime>
@@ -25,7 +26,6 @@
 #include <QToolButton>
 #include <QStatusBar>
 #include <QToolTip>
-#include <QDockWidget>
 #include <QPlainTextEdit>
 #include <QScrollBar>
 

src/gui/qgsuserinputdockwidget.cpp

@@ -19,7 +19,7 @@
 #include <QBoxLayout>
 
 QgsUserInputDockWidget::QgsUserInputDockWidget( QWidget *parent )
-    : QDockWidget( tr( "User Input Panel" ), parent )
+    : QgsDockWidget( tr( "User Input Panel" ), parent )
     , mLayoutHorizontal( true )
 {
   QWidget* w = new QWidget( nullptr );
@@ -124,6 +124,6 @@ void QgsUserInputDockWidget::paintEvent( QPaintEvent * event )
   }
   else
   {
-    QDockWidget::paintEvent( event );
+    QgsDockWidget::paintEvent( event );
   }
 }

src/gui/qgsuserinputdockwidget.h

@@ -18,7 +18,7 @@
 #ifndef QGSUSERINPUTDOCKWIDGET_H
 #define QGSUSERINPUTDOCKWIDGET_H
 
-#include <QDockWidget>
+#include "qgsdockwidget.h"
 #include <QMap>
 
 class QFrame;
@@ -31,7 +31,7 @@ class QBoxLayout;
  * Several widgets can be displayed at once, they will be separated by a separator. Widgets will be either layout horizontally or vertically.
  * The dock is automatically hidden if it contains no widget.
  */
-class GUI_EXPORT QgsUserInputDockWidget : public QDockWidget
+class GUI_EXPORT QgsUserInputDockWidget : public QgsDockWidget
 {
     Q_OBJECT
   public:

src/plugins/coordinate_capture/coordinatecapture.cpp

@@ -29,6 +29,7 @@
 #include <qgscoordinatereferencesystem.h>
 #include <qgscoordinatetransform.h>
 #include <qgsgenericprojectionselector.h>
+#include "qgsdockwidget.h"
 
 #include "coordinatecapture.h"
 #include "coordinatecapturegui.h"
@@ -39,7 +40,6 @@
 
 #include <QAction>
 #include <QToolBar>
-#include <QDockWidget>
 #include <QLayout>
 #include <QLineEdit>
 #include <QClipboard>
@@ -101,7 +101,7 @@ void CoordinateCapture::initGui()
   mUserCrsDisplayPrecision = ( mCrs.mapUnits() == QGis::Degrees ) ? 5 : 3; // precision depends on CRS units
 
   //create the dock widget
-  mpDockWidget = new QDockWidget( tr( "Coordinate Capture" ), mQGisIface->mainWindow() );
+  mpDockWidget = new QgsDockWidget( tr( "Coordinate Capture" ), mQGisIface->mainWindow() );
   mpDockWidget->setObjectName( "CoordinateCapture" );
   mpDockWidget->setAllowedAreas( Qt::LeftDockWidgetArea | Qt::RightDockWidgetArea );
   mQGisIface->addDockWidget( Qt::LeftDockWidgetArea, mpDockWidget );

src/plugins/coordinate_capture/coordinatecapture.h

@@ -50,7 +50,7 @@ class QAction;
 class QToolBar;
 class QToolButton;
 class QPushButton;
-class QDockWidget;
+class QgsDockWidget;
 class QLineEdit;
 class QIcon;
 class QLabel;
@@ -112,7 +112,7 @@ class CoordinateCapture: public QObject, public QgisPlugin
 
   private:
     //! Container for the coordinate info
-    QPointer<QDockWidget> mpDockWidget;
+    QPointer<QgsDockWidget> mpDockWidget;
 
     //!output display for user defined Coordinate Reference System
     QPointer<QLineEdit> mpUserCrsEdit;

src/plugins/georeferencer/qgsgeorefplugingui.cpp

@@ -69,7 +69,7 @@
 #include "qgsmessagebar.h"
 
 QgsGeorefDockWidget::QgsGeorefDockWidget( const QString & title, QWidget * parent, Qt::WindowFlags flags )
-    : QDockWidget( title, parent, flags )
+    : QgsDockWidget( title, parent, flags )
 {
   setObjectName( "GeorefDockWidget" ); // set object name so the position can be saved
 }

src/plugins/georeferencer/qgsgeorefplugingui.h

@@ -40,7 +40,7 @@ class QgsRasterLayer;
 class QgsRectangle;
 class QgsMessageBar;
 
-class QgsGeorefDockWidget : public QDockWidget
+class QgsGeorefDockWidget : public QgsDockWidget
 {
     Q_OBJECT
   public:
@@ -256,7 +256,7 @@ class QgsGeorefPluginGui : public QMainWindow, private Ui::QgsGeorefPluginGuiBas
     bool mGCPsDirty;
     bool mLoadInQgis;
 
-    QDockWidget* mDock;
+    QgsDockWidget* mDock;
     int messageTimeout();
 };
 

src/plugins/georeferencer/qgsgeorefpluginguibase.ui

@@ -146,9 +146,9 @@
    <addaction name="mActionLinkGeorefToQGis"/>
    <addaction name="mActionLinkQGisToGeoref"/>
   </widget>
-  <widget class="QDockWidget" name="dockWidgetGCPpoints">
+  <widget class="QgsDockWidget" name="dockWidgetGCPpoints">
    <property name="features">
-    <set>QDockWidget::AllDockWidgetFeatures</set>
+    <set>QgsDockWidget::AllDockWidgetFeatures</set>
    </property>
    <property name="allowedAreas">
     <set>Qt::AllDockWidgetAreas</set>

src/plugins/grass/qgsgrasstools.cpp

@@ -150,7 +150,7 @@ class QgsGrassToolsTreeFilterProxyModel : public QSortFilterProxyModel
 };
 
 QgsGrassTools::QgsGrassTools( QgisInterface *iface, QWidget * parent, const char * name, Qt::WindowFlags f )
-    : QDockWidget( parent, f )
+    : QgsDockWidget( parent, f )
     , mModulesListModel( 0 )
     , mModelProxy( 0 )
 {

src/plugins/grass/qgsgrasstools.h

@@ -16,7 +16,7 @@
 #ifndef QGSGRASSTOOLS_H
 #define QGSGRASSTOOLS_H
 
-#include <QDockWidget>
+#include "qgsdockwidget.h"
 
 #include "ui_qgsgrasstoolsbase.h"
 
@@ -35,7 +35,7 @@ class QgsGrassToolsTreeFilterProxyModel;
  *  \brief Interface to GRASS modules.
  *
  */
-class QgsGrassTools: public QDockWidget, public Ui::QgsGrassToolsBase
+class QgsGrassTools: public QgsDockWidget, public Ui::QgsGrassToolsBase
 {
     Q_OBJECT
 

src/plugins/grass/qgsgrasstoolsbase.ui

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
  <class>QgsGrassToolsBase</class>
- <widget class="QDockWidget" name="QgsGrassToolsBase">
+ <widget class="QgsDockWidget" name="QgsGrassToolsBase">
   <property name="geometry">
    <rect>
     <x>0</x>

src/plugins/roadgraph/roadgraphplugin.cpp

@@ -31,6 +31,7 @@
 #include <qgsgraphbuilder.h>
 #include <qgsgraph.h>
 #include <qgsdistancearcproperter.h>
+#include "qgsdockwidget.h"
 
 // Road grap plugin includes
 #include "roadgraphplugin.h"
@@ -50,7 +51,6 @@
 #include <QLocale>
 #include <QToolBar>
 #include <QPushButton>
-#include <QDockWidget>
 #include <QVBoxLayout>
 #include <QDebug>
 

src/plugins/roadgraph/roadgraphplugin.h

@@ -27,7 +27,7 @@ class QAction;
 class QToolBar;
 class QPainter;
 class QgisInterface;
-class QDockWidget;
+class QgsDockWidget;
 
 //forward declarations RoadGraph plugins classes
 class QgsGraphDirector;

src/plugins/roadgraph/shortestpathwidget.cpp

@@ -55,7 +55,7 @@
 //standard includes
 
 RgShortestPathWidget::RgShortestPathWidget( QWidget* theParent, RoadGraphPlugin *thePlugin )
-    : QDockWidget( theParent )
+    : QgsDockWidget( theParent )
     , mPlugin( thePlugin )
 {
   setWindowTitle( tr( "Shortest path" ) );

src/plugins/roadgraph/shortestpathwidget.h

@@ -12,11 +12,9 @@
 #ifndef ROADGRAPHPLUGIN_SHORTESTPATHDLG_H
 #define ROADGRAPHPLUGIN_SHORTESTPATHDLG_H
 
-// QT includes
-#include <QDockWidget>
-
 // Qgis includes
 #include <qgspoint.h>
+#include "qgsdockwidget.h"
 
 // standard includes
 
@@ -41,7 +39,7 @@ class QgsGraph;
  * \class VrpPluginShortestPathDlg
  * \brief This class implement user interface for finding shortest path between two points.
  */
-class RgShortestPathWidget : public QDockWidget
+class RgShortestPathWidget : public QgsDockWidget
 {
     Q_OBJECT
   public:

src/plugins/topology/checkDock.cpp

@@ -42,7 +42,7 @@
 //class QgisInterface;
 
 checkDock::checkDock( QgisInterface* qIface, QWidget* parent )
-    : QDockWidget( parent ), Ui::checkDock()
+    : QgsDockWidget( parent ), Ui::checkDock()
 {
   mTest = new topolTest( qIface );
 

src/plugins/topology/checkDock.h

@@ -18,7 +18,7 @@
 #ifndef CHECKDOCK_H
 #define CHECKDOCK_H
 
-#include <QDockWidget>
+#include "qgsdockwidget.h"
 
 #include <qgsvectorlayer.h>
 #include <qgsgeometry.h>
@@ -38,7 +38,7 @@ class QgisApp;
 class QgisInterface;
 class checkDock;
 
-class checkDock : public QDockWidget, private Ui::checkDock
+class checkDock : public QgsDockWidget, private Ui::checkDock
 {
     Q_OBJECT
 

src/plugins/topology/checkDock.ui

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
  <class>checkDock</class>
- <widget class="QDockWidget" name="checkDock">
+ <widget class="QgsDockWidget" name="checkDock">
   <property name="geometry">
    <rect>
     <x>0</x>

src/providers/wms/qgstilescalewidget.cpp

@@ -20,8 +20,8 @@
 #include "qgsrasterlayer.h"
 #include "qgsmessagelog.h"
 #include "qgslogger.h"
+#include "qgsdockwidget.h"
 
-#include <QDockWidget>
 #include <QMainWindow>
 #include <QMenu>
 #include <QGraphicsView>
@@ -109,7 +109,7 @@ void QgsTileScaleWidget::on_mSlider_valueChanged( int value )
 
 void QgsTileScaleWidget::showTileScale( QMainWindow *mainWindow )
 {
-  QDockWidget *dock = mainWindow->findChild<QDockWidget *>( "theTileScaleDock" );
+  QgsDockWidget *dock = mainWindow->findChild<QgsDockWidget *>( "theTileScaleDock" );
   if ( dock )
   {
     dock->setVisible( dock->isHidden() );
@@ -139,7 +139,7 @@ void QgsTileScaleWidget::showTileScale( QMainWindow *mainWindow )
   }
 
   //create the dock widget
-  dock = new QDockWidget( tr( "Tile Scale Panel" ), mainWindow );
+  dock = new QgsDockWidget( tr( "Tile Scale Panel" ), mainWindow );
   dock->setObjectName( "theTileScaleDock" );
   dock->setAllowedAreas( Qt::LeftDockWidgetArea | Qt::RightDockWidgetArea );
   mainWindow->addDockWidget( Qt::RightDockWidgetArea, dock );

src/ui/qgsadvanceddigitizingdockwidgetbase.ui

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
  <class>QgsAdvancedDigitizingDockWidgetBase</class>
- <widget class="QDockWidget" name="QgsAdvancedDigitizingDockWidgetBase">
+ <widget class="QgsDockWidget" name="QgsAdvancedDigitizingDockWidgetBase">
   <property name="geometry">
    <rect>
     <x>0</x>

src/ui/qgsbookmarksbase.ui

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
  <class>QgsBookmarksBase</class>
- <widget class="QDockWidget" name="QgsBookmarksBase">
+ <widget class="QgsDockWidget" name="QgsBookmarksBase">
   <property name="geometry">
    <rect>
     <x>0</x>

src/ui/qgsbrowserdockwidgetbase.ui

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
  <class>QgsBrowserDockWidgetBase</class>
- <widget class="QDockWidget" name="QgsBrowserDockWidgetBase">
+ <widget class="QgsDockWidget" name="QgsBrowserDockWidgetBase">
   <property name="geometry">
    <rect>
     <x>0</x>

src/ui/qgsstatisticalsummarybase.ui

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
  <class>QgsStatisticalSummaryWidgetBase</class>
- <widget class="QDockWidget" name="QgsStatisticalSummaryWidgetBase">
+ <widget class="QgsDockWidget" name="QgsStatisticalSummaryWidgetBase">
   <property name="geometry">
    <rect>
     <x>0</x>