haskal
/
kicad
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Cast TOOL_EVENT parameter type to intptr_t

This commit is contained in:
Gustav Bergquist 2016-09-21 21:22:19 +02:00 committed by Maciej Suminski
parent 0e32cc14c2
commit 061a7b8450
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pcbnew/tools/pcb_editor_control.cpp
View File

@ -21,6 +21,7 @@
* or you may write to the Free Software Foundation, Inc., * or you may write to the Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
*/ */
#include <cstdint>
#include "pcb_editor_control.h" #include "pcb_editor_control.h"
#include "common_actions.h" #include "common_actions.h"
@ -776,7 +777,7 @@ static bool highlightNet( TOOL_MANAGER* aToolMgr, const VECTOR2D& aPosition )
int PCB_EDITOR_CONTROL::HighlightNet( const TOOL_EVENT& aEvent ) int PCB_EDITOR_CONTROL::HighlightNet( const TOOL_EVENT& aEvent )
{ {
int netcode = aEvent.Parameter<long>(); int netcode = aEvent.Parameter<intptr_t>();
if( netcode > 0 ) if( netcode > 0 )
{ {

12
pcbnew/tools/pcbnew_control.cpp
View File

@ -22,6 +22,8 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
*/ */
#include <cstdint>
#include "pcbnew_control.h" #include "pcbnew_control.h"
#include "common_actions.h" #include "common_actions.h"
#include "selection_tool.h" #include "selection_tool.h"
@ -174,7 +176,7 @@ int PCBNEW_CONTROL::ZoomFitScreen( const TOOL_EVENT& aEvent )
int PCBNEW_CONTROL::ZoomPreset( const TOOL_EVENT& aEvent ) int PCBNEW_CONTROL::ZoomPreset( const TOOL_EVENT& aEvent )
{ {
unsigned int idx = aEvent.Parameter<long>(); unsigned int idx = aEvent.Parameter<intptr_t>();
std::vector<double>& zoomList = m_frame->GetScreen()->m_ZoomList; std::vector<double>& zoomList = m_frame->GetScreen()->m_ZoomList;
KIGFX::VIEW* view = m_frame->GetGalCanvas()->GetView(); KIGFX::VIEW* view = m_frame->GetGalCanvas()->GetView();
KIGFX::GAL* gal = m_frame->GetGalCanvas()->GetGAL(); KIGFX::GAL* gal = m_frame->GetGalCanvas()->GetGAL();
@ -332,7 +334,7 @@ int PCBNEW_CONTROL::HighContrastDec( const TOOL_EVENT& aEvent )
// Layer control // Layer control
int PCBNEW_CONTROL::LayerSwitch( const TOOL_EVENT& aEvent ) int PCBNEW_CONTROL::LayerSwitch( const TOOL_EVENT& aEvent )
{ {
m_frame->SwitchLayer( NULL, (LAYER_ID) aEvent.Parameter<long>() ); m_frame->SwitchLayer( NULL, (LAYER_ID) aEvent.Parameter<intptr_t>() );
return 0; return 0;
} }
@ -445,7 +447,7 @@ int PCBNEW_CONTROL::LayerAlphaDec( const TOOL_EVENT& aEvent )
// Cursor control // Cursor control
int PCBNEW_CONTROL::CursorControl( const TOOL_EVENT& aEvent ) int PCBNEW_CONTROL::CursorControl( const TOOL_EVENT& aEvent )
{ {
long type = aEvent.Parameter<long>(); long type = aEvent.Parameter<intptr_t>();
bool fastMove = type & COMMON_ACTIONS::CURSOR_FAST_MOVE; bool fastMove = type & COMMON_ACTIONS::CURSOR_FAST_MOVE;
type &= ~COMMON_ACTIONS::CURSOR_FAST_MOVE; type &= ~COMMON_ACTIONS::CURSOR_FAST_MOVE;
@ -552,7 +554,7 @@ int PCBNEW_CONTROL::CursorControl( const TOOL_EVENT& aEvent )
int PCBNEW_CONTROL::PanControl( const TOOL_EVENT& aEvent ) int PCBNEW_CONTROL::PanControl( const TOOL_EVENT& aEvent )
{ {
long type = aEvent.Parameter<long>(); long type = aEvent.Parameter<intptr_t>();
KIGFX::VIEW* view = getView(); KIGFX::VIEW* view = getView();
GRID_HELPER gridHelper( m_frame ); GRID_HELPER gridHelper( m_frame );
VECTOR2D center = view->GetCenter(); VECTOR2D center = view->GetCenter();
@ -674,7 +676,7 @@ int PCBNEW_CONTROL::GridResetOrigin( const TOOL_EVENT& aEvent )
int PCBNEW_CONTROL::GridPreset( const TOOL_EVENT& aEvent ) int PCBNEW_CONTROL::GridPreset( const TOOL_EVENT& aEvent )
{ {
long idx = aEvent.Parameter<long>(); long idx = aEvent.Parameter<intptr_t>();
m_frame->SetPresetGrid( idx ); m_frame->SetPresetGrid( idx );
updateGrid(); updateGrid();