1
0
Fork 0

Remove unnecessary includes/using

flight.hxx (FGInterface) was pulling in list, string and vector, and
'using' them, despite no actual need.
This commit is contained in:
James Turner 2013-07-29 22:59:45 +01:00
parent 77768e2698
commit cff6b2034d
5 changed files with 10 additions and 18 deletions

View file

@ -38,7 +38,7 @@ private:
int data_in_port;
int data_out_port;
int cmd_port;
string fdm_host;
std::string fdm_host;
simgear::Socket data_client;
simgear::Socket data_server;
@ -51,7 +51,7 @@ private:
public:
// Constructor
FGExternalNet( double dt, string host, int dop, int dip, int cp );
FGExternalNet( double dt, std::string host, int dop, int dip, int cp );
// Destructor
~FGExternalNet();

View file

@ -38,11 +38,11 @@ private:
bool valid;
string fifo_name_1;
string fifo_name_2;
std::string fifo_name_1;
std::string fifo_name_2;
FILE *pd1;
FILE *pd2;
string _protocol;
std::string _protocol;
FGNetCtrls ctrls;
FGNetFDM fdm;
@ -51,8 +51,8 @@ private:
double last_weight;
double last_cg_offset;
vector <string> property_names;
vector <SGPropertyNode_ptr> nodes;
std::vector <std::string> property_names;
std::vector <SGPropertyNode_ptr> nodes;
// Protocol specific init routines
void init_binary();
@ -66,7 +66,7 @@ private:
public:
// Constructor
FGExternalPipe( double dt, string fifo_name, string protocol );
FGExternalPipe( double dt, std::string fifo_name, std::string protocol );
// Destructor
~FGExternalPipe();

View file

@ -200,7 +200,7 @@ FGInterface::common_init ()
if ( !fgHasNode("/sim/presets/speed-set") ) {
set_V_calibrated_kts(0.0);
} else {
const string speedset = fgGetString("/sim/presets/speed-set");
const std::string speedset = fgGetString("/sim/presets/speed-set");
if ( speedset == "knots" || speedset == "KNOTS" ) {
set_V_calibrated_kts( fgGetDouble("/sim/presets/airspeed-kt") );
} else if ( speedset == "mach" || speedset == "MACH" ) {

View file

@ -75,20 +75,12 @@
#include <math.h>
#include <list>
#include <vector>
#include <string>
#include <simgear/compiler.h>
#include <simgear/constants.h>
#include <simgear/structure/subsystem_mgr.hxx>
#include <simgear/props/tiedpropertylist.hxx>
#include <FDM/groundcache.hxx>
using std::list;
using std::vector;
using std::string;
namespace simgear {
class BVHMaterial;
}

View file

@ -843,7 +843,7 @@ static bool
do_property_cycle (const SGPropertyNode * arg)
{
SGPropertyNode * prop = get_prop(arg);
vector<SGPropertyNode_ptr> values = arg->getChildren("value");
std::vector<SGPropertyNode_ptr> values = arg->getChildren("value");
bool wrap = arg->getBoolValue("wrap", true);
// compatible with knob/pick animations