From 6798c269232552617cd7e272c85645ddfb851169 Mon Sep 17 00:00:00 2001
From: Chris Laurel <claurel@gmail.com>
Date: Wed, 8 Aug 2001 23:55:30 +0000
Subject: [PATCH] Add std:: namespace indicator to all uses of string

---
 src/celestiacore.h | 4 ++--
 src/command.h      | 2 +-
 src/meshmanager.h  | 6 +++---
 src/render.h       | 4 ++--
 src/simulation.h   | 4 ++--
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/celestiacore.h b/src/celestiacore.h
index b11d629a9..110952524 100644
--- a/src/celestiacore.h
+++ b/src/celestiacore.h
@@ -85,14 +85,14 @@ class CelestiaCore
 
     void writeFavoritesFile();
     void activateFavorite(FavoritesEntry&);
-    void addFavorite(string);
+    void addFavorite(std::string);
     const FavoritesList* getFavorites();
 
     void setContextMenuCallback(ContextMenuFunc);
 
  private:
     void cancelScript();
-    bool readStars(std::string, std::string);
+    bool readStars(const CelestiaConfig&);
     void setFaintest(float);
     void renderOverlay();
 
diff --git a/src/command.h b/src/command.h
index e1812a40d..f794f2d2a 100644
--- a/src/command.h
+++ b/src/command.h
@@ -70,7 +70,7 @@ class CommandSelect : public InstantaneousCommand
     void process(ExecutionEnvironment&);
 
  private:
-    string target;
+    std::string target;
 };
 
 
diff --git a/src/meshmanager.h b/src/meshmanager.h
index 25fe9db00..46b932885 100644
--- a/src/meshmanager.h
+++ b/src/meshmanager.h
@@ -20,12 +20,12 @@ class MeshManager : public ResourceManager
 {
  public:
     MeshManager() : ResourceManager() {};
-    MeshManager(string _baseDir) : ResourceManager(_baseDir) {};
+    MeshManager(std::string _baseDir) : ResourceManager(_baseDir) {};
     MeshManager(char* _baseDir) : ResourceManager(_baseDir) {};
     ~MeshManager();
 
-    bool find(const string& name, Mesh**);
-    Mesh* load(const string& name);
+    bool find(const std::string& name, Mesh**);
+    Mesh* load(const std::string& name);
 };
 
 #endif // _MESHMANAGER_H_
diff --git a/src/render.h b/src/render.h
index 008ca3727..26e2ef402 100644
--- a/src/render.h
+++ b/src/render.h
@@ -86,12 +86,12 @@ class Renderer
     void showAsterisms(AsterismList*);
 
     typedef struct {
-        string text;
+        std::string text;
         Color color;
         Point3f position;
     } Label;
 
-    void addLabel(string, Color, Point3f);
+    void addLabel(std::string, Color, Point3f);
     void clearLabels();
 
     void setFont(TextureFont*);
diff --git a/src/simulation.h b/src/simulation.h
index c609a2e73..068f89fa4 100644
--- a/src/simulation.h
+++ b/src/simulation.h
@@ -57,8 +57,8 @@ class Simulation
     void selectStar(uint32);
     void selectPlanet(int);
     UniversalCoord getSelectionPosition(Selection& sel, double when);
-    Selection findObject(string s);
-    Selection findObjectFromPath(string s);
+    Selection findObject(std::string s);
+    Selection findObjectFromPath(std::string s);
     void gotoSelection(double gotoTime,
                        Vec3f up, astro::CoordinateSystem upFrame);
     void gotoSelection(double gotoTime, double distance,