From de959a14f35ee4e74d405b418bb09689967ee22f Mon Sep 17 00:00:00 2001
From: James Turner <zakalawe@mac.com>
Date: Mon, 25 Jan 2016 17:17:17 -0600
Subject: [PATCH] Rename Viewer/viewer.cxx to view

- keep class and file names in sync.
---
 src/AIModel/AIEscort.cxx               | 2 +-
 src/AIModel/AIGroundVehicle.cxx        | 2 +-
 src/Cockpit/panel.cxx                  | 2 +-
 src/Instrumentation/HUD/HUD.cxx        | 2 +-
 src/Instrumentation/HUD/HUD_ladder.cxx | 2 +-
 src/Instrumentation/HUD/HUD_runway.cxx | 2 +-
 src/Main/fg_commands.cxx               | 2 +-
 src/Main/options.cxx                   | 2 +-
 src/Model/acmodel.cxx                  | 2 +-
 src/Model/panelnode.cxx                | 2 +-
 src/Time/light.cxx                     | 2 +-
 src/Viewer/CMakeLists.txt              | 4 ++--
 src/Viewer/renderer.cxx                | 2 +-
 src/Viewer/{viewer.cxx => view.cxx}    | 4 ++--
 src/Viewer/{viewer.hxx => view.hxx}    | 2 +-
 src/Viewer/viewmgr.cxx                 | 6 +++---
 16 files changed, 20 insertions(+), 20 deletions(-)
 rename src/Viewer/{viewer.cxx => view.cxx} (99%)
 rename src/Viewer/{viewer.hxx => view.hxx} (99%)

diff --git a/src/AIModel/AIEscort.cxx b/src/AIModel/AIEscort.cxx
index c2067ae1a..b4662b708 100644
--- a/src/AIModel/AIEscort.cxx
+++ b/src/AIModel/AIEscort.cxx
@@ -33,7 +33,7 @@
 #include <cmath>
 #include <Main/util.hxx>
 #include <Main/globals.hxx>
-#include <Viewer/viewer.hxx>
+#include <Viewer/view.hxx>
 
 #include <Scenery/scenery.hxx>
 
diff --git a/src/AIModel/AIGroundVehicle.cxx b/src/AIModel/AIGroundVehicle.cxx
index 2ef662e09..da72f905a 100644
--- a/src/AIModel/AIGroundVehicle.cxx
+++ b/src/AIModel/AIGroundVehicle.cxx
@@ -24,7 +24,7 @@
 
 #include <simgear/sg_inlines.h>
 
-#include <Viewer/viewer.hxx>
+#include <Viewer/view.hxx>
 #include <Scenery/scenery.hxx>
 #include <Airports/dynamics.hxx>
 #include <Main/globals.hxx>
diff --git a/src/Cockpit/panel.cxx b/src/Cockpit/panel.cxx
index dd2c6c154..18b8fe78b 100644
--- a/src/Cockpit/panel.cxx
+++ b/src/Cockpit/panel.cxx
@@ -59,7 +59,7 @@
 #include <Main/globals.hxx>
 #include <Main/fg_props.hxx>
 #include <Viewer/viewmgr.hxx>
-#include <Viewer/viewer.hxx>
+#include <Viewer/view.hxx>
 #include <Time/light.hxx>
 #include <GUI/FGFontCache.hxx>	
 #include <Instrumentation/dclgps.hxx>
diff --git a/src/Instrumentation/HUD/HUD.cxx b/src/Instrumentation/HUD/HUD.cxx
index 906341255..66300afc5 100644
--- a/src/Instrumentation/HUD/HUD.cxx
+++ b/src/Instrumentation/HUD/HUD.cxx
@@ -39,7 +39,7 @@
 #include <Main/globals.hxx>
 #include <Main/fg_props.hxx>
 #include <Viewer/viewmgr.hxx>
-#include <Viewer/viewer.hxx>
+#include <Viewer/view.hxx>
 #include <GUI/FGFontCache.hxx>
 #include <GUI/gui.h> // for guiErrorMessage
 
