fly/terragear
1
0
Fork 0
Code Activity

Made sure that any #include-instruction comes before the first "using"-declaration, so that we can spot buggy header-files more easily.

Browse source
This commit is contained in:
Ralf Gerlich 2008-08-08 12:31:02 +02:00
parent 4a35fedf64
commit e4ac5911ae
13 changed files with 38 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/Airports/GenAirports/convex_hull.cxx
View file

@ -34,14 +34,14 @@
#include <simgear/constants.h> #include <simgear/constants.h>
#include <simgear/structure/exception.hxx> #include <simgear/structure/exception.hxx>
using std::less;
using std::map;
#include <simgear/constants.h> #include <simgear/constants.h>
#include "convex_hull.hxx" #include "convex_hull.hxx"
#include "point2d.hxx" #include "point2d.hxx"
using std::less;
using std::map;
// stl map typedefs // stl map typedefs
typedef map < double, double, less<double> > map_container; typedef map < double, double, less<double> > map_container;

7
src/Airports/GenAirports/main.cxx
View file

@ -35,16 +35,12 @@
#include <list> #include <list>
#include <vector> #include <vector>
using std::vector;
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
#include <string> #include <string>
#include <iostream> #include <iostream>
using std::cout;
using std::endl;
#include <simgear/constants.h> #include <simgear/constants.h>
#include <simgear/bucket/newbucket.hxx> #include <simgear/bucket/newbucket.hxx>
#include <simgear/debug/logstream.hxx> #include <simgear/debug/logstream.hxx>
@ -61,6 +57,9 @@ using std::endl;
# include <Win32/mkdir.hpp> # include <Win32/mkdir.hpp>
#endif #endif
using std::vector;
using std::cout;
using std::endl;
int nudge = 10; int nudge = 10;

4
src/Airspace/airspace.cxx
View file

@ -90,14 +90,14 @@
#include <sys/stat.h> #include <sys/stat.h>
#include <fcntl.h> #include <fcntl.h>
using std::string;
/******************* simgear ********************************/ /******************* simgear ********************************/
#include <simgear/constants.h> #include <simgear/constants.h>
#include <simgear/math/sg_geodesy.hxx> #include <simgear/math/sg_geodesy.hxx>
#include <simgear/misc/sg_path.hxx> #include <simgear/misc/sg_path.hxx>
/************************************************************/ /************************************************************/
using std::string;
// Configure the following for your particular directory structure ... // Configure the following for your particular directory structure ...
const string dafift_base = "/usr/local/share/DAFIFT"; const string dafift_base = "/usr/local/share/DAFIFT";

5
src/Lib/Polygon/chop-bin.cxx
View file

