fly/flightgear
1
0
Fork 0
Code Activity

Fix 'using std::' abuses

Browse source
This commit is contained in:
James Turner 2010-08-09 08:36:20 +01:00
parent 3e03f879a7
commit 19360a8425
6 changed files with 7 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/GUI/dialog.hxx
View file

@ -161,7 +161,7 @@ private:
bool _needsRelayout; bool _needsRelayout;
// Nasal module. // Nasal module.
string _module; std::string _module;
SGPropertyNode_ptr _nasal_close; SGPropertyNode_ptr _nasal_close;
// PUI provides no way for userdata to be deleted automatically // PUI provides no way for userdata to be deleted automatically
@ -173,7 +173,7 @@ private:
PropertyObject (const char * name, PropertyObject (const char * name,
puObject * object, puObject * object,
SGPropertyNode_ptr node); SGPropertyNode_ptr node);
string name; std::string name;
puObject * object; puObject * object;
SGPropertyNode_ptr node; SGPropertyNode_ptr node;
}; };

3
src/Input/FGDeviceConfigurationMap.hxx
View file

@ -33,9 +33,8 @@
#include <simgear/misc/sg_path.hxx> #include <simgear/misc/sg_path.hxx>
#include <map> #include <map>
using std::map;
class FGDeviceConfigurationMap : public map<string,SGPropertyNode_ptr> { class FGDeviceConfigurationMap : public std::map<std::string,SGPropertyNode_ptr> {
public: public:
FGDeviceConfigurationMap ( const char * relative_path, SGPropertyNode_ptr base, const char * childname ); FGDeviceConfigurationMap ( const char * relative_path, SGPropertyNode_ptr base, const char * childname );
virtual ~FGDeviceConfigurationMap(); virtual ~FGDeviceConfigurationMap();

2
src/Model/model_panel.cxx
View file

@ -28,7 +28,7 @@ using namespace simgear;
//////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////
osg::Node * 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); osg::Node* node = SGModelLib::loadModel(path, prop_root);
if (node) if (node)

2
src/Model/model_panel.hxx
View file

@ -45,7 +45,7 @@ class FGLocation;
* Subsystems should not normally invoke this function directly; * Subsystems should not normally invoke this function directly;
* instead, they should use the SGModelLoader declared in loader.hxx. * 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 #endif // __MODEL_HXX

2
src/Navaids/awynet.cxx
View file

@ -37,7 +37,7 @@
#include "awynet.hxx" #include "awynet.hxx"
using std::sort; using std::sort;
using std::string;
using std::cerr; using std::cerr;
using std::endl; using std::endl;

2
src/Navaids/fixlist.cxx
View file

@ -66,7 +66,7 @@ bool FGFixList::init(const SGPath& path ) {
// read in each remaining line of the file // read in each remaining line of the file
while ( ! in.eof() ) { while ( ! in.eof() ) {
double lat, lon; double lat, lon;
string ident; std::string ident;
in >> lat >> lon >> ident; in >> lat >> lon >> ident;
if (lat > 95) break; if (lat > 95) break;