diff --git a/src/Instrumentation/HUD/HUD_ladder.cxx b/src/Instrumentation/HUD/HUD_ladder.cxx
index 92a39f68e..6371da41d 100644
--- a/src/Instrumentation/HUD/HUD_ladder.cxx
+++ b/src/Instrumentation/HUD/HUD_ladder.cxx
@@ -25,7 +25,7 @@
 
 #include <sstream>
 #include <simgear/math/SGGeometry.hxx>
-#include <Viewer/viewer.hxx>
+#include <Viewer/view.hxx>
 
 #include "HUD.hxx"
 #include "HUD_private.hxx"
diff --git a/src/Instrumentation/HUD/HUD_runway.cxx b/src/Instrumentation/HUD/HUD_runway.cxx
index 6fae692d1..743e5df58 100644
--- a/src/Instrumentation/HUD/HUD_runway.cxx
+++ b/src/Instrumentation/HUD/HUD_runway.cxx
@@ -34,7 +34,7 @@
 #include <FDM/flight.hxx>
 #include <Environment/environment.hxx>
 #include <Environment/environment_mgr.hxx>
-#include <Viewer/viewer.hxx>
+#include <Viewer/view.hxx>
 #include <Viewer/viewmgr.hxx>
 #include <Airports/airport.hxx>
 
diff --git a/src/Main/fg_commands.cxx b/src/Main/fg_commands.cxx
index a7a5945dc..1e93a0b7b 100644
--- a/src/Main/fg_commands.cxx
+++ b/src/Main/fg_commands.cxx
@@ -37,7 +37,7 @@
 #include <Airports/xmlloader.hxx>
 #include <Network/HTTPClient.hxx>
 #include <Viewer/viewmgr.hxx>
-#include <Viewer/viewer.hxx>
+#include <Viewer/view.hxx>
 #include <Environment/presets.hxx>
 #include <Navaids/NavDataCache.hxx>
 
diff --git a/src/Main/options.cxx b/src/Main/options.cxx
index 97d9cc8d2..3c412ca68 100644
--- a/src/Main/options.cxx
+++ b/src/Main/options.cxx
@@ -68,7 +68,7 @@
 #include "util.hxx"
 #include "main.hxx"
 #include "locale.hxx"
-#include <Viewer/viewer.hxx>
+#include <Viewer/view.hxx>
 #include <Viewer/viewmgr.hxx>
 #include <Environment/presets.hxx>
 #include <Network/http/httpd.hxx>
diff --git a/src/Model/acmodel.cxx b/src/Model/acmodel.cxx
index 37ef66fd0..f17dd661a 100644
--- a/src/Model/acmodel.cxx
+++ b/src/Model/acmodel.cxx
@@ -22,7 +22,7 @@
 #include <Main/fg_props.hxx>
 #include <Viewer/renderer.hxx>
 #include <Viewer/viewmgr.hxx>
-#include <Viewer/viewer.hxx>
+#include <Viewer/view.hxx>
 #include <Scenery/scenery.hxx>
 #include <Sound/fg_fx.hxx>
 
diff --git a/src/Model/panelnode.cxx b/src/Model/panelnode.cxx
index 6399133f3..0c725d4e4 100644
--- a/src/Model/panelnode.cxx
+++ b/src/Model/panelnode.cxx
@@ -25,7 +25,7 @@
 #include <Main/fg_os.hxx>
 #include <Cockpit/panel.hxx>
 #include <Cockpit/panel_io.hxx>
-#include "Viewer/viewer.hxx"
+#include "Viewer/view.hxx"
 #include "Viewer/viewmgr.hxx"
 
 using std::vector;
diff --git a/src/Time/light.cxx b/src/Time/light.cxx
index c037657b0..8600372ce 100644
--- a/src/Time/light.cxx
+++ b/src/Time/light.cxx
@@ -43,7 +43,7 @@
 #include <Main/globals.hxx>
 #include <Main/fg_props.hxx>
 #include <Viewer/renderer.hxx>