@ -32,9 +32,6 @@
#include <string> #include <string>
#include <iostream> #include <iostream>
using std::cout;
using std::endl;
#include <simgear/bucket/newbucket.hxx> #include <simgear/bucket/newbucket.hxx>
#include <simgear/debug/logstream.hxx> #include <simgear/debug/logstream.hxx>
#include <simgear/structure/exception.hxx> #include <simgear/structure/exception.hxx>
@ -49,6 +46,8 @@ using std::endl;
#include "simple_clip.hxx" #include "simple_clip.hxx"
#include "chop.hxx" #include "chop.hxx"
using std::cout;
using std::endl;
static void clip_and_write_poly( string root, long int p_index, static void clip_and_write_poly( string root, long int p_index,
const string &poly_type, const string &poly_type,

4
src/Lib/Polygon/polygon.cxx
View file

@ -35,14 +35,14 @@ extern "C" {
#include <simgear/math/sg_geodesy.hxx> #include <simgear/math/sg_geodesy.hxx>
#include <simgear/structure/exception.hxx> #include <simgear/structure/exception.hxx>
using std::endl;
#include <Geometry/trinodes.hxx> #include <Geometry/trinodes.hxx>
#include <poly2tri/interface.h> #include <poly2tri/interface.h>
#include "polygon.hxx" #include "polygon.hxx"
#include "point2d.hxx" #include "point2d.hxx"
using std::endl;
// Constructor // Constructor
TGPolygon::TGPolygon( void ) TGPolygon::TGPolygon( void )
{ {

6
src/Lib/vpf/table.cxx
View file

@ -10,13 +10,13 @@
#include <stdlib.h> #include <stdlib.h>
#include "vpfbase.hxx"
#include "table.hxx"
using std::string; using std::string;
using std::ifstream; using std::ifstream;
using std::istream; using std::istream;
#include "vpfbase.hxx"
#include "table.hxx"
//////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////

6
src/Lib/vpf/value.cxx
View file

@ -4,12 +4,12 @@
#include <iostream> #include <iostream>
#include <string> #include <string>
using std::ostream;
using std::string;
#include "vpfbase.hxx" #include "vpfbase.hxx"
#include "value.hxx" #include "value.hxx"
using std::ostream;
using std::string;
VpfValue::VpfValue () VpfValue::VpfValue ()
: _raw_type('X'), : _raw_type('X'),
_element_count(0) _element_count(0)

4
src/Lib/vpf/vpf-dump.cxx
View file

@ -17,12 +17,12 @@
#include <iostream> #include <iostream>
#include "vpf.hxx"
using std::cout; using std::cout;
using std::cerr; using std::cerr;
using std::endl; using std::endl;
#include "vpf.hxx"
/** /**
* Get a printable name for a value type. * Get a printable name for a value type.

4
src/Lib/vpf/vpf-summary.cxx
View file

@ -26,14 +26,14 @@
#include <iostream> #include <iostream>
#include <string> #include <string>
#include "vpf.hxx"
using std::string; using std::string;
using std::cout; using std::cout;
using std::cerr; using std::cerr;
using std::endl; using std::endl;
#include "vpf.hxx"
/** /**
* Get a printable name for a value type. * Get a printable name for a value type.
*/ */

4
src/Lib/vpf/vpf-topology.cxx
View file

@ -8,14 +8,14 @@
#include <stdlib.h> #include <stdlib.h>
#include "vpf.hxx"
using std::cout; using std::cout;
using std::cerr; using std::cerr;
using std::endl; using std::endl;
using std::ostream; using std::ostream;
using std::string; using std::string;
#include "vpf.hxx"
ostream & ostream &
operator<< (ostream &output, const VpfRectangle &rect) operator<< (ostream &output, const VpfRectangle &rect)

12
src/Prep/E00Lines/main.cxx
View file

@ -37,12 +37,6 @@
#include <string> #include <string>
#include <vector> #include <vector>
using std::cerr;
using std::cout;
using std::endl;
using std::string;
using std::vector;
#include <Geometry/rectangle.hxx> #include <Geometry/rectangle.hxx>
#include <Geometry/util.hxx> #include <Geometry/util.hxx>
#include <Polygon/chop.hxx> #include <Polygon/chop.hxx>
@ -54,6 +48,12 @@ using std::vector;
# include <Win32/mkdir.hpp> # include <Win32/mkdir.hpp>
#endif #endif
using std::cerr;
using std::cout;
using std::endl;
using std::string;
using std::vector;
//////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////

4
src/Prep/Photo/findcorners.cxx
View file

@ -8,11 +8,11 @@
#include <plib/sg.h> #include <plib/sg.h>
#include <simgear/math/sg_geodesy.hxx>
using std::cout; using std::cout;
using std::endl; using std::endl;
#include <simgear/math/sg_geodesy.hxx>
int main( int argc, char **argv ) { int main( int argc, char **argv ) {
if ( argc != 11 ) { if ( argc != 11 ) {

12
src/Prep/TGVPF/tgvpf.cxx
View file

@ -38,12 +38,6 @@
#include <string> #include <string>
#include <vector> #include <vector>
using std::cerr;
using std::cout;
using std::endl;
using std::string;
using std::vector;
#include <Geometry/line.hxx> #include <Geometry/line.hxx>
#include <Geometry/util.hxx> #include <Geometry/util.hxx>
#include <Polygon/chop.hxx> #include <Polygon/chop.hxx>
@ -55,6 +49,12 @@ using std::vector;
# include <Win32/mkdir.hpp> # include <Win32/mkdir.hpp>
#endif #endif
using std::cerr;
using std::cout;
using std::endl;
using std::string;
using std::vector;
//////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////