Even more std::string fixes.
This commit is contained in:
parent
f467ba3609
commit
025b94f099
3 changed files with 4 additions and 4 deletions
|
@ -45,7 +45,7 @@ FGButton::~FGButton ()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
void FGButton::init( const SGPropertyNode * node, const string name, string & module )
|
void FGButton::init( const SGPropertyNode * node, const std::string name, std::string & module )
|
||||||
{
|
{
|
||||||
if (node == 0) {
|
if (node == 0) {
|
||||||
SG_LOG(SG_INPUT, SG_DEBUG, "No bindings for button " << name);
|
SG_LOG(SG_INPUT, SG_DEBUG, "No bindings for button " << name);
|
||||||
|
|
|
@ -32,7 +32,7 @@ class FGButton : public FGCommonInput {
|
||||||
public:
|
public:
|
||||||
FGButton();
|
FGButton();
|
||||||
virtual ~FGButton();
|
virtual ~FGButton();
|
||||||
void init( const SGPropertyNode * node, const string name, string & module );
|
void init( const SGPropertyNode * node, const std::string name, std::string & module );
|
||||||
void update( int modifiers, bool pressed, int x = -1, int y = -1);
|
void update( int modifiers, bool pressed, int x = -1, int y = -1);
|
||||||
bool is_repeatable;
|
bool is_repeatable;
|
||||||
float interval_sec;
|
float interval_sec;
|
||||||
|
|
|
@ -39,14 +39,14 @@
|
||||||
|
|
||||||
class FGCommonInput {
|
class FGCommonInput {
|
||||||
public:
|
public:
|
||||||
typedef vector<SGSharedPtr<SGBinding> > binding_list_t;
|
typedef std::vector<SGSharedPtr<SGBinding> > binding_list_t;
|
||||||
|
|
||||||
/*
|
/*
|
||||||
read all "binding" nodes directly under the specified base node and fill the
|
read all "binding" nodes directly under the specified base node and fill the
|
||||||
vector of SGBinding supplied in binding_list. Reads all the mod-xxx bindings and
|
vector of SGBinding supplied in binding_list. Reads all the mod-xxx bindings and
|
||||||
add the corresponding SGBindings.
|
add the corresponding SGBindings.
|
||||||
*/
|
*/
|
||||||
static void read_bindings (const SGPropertyNode * base, binding_list_t * binding_list, int modifiers, const string & module );
|
static void read_bindings (const SGPropertyNode * base, binding_list_t * binding_list, int modifiers, const std::string & module );
|
||||||
};
|
};
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
Loading…
Reference in a new issue