-#include <Viewer/viewer.hxx>
+#include <Viewer/view.hxx>
 
 #include "light.hxx"
 #include "sunsolver.hxx"
diff --git a/src/Viewer/CMakeLists.txt b/src/Viewer/CMakeLists.txt
index d517c7201..7ed0aa2ba 100644
--- a/src/Viewer/CMakeLists.txt
+++ b/src/Viewer/CMakeLists.txt
@@ -10,7 +10,7 @@ set(SOURCES
 	renderer.cxx
 	renderingpipeline.cxx
 	splash.cxx
-	viewer.cxx
+	view.cxx
 	viewmgr.cxx
 	)
 
@@ -23,7 +23,7 @@ set(HEADERS
 	renderer.hxx
 	renderingpipeline.hxx
 	splash.hxx
-	viewer.hxx
+	view.hxx
 	viewmgr.hxx
 	)
 
diff --git a/src/Viewer/renderer.cxx b/src/Viewer/renderer.cxx
index 270ea178e..552a880c8 100644
--- a/src/Viewer/renderer.cxx
+++ b/src/Viewer/renderer.cxx
@@ -105,7 +105,7 @@
 #include <Environment/ephemeris.hxx>
 
 //#include <Main/main.hxx>
-#include "viewer.hxx"
+#include "view.hxx"
 #include "viewmgr.hxx"
 #include "splash.hxx"
 #include "renderer.hxx"
diff --git a/src/Viewer/viewer.cxx b/src/Viewer/view.cxx
similarity index 99%
rename from src/Viewer/viewer.cxx
rename to src/Viewer/view.cxx
index 3679a2636..dbdc11f2c 100644
--- a/src/Viewer/viewer.cxx
+++ b/src/Viewer/view.cxx
@@ -1,4 +1,4 @@
-// viewer.cxx -- class for managing a viewer in the flightgear world.
+// view.cxx -- class for managing a view in the flightgear world.
 //
 // Written by Curtis Olson, started August 1997.
 //                          overhaul started October 2000.
@@ -27,7 +27,7 @@
 #  include "config.h"
 #endif
 
-#include "viewer.hxx"
+#include "view.hxx"
 
 #include <simgear/compiler.h>
 #include <cassert>
diff --git a/src/Viewer/viewer.hxx b/src/Viewer/view.hxx
similarity index 99%
rename from src/Viewer/viewer.hxx
rename to src/Viewer/view.hxx
index a215ac87e..773909b69 100644
--- a/src/Viewer/viewer.hxx
+++ b/src/Viewer/view.hxx
@@ -1,4 +1,4 @@
-// viewer.hxx -- class for managing a viewer in the flightgear world.
+// view.hxx -- class for managing a view in the flightgear world.
 //
 // Written by Curtis Olson, started August 1997.
 //                          overhaul started October 2000.
diff --git a/src/Viewer/viewmgr.cxx b/src/Viewer/viewmgr.cxx
index 1bc091c8c..1293523d0 100644
--- a/src/Viewer/viewmgr.cxx
+++ b/src/Viewer/viewmgr.cxx
@@ -31,7 +31,7 @@
 #include <simgear/scene/util/OsgMath.hxx>
 
 #include <Main/fg_props.hxx>
-#include "viewer.hxx"
+#include "view.hxx"
 
 #include "CameraGroup.hxx"
 
@@ -55,7 +55,7 @@ FGViewMgr::init ()
     SG_LOG(SG_VIEW, SG_WARN, "duplicate init of view manager");
     return;
   }
-  
+
   inited = true;
 
   for (unsigned int i = 0; i < config_list.size(); i++) {
@@ -85,7 +85,7 @@ FGViewMgr::shutdown()
     if (!inited) {
         return;
     }
-    
+
     inited = false;
     views.clear();
 }
-- 
2.39.5