If it's a struct, it's not a class

[flightgear.git] / src / ATC / tower.hxx

diff --git a/src/ATC/tower.hxx b/src/ATC/tower.hxx
index de0bf632f7081e1e502102459cb39f266a96b9d3..a1ed67892db46d408cea193eb401c4ff03f98037 100644 (file)
--- a/src/ATC/tower.hxx
+++ b/src/ATC/tower.hxx
@@ -16,7 +16,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.
 
 #ifndef _FG_TOWER_HXX
 #define _FG_TOWER_HXX
@@ -24,9 +24,7 @@
 #include <simgear/compiler.h>
 #include <simgear/math/point3d.hxx>
 #include <simgear/misc/sgstream.hxx>
-//#include <simgear/math/sg_geodesy.hxx>
 #include <plib/sg.h>
-//#include <Airports/runways.hxx>
 
 #include STL_IOSTREAM
 #include STL_STRING
@@ -35,11 +33,12 @@ SG_USING_STD(string);
 SG_USING_STD(ios);
 
 #include "ATC.hxx"
-//#include "ATCmgr.hxx"
-#include "ground.hxx"
 #include "ATCProjection.hxx"
 #include "AIPlane.hxx"
 
+class FGATCMgr;
+class FGGround;
+
 //DCL - a complete guess for now.
 #define FG_TOWER_DEFAULT_RANGE 30
 
@@ -162,14 +161,14 @@ public:
        
        // Public interface to the active runway - this will get more complex 
        // in the future and consider multi-runway use, airplane weight etc.
-       inline const string& GetActiveRunway() { return activeRwy; }
-       inline const RunwayDetails& GetActiveRunwayDetails() { return rwy; }
+       inline const string& GetActiveRunway() const { return activeRwy; }
+       inline const RunwayDetails& GetActiveRunwayDetails() const { return rwy; }
        // Get the pattern direction of the active rwy.
-       inline int GetPatternDirection() { return rwy.patternDirection; }
+       inline int GetPatternDirection() const { return rwy.patternDirection; }
        
-       inline const string& get_trans_ident() { return trans_ident; }
+       inline const string& get_trans_ident() const { return trans_ident; }
        
-       inline FGGround* GetGroundPtr() { return ground; }
+       inline FGGround* const GetGroundPtr() const { return ground; }
        
        // Returns true if positions of crosswind/downwind/base leg turns should be constrained by previous traffic
        // plus the constraint position as a rwy orientated orthopos (meters)