Merge branch 'ehofman/sky'

[flightgear.git] / src / Airports / apt_loader.hxx

diff --git a/src/Airports/apt_loader.hxx b/src/Airports/apt_loader.hxx
index d9df742e5648345eacfed34dc576d6ade3c6e2d8..54596e8d85bf37e07a36547ecc09acc68686a721 100644 (file)
--- a/src/Airports/apt_loader.hxx
+++ b/src/Airports/apt_loader.hxx
@@ -17,7 +17,7 @@
 //
 // You should have received a copy of the GNU General Public License
 // along with this program; if not, write to the Free Software
-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 //
 // $Id$
 
@@ -25,26 +25,18 @@
 #ifndef _FG_APT_LOADER_HXX
 #define _FG_APT_LOADER_HXX
 
-
-#ifdef HAVE_CONFIG_H
-#  include <config.h>
-#endif
-
 #include <simgear/compiler.h>
 
-#include STL_STRING
-
-SG_USING_STD(string);
-
-#include "simple.hxx"
-#include "runways.hxx"
+#include <string>
 
+// forward decls
+class FGCommList;
 
 // Load the airport data base from the specified aptdb file.  The
 // metar file is used to mark the airports as having metar available
 // or not.
-bool fgAirportDBLoad( FGAirportList *airports, FGRunwayList *runways,
-                      const string &aptdb_file, const string &metar_file );
+bool fgAirportDBLoad( const std::string &aptdb_file, 
+        FGCommList *comm_list, const std::string &metar_file );
 
 
 #endif // _FG_APT_LOADER_HXX