From 3c4fc76094f4951ff82d0979374e9b38479bc656 Mon Sep 17 00:00:00 2001
From: Klaus Basan <klaus.basan@klausbasan.de>
Date: Thu, 16 Oct 2014 03:13:35 +0200
Subject: [PATCH] refs #335, renaming

---
 src/blackgui/components/cockpitinfoareacomponent.cpp | 2 +-
 src/blackgui/components/voiceroomscomponent.h        | 2 ++
 src/blackgui/dockwidget.cpp                          | 2 +-
 src/blackgui/dockwidget.h                            | 5 ++---
 src/blackgui/dockwidgetinfoarea.cpp                  | 2 +-
 src/blackgui/infoarea.cpp                            | 4 ++--
 src/blackgui/infoarea.h                              | 4 ++--
 7 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/src/blackgui/components/cockpitinfoareacomponent.cpp b/src/blackgui/components/cockpitinfoareacomponent.cpp
index 02adb2329..36d5a5c44 100644
--- a/src/blackgui/components/cockpitinfoareacomponent.cpp
+++ b/src/blackgui/components/cockpitinfoareacomponent.cpp
@@ -23,7 +23,7 @@ namespace BlackGui
             ui(new Ui::CCockpitInfoAreaComponent)
         {
             ui->setupUi(this);
-            initInfoArea();
+            this->initInfoArea();
             this->ps_setTabBarPosition(QTabWidget::North);
         }
 
diff --git a/src/blackgui/components/voiceroomscomponent.h b/src/blackgui/components/voiceroomscomponent.h
index cf0c22d30..56ff2ef26 100644
--- a/src/blackgui/components/voiceroomscomponent.h
+++ b/src/blackgui/components/voiceroomscomponent.h
@@ -7,6 +7,8 @@
  * contained in the LICENSE file.
  */
 
+//! \file
+
 #ifndef BLACKGUI_VOICEROOMSCOMPONENT_H
 #define BLACKGUI_VOICEROOMSCOMPONENT_H
 
diff --git a/src/blackgui/dockwidget.cpp b/src/blackgui/dockwidget.cpp
index b31edd159..b082370fb 100644
--- a/src/blackgui/dockwidget.cpp
+++ b/src/blackgui/dockwidget.cpp
@@ -19,7 +19,7 @@ namespace BlackGui
 {
     CDockWidget::CDockWidget(QWidget *parent) : QDockWidget(parent)
     {
-        this->onStyleSheetsChanged();
+        this->ps_onStyleSheetsChanged();
         this->initTitleBarWidgets();
 
         // connect
diff --git a/src/blackgui/dockwidget.h b/src/blackgui/dockwidget.h
index e6ce90a26..61da101e0 100644
--- a/src/blackgui/dockwidget.h
+++ b/src/blackgui/dockwidget.h
@@ -21,7 +21,7 @@
 namespace BlackGui
 {
 
-    //! \brief Our base class for dockable widgets containing some specialized functionality on top of QWidget.
+    //! \brief Our base class for dockable widgets containing some specialized functionality on top of QDockWidget.
     //! \details We currently use dockable widgets either as "info area" or "info bar" dockable widget.
     //! Info area widgets reside in an info are and represent a larger piece of information (e.g. all ATC stations, all aircrafts in range).
     //! An info bar is meant to be a small info window displaying information about status, menu state etc.
@@ -31,7 +31,6 @@ namespace BlackGui
     //! \sa CDockWidgetInfoBar
     class CDockWidget : public QDockWidget
     {
-        // KB TODO: Make this an interface, IDockWidget?
         Q_OBJECT
 
     public:
@@ -117,7 +116,7 @@ namespace BlackGui
 
     protected slots:
         //! Style sheet has changed
-        virtual void onStyleSheetsChanged();
+        virtual void ps_onStyleSheetsChanged();
 
     private slots:
         //! Top level has been chaged
diff --git a/src/blackgui/dockwidgetinfoarea.cpp b/src/blackgui/dockwidgetinfoarea.cpp
index 742421d40..cf72f016a 100644
--- a/src/blackgui/dockwidgetinfoarea.cpp
+++ b/src/blackgui/dockwidgetinfoarea.cpp
@@ -39,7 +39,7 @@ namespace BlackGui
     {
         const CInfoArea *ia = getParentInfoArea();
         if (!ia) return false;
-        return ia->isSelectedInfoArea(this);
+        return ia->isSelectedDockWidgetInfoArea(this);
     }
 
     bool CDockWidgetInfoArea::isVisibleWidget() const
diff --git a/src/blackgui/infoarea.cpp b/src/blackgui/infoarea.cpp
index 93acd5537..7d214eb5c 100644
--- a/src/blackgui/infoarea.cpp
+++ b/src/blackgui/infoarea.cpp
@@ -29,8 +29,8 @@ namespace BlackGui
 
     void CInfoArea::initInfoArea()
     {
-        // after(!) GUI is established
-        if (this->m_dockableWidgets.isEmpty())
+        // after(!) GUI is setup
+        if (this->m_dockWidgetInfoAreas.isEmpty())
         {
             this->m_dockableWidgets = this->getOwnDockWidgetAreas();
             Q_ASSERT(!this->m_dockableWidgets.isEmpty());
diff --git a/src/blackgui/infoarea.h b/src/blackgui/infoarea.h
index b8cdcfbdf..3ceb44ef6 100644
--- a/src/blackgui/infoarea.h
+++ b/src/blackgui/infoarea.h
@@ -71,13 +71,13 @@ namespace BlackGui
         //! Constructor
         explicit CInfoArea(QWidget *parent = nullptr);
 
-        //! Override close event
+        //! \copydoc QWidget::closeEvent
         virtual void closeEvent(QCloseEvent *event) override;
 
         //! \copydoc QWidget::paintEvent
         virtual void paintEvent(QPaintEvent *event) override;
 
-        //! Preferred size when floating
+        //! Preferred size when floating (size hint)
         virtual QSize getPreferredSizeWhenFloating(int areaIndex) const = 0;
 
         //! Info area (index) to icon