Typos, license headers...

diff --git a/src/Airports/airports_fwd.hxx b/src/Airports/airports_fwd.hxx
index 6ea223441b8c1a743355a5123fd074de106a8c97..679587a4c935cc93e878c577170c7d886c61a77f 100644 (file)
--- a/src/Airports/airports_fwd.hxx
+++ b/src/Airports/airports_fwd.hxx
@@ -1,9 +1,20 @@
-/*
- * airports_fwd.hxx
- *
- *  Created on: 04.03.2013
- *      Author: tom
- */
+// Airports forward declarations
+//
+// Copyright (C) 2013  Thomas Geymayer <tomgey@gmail.com>
+//
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of the GNU General Public License as
+// published by the Free Software Foundation; either version 2 of the
+// License, or (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful, but
+// WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// General Public License for more details.
+//
+// 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., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 #ifndef AIRPORTS_FWD_HXX_
 #define AIRPORTS_FWD_HXX_

diff --git a/src/Canvas/FGCanvasSystemAdapter.cxx b/src/Canvas/FGCanvasSystemAdapter.cxx
index f6c94522ea92a3b5e0c7a4443fc5892a6070fde4..c91c5d17caf754e2f6dfb46d4af6ed0e0a5beef6 100644 (file)
--- a/src/Canvas/FGCanvasSystemAdapter.cxx
+++ b/src/Canvas/FGCanvasSystemAdapter.cxx
@@ -1,3 +1,21 @@
+// Integrate Canvas into FlightGear
+//
+// Copyright (C) 2012  Thomas Geymayer <tomgey@gmail.com>
+//
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of the GNU General Public License as
+// published by the Free Software Foundation; either version 2 of the
+// License, or (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful, but
+// WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// General Public License for more details.
+//
+// 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., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+
 #include "FGCanvasSystemAdapter.hxx"
 
 #include <Main/globals.hxx>

diff --git a/src/Canvas/FGCanvasSystemAdapter.hxx b/src/Canvas/FGCanvasSystemAdapter.hxx
index d56397a088c19ab0278d1ceeabfb668ac27230b7..4cb3a5547f8be3e8a5d4b07bfd0f487663856172 100644 (file)
--- a/src/Canvas/FGCanvasSystemAdapter.hxx
+++ b/src/Canvas/FGCanvasSystemAdapter.hxx
@@ -1,9 +1,20 @@
-/*
- * FGCanvasSystemAdapter.hxx
- *
- *  Created on: 02.11.2012
- *      Author: tom
- */
+// Integrate Canvas into FlightGear
+//
+// Copyright (C) 2012  Thomas Geymayer <tomgey@gmail.com>
+//
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of the GNU General Public License as
+// published by the Free Software Foundation; either version 2 of the
+// License, or (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful, but
+// WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// General Public License for more details.
+//
+// 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., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 #ifndef FG_CANVASSYSTEMADAPTER_HXX_
 #define FG_CANVASSYSTEMADAPTER_HXX_

diff --git a/src/GUI/CanvasWidget.cxx b/src/GUI/CanvasWidget.cxx
index 7113bef426f04d5a76905a12057a261ae8acae4f..d627d6f2f152f88fafb7163d31a35f124524f60e 100644 (file)
--- a/src/GUI/CanvasWidget.cxx
+++ b/src/GUI/CanvasWidget.cxx
@@ -1,9 +1,20 @@
-/*
- * CanvasWidget.cxx
- *
- *  Created on: 03.07.2012
- *      Author: tom
- */
+// Airports forward declarations
+//
+// Copyright (C) 2012  Thomas Geymayer <tomgey@gmail.com>
+//
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of the GNU General Public License as
+// published by the Free Software Foundation; either version 2 of the
+// License, or (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful, but
+// WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// General Public License for more details.
+//
+// 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., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 #ifdef HAVE_CONFIG_H
 #  include <config.h>

