fly/flightgear
1
0
Fork 0
Code Activity

- remove the SG_GLxxxx_H #defines, since OSG provides its own versions

Browse source 
- this exposed a bizarre issue on Mac where dragging in <AGL/agl.h> in
   extensions.hxx was pulling in all of Carbon to the global namespace
   - very scary. As a result, I now need to explicitly include CoreFoundation
   in fg_init.cxx.
 - change SG_USING_STD(x) to using std::x
This commit is contained in:
ehofman 2008-07-27 16:25:13 +00:00
parent 967bf101ef
commit 667e64e1eb
173 changed files with 348 additions and 334 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/AIModel/AIAircraft.cxx
View file

@ -40,7 +40,7 @@
# include <ieeefp.h>
#endif
SG_USING_STD(string);
using std::string;
#include "AIAircraft.hxx"
#include "performancedata.hxx"

2
src/AIModel/AIAircraft.hxx
View file

@ -28,7 +28,7 @@
#include <Traffic/Schedule.hxx>
#include <string>
SG_USING_STD(string);
using std::string;
class PerformanceData;

4
src/AIModel/AIBallistic.hxx
View file

@ -31,8 +31,8 @@
#include "AIManager.hxx"
#include "AIBase.hxx"
SG_USING_STD(vector);
SG_USING_STD(list);
using std::vector;
using std::list;
class FGAIBallistic : public FGAIBase {

4
src/AIModel/AIBase.hxx
View file

@ -34,8 +34,8 @@
#include <Main/fg_props.hxx>
SG_USING_STD(string);
SG_USING_STD(list);
using std::string;
using std::list;
class FGAIManager;
class FGAIFlightPlan;

4
src/AIModel/AICarrier.hxx
View file

@ -29,8 +29,8 @@
#include <simgear/compiler.h>
SG_USING_STD(string);
SG_USING_STD(list);
using std::string;
using std::list;
#include "AIShip.hxx"

4
src/AIModel/AIFlightPlan.hxx
View file

@ -29,8 +29,8 @@
#include "AIBase.hxx"
SG_USING_STD(vector);
SG_USING_STD(string);
using std::vector;
using std::string;
class FGAIFlightPlan {

2
src/AIModel/AIFlightPlanCreateCruise.cxx
View file

@ -31,7 +31,7 @@
#include <Environment/environment_mgr.hxx>
#include <Environment/environment.hxx>
SG_USING_STD(iostream);
using std::iostream;
void FGAIFlightPlan::evaluateRoutePart(double deplat,
double deplon,

2
src/AIModel/AIManager.hxx
View file

@ -36,7 +36,7 @@
#include <Traffic/SchedFlight.hxx>
#include <Traffic/Schedule.hxx>
SG_USING_STD(list);
using std::list;
class FGAIThermal;

2
src/AIModel/AIStatic.cxx
View file

@ -29,7 +29,7 @@
#include <string>
#include <math.h>
SG_USING_STD(string);
using std::string;
#include "AIStatic.hxx"

2
src/AIModel/AIStatic.hxx
View file

@ -25,7 +25,7 @@
#include "AIBase.hxx"
#include <string>
SG_USING_STD(string);
using std::string;
class FGAIStatic : public FGAIBase {

2
src/AIModel/AIStorm.cxx
View file

@ -31,7 +31,7 @@
#include <cstdlib>
#include <time.h>
SG_USING_STD(string);
using std::string;
#include "AIStorm.hxx"

2
src/AIModel/AIStorm.hxx
View file

@ -25,7 +25,7 @@
#include "AIBase.hxx"
#include <string>
SG_USING_STD(string);
using std::string;
class FGAIStorm : public FGAIBase {

2
src/AIModel/AIThermal.cxx
View file

@ -29,7 +29,7 @@
#include <string>
#include <math.h>
SG_USING_STD(string);
using std::string;
#include "AIThermal.hxx"

2
src/AIModel/AIThermal.hxx
View file

@ -25,7 +25,7 @@
#include "AIBase.hxx"
#include <string>
SG_USING_STD(string);
using std::string;
class FGAIThermal : public FGAIBase {

6
src/AIModel/submodel.hxx
View file

@ -19,9 +19,9 @@
#include <Main/fg_props.hxx>
SG_USING_STD(vector);
SG_USING_STD(string);
SG_USING_STD(list);
using std::vector;
using std::string;
using std::list;
class FGAIBase;

4
src/ATC/trafficcontrol.hxx
View file

@ -35,8 +35,8 @@
#include <string>
#include <vector>
SG_USING_STD(string);
SG_USING_STD(vector);
using std::string;
using std::vector;
typedef vector<int> intVec;

2
src/ATCDCL/AIGAVFRTraffic.cxx
View file

@ -29,7 +29,7 @@
#include <string>
#include <math.h>
SG_USING_STD(string);
using std::string;
#include "ATC.hxx"
#include "ATCmgr.hxx"

2
src/ATCDCL/AIGAVFRTraffic.hxx
View file

@ -28,7 +28,7 @@
#include "AILocalTraffic.hxx"
#include <string>
SG_USING_STD(string);
using std::string;
class FGAIGAVFRTraffic : public FGAILocalTraffic {

2
src/ATCDCL/AILocalTraffic.cxx
View file

@ -47,7 +47,7 @@ during descent to avoid occasionally landing short or long.
#include <string>
#include <math.h>
SG_USING_STD(string);
using std::string;
#include "ATCmgr.hxx"
#include "AILocalTraffic.hxx"

2
src/ATCDCL/AILocalTraffic.hxx
View file

@ -34,7 +34,7 @@ class FGTower;
struct Gate;
#include <string>
SG_USING_STD(string);
using std::string;
enum TaxiState {
TD_INBOUND,

4
src/ATCDCL/AIMgr.cxx
View file

@ -46,8 +46,8 @@
#include "ATCutils.hxx"
#include "commlist.hxx"
SG_USING_STD(list);
SG_USING_STD(cout);
using std::list;
using std::cout;
using namespace simgear;

2
src/ATCDCL/AIMgr.hxx
View file

@ -31,7 +31,7 @@
#include "ATCmgr.hxx"
#include "AIEntity.hxx"
SG_USING_STD(list);
using std::list;
class FGAIMgr : public SGSubsystem

2
src/ATCDCL/AIPlane.cxx
View file

@ -25,7 +25,7 @@
#include <simgear/sound/soundmgr_openal.hxx>
#include <math.h>
#include <string>
SG_USING_STD(string);
using std::string;
#include "AIPlane.hxx"

6
src/ATCDCL/ATC.hxx
View file

@ -35,9 +35,9 @@
#include "ATCVoice.hxx"
SG_USING_STD(ostream);
SG_USING_STD(string);
SG_USING_STD(ios);
using std::ostream;
using std::string;
using std::ios;
enum plane_type {
UNKNOWN,

2
src/ATCDCL/ATCDialog.cxx
View file

@ -39,7 +39,7 @@
#include <sstream>
SG_USING_STD(ostringstream);
using std::ostringstream;
FGATCDialog *current_atcdialog;

4
src/ATCDCL/ATCDialog.hxx
View file

@ -28,8 +28,8 @@
#include "ATC.hxx"
SG_USING_STD(vector);
SG_USING_STD(map);
using std::vector;
using std::map;
class NewGUI;

6
src/ATCDCL/ATCVoice.hxx
View file

@ -30,9 +30,9 @@
#include <simgear/sound/sample_openal.hxx>
SG_USING_STD(map);
SG_USING_STD(list);
SG_USING_STD(string);
using std::map;
using std::list;
using std::string;
struct WordData {

6
src/ATCDCL/ATCmgr.hxx
View file

@ -34,9 +34,9 @@
#include "tower.hxx"
#include "approach.hxx"
SG_USING_STD(string);
SG_USING_STD(list);
SG_USING_STD(map);
using std::string;
using std::list;
using std::map;
// Structure for holding details of the ATC frequencies at a given airport, and whether they are in the active list or not.
// These can then be cross referenced with the commlists which are stored by frequency or bucket.

2
src/ATCDCL/ATCutils.hxx
View file

@ -24,7 +24,7 @@
#include <math.h>
#include <simgear/math/point3d.hxx>
#include <string>
SG_USING_STD(string);
using std::string;
// These are defined here because I had a problem with SG_DEGREES_TO_RADIANS
#define DCL_PI 3.1415926535f

4
src/ATCDCL/atis.cxx
View file

@ -29,10 +29,10 @@
#include <stdlib.h> // atoi()
#include <stdio.h> // sprintf
#include <string>
SG_USING_STD(string);
using std::string;
#include <iostream>
SG_USING_STD(cout);
using std::cout;
#include <simgear/misc/sg_path.hxx>

8
src/ATCDCL/commlist.hxx
View file

@ -44,10 +44,10 @@
#include "ATC.hxx"
#include "atis.hxx"
SG_USING_STD(list);
SG_USING_STD(map);
SG_USING_STD(vector);
SG_USING_STD(string);
using std::list;
using std::map;
using std::vector;
using std::string;
// A list of ATC stations
typedef list < ATCData > comm_list_type;

4
src/ATCDCL/ground.cxx
View file

@ -37,8 +37,8 @@
#include "AILocalTraffic.hxx"
#include "ATCmgr.hxx"
SG_USING_STD(ifstream);
SG_USING_STD(cout);
using std::ifstream;
using std::cout;
node::node() {
}

2
src/ATCDCL/tower.cxx
View file

@ -48,7 +48,7 @@
#include "AILocalTraffic.hxx"
SG_USING_STD(cout);
using std::cout;
// TowerPlaneRec

4
src/ATCDCL/transmissionlist.hxx
View file

@ -34,8 +34,8 @@
#include "ATC.hxx"
#include "transmission.hxx"
SG_USING_STD(map);
SG_USING_STD(vector);
using std::map;
using std::vector;
class FGTransmissionList {

2
src/Aircraft/replay.hxx
View file

@ -39,7 +39,7 @@
#include <Network/net_ctrls.hxx>
#include <Network/net_fdm.hxx>
SG_USING_STD(deque);
using std::deque;
class FGReplayData {

2
src/Airports/apt_loader.hxx
View file

@ -34,7 +34,7 @@
#include <string>
SG_USING_STD(string);
using std::string;
#include "simple.hxx"
#include "runways.hxx"

6
src/Airports/calc_loc.cxx
View file

@ -17,9 +17,9 @@
#include <simgear/math/sg_geodesy.hxx>
SG_USING_STD(string);
SG_USING_STD(cout);
SG_USING_STD(endl);
using std::string;
using std::cout;
using std::endl;
int main( int argc, char **argv ) {

8
src/Airports/dynamics.cxx
View file

@ -43,10 +43,10 @@
#include <string>
#include <vector>
SG_USING_STD(string);
SG_USING_STD(vector);
SG_USING_STD(sort);
SG_USING_STD(random_shuffle);
using std::string;
using std::vector;
using std::sort;
using std::random_shuffle;
#include "simple.hxx"
#include "dynamics.hxx"

2
src/Airports/gnnode.cxx
View file

@ -2,7 +2,7 @@
#include "groundnetwork.hxx"
#include <algorithm>
SG_USING_STD(sort);
using std::sort;
/*****************************************************************************
* Helper function for parsing position string

4
src/Airports/gnnode.hxx
View file

@ -20,8 +20,8 @@
#include <string>
#include <simgear/compiler.h>
SG_USING_STD(string);
SG_USING_STD(vector);
using std::string;
using std::vector;
class FGTaxiSegment;
typedef vector<FGTaxiSegment*> FGTaxiSegmentVector;

4
src/Airports/groundnetwork.hxx
View file

@ -30,8 +30,8 @@
#include <string>
#include <vector>
SG_USING_STD(string);
SG_USING_STD(vector);
using std::string;
using std::vector;
#include "gnnode.hxx"
#include "parking.hxx"

4
src/Airports/parking.hxx
View file

@ -36,8 +36,8 @@
#include "gnnode.hxx"
SG_USING_STD(string);
SG_USING_STD(vector);
using std::string;
using std::vector;
class FGTaxiRoute;

2
src/Airports/runwayprefloader.hxx
View file

@ -24,7 +24,7 @@
#include "runwayprefs.hxx"
SG_USING_STD(string);
using std::string;
class FGRunwayPreferenceXMLLoader : public XMLVisitor {
public:

4
src/Airports/runwayprefs.hxx
View file

@ -30,8 +30,8 @@
#include <simgear/compiler.h>
SG_USING_STD(vector);
SG_USING_STD(string);
using std::vector;
using std::string;
typedef vector<time_t> timeVec;
typedef vector<time_t>::const_iterator timeVecConstIterator;

4
src/Airports/runways.cxx
View file

@ -38,8 +38,8 @@
#include "runways.hxx"
SG_USING_STD(istream);
SG_USING_STD(multimap);
using std::istream;
using std::multimap;
// add an entry to the list

4
src/Airports/runways.hxx
View file

@ -39,8 +39,8 @@
#include <string>
#include <map>
SG_USING_STD(string);
SG_USING_STD(multimap);
using std::string;
using std::multimap;
struct ltstr {

4
src/Airports/simple.cxx
View file

@ -52,8 +52,8 @@
#include "simple.hxx"
#include "xmlloader.hxx"
SG_USING_STD(sort);
SG_USING_STD(random_shuffle);
using std::sort;
using std::random_shuffle;

8
src/Airports/simple.hxx
View file

@ -51,10 +51,10 @@
#include "dynamics.hxx"
SG_USING_STD(string);
SG_USING_STD(map);
SG_USING_STD(set);
SG_USING_STD(vector);
using std::string;
using std::map;
using std::set;
using std::vector;

4
src/Autopilot/route_mgr.hxx
View file

@ -37,8 +37,8 @@
#include <string>
#include <vector>
SG_USING_STD(string);
SG_USING_STD(vector);
using std::string;
using std::vector;
#include <simgear/props/props.hxx>
#include <simgear/route/route.hxx>

6
src/Autopilot/xmlauto.hxx
View file

@ -38,9 +38,9 @@
#include <vector>
#include <deque>
SG_USING_STD(string);
SG_USING_STD(vector);
SG_USING_STD(deque);
using std::string;
using std::vector;
using std::deque;
#include <simgear/props/props.hxx>
#include <simgear/structure/subsystem_mgr.hxx>

3
src/Cockpit/hud.cxx
View file

@ -38,6 +38,7 @@
#include <simgear/constants.h>
#include <simgear/debug/logstream.hxx>
#include <simgear/misc/sg_path.hxx>
#include <osg/GLU>
#include <Aircraft/aircraft.hxx>
//#include <Autopilot/xmlauto.hxx>
@ -47,8 +48,6 @@
#include "hud.hxx"
#include SG_GLU_H
static HUD_Properties *HUDprop = 0;

4
src/Cockpit/hud.hxx
View file

@ -65,8 +65,8 @@ namespace osg {
#include <plib/sg.h>
SG_USING_STD(deque);
SG_USING_STD(vector);
using std::deque;
using std::vector;
#define float_to_int(v) SGMiscf::roundToInt(v)

2
src/Cockpit/hud_rwy.cxx
View file

@ -34,7 +34,7 @@
#include <simgear/math/polar3d.hxx>
#include <ATCDCL/ATCutils.hxx>
#include SG_GLU_H
#include <osg/GLU>
// int x, int y, int width, int height, float scale_data, bool working)

3
src/Cockpit/panel.cxx
View file

@ -47,6 +47,7 @@
#include <simgear/debug/logstream.hxx>
#include <simgear/misc/sg_path.hxx>
#include <simgear/scene/model/model.hxx>
#include <osg/GLU>
#include <Main/globals.hxx>
#include <Main/fg_props.hxx>
@ -57,8 +58,6 @@
#include "hud.hxx"
#include "panel.hxx"
#include SG_GLU_H
#define WIN_X 0
#define WIN_Y 0
#define WIN_W 1024

4
src/Cockpit/panel.hxx
View file

@ -50,8 +50,8 @@
#include <Input/input.hxx>
#include <Instrumentation/dclgps.hxx>
SG_USING_STD(vector);
SG_USING_STD(map);
using std::vector;
using std::map;
class FGPanelInstrument;

6
src/Cockpit/panel_io.cxx
View file

@ -46,9 +46,9 @@
//built-in layers
#include "built_in/FGMagRibbon.hxx"
SG_USING_STD(istream);
SG_USING_STD(ifstream);
SG_USING_STD(string);
using std::istream;
using std::ifstream;
using std::string;

2
src/Environment/environment_ctrl.cxx
View file

@ -39,7 +39,7 @@
#include "environment_mgr.hxx"
#include "environment_ctrl.hxx"
SG_USING_STD(sort);
using std::sort;
class metar_filter : public FGAirportSearchFilter {
virtual bool pass(FGAirport *a) { return a->getMetar(); }

4
src/Environment/environment_ctrl.hxx
View file

@ -40,8 +40,8 @@
#include <queue>
#include <vector>
SG_USING_STD(queue);
SG_USING_STD(vector);
using std::queue;
using std::vector;
class SGPropertyNode;
class FGAirport;

2
src/Environment/fgclouds.hxx
View file

@ -32,7 +32,7 @@
#include <string>
SG_USING_STD(string);
using std::string;
class SGNewCloud;
class SGCloudField;

6
src/Environment/fgmetar.hxx
View file

@ -30,9 +30,9 @@
#include <simgear/environment/metar.hxx>
SG_USING_STD(vector);
SG_USING_STD(map);
SG_USING_STD(string);
using std::vector;
using std::map;
using std::string;
class FGMetar : public SGMetar {

4
src/FDM/LaRCsim/LaRCsimIC.cxx
View file

@ -39,8 +39,8 @@
#include "LaRCsimIC.hxx"
SG_USING_STD(cout);
SG_USING_STD(endl);
using std::cout;
using std::endl;
LaRCsimIC::LaRCsimIC(void) {

2
src/FDM/UIUCModel/uiuc_1DdataFileReader.h
View file

@ -10,7 +10,7 @@
#include "uiuc_aircraft.h"
#include "uiuc_warnings_errors.h"
//SG_USING_STD(istrstream);
//using std::istrstream;
int uiuc_1DdataFileReader( string file_name,
double x[],

2
src/FDM/UIUCModel/uiuc_2DdataFileReader.h
View file

@ -9,7 +9,7 @@
#include "uiuc_parsefile.h"
#include "uiuc_aircraft.h"
//SG_USING_STD(istrstream);
//using std::istrstream;
void uiuc_2DdataFileReader( string file_name,
double x[100][100],

4
src/FDM/UIUCModel/uiuc_flapdata.h
View file

@ -16,8 +16,8 @@ robinst@ecf.toronto.edu
#include "uiuc_warnings_errors.h"
//#include "uiuc_aircraft.h"
SG_USING_STD(ifstream);
SG_USING_STD(istringstream);
using std::ifstream;
using std::istringstream;
class flapStruct {
private:

2
src/FDM/UIUCModel/uiuc_gear.cpp
View file

@ -74,7 +74,7 @@
SG_USING_STD(cerr);
using std::cerr;
#define HEIGHT_AGL_WHEEL d_wheel_rwy_local_v[2]

8
src/FDM/UIUCModel/uiuc_menu.cpp
View file

@ -166,12 +166,12 @@
#include "uiuc_menu.h"
SG_USING_STD(cerr);
SG_USING_STD(cout);
SG_USING_STD(endl);
using std::cerr;
using std::cout;
using std::endl;
#ifndef _MSC_VER
SG_USING_STD(exit);
using std::exit;
#endif
void uiuc_menu( string aircraft_name )

8
src/FDM/UIUCModel/uiuc_menu_CD.cpp
View file

@ -79,12 +79,12 @@
#include "uiuc_menu_CD.h"
SG_USING_STD(cerr);
SG_USING_STD(cout);
SG_USING_STD(endl);
using std::cerr;
using std::cout;
using std::endl;
#ifndef _MSC_VER
SG_USING_STD(exit);
using std::exit;
#endif
void parse_CD( const string& linetoken2, const string& linetoken3,

8
src/FDM/UIUCModel/uiuc_menu_CL.cpp
View file

@ -79,12 +79,12 @@
#include "uiuc_menu_CL.h"
SG_USING_STD(cerr);
SG_USING_STD(cout);
SG_USING_STD(endl);
using std::cerr;
using std::cout;
using std::endl;
#ifndef _MSC_VER
SG_USING_STD(exit);
using std::exit;
#endif
void parse_CL( const string& linetoken2, const string& linetoken3,

8
src/FDM/UIUCModel/uiuc_menu_CY.cpp
View file

@ -79,12 +79,12 @@
#include "uiuc_menu_CY.h"
SG_USING_STD(cerr);
SG_USING_STD(cout);
SG_USING_STD(endl);
using std::cerr;
using std::cout;
using std::endl;
#ifndef _MSC_VER
SG_USING_STD(exit);
using std::exit;
#endif
void parse_CY( const string& linetoken2, const string& linetoken3,

8
src/FDM/UIUCModel/uiuc_menu_Cm.cpp
View file

@ -79,12 +79,12 @@
#include "uiuc_menu_Cm.h"
SG_USING_STD(cerr);
SG_USING_STD(cout);
SG_USING_STD(endl);
using std::cerr;
using std::cout;
using std::endl;
#ifndef _MSC_VER
SG_USING_STD(exit);
using std::exit;
#endif
void parse_Cm( const string& linetoken2, const string& linetoken3,

8
src/FDM/UIUCModel/uiuc_menu_Cn.cpp
View file

@ -79,12 +79,12 @@
#include "uiuc_menu_Cn.h"
SG_USING_STD(cerr);
SG_USING_STD(cout);
SG_USING_STD(endl);
using std::cerr;
using std::cout;
using std::endl;
#ifndef _MSC_VER
SG_USING_STD(exit);
using std::exit;
#endif
void parse_Cn( const string& linetoken2, const string& linetoken3,

8
src/FDM/UIUCModel/uiuc_menu_Croll.cpp
View file

@ -79,12 +79,12 @@
#include "uiuc_menu_Croll.h"
SG_USING_STD(cerr);
SG_USING_STD(cout);
SG_USING_STD(endl);
using std::cerr;
using std::cout;
using std::endl;
#ifndef _MSC_VER
SG_USING_STD(exit);
using std::exit;
#endif
void parse_Cl( const string& linetoken2, const string& linetoken3,

8
src/FDM/UIUCModel/uiuc_menu_controlSurface.cpp
View file

@ -79,12 +79,12 @@
#include "uiuc_menu_controlSurface.h"
SG_USING_STD(cerr);
SG_USING_STD(cout);
SG_USING_STD(endl);
using std::cerr;
using std::cout;
using std::endl;
#ifndef _MSC_VER
SG_USING_STD(exit);
using std::exit;
#endif
void parse_controlSurface( const string& linetoken2, const string& linetoken3,

8
src/FDM/UIUCModel/uiuc_menu_engine.cpp
View file

@ -79,12 +79,12 @@
#include "uiuc_menu_engine.h"
SG_USING_STD(cerr);
SG_USING_STD(cout);
SG_USING_STD(endl);
using std::cerr;
using std::cout;
using std::endl;
#ifndef _MSC_VER
SG_USING_STD(exit);
using std::exit;
#endif
void parse_engine( const string& linetoken2, const string& linetoken3,

8
src/FDM/UIUCModel/uiuc_menu_fog.cpp
View file

@ -79,12 +79,12 @@
#include "uiuc_menu_fog.h"
SG_USING_STD(cerr);
SG_USING_STD(cout);
SG_USING_STD(endl);
using std::cerr;
using std::cout;
using std::endl;
#ifndef _MSC_VER
SG_USING_STD(exit);
using std::exit;
#endif
void parse_fog( const string& linetoken2, const string& linetoken3,

8
src/FDM/UIUCModel/uiuc_menu_gear.cpp
View file

@ -79,12 +79,12 @@
#include "uiuc_menu_gear.h"
SG_USING_STD(cerr);
SG_USING_STD(cout);
SG_USING_STD(endl);
using std::cerr;
using std::cout;
using std::endl;
#ifndef _MSC_VER
SG_USING_STD(exit);
using std::exit;
#endif
void parse_gear( const string& linetoken2, const string& linetoken3,

8
src/FDM/UIUCModel/uiuc_menu_geometry.cpp
View file

@ -79,12 +79,12 @@
#include "uiuc_menu_geometry.h"
SG_USING_STD(cerr);
SG_USING_STD(cout);
SG_USING_STD(endl);
using std::cerr;
using std::cout;
using std::endl;
#ifndef _MSC_VER
SG_USING_STD(exit);
using std::exit;
#endif
void parse_geometry( const string& linetoken2, const string& linetoken3,

8
src/FDM/UIUCModel/uiuc_menu_ice.cpp
View file

@ -79,12 +79,12 @@
#include "uiuc_menu_ice.h"
SG_USING_STD(cerr);
SG_USING_STD(cout);
SG_USING_STD(endl);
using std::cerr;
using std::cout;
using std::endl;
#ifndef _MSC_VER
SG_USING_STD(exit);
using std::exit;
#endif
void parse_ice( const string& linetoken2, const string& linetoken3,

8
src/FDM/UIUCModel/uiuc_menu_init.cpp
View file

@ -80,12 +80,12 @@
#include "uiuc_menu_init.h"
SG_USING_STD(cerr);
SG_USING_STD(cout);
SG_USING_STD(endl);
using std::cerr;
using std::cout;
using std::endl;
#ifndef _MSC_VER
SG_USING_STD(exit);
using std::exit;
#endif
void parse_init( const string& linetoken2, const string& linetoken3,

8
src/FDM/UIUCModel/uiuc_menu_mass.cpp
View file

@ -79,12 +79,12 @@
#include "uiuc_menu_mass.h"
SG_USING_STD(cerr);
SG_USING_STD(cout);
SG_USING_STD(endl);
using std::cerr;
using std::cout;
using std::endl;
#ifndef _MSC_VER
SG_USING_STD(exit);
using std::exit;
#endif
void parse_mass( const string& linetoken2, const string& linetoken3,

8
src/FDM/UIUCModel/uiuc_menu_misc.cpp
View file

@ -79,12 +79,12 @@
#include "uiuc_menu_misc.h"
SG_USING_STD(cerr);
SG_USING_STD(cout);
SG_USING_STD(endl);
using std::cerr;
using std::cout;
using std::endl;
#ifndef _MSC_VER
SG_USING_STD(exit);
using std::exit;
#endif
void parse_misc( const string& linetoken2, const string& linetoken3,

8
src/FDM/UIUCModel/uiuc_menu_record.cpp
View file

@ -82,12 +82,12 @@
#include "uiuc_menu_record.h"
SG_USING_STD(cerr);
SG_USING_STD(cout);
SG_USING_STD(endl);
using std::cerr;
using std::cout;
using std::endl;
#ifndef _MSC_VER
SG_USING_STD(exit);
using std::exit;
#endif
void parse_record( const string& linetoken2, const string& linetoken3,

8
src/FDM/UIUCModel/uiuc_parsefile.h
View file

@ -7,10 +7,10 @@
#include <list>
#include <fstream>
SG_USING_STD(list);
SG_USING_STD(string);
SG_USING_STD(getline);
SG_USING_STD(ifstream);
using std::list;
using std::string;
using std::getline;
using std::ifstream;
#define DELIMITERS " \t"
#define COMMENT "#"

2
src/FDM/UIUCModel/uiuc_recorder.cpp
View file

@ -99,7 +99,7 @@
#include "uiuc_recorder.h"
SG_USING_STD(endl); // -dw
using std::endl; // -dw
void uiuc_recorder( double dt )
{

4
src/FDM/UIUCModel/uiuc_wrapper.cpp
View file

@ -102,8 +102,8 @@
//#include "uiuc_network.h"
#include "uiuc_get_flapper.h"
SG_USING_STD(cout);
SG_USING_STD(endl);
using std::cout;
using std::endl;
extern "C" void uiuc_initial_init ();
extern "C" void uiuc_defaults_inits ();

2
src/FDM/YASim/Rotor.cpp
View file

@ -11,7 +11,7 @@
#include <iostream>
#include <iomanip>
SG_USING_STD(setprecision);
using std::setprecision;
#ifdef TEST_DEBUG
#include <stdio.h>

6
src/FDM/flight.hxx
View file

@ -84,9 +84,9 @@
#include <simgear/structure/subsystem_mgr.hxx>
#include <FDM/groundcache.hxx>
SG_USING_STD(list);
SG_USING_STD(vector);
SG_USING_STD(string);
using std::list;
using std::vector;
using std::string;
// This is based heavily on LaRCsim/ls_generic.h
class FGInterface : public SGSubsystem {

2
src/GUI/dialog.hxx
View file

@ -15,7 +15,7 @@
#include <simgear/misc/sg_path.hxx>
#include <vector>
SG_USING_STD(vector);
using std::vector;
// ugly temporary workaround for plib's lack of user defined class ids FIXME

2
src/GUI/layout-test.cxx
View file

@ -5,7 +5,7 @@
#include <iostream>
#include <simgear/compiler.h>
#include SG_GL_H
#include <osg/GL>
#include <plib/pw.h>
#include <plib/pu.h>
#include <simgear/props/props.hxx>

4
src/GUI/menubar.hxx
View file

@ -13,10 +13,10 @@
#include <plib/pu.h>
#include <map>
SG_USING_STD(map);
using std::map;
#include <vector>
SG_USING_STD(vector);
using std::vector;
class puMenuBar;

6
src/GUI/new_gui.hxx
View file

@ -22,9 +22,9 @@
#include <vector>
#include <map>
SG_USING_STD(vector);
SG_USING_STD(map);
SG_USING_STD(string);
using std::vector;
using std::map;
using std::string;
#include <Main/fg_props.hxx>

2
src/GUI/property_list.cxx
View file

@ -31,7 +31,7 @@
#include <iomanip>
#include <iostream>
#include <string>
SG_USING_STD(string);
using std::string;
using std::cout;
typedef string stdString; // puObject has a "string" member

12
src/Input/fgjs.cxx
View file

@ -38,12 +38,12 @@
#include <fstream>
#include <string>
SG_USING_STD(fstream);
SG_USING_STD(cout);
SG_USING_STD(cin);
SG_USING_STD(endl);
SG_USING_STD(ios);
SG_USING_STD(string);
using std::fstream;
using std::cout;
using std::cin;
using std::endl;
using std::ios;
using std::string;
#include <simgear/constants.h>
#include <simgear/debug/logstream.hxx>

8
src/Input/input.cxx
View file

@ -59,10 +59,10 @@
#include <Scenery/scenery.hxx>
#include <Main/renderer.hxx>
SG_USING_STD(ifstream);
SG_USING_STD(ostringstream);
SG_USING_STD(string);
SG_USING_STD(vector);
using std::ifstream;
using std::ostringstream;
using std::string;
using std::vector;
void mouseClickHandler(int button, int updown, int x, int y, bool mainWindow, const osgGA::GUIEventAdapter*);
void mouseMotionHandler(int x, int y);

4
src/Input/input.hxx
View file

@ -48,8 +48,8 @@
#include <list>
#include <vector>
SG_USING_STD(map);
SG_USING_STD(vector);
using std::map;
using std::vector;

6
src/Input/jsinput.cxx
View file

@ -22,9 +22,9 @@
#include <iostream>
SG_USING_STD(cout);
SG_USING_STD(cin);
SG_USING_STD(endl);
using std::cout;
using std::cin;
using std::endl;
#include "jsinput.h"

3
src/Instrumentation/HUD/HUD.cxx
View file

@ -31,14 +31,13 @@
#include <simgear/constants.h>
#include <simgear/misc/sg_path.hxx>
#include <osg/GLU>
#include <Main/globals.hxx>
#include <Main/viewmgr.hxx>
#include "HUD.hxx"
#include SG_GLU_H
static float clamp(float f)
{

4
src/Instrumentation/HUD/HUD.hxx
View file

@ -33,8 +33,8 @@
#include <deque>
#include <fstream>
SG_USING_STD(deque);
SG_USING_STD(vector);
using std::deque;
using std::vector;
#include <osg/State>

2
src/Instrumentation/HUD/HUD_runway.cxx
View file

@ -26,7 +26,7 @@
#include <simgear/compiler.h>
#include <simgear/math/sg_geodesy.hxx>
#include <simgear/math/polar3d.hxx>
#include SG_GLU_H
#include <osg/GLU>
#include <Main/globals.hxx>
#include <Scenery/scenery.hxx>

2
src/Instrumentation/KLN89/kln89.cxx
View file

@ -47,7 +47,7 @@
#include <Main/fg_props.hxx>
#include <simgear/math/point3d.hxx>
SG_USING_STD(cout);
using std::cout;
KLN89::KLN89(RenderArea2D* instrument)
: DCLGPS(instrument) {

Some files were not shown because too many files have changed in this diff Show more