Replace boost::function with std::function
This commit is contained in:
parent
7f56ff4d42
commit
9a07b03b4c
|
@ -28,7 +28,7 @@
|
||||||
#define EDIT_CONSTRAINTS_H_
|
#define EDIT_CONSTRAINTS_H_
|
||||||
|
|
||||||
#include <math/vector2d.h>
|
#include <math/vector2d.h>
|
||||||
#include <boost/function.hpp>
|
#include <functional>
|
||||||
|
|
||||||
class EDIT_POINT;
|
class EDIT_POINT;
|
||||||
class EDIT_LINE;
|
class EDIT_LINE;
|
||||||
|
@ -232,7 +232,7 @@ class EC_SNAPLINE : public EDIT_CONSTRAINT<EDIT_LINE>
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
///< Typedef for a function that determines snapping point.
|
///< Typedef for a function that determines snapping point.
|
||||||
typedef boost::function<VECTOR2D (const VECTOR2D&)> V2D_TRANSFORM_FUN;
|
typedef std::function<VECTOR2D( const VECTOR2D& )> V2D_TRANSFORM_FUN;
|
||||||
|
|
||||||
EC_SNAPLINE( EDIT_LINE& aLine, V2D_TRANSFORM_FUN aSnapFun );
|
EC_SNAPLINE( EDIT_LINE& aLine, V2D_TRANSFORM_FUN aSnapFun );
|
||||||
|
|
||||||
|
|
|
@ -26,7 +26,7 @@
|
||||||
#ifndef DIALOG_FIND_BASE_H
|
#ifndef DIALOG_FIND_BASE_H
|
||||||
#define DIALOG_FIND_BASE_H
|
#define DIALOG_FIND_BASE_H
|
||||||
|
|
||||||
#include <boost/function.hpp>
|
#include <functional>
|
||||||
#include <sys/types.h>
|
#include <sys/types.h>
|
||||||
#include <wx/event.h>
|
#include <wx/event.h>
|
||||||
#include <deque>
|
#include <deque>
|
||||||
|
@ -59,7 +59,7 @@ public:
|
||||||
* case where no item is found
|
* case where no item is found
|
||||||
* @param aCallback
|
* @param aCallback
|
||||||
*/
|
*/
|
||||||
void SetCallback( boost::function<void( BOARD_ITEM* )> aCallback )
|
void SetCallback( std::function<void( BOARD_ITEM* )> aCallback )
|
||||||
{
|
{
|
||||||
m_highlightCallback = aCallback;
|
m_highlightCallback = aCallback;
|
||||||
}
|
}
|
||||||
|
@ -71,7 +71,7 @@ private:
|
||||||
std::deque<BOARD_ITEM*>::iterator m_it;
|
std::deque<BOARD_ITEM*>::iterator m_it;
|
||||||
bool m_upToDate;
|
bool m_upToDate;
|
||||||
|
|
||||||
boost::function<void( BOARD_ITEM* )> m_highlightCallback;
|
std::function<void( BOARD_ITEM* )> m_highlightCallback;
|
||||||
|
|
||||||
void onTextEnter( wxCommandEvent& event ) override;
|
void onTextEnter( wxCommandEvent& event ) override;
|
||||||
void onFindNextClick( wxCommandEvent& event ) override;
|
void onFindNextClick( wxCommandEvent& event ) override;
|
||||||
|
|
Loading…
Reference in New Issue