fly/terragear
1
0
Fork 0
Code Activity

FG_ to SG_ changees.

Browse source
This commit is contained in:
curt 2001-03-25 12:07:07 +00:00
parent 9acc48acce
commit 56745955f3
11 changed files with 23 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -40,7 +40,7 @@
#include <simgear/constants.h>
#include <simgear/bucket/newbucket.hxx>
#include <simgear/debug/logstream.hxx>
#include <simgear/misc/fgstream.hxx>
#include <simgear/misc/sgstream.hxx>
#include <Polygon/index.hxx>
@ -117,7 +117,7 @@ int main( int argc, char **argv ) {
string counter_file = work_dir + "/poly_counter";
poly_index_init( counter_file );
fg_gzifstream in( input_file );
sg_gzifstream in( input_file );
if ( !in ) {
SG_LOG( SG_GENERAL, SG_ALERT, "Cannot open file: " << input_file );
exit(-1);

4
src/BuildTiles/Clipper/clipper.cxx
View file

@ -26,7 +26,7 @@
#include <simgear/constants.h>
#include <simgear/debug/logstream.hxx>
#include <simgear/misc/fgstream.hxx>
#include <simgear/misc/sgstream.hxx>
#include <Polygon/names.hxx>
@ -68,7 +68,7 @@ bool FGClipper::load_polys(const string& path) {
SG_LOG( SG_CLIPPER, SG_INFO, "Loading " << path << " ..." );
fg_gzifstream in( path );
sg_gzifstream in( path );
if ( !in ) {
SG_LOG( SG_CLIPPER, SG_ALERT, "Cannot open file: " << path );

2
src/BuildTiles/Main/main.cxx
View file

@ -765,7 +765,7 @@ static void do_custom_objects( const FGConstruct& c ) {
string dest_dir = output_base + "/Scenery/" + b.gen_base_path();
string dest_ind = dest_dir + "/" + b.gen_index_str() + ".ind";
fg_gzifstream in( index_file );
sg_gzifstream in( index_file );
if ( ! in.is_open() ) {
cout << "No custom objects" << endl;

4
src/BuildTiles/Match/match.cxx
View file

@ -27,7 +27,7 @@
#include <simgear/math/point3d.hxx>
#include <simgear/math/sg_geodesy.hxx>
#include <simgear/misc/fgstream.hxx>
#include <simgear/misc/sgstream.hxx>
#ifdef _MSC_VER
# include <Win32/mkdir.hpp>
@ -55,7 +55,7 @@ void FGMatch::scan_share_file( const string& dir, const SGBucket& b,
cout << "reading shared data from " << file << endl;
fg_gzifstream in( file );
sg_gzifstream in( file );
if ( !in.is_open() ) {
cout << "Cannot open file: " << file << endl;
return;

6
src/Lib/Array/array.cxx
View file

@ -47,7 +47,7 @@
#include STL_STRING
#include <simgear/constants.h>
#include <simgear/misc/fgstream.hxx>
#include <simgear/misc/sgstream.hxx>
#include <simgear/misc/strutils.hxx>
#include <simgear/math/leastsqs.hxx>
@ -89,7 +89,7 @@ FGArray::open( const string& file ) {
cout << " Not yet ported ..." << endl;
return 0;
} else {
in = new fg_gzifstream( file );
in = new sg_gzifstream( file );
if ( ! in->is_open() ) {
cout << " Cannot open " << file << endl;
return 0;
@ -104,7 +104,7 @@ FGArray::open( const string& file ) {
// close an Array file
int
FGArray::close() {
// the fg_gzifstream doesn't seem to have a close()
// the sg_gzifstream doesn't seem to have a close()
delete in;

4
src/Lib/Array/array.hxx
View file

@ -37,7 +37,7 @@
#include <simgear/bucket/newbucket.hxx>
#include <simgear/math/point3d.hxx>
#include <simgear/math/sg_types.hxx>
#include <simgear/misc/fgstream.hxx>
#include <simgear/misc/sgstream.hxx>
SG_USING_STD(vector);
@ -53,7 +53,7 @@ private:
// file pointer for input
// gzFile fd;
fg_gzifstream *in;
sg_gzifstream *in;
// coordinates (in arc seconds) of south west corner
double originx, originy;

6
src/Lib/DEM/dem.cxx
View file

@ -48,7 +48,7 @@
#endif
#include <simgear/constants.h>
#include <simgear/misc/fgstream.hxx>
#include <simgear/misc/sgstream.hxx>
#include <simgear/misc/strutils.hxx>
#ifdef _MSC_VER
@ -102,7 +102,7 @@ FGDem::open ( const string& file ) {
printf("Not yet ported ...\n");
return 0;
} else {
in = new fg_gzifstream( file );
in = new sg_gzifstream( file );
if ( !(*in) ) {
cout << "Cannot open " << file << endl;
return 0;
@ -117,7 +117,7 @@ FGDem::open ( const string& file ) {
// close a DEM file
int
FGDem::close () {
// the fg_gzifstream doesn't seem to have a close()
// the sg_gzifstream doesn't seem to have a close()
delete in;

4
src/Lib/DEM/dem.hxx
View file

@ -31,7 +31,7 @@
#include <simgear/bucket/newbucket.hxx>
#include <simgear/misc/fgstream.hxx>
#include <simgear/misc/sgstream.hxx>
#define DEM_SIZE 1200
@ -44,7 +44,7 @@ private:
// file pointer for input
// gzFile fd;
fg_gzifstream *in;
sg_gzifstream *in;
// coordinates (in arc seconds) of south west corner
double originx, originy;

4
src/Lib/e00/teste00.cxx
View file

@ -1,13 +1,13 @@
// teste00.cxx - test the E00 parsing routines and dump some results.
#include <simgear/misc/fgstream.hxx>
#include <simgear/misc/sgstream.hxx>
#include "e00.hxx"
int main (int ac, const char ** av)
{
for (int i = 1; i < ac; i++) {
cerr << "Reading " << av[i] << endl;
fg_gzifstream input(av[i]);
sg_gzifstream input(av[i]);
E00 data;
try {
data.readE00(input);

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

@ -27,7 +27,7 @@
#include <simgear/constants.h>
#include <simgear/math/sg_geodesy.hxx>
#include <simgear/debug/logstream.hxx>
#include <simgear/misc/fgstream.hxx>
#include <simgear/misc/sgstream.hxx>
#include <iostream>
#include <string>
@ -603,7 +603,7 @@ main (int argc, const char **argv)
cout << "Processing " << argv[argPos] << endl;
// Grab command-line arguments.
fg_gzifstream input(argv[argPos]);
sg_gzifstream input(argv[argPos]);
if ( !input.good() ) {
SG_LOG( SG_GENERAL, SG_ALERT, "Cannot open file: " << argv[argPos]);
exit(-1);

4
src/Prep/MergerClipper/merger.cxx
View file

@ -24,7 +24,7 @@
*/
#include <simgear/constants.h>
#include <simgear/debug/logstream.hxx>
#include <simgear/misc/fgstream.hxx>
#include <simgear/misc/sgstream.hxx>
#include <Polygon/names.hxx>
#include <Polygon/index.hxx>
@ -60,7 +60,7 @@ bool FGMerger::load_polys(const string& path, FGPolyList& subject) {
SG_LOG( SG_CLIPPER, SG_INFO, "Loading " << path << " ..." );
fg_gzifstream in( path );
sg_gzifstream in( path );
if ( !in ) {
SG_LOG( SG_CLIPPER, SG_ALERT, "Cannot open file: " << path );