Move TOOLS_HOLDER into tools/ folder
Also clean up some compiler warnings
This commit is contained in:
parent
7bda8178d1
commit
e528769637
|
@ -39,7 +39,7 @@
|
||||||
#include "panel_prev_3d_base.h"
|
#include "panel_prev_3d_base.h"
|
||||||
|
|
||||||
#include <vector>
|
#include <vector>
|
||||||
#include <tools_holder.h>
|
#include <tool/tools_holder.h>
|
||||||
#include <3d_canvas/eda_3d_canvas.h>
|
#include <3d_canvas/eda_3d_canvas.h>
|
||||||
#include <3d_viewer_id.h>
|
#include <3d_viewer_id.h>
|
||||||
#include <3d_rendering/ctrack_ball.h>
|
#include <3d_rendering/ctrack_ball.h>
|
||||||
|
|
|
@ -768,6 +768,8 @@ class EDA_3D_BOARD_HOLDER
|
||||||
public:
|
public:
|
||||||
virtual BOARD_ADAPTER& GetAdapter() = 0;
|
virtual BOARD_ADAPTER& GetAdapter() = 0;
|
||||||
virtual CCAMERA& GetCurrentCamera() = 0;
|
virtual CCAMERA& GetCurrentCamera() = 0;
|
||||||
|
|
||||||
|
virtual ~EDA_3D_BOARD_HOLDER() {};
|
||||||
};
|
};
|
||||||
|
|
||||||
#endif // BOARD_ADAPTER_H
|
#endif // BOARD_ADAPTER_H
|
||||||
|
|
|
@ -331,7 +331,6 @@ set( COMMON_SRCS
|
||||||
status_popup.cpp
|
status_popup.cpp
|
||||||
systemdirsappend.cpp
|
systemdirsappend.cpp
|
||||||
template_fieldnames.cpp
|
template_fieldnames.cpp
|
||||||
tools_holder.cpp
|
|
||||||
trace_helpers.cpp
|
trace_helpers.cpp
|
||||||
undo_redo_container.cpp
|
undo_redo_container.cpp
|
||||||
utf8.cpp
|
utf8.cpp
|
||||||
|
@ -381,6 +380,7 @@ set( COMMON_SRCS
|
||||||
tool/tool_base.cpp
|
tool/tool_base.cpp
|
||||||
tool/tool_dispatcher.cpp
|
tool/tool_dispatcher.cpp
|
||||||
tool/tool_event.cpp
|
tool/tool_event.cpp
|
||||||
|
tool/tools_holder.cpp
|
||||||
tool/tool_interactive.cpp
|
tool/tool_interactive.cpp
|
||||||
tool/tool_manager.cpp
|
tool/tool_manager.cpp
|
||||||
tool/tool_menu.cpp
|
tool/tool_menu.cpp
|
||||||
|
|
|
@ -26,8 +26,8 @@
|
||||||
#include <tool/action_manager.h>
|
#include <tool/action_manager.h>
|
||||||
#include <tool/action_menu.h>
|
#include <tool/action_menu.h>
|
||||||
#include <tool/actions.h>
|
#include <tool/actions.h>
|
||||||
|
#include <tool/tools_holder.h>
|
||||||
#include <tool/tool_manager.h>
|
#include <tool/tool_manager.h>
|
||||||
#include <tools_holder.h>
|
|
||||||
|
|
||||||
|
|
||||||
TOOLS_HOLDER::TOOLS_HOLDER() :
|
TOOLS_HOLDER::TOOLS_HOLDER() :
|
|
@ -46,7 +46,7 @@
|
||||||
#include <frame_type.h>
|
#include <frame_type.h>
|
||||||
#include <hotkeys_basic.h>
|
#include <hotkeys_basic.h>
|
||||||
#include <kiway_holder.h>
|
#include <kiway_holder.h>
|
||||||
#include <tools_holder.h>
|
#include <tool/tools_holder.h>
|
||||||
#include <widgets/ui_common.h>
|
#include <widgets/ui_common.h>
|
||||||
|
|
||||||
// Option for main frames
|
// Option for main frames
|
||||||
|
|
|
@ -66,6 +66,8 @@ protected:
|
||||||
public:
|
public:
|
||||||
TOOLS_HOLDER();
|
TOOLS_HOLDER();
|
||||||
|
|
||||||
|
virtual ~TOOLS_HOLDER() { }
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Return the MVC controller.
|
* Return the MVC controller.
|
||||||
*/
|
*/
|
Loading…
Reference in New Issue