From ce57c573df0ebbdd5440ecb2219875aa5f07adf5 Mon Sep 17 00:00:00 2001
From: Klaus Basan <klaus.basan@klausbasan.de>
Date: Wed, 17 Dec 2014 18:41:36 +0100
Subject: [PATCH] refs #358, aircrafts -> aircraft in GUI

---
 src/blackgui/components/aircraftcomponent.cpp | 20 +++++++++----------
 src/blackgui/components/aircraftcomponent.h   |  4 ++--
 src/blackgui/components/aircraftcomponent.ui  |  6 +++---
 .../components/mainkeypadareacomponent.ui     |  2 +-
 4 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/src/blackgui/components/aircraftcomponent.cpp b/src/blackgui/components/aircraftcomponent.cpp
index d67932053..e75ec0314 100644
--- a/src/blackgui/components/aircraftcomponent.cpp
+++ b/src/blackgui/components/aircraftcomponent.cpp
@@ -31,17 +31,17 @@ namespace BlackGui
             this->ui->tvp_AirportsInRange->setResizeMode(CAirportView::ResizingOnce);
             m_updateTimer = new CUpdateTimer(SLOT(update()), this);
 
-            connect(this->ui->tvp_AircraftsInRange, &CAircraftView::countChanged, this, &CAircraftComponent::ps_countChanged);
+            connect(this->ui->tvp_AircraftInRange, &CAircraftView::countChanged, this, &CAircraftComponent::ps_countChanged);
             connect(this->ui->tvp_AirportsInRange, &CAircraftView::countChanged, this, &CAircraftComponent::ps_countChanged);
         }
 
         CAircraftComponent::~CAircraftComponent()
         { }
 
-        int CAircraftComponent::countAircrafts() const
+        int CAircraftComponent::countAircraft() const
         {
-            Q_ASSERT(this->ui->tvp_AircraftsInRange);
-            return this->ui->tvp_AircraftsInRange->rowCount();
+            Q_ASSERT(this->ui->tvp_AircraftInRange);
+            return this->ui->tvp_AircraftInRange->rowCount();
         }
 
         int CAircraftComponent::countAirportsInRange() const
@@ -52,16 +52,16 @@ namespace BlackGui
 
         void CAircraftComponent::update()
         {
-            Q_ASSERT(this->ui->tvp_AircraftsInRange);
+            Q_ASSERT(this->ui->tvp_AircraftInRange);
             Q_ASSERT(this->getIContextNetwork());
             Q_ASSERT(this->getIContextSimulator());
 
             if (this->getIContextNetwork()->isConnected())
             {
-                bool visible = (this->isVisibleWidget() && this->currentWidget() == this->ui->tb_AircraftsInRange);
-                if (this->countAircrafts() < 1 || visible)
+                bool visible = (this->isVisibleWidget() && this->currentWidget() == this->ui->tb_AircraftInRange);
+                if (this->countAircraft() < 1 || visible)
                 {
-                    this->ui->tvp_AircraftsInRange->updateContainer(this->getIContextNetwork()->getAircraftInRange());
+                    this->ui->tvp_AircraftInRange->updateContainer(this->getIContextNetwork()->getAircraftInRange());
                 }
             }
             if (this->getIContextSimulator()->isConnected())
@@ -94,11 +94,11 @@ namespace BlackGui
         void CAircraftComponent::ps_countChanged(int count)
         {
             Q_UNUSED(count);
-            int ac = this->indexOf(this->ui->tb_AircraftsInRange);
+            int ac = this->indexOf(this->ui->tb_AircraftInRange);
             int ap = this->indexOf(this->ui->tb_AirportsInRange);
             QString acs = this->tabBar()->tabText(ac);
             QString aps = this->tabBar()->tabText(ap);
-            acs = CGuiUtility::replaceTabCountValue(acs, this->countAircrafts());
+            acs = CGuiUtility::replaceTabCountValue(acs, this->countAircraft());
             aps = CGuiUtility::replaceTabCountValue(aps, this->countAirportsInRange());
             this->tabBar()->setTabText(ac, acs);
             this->tabBar()->setTabText(ap, aps);
diff --git a/src/blackgui/components/aircraftcomponent.h b/src/blackgui/components/aircraftcomponent.h
index 777a706b3..7e5f20baa 100644
--- a/src/blackgui/components/aircraftcomponent.h
+++ b/src/blackgui/components/aircraftcomponent.h
@@ -43,8 +43,8 @@ namespace BlackGui
             //! Timer for updating
             CUpdateTimer *getTimerComponent() { return this->m_updateTimer; }
 
-            //! Aircrafts in range
-            int countAircrafts() const;
+            //! Aircraft in range
+            int countAircraft() const;
 
             //! Airports in range
             int countAirportsInRange() const;
diff --git a/src/blackgui/components/aircraftcomponent.ui b/src/blackgui/components/aircraftcomponent.ui
index 99e6e5f93..1b54601f4 100644
--- a/src/blackgui/components/aircraftcomponent.ui
+++ b/src/blackgui/components/aircraftcomponent.ui
@@ -22,9 +22,9 @@
   <property name="currentIndex">
    <number>0</number>
   </property>
-  <widget class="QWidget" name="tb_AircraftsInRange">
+  <widget class="QWidget" name="tb_AircraftInRange">
    <attribute name="title">
-    <string>Aircrafts in range</string>
+    <string>Aircraft in range</string>
    </attribute>
    <layout class="QVBoxLayout" name="vl_AircraftsInRange">
     <property name="spacing">
@@ -43,7 +43,7 @@
      <number>0</number>
     </property>
     <item>
-     <widget class="BlackGui::Views::CAircraftView" name="tvp_AircraftsInRange">
+     <widget class="BlackGui::Views::CAircraftView" name="tvp_AircraftInRange">
       <attribute name="verticalHeaderVisible">
        <bool>false</bool>
       </attribute>
diff --git a/src/blackgui/components/mainkeypadareacomponent.ui b/src/blackgui/components/mainkeypadareacomponent.ui
index 0d10d519f..f79750576 100644
--- a/src/blackgui/components/mainkeypadareacomponent.ui
+++ b/src/blackgui/components/mainkeypadareacomponent.ui
@@ -194,7 +194,7 @@
          </size>
         </property>
         <property name="text">
-         <string>Aircrafts</string>
+         <string>Aircraft</string>
         </property>
         <property name="checkable">
          <bool>true</bool>