From: James Turner <zakalawe@mac.com>
Date: Mon, 9 Aug 2010 08:40:20 +0000 (+0100)
Subject: Even more std::string fixes.
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=025b94f09950de6afecf2097d921c7735c16d35d;p=flightgear.git

Even more std::string fixes.
---

diff --git a/src/Input/FGButton.cxx b/src/Input/FGButton.cxx
index cb03aeac4..63a679d79 100644
--- 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 6ab5347a0..675f969d2 100644
--- 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 575ab5402..046ce8264 100644
--- 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