Merge branch 'maint2' into next

[flightgear.git] / src / Instrumentation / KLN89 / kln89_page_apt.hxx

diff --git a/src/Instrumentation/KLN89/kln89_page_apt.hxx b/src/Instrumentation/KLN89/kln89_page_apt.hxx
index d5814fda8d98a663a12b3bc972889a0c7a2c14aa..33dd5603cd37d0cdebe651098c6c5f0c317907d9 100644 (file)
--- a/src/Instrumentation/KLN89/kln89_page_apt.hxx
+++ b/src/Instrumentation/KLN89/kln89_page_apt.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$
 
@@ -26,7 +26,7 @@
 
 #include "kln89.hxx"
 
-#include <Airports/runways.hxx>
+class FGRunway;
 
 struct AptFreq {
        string service;
@@ -49,7 +49,7 @@ public:
        void Knob2Left1();
        void Knob2Right1();
        
-       void SetId(string s);
+       void SetId(const string& s);
        
 private:
        // Update the cached airport details
@@ -60,7 +60,7 @@ private:
        string _save_apt_id;
        const FGAirport* ap;
        
-       vector<FGRunway> _aptRwys;
+       vector<FGRunway*> _aptRwys;
        vector<AptFreq> _aptFreqs;
        
        iap_list_type _iaps;