warning fixes

[flightgear.git] / src / Instrumentation / mk_viii.cxx

diff --git a/src/Instrumentation/mk_viii.cxx b/src/Instrumentation/mk_viii.cxx
index 50e1df1a75ec323c32597bd2166098ff9ccb593a..4645ceef5d51d9881ea6174f4f825beeab13424b 100755 (executable)
--- a/src/Instrumentation/mk_viii.cxx
+++ b/src/Instrumentation/mk_viii.cxx
@@ -74,13 +74,13 @@
 
 using std::string;
 
-#include "Airports/runways.hxx"
-#include "Airports/simple.hxx"
+#include <Airports/runways.hxx>
+#include <Airports/simple.hxx>
 #ifndef _MSC_VER
-#  include "Include/version.h"
+#  include <Include/version.h>
 #endif
-#include "Main/fg_props.hxx"
-#include "Main/globals.hxx"
+#include <Main/fg_props.hxx>
+#include <Main/globals.hxx>
 #include "instrument_mgr.hxx"
 #include "mk_viii.hxx"
 
@@ -4254,13 +4254,9 @@ MK_VIII::Mode6Handler::test_airport (const FGAirport *airport)
   return false;
 }
 
-bool MK_VIII::Mode6Handler::AirportFilter::pass(FGPositioned* a) const
+bool MK_VIII::Mode6Handler::AirportFilter::passAirport(FGAirport* a) const
 {
-  if (a->type() != FGPositioned::AIRPORT) {
-    return false;
-  }
-    
-  bool ok = self->test_airport(static_cast<FGAirport*>(a));
+  bool ok = self->test_airport(a);
   return ok;
 }
 
@@ -4497,14 +4493,9 @@ MK_VIII::TCFHandler::select_runway (const FGAirport *airport)
   return _runway;
 }
 
-bool MK_VIII::TCFHandler::AirportFilter::pass(FGPositioned* aPos) const
+bool MK_VIII::TCFHandler::AirportFilter::passAirport(FGAirport* aApt) const
 {
-  if (aPos->type() != FGPositioned::AIRPORT) {
-    return false;
-  }
-  
-  FGAirport* apt = static_cast<FGAirport*>(aPos);
-  return apt->hasHardRunwayOfLengthFt(mk->conf.runway_database);
+  return aApt->hasHardRunwayOfLengthFt(mk->conf.runway_database);
 }
    
 void