diff --git a/src/GUI/CanvasWidget.hxx b/src/GUI/CanvasWidget.hxx
index 8d4f60780fd569bcbd128e4cc2bceadc50e38cd2..63d648c7b58ceaf99460433b50c8e751f5b5baed 100644 (file)
--- a/src/GUI/CanvasWidget.hxx
+++ b/src/GUI/CanvasWidget.hxx
@@ -1,9 +1,20 @@
-/*
- * CanvasWidget.hxx
- *
- *  Created on: 03.07.2012
- *      Author: tom
- */
+// CanvasWidget -- Using Canvas inside PUI dialogs
+//
+// Copyright (C) 2012  Thomas Geymayer <tomgey@gmail.com>
+//
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of the GNU General Public License as
+// published by the Free Software Foundation; either version 2 of the
+// License, or (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful, but
+// WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// General Public License for more details.
+//
+// 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., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 #ifndef CANVASWIDGET_HXX_
 #define CANVASWIDGET_HXX_

diff --git a/src/Instrumentation/navradio.cxx b/src/Instrumentation/navradio.cxx
index cc4acedd821c94cbe336b2bcf545c81db1c5410b..480a6f80a5760f76bfceb0a87052c4efffddd99e 100644 (file)
--- a/src/Instrumentation/navradio.cxx
+++ b/src/Instrumentation/navradio.cxx
@@ -571,7 +571,7 @@ void FGNavRadio::updateReceiver(double dt)
     } // of false courses disabled
     
     const double VOR_FULL_ARC = 20.0; // VOR is -10 .. 10 degree swing
-    _cdiDeflection *= VOR_FULL_ARC / _localizerWidth; // increased localiser sensitivity
+    _cdiDeflection *= VOR_FULL_ARC / _localizerWidth; // increased localizer sensitivity
     
     if (backcourse_node->getBoolValue()) {
       _cdiDeflection = -_cdiDeflection;
@@ -582,7 +582,7 @@ void FGNavRadio::updateReceiver(double dt)
       r = ( r<0.0 ? -r-180.0 : -r+180.0 );
     }
     _cdiDeflection = r;
-  } // of non-localiser case
+  } // of non-localizer case
   
   SG_CLAMP_RANGE(_cdiDeflection, -10.0, 10.0 );
   _cdiDeflection *= signal_quality_norm;

diff --git a/src/Instrumentation/navradio.hxx b/src/Instrumentation/navradio.hxx
index abb288421b5b6076ac0bd96806f84129c3ef5a1b..c731f1d2b7a3c896c2efce7c7035a1831d92931e 100644 (file)
--- a/src/Instrumentation/navradio.hxx
+++ b/src/Instrumentation/navradio.hxx
@@ -24,7 +24,7 @@
 #ifndef _FG_NAVRADIO_HXX
 #define _FG_NAVRADIO_HXX
 
-
+#include <Navaids/navaids_fwd.hxx>
 #include <Main/fg_props.hxx>
 
 #include <simgear/compiler.h>
@@ -32,8 +32,6 @@
 #include <simgear/timing/timestamp.hxx>
 
 class SGSampleGroup;
-class FGNavRecord;
-typedef SGSharedPtr<FGNavRecord> FGNavRecordPtr;
 
 class FGNavRadio : public SGSubsystem, public SGPropertyChangeListener
 {
@@ -119,8 +117,8 @@ class FGNavRadio : public SGSubsystem, public SGPropertyChangeListener
     int play_count;
     bool _nav_search;
     double _last_freq;
-    FGNavRecordPtr _navaid;
-    FGNavRecordPtr _gs;
+    FGNavRecordRef _navaid;
+    FGNavRecordRef _gs;
     
     double target_radial;
     double effective_range;

diff --git a/src/Navaids/navdb.cxx b/src/Navaids/navdb.cxx
index 9cc1654a974259e52e4c88d0b70cd73afd7303ff..6a1961ae0115474120ffa0cf21fa30d921c99991 100644 (file)
--- a/src/Navaids/navdb.cxx
+++ b/src/Navaids/navdb.cxx
@@ -74,10 +74,10 @@ static bool autoAlignLocalizers = false;
 static double autoAlignThreshold = 0.0;
 
 /**
- * Given a runway, and proposed localiser data (ident, positioned and heading),
- * precisely align the localiser with the actual runway heading, providing the
- * difference between the localiser course and runway heading is less than a
- * threshold. (To allow for localizers such as Kai-Tek requiring a turn on final).
+ * Given a runway, and proposed localizer data (ident, positioned and heading),
+ * precisely align the localizer with the actual runway heading, providing the
+ * difference between the localizer course and runway heading is less than a
+ * threshold. (To allow for localizers such as Kai-Tak requiring a turn on final).
  *
  * The positioned and heading argument are modified if changes are made.
  */