From a9f48ce1306b8d9241f58a2d32a7749cb83a9fb5 Mon Sep 17 00:00:00 2001
From: James Turner <zakalawe@mac.com>
Date: Sat, 20 Jun 2020 14:11:02 +0100
Subject: [PATCH] Fix some file/class name violations.

Ensure the file-name matches the class within, to avoid confusing
people more than necessary.
---
 src/GUI/{AircraftModel.cxx => AircraftItemModel.cxx}      | 2 +-
 src/GUI/{AircraftModel.hxx => AircraftItemModel.hxx}      | 0
 ...rcraftSearchFilterModel.cxx => AircraftProxyModel.cxx} | 4 ++--
 ...rcraftSearchFilterModel.hxx => AircraftProxyModel.hxx} | 0
 src/GUI/CMakeLists.txt                                    | 8 ++++----
 src/GUI/LauncherController.cxx                            | 4 ++--
 src/GUI/LauncherMainWindow.cxx                            | 1 -
 src/GUI/RecentAircraftModel.cxx                           | 2 +-
 8 files changed, 10 insertions(+), 11 deletions(-)
 rename src/GUI/{AircraftModel.cxx => AircraftItemModel.cxx} (99%)
 rename src/GUI/{AircraftModel.hxx => AircraftItemModel.hxx} (100%)
 rename src/GUI/{AircraftSearchFilterModel.cxx => AircraftProxyModel.cxx} (98%)
 rename src/GUI/{AircraftSearchFilterModel.hxx => AircraftProxyModel.hxx} (100%)

diff --git a/src/GUI/AircraftModel.cxx b/src/GUI/AircraftItemModel.cxx
similarity index 99%
rename from src/GUI/AircraftModel.cxx
rename to src/GUI/AircraftItemModel.cxx
index bcfaa38fe..fd2e89ab8 100644
--- a/src/GUI/AircraftModel.cxx
+++ b/src/GUI/AircraftItemModel.cxx
@@ -18,7 +18,7 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
-#include "AircraftModel.hxx"
+#include "AircraftItemModel.hxx"
 
 #include <QSettings>
 #include <QDebug>
diff --git a/src/GUI/AircraftModel.hxx b/src/GUI/AircraftItemModel.hxx
similarity index 100%
rename from src/GUI/AircraftModel.hxx
rename to src/GUI/AircraftItemModel.hxx
diff --git a/src/GUI/AircraftSearchFilterModel.cxx b/src/GUI/AircraftProxyModel.cxx
similarity index 98%
rename from src/GUI/AircraftSearchFilterModel.cxx
rename to src/GUI/AircraftProxyModel.cxx
index 4cbc45331..0cd44add6 100644
--- a/src/GUI/AircraftSearchFilterModel.cxx
+++ b/src/GUI/AircraftProxyModel.cxx
@@ -1,9 +1,9 @@
-#include "AircraftSearchFilterModel.hxx"
+#include "AircraftProxyModel.hxx"
 
 #include <QSettings>
 #include <QDebug>
 
-#include "AircraftModel.hxx"
+#include "AircraftItemModel.hxx"
 #include "FavouriteAircraftData.hxx"
 
 #include <simgear/package/Package.hxx>
diff --git a/src/GUI/AircraftSearchFilterModel.hxx b/src/GUI/AircraftProxyModel.hxx
similarity index 100%
rename from src/GUI/AircraftSearchFilterModel.hxx
rename to src/GUI/AircraftProxyModel.hxx
diff --git a/src/GUI/CMakeLists.txt b/src/GUI/CMakeLists.txt
index 91c1982c1..55935646f 100644
--- a/src/GUI/CMakeLists.txt
+++ b/src/GUI/CMakeLists.txt
@@ -90,8 +90,8 @@ if (HAVE_QT)
                             NavaidDiagram.hxx
                             SetupRootDialog.cxx
                             SetupRootDialog.hxx
-                            AircraftModel.hxx
-                            AircraftModel.cxx
+                            AircraftItemModel.hxx
+                            AircraftItemModel.cxx
                             CatalogListModel.cxx
                             CatalogListModel.hxx
                             QtMessageBox.cxx
@@ -104,8 +104,8 @@ if (HAVE_QT)
                             LocationController.hxx
                             LauncherArgumentTokenizer.cxx
                             LauncherArgumentTokenizer.hxx
-                            AircraftSearchFilterModel.cxx
-                            AircraftSearchFilterModel.hxx
+                            AircraftProxyModel.cxx
+                            AircraftProxyModel.hxx
                             DefaultAircraftLocator.cxx
                             DefaultAircraftLocator.hxx
                             LaunchConfig.cxx
diff --git a/src/GUI/LauncherController.cxx b/src/GUI/LauncherController.cxx
index 218fac9fa..84605c490 100644
--- a/src/GUI/LauncherController.cxx
+++ b/src/GUI/LauncherController.cxx
@@ -27,8 +27,8 @@
 #include <Main/fg_props.hxx>
 #include "version.h"
 
-#include "AircraftModel.hxx"
-#include "AircraftSearchFilterModel.hxx"
+#include "AircraftItemModel.hxx"
+#include "AircraftProxyModel.hxx"
 #include "AirportDiagram.hxx"
 #include "CarrierDiagram.hxx"
 #include "CarriersLocationModel.hxx"
diff --git a/src/GUI/LauncherMainWindow.cxx b/src/GUI/LauncherMainWindow.cxx
index ffdb7bc6b..6ee297ddb 100755
--- a/src/GUI/LauncherMainWindow.cxx
+++ b/src/GUI/LauncherMainWindow.cxx
@@ -22,7 +22,6 @@
 #include "QtLauncher.hxx"
 #include "DefaultAircraftLocator.hxx"
 #include "LaunchConfig.hxx"
-#include "AircraftModel.hxx"
 #include "LocalAircraftCache.hxx"
 #include "LauncherController.hxx"
 #include "AddOnsController.hxx"
diff --git a/src/GUI/RecentAircraftModel.cxx b/src/GUI/RecentAircraftModel.cxx
index 9fad02def..d07979182 100644
--- a/src/GUI/RecentAircraftModel.cxx
+++ b/src/GUI/RecentAircraftModel.cxx
@@ -3,7 +3,7 @@
 #include <QSettings>
 #include <QDebug>
 
-#include "AircraftModel.hxx"
+#include "AircraftItemModel.hxx"
 
 const int MAX_RECENT_AIRCRAFT = 20;