benn/lumiera_
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

DockAccess: fix compilation due to renaming

Browse source 
the renamed entity DockArea is still defunct, but also not used yet
This commit is contained in:
Fischlurch 2018-06-17 15:19:48 +02:00
parent 5cac40654f
commit 30db188064
2 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/gui/workspace/dock-area.cpp
View file

@ -48,11 +48,13 @@ namespace workspace {
const DockArea::PanelDescription const DockArea::PanelDescription
DockArea::panelDescriptionList[] = { DockArea::panelDescriptionList[] = {
#if false /////////////////////////////////////////////////////////////////////////////////////////////////////////////UNIMPLEMENTED :: TICKET #1144
DockArea::Panel<TimelinePanel>(), DockArea::Panel<TimelinePanel>(),
DockArea::Panel<TimelinePanelObsolete>(), DockArea::Panel<TimelinePanelObsolete>(),
DockArea::Panel<InfoBoxPanel>(), DockArea::Panel<InfoBoxPanel>(),
DockArea::Panel<ViewerPanel>(), DockArea::Panel<ViewerPanel>(),
DockArea::Panel<AssetsPanel>() DockArea::Panel<AssetsPanel>()
#endif /////////////////////////////////////////////////////////////////////////////////////////////////////////////UNIMPLEMENTED :: TICKET #1144
}; };
unsigned short DockArea::panelID = 0; unsigned short DockArea::panelID = 0;
@ -291,7 +293,7 @@ namespace workspace {
// Connect event handlers // Connect event handlers
panel->signal_hidePanel().connect(sigc::bind( 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 // Add the panel to the list
panels_.push_back(panel); panels_.push_back(panel);

7
src/gui/workspace/dock-area.hpp
View file

@ -223,7 +223,7 @@ namespace workspace {
class PanelDescription class PanelDescription
{ {
protected: 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? ///////////////////////////////TICKET #1026 : code smell, why not just using inheritance?
private: private:
/** reference to the typeID of this class */ /** reference to the typeID of this class */
@ -291,7 +291,7 @@ namespace workspace {
* @return Returns a pointer to the panel object. * @return Returns a pointer to the panel object.
*/ */
panel::Panel* panel::Panel*
create (PanelManager& panelManager, Gdl::DockItem& dockItem) const create (DockArea& panelManager, Gdl::DockItem& dockItem) const
{ {
REQUIRE(createPanelProc_); REQUIRE(createPanelProc_);
return createPanelProc_ (panelManager, dockItem); return createPanelProc_ (panelManager, dockItem);
@ -303,6 +303,7 @@ namespace workspace {
/** /**
* A helper class that will create PanelDescription objects. * A helper class that will create PanelDescription objects.
* @param P The type of panel::Panel that the PanelDescription will describe. * @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> template<class P>
class Panel class Panel
@ -323,7 +324,7 @@ namespace workspace {
* @return pointer to the created panel object. * @return pointer to the created panel object.
*/ */
static panel::Panel* static panel::Panel*
createPanel (PanelManager& panelManager, Gdl::DockItem& dockItem) createPanel (DockArea& panelManager, Gdl::DockItem& dockItem)
{ {
return new P(panelManager, dockItem); return new P(panelManager, dockItem);
} }