Browse Source

Move TOOLS_HOLDER into tools/ folder

Also clean up some compiler warnings
pull/16/head
Ian McInerney 6 years ago
parent
commit
e528769637
  1. 2
      3d-viewer/3d_cache/dialogs/panel_prev_3d.h
  2. 2
      3d-viewer/3d_canvas/board_adapter.h
  3. 2
      common/CMakeLists.txt
  4. 2
      common/tool/tools_holder.cpp
  5. 2
      include/eda_base_frame.h
  6. 2
      include/tool/tools_holder.h

2
3d-viewer/3d_cache/dialogs/panel_prev_3d.h

@ -39,7 +39,7 @@
#include "panel_prev_3d_base.h"
#include <vector>
#include <tools_holder.h>
#include <tool/tools_holder.h>
#include <3d_canvas/eda_3d_canvas.h>
#include <3d_viewer_id.h>
#include <3d_rendering/ctrack_ball.h>

2
3d-viewer/3d_canvas/board_adapter.h

@ -768,6 +768,8 @@ class EDA_3D_BOARD_HOLDER
public:
virtual BOARD_ADAPTER& GetAdapter() = 0;
virtual CCAMERA& GetCurrentCamera() = 0;
virtual ~EDA_3D_BOARD_HOLDER() {};
};
#endif // BOARD_ADAPTER_H

2
common/CMakeLists.txt

@ -331,7 +331,6 @@ set( COMMON_SRCS
status_popup.cpp
systemdirsappend.cpp
template_fieldnames.cpp
tools_holder.cpp
trace_helpers.cpp
undo_redo_container.cpp
utf8.cpp
@ -381,6 +380,7 @@ set( COMMON_SRCS
tool/tool_base.cpp
tool/tool_dispatcher.cpp
tool/tool_event.cpp
tool/tools_holder.cpp
tool/tool_interactive.cpp
tool/tool_manager.cpp
tool/tool_menu.cpp

2
common/tools_holder.cpp → common/tool/tools_holder.cpp

@ -26,8 +26,8 @@
#include <tool/action_manager.h>
#include <tool/action_menu.h>
#include <tool/actions.h>
#include <tool/tools_holder.h>
#include <tool/tool_manager.h>
#include <tools_holder.h>
TOOLS_HOLDER::TOOLS_HOLDER() :

2
include/eda_base_frame.h

@ -46,7 +46,7 @@
#include <frame_type.h>
#include <hotkeys_basic.h>
#include <kiway_holder.h>
#include <tools_holder.h>
#include <tool/tools_holder.h>
#include <widgets/ui_common.h>
// Option for main frames

2
include/tools_holder.h → include/tool/tools_holder.h

@ -66,6 +66,8 @@ protected:
public:
TOOLS_HOLDER();
virtual ~TOOLS_HOLDER() { }
/**
* Return the MVC controller.
*/
Loading…
Cancel
Save