Add std:: namespace indicator to all uses of string

This commit is contained in:
Chris Laurel 2001-08-08 23:55:30 +00:00
parent 05ee7bef2d
commit 6798c26923
5 changed files with 10 additions and 10 deletions

View file

@ -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();

View file

@ -70,7 +70,7 @@ class CommandSelect : public InstantaneousCommand
void process(ExecutionEnvironment&);
private:
string target;
std::string target;
};

View file

@ -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_

View file

@ -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*);

View file

@ -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,