From 1c905e5881f1ee8add6f54fe00c849764a0cbcb1 Mon Sep 17 00:00:00 2001 From: Thomas Geymayer Date: Wed, 6 Mar 2013 01:03:47 +0100 Subject: [PATCH] Typos, license headers... --- src/Airports/airports_fwd.hxx | 23 +++++++++++++++++------ src/Canvas/FGCanvasSystemAdapter.cxx | 18 ++++++++++++++++++ src/Canvas/FGCanvasSystemAdapter.hxx | 23 +++++++++++++++++------ src/GUI/CanvasWidget.cxx | 23 +++++++++++++++++------ src/GUI/CanvasWidget.hxx | 23 +++++++++++++++++------ src/Instrumentation/navradio.cxx | 4 ++-- src/Instrumentation/navradio.hxx | 8 +++----- src/Navaids/navdb.cxx | 8 ++++---- 8 files changed, 95 insertions(+), 35 deletions(-) diff --git a/src/Airports/airports_fwd.hxx b/src/Airports/airports_fwd.hxx index 6ea223441..679587a4c 100644 --- 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 +// +// 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 f6c94522e..c91c5d17c 100644 --- a/src/Canvas/FGCanvasSystemAdapter.cxx +++ b/src/Canvas/FGCanvasSystemAdapter.cxx @@ -1,3 +1,21 @@ +// Integrate Canvas into FlightGear +// +// Copyright (C) 2012 Thomas Geymayer +// +// 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
diff --git a/src/Canvas/FGCanvasSystemAdapter.hxx b/src/Canvas/FGCanvasSystemAdapter.hxx index d56397a08..4cb3a5547 100644 --- 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 +// +// 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 7113bef42..d627d6f2f 100644 --- 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 +// +// 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 diff --git a/src/GUI/CanvasWidget.hxx b/src/GUI/CanvasWidget.hxx index 8d4f60780..63d648c7b 100644 --- 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 +// +// 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 cc4acedd8..480a6f80a 100644 --- 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 abb288421..c731f1d2b 100644 --- a/src/Instrumentation/navradio.hxx +++ b/src/Instrumentation/navradio.hxx @@ -24,7 +24,7 @@ #ifndef _FG_NAVRADIO_HXX #define _FG_NAVRADIO_HXX - +#include #include
#include @@ -32,8 +32,6 @@ #include class SGSampleGroup; -class FGNavRecord; -typedef SGSharedPtr 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 9cc1654a9..6a1961ae0 100644 --- 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. */