From 30db188064dd26df2159e9b7b7c23679e31b1c06 Mon Sep 17 00:00:00 2001
From: Ichthyostega <prg@ichthyostega.de>
Date: Sun, 17 Jun 2018 15:19:48 +0200
Subject: [PATCH] DockAccess: fix compilation due to renaming

the renamed entity DockArea is still defunct, but also not used yet
---
 src/gui/workspace/dock-area.cpp | 4 +++-
 src/gui/workspace/dock-area.hpp | 7 ++++---
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/gui/workspace/dock-area.cpp b/src/gui/workspace/dock-area.cpp
index 6019ec724..ff4ef8d00 100644
--- a/src/gui/workspace/dock-area.cpp
+++ b/src/gui/workspace/dock-area.cpp
@@ -48,11 +48,13 @@ namespace workspace {
   
   const DockArea::PanelDescription
     DockArea::panelDescriptionList[] = {
+#if false /////////////////////////////////////////////////////////////////////////////////////////////////////////////UNIMPLEMENTED :: TICKET #1144
       DockArea::Panel<TimelinePanel>(),
       DockArea::Panel<TimelinePanelObsolete>(),
       DockArea::Panel<InfoBoxPanel>(),
       DockArea::Panel<ViewerPanel>(),
       DockArea::Panel<AssetsPanel>()
+#endif    /////////////////////////////////////////////////////////////////////////////////////////////////////////////UNIMPLEMENTED :: TICKET #1144
     };
   
   unsigned short DockArea::panelID = 0;
@@ -291,7 +293,7 @@ namespace workspace {
     
     // Connect event handlers
     panel->signal_hidePanel().connect(sigc::bind(
-      sigc::mem_fun(*this, &PanelManager::on_panel_shown), panel));
+      sigc::mem_fun(*this, &DockArea::on_panel_shown), panel));
     
     // Add the panel to the list
     panels_.push_back(panel);
diff --git a/src/gui/workspace/dock-area.hpp b/src/gui/workspace/dock-area.hpp
index 66b8137dd..b44ee2b47 100644
--- a/src/gui/workspace/dock-area.hpp
+++ b/src/gui/workspace/dock-area.hpp
@@ -223,7 +223,7 @@ namespace workspace {
       class PanelDescription
         {
         protected:
-          typedef panel::Panel* (*const CreatePanelProc)(PanelManager&, Gdl::DockItem&);
+          typedef panel::Panel* (*const CreatePanelProc)(DockArea&, Gdl::DockItem&);
                                                             ///////////////////////////////TICKET #1026 : code smell, why not just using inheritance?          
         private:
           /** reference to the typeID of this class */
@@ -291,7 +291,7 @@ namespace workspace {
            * @return Returns a pointer to the panel object.
            */
           panel::Panel*
-          create (PanelManager& panelManager, Gdl::DockItem& dockItem)  const
+          create (DockArea& panelManager, Gdl::DockItem& dockItem)  const
             {
               REQUIRE(createPanelProc_);
               return createPanelProc_ (panelManager, dockItem);
@@ -303,6 +303,7 @@ namespace workspace {
       /**
        * A helper class that will create PanelDescription objects.
        * @param P The type of panel::Panel that the PanelDescription will describe.
+       * @deprecated to be refactored as of 6/2018   /////////////////////////////////////////////TICKET #1144  refactor dock handling
        */
       template<class P>
       class Panel
@@ -323,7 +324,7 @@ namespace workspace {
            * @return pointer to the created panel object.
            */
           static panel::Panel*
-          createPanel (PanelManager& panelManager, Gdl::DockItem& dockItem)
+          createPanel (DockArea& panelManager, Gdl::DockItem& dockItem)
             {
               return new P(panelManager, dockItem);
             }