Even more std::string fixes.

diff --git a/src/Input/FGButton.cxx b/src/Input/FGButton.cxx
index cb03aeac4f1a158333292781e2cf68638b1a9159..63a679d79e02f74cd3b7919af1617c69d6a1cb24 100644 (file)
--- a/src/Input/FGButton.cxx
+++ b/src/Input/FGButton.cxx
@@ -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) {
     SG_LOG(SG_INPUT, SG_DEBUG, "No bindings for button " << name);

diff --git a/src/Input/FGButton.hxx b/src/Input/FGButton.hxx
index 6ab5347a00c68d691b89aea3f8582abb2bb56937..675f969d29ac5f254d5b60b93ecbf1526ffb9a1b 100644 (file)
--- a/src/Input/FGButton.hxx
+++ b/src/Input/FGButton.hxx
@@ -32,7 +32,7 @@ class FGButton : public FGCommonInput {
 public:
   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);
   bool is_repeatable;
   float interval_sec;

diff --git a/src/Input/FGCommonInput.hxx b/src/Input/FGCommonInput.hxx
index 575ab5402451a3dda8a3f2c1b3647980c04a41b9..046ce8264c8355315574b972ee6f4ab87e3d9fb8 100644 (file)
--- a/src/Input/FGCommonInput.hxx
+++ b/src/Input/FGCommonInput.hxx
@@ -39,14 +39,14 @@
 
 class FGCommonInput {
 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 
    vector of SGBinding supplied in binding_list. Reads all the mod-xxx bindings and 
    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