diff --git a/3d-viewer/3d_cache/dialogs/panel_prev_model.cpp b/3d-viewer/3d_cache/dialogs/panel_prev_model.cpp index ec483e982d..4333d2efae 100644 --- a/3d-viewer/3d_cache/dialogs/panel_prev_model.cpp +++ b/3d-viewer/3d_cache/dialogs/panel_prev_model.cpp @@ -123,9 +123,7 @@ PANEL_PREV_3D::PANEL_PREV_3D( wxWindow* aParent, S3D_CACHE* aCacheManager ) : zoff = NULL; wxBoxSizer* mainBox = new wxBoxSizer( wxVERTICAL ); - - wxStaticBoxSizer* vbox = new wxStaticBoxSizer( wxVERTICAL, this, _( "3D Model Orientation" ) ); - + wxStaticBoxSizer* vbox = new wxStaticBoxSizer( wxVERTICAL, this, _( "3D Preview" ) ); m_FileTree = NULL; if( NULL != aParent ) diff --git a/3d-viewer/common_ogl/cogl_att_list.cpp b/3d-viewer/common_ogl/cogl_att_list.cpp index abae8ffe35..4254e0aae3 100644 --- a/3d-viewer/common_ogl/cogl_att_list.cpp +++ b/3d-viewer/common_ogl/cogl_att_list.cpp @@ -56,7 +56,8 @@ const int COGL_ATT_LIST::m_openGL_AttributesList[] = { int COGL_ATT_LIST::m_openGL_AttributesList_toUse[ - sizeof( COGL_ATT_LIST::m_openGL_AttributesList )] = { 0 }; + sizeof( COGL_ATT_LIST::m_openGL_AttributesList ) / + sizeof( COGL_ATT_LIST::m_openGL_AttributesList[0] ) ] = { 0 }; const int *COGL_ATT_LIST::GetAttributesList( bool aUseAntiAliasing ) diff --git a/include/plugins/3d/3d_plugin.h b/include/plugins/3d/3d_plugin.h index 60f0f99661..935dc79a33 100644 --- a/include/plugins/3d/3d_plugin.h +++ b/include/plugins/3d/3d_plugin.h @@ -43,7 +43,7 @@ #define REVISION 0 #define PATCH 0 -#include "../kicad_plugin.h" +#include "plugins/kicad_plugin.h" KICAD_PLUGIN_EXPORT char const* GetKicadPluginClass( void ) diff --git a/include/plugins/3dapi/ifsg_colors.h b/include/plugins/3dapi/ifsg_colors.h index dd24af9560..e93b3cb627 100644 --- a/include/plugins/3dapi/ifsg_colors.h +++ b/include/plugins/3dapi/ifsg_colors.h @@ -35,7 +35,7 @@ /** - * Class IFSG_INDEX + * Class IFSG_COLORS * is the wrapper for SGCOLORS */ class SGLIB_API IFSG_COLORS : public IFSG_NODE diff --git a/include/plugins/3dapi/ifsg_coords.h b/include/plugins/3dapi/ifsg_coords.h index 8eba8df502..428681f82a 100644 --- a/include/plugins/3dapi/ifsg_coords.h +++ b/include/plugins/3dapi/ifsg_coords.h @@ -34,7 +34,7 @@ /** - * Class IFSG_INDEX + * Class IFSG_COORDS * is the wrapper for SGCOORDS */ class SGLIB_API IFSG_COORDS : public IFSG_NODE diff --git a/include/plugins/3dapi/ifsg_node.h b/include/plugins/3dapi/ifsg_node.h index 30847ea4cd..6b3641ee2a 100644 --- a/include/plugins/3dapi/ifsg_node.h +++ b/include/plugins/3dapi/ifsg_node.h @@ -53,14 +53,6 @@ class SGNODE; */ class SGLIB_API IFSG_NODE { -private: - // hide the copy constructors and assignment operator to avoid accidental misuse - IFSG_NODE( const IFSG_NODE& aParent ); - IFSG_NODE( IFSG_NODE& aParent ); - IFSG_NODE( volatile const IFSG_NODE& aParent ); - IFSG_NODE( volatile IFSG_NODE& aParent ); - IFSG_NODE& operator= ( const IFSG_NODE& ); - protected: SGNODE* m_node; @@ -68,6 +60,13 @@ public: IFSG_NODE(); virtual ~IFSG_NODE(); + // deleted operators + IFSG_NODE( const IFSG_NODE& aParent ) = delete; + IFSG_NODE( IFSG_NODE& aParent ) = delete; + IFSG_NODE( volatile const IFSG_NODE& aParent ) = delete; + IFSG_NODE( volatile IFSG_NODE& aParent ) = delete; + IFSG_NODE& operator= ( const IFSG_NODE& ) = delete; + /** * Function Destroy * deletes the object held by this wrapper