From 19360a84254bb0393c012ec85dbf96f2ae35cd83 Mon Sep 17 00:00:00 2001
From: James Turner <zakalawe@mac.com>
Date: Mon, 9 Aug 2010 08:36:20 +0100
Subject: [PATCH] Fix 'using std::' abuses

---
 src/GUI/dialog.hxx                     | 4 ++--
 src/Input/FGDeviceConfigurationMap.hxx | 3 +--
 src/Model/model_panel.cxx              | 2 +-
 src/Model/model_panel.hxx              | 2 +-
 src/Navaids/awynet.cxx                 | 2 +-
 src/Navaids/fixlist.cxx                | 2 +-
 6 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/src/GUI/dialog.hxx b/src/GUI/dialog.hxx
index e08dbe75a..090ef2bbc 100644
--- a/src/GUI/dialog.hxx
+++ b/src/GUI/dialog.hxx
@@ -161,7 +161,7 @@ private:
     bool _needsRelayout;
 
     // Nasal module.
-    string _module;
+    std::string _module;
     SGPropertyNode_ptr _nasal_close;
 
     // PUI provides no way for userdata to be deleted automatically
@@ -173,7 +173,7 @@ private:
         PropertyObject (const char * name,
                         puObject * object,
                         SGPropertyNode_ptr node);
-        string name;
+        std::string name;
         puObject * object;
         SGPropertyNode_ptr node;
     };
diff --git a/src/Input/FGDeviceConfigurationMap.hxx b/src/Input/FGDeviceConfigurationMap.hxx
index 27a3a8a14..e89addc96 100644
--- a/src/Input/FGDeviceConfigurationMap.hxx
+++ b/src/Input/FGDeviceConfigurationMap.hxx
@@ -33,9 +33,8 @@
 #include <simgear/misc/sg_path.hxx>
 
 #include <map>
-using std::map;
 
-class FGDeviceConfigurationMap : public map<string,SGPropertyNode_ptr> {
+class FGDeviceConfigurationMap : public std::map<std::string,SGPropertyNode_ptr> {
 public:
   FGDeviceConfigurationMap ( const char * relative_path, SGPropertyNode_ptr base, const char * childname );
   virtual ~FGDeviceConfigurationMap();
diff --git a/src/Model/model_panel.cxx b/src/Model/model_panel.cxx
index b18d1f164..8a2ec9b2f 100644
--- a/src/Model/model_panel.cxx
+++ b/src/Model/model_panel.cxx
@@ -28,7 +28,7 @@ using namespace simgear;
 ////////////////////////////////////////////////////////////////////////
 
 osg::Node *
-fgLoad3DModelPanel(const string &path, SGPropertyNode *prop_root)
+fgLoad3DModelPanel(const std::string &path, SGPropertyNode *prop_root)
 {
     osg::Node* node = SGModelLib::loadModel(path, prop_root);
     if (node)
diff --git a/src/Model/model_panel.hxx b/src/Model/model_panel.hxx
index dcf41dd95..301f770c8 100644
--- a/src/Model/model_panel.hxx
+++ b/src/Model/model_panel.hxx
@@ -45,7 +45,7 @@ class FGLocation;
  * Subsystems should not normally invoke this function directly;
  * instead, they should use the SGModelLoader declared in loader.hxx.
  */
-osg::Node *fgLoad3DModelPanel( const string &path, SGPropertyNode *prop_root);
+osg::Node *fgLoad3DModelPanel( const std::string &path, SGPropertyNode *prop_root);
 
 
 #endif // __MODEL_HXX
diff --git a/src/Navaids/awynet.cxx b/src/Navaids/awynet.cxx
index 5176134c0..4432c8d71 100755
--- a/src/Navaids/awynet.cxx
+++ b/src/Navaids/awynet.cxx
@@ -37,7 +37,7 @@
 #include "awynet.hxx"
 
 using std::sort;
-
+using std::string;
 using std::cerr;
 using std::endl;
 
diff --git a/src/Navaids/fixlist.cxx b/src/Navaids/fixlist.cxx
index f9fc37a5d..835a2b1b5 100644
--- a/src/Navaids/fixlist.cxx
+++ b/src/Navaids/fixlist.cxx
@@ -66,7 +66,7 @@ bool FGFixList::init(const SGPath& path ) {
     // read in each remaining line of the file
     while ( ! in.eof() ) {
       double lat, lon;
-      string ident;
+      std::string ident;
       in >> lat >> lon >> ident;
       if (lat > 95) break;
 
-- 
2.39.5