From 2e6904b8a45e0190a11b0cd176b92e90f694126d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Beat=20K=C3=BCng?= <beat-kueng@gmx.net>
Date: Fri, 2 Mar 2018 14:00:22 +0100
Subject: [PATCH] navigator: use '#pragma once' as include guard

---
 src/modules/navigator/datalinkloss.h                | 4 +---
 src/modules/navigator/enginefailure.h               | 4 +---
 src/modules/navigator/geofence.h                    | 5 +----
 src/modules/navigator/gpsfailure.h                  | 4 +---
 src/modules/navigator/land.h                        | 5 +----
 src/modules/navigator/loiter.h                      | 5 +----
 src/modules/navigator/mission.h                     | 5 +----
 src/modules/navigator/mission_block.h               | 5 +----
 src/modules/navigator/mission_feasibility_checker.h | 4 +---
 src/modules/navigator/navigation.h                  | 4 +---
 src/modules/navigator/navigator.h                   | 4 +---
 src/modules/navigator/navigator_mode.h              | 5 +----
 src/modules/navigator/precland.h                    | 5 +----
 src/modules/navigator/rcloss.h                      | 4 +---
 src/modules/navigator/rtl.h                         | 5 +----
 src/modules/navigator/takeoff.h                     | 6 +-----
 16 files changed, 16 insertions(+), 58 deletions(-)

diff --git a/src/modules/navigator/datalinkloss.h b/src/modules/navigator/datalinkloss.h
index e622b5c412..292be27f86 100644
--- a/src/modules/navigator/datalinkloss.h
+++ b/src/modules/navigator/datalinkloss.h
@@ -37,8 +37,7 @@
  * @author Thomas Gubler <thomasgubler@gmail.com>
  */
 
-#ifndef NAVIGATOR_DATALINKLOSS_H
-#define NAVIGATOR_DATALINKLOSS_H
+#pragma once
 
 #include <px4_module_params.h>
 
@@ -91,4 +90,3 @@ private:
 	void		advance_dll();
 
 };
-#endif
diff --git a/src/modules/navigator/enginefailure.h b/src/modules/navigator/enginefailure.h
index 2b8f184b22..8ba17d8246 100644
--- a/src/modules/navigator/enginefailure.h
+++ b/src/modules/navigator/enginefailure.h
@@ -37,8 +37,7 @@
  * @author Thomas Gubler <thomasgubler@gmail.com>
  */
 
-#ifndef NAVIGATOR_ENGINEFAILURE_H
-#define NAVIGATOR_ENGINEFAILURE_H
+#pragma once
 
 #include "navigator_mode.h"
 #include "mission_block.h"
@@ -72,4 +71,3 @@ private:
 	void		advance_ef();
 
 };
-#endif
diff --git a/src/modules/navigator/geofence.h b/src/modules/navigator/geofence.h
index 0314d44440..7fee1f69d9 100644
--- a/src/modules/navigator/geofence.h
+++ b/src/modules/navigator/geofence.h
@@ -38,8 +38,7 @@
  * @author Thomas Gubler <thomasgubler@gmail.com>
  */
 
-#ifndef GEOFENCE_H_
-#define GEOFENCE_H_
+#pragma once
 
 #include <cfloat>
 
@@ -210,5 +209,3 @@ private:
 	 */
 	bool insideCircle(const PolygonInfo &polygon, double lat, double lon, float altitude);
 };
-
-#endif /* GEOFENCE_H_ */
diff --git a/src/modules/navigator/gpsfailure.h b/src/modules/navigator/gpsfailure.h
index 35227188f8..1802031cbc 100644
--- a/src/modules/navigator/gpsfailure.h
+++ b/src/modules/navigator/gpsfailure.h
@@ -37,8 +37,7 @@
  * @author Thomas Gubler <thomasgubler@gmail.com>
  */
 
-#ifndef NAVIGATOR_GPSFAILURE_H
-#define NAVIGATOR_GPSFAILURE_H
+#pragma once
 
 #include <px4_module_params.h>
 
@@ -86,4 +85,3 @@ private:
 	void		advance_gpsf();
 
 };
-#endif
diff --git a/src/modules/navigator/land.h b/src/modules/navigator/land.h
index 01ae962ebb..e534fee13f 100644
--- a/src/modules/navigator/land.h
+++ b/src/modules/navigator/land.h
@@ -38,8 +38,7 @@
  * @author Andreas Antener <andreas@uaventure.com>
  */
 
-#ifndef NAVIGATOR_LAND_H
-#define NAVIGATOR_LAND_H
+#pragma once
 
 #include "navigator_mode.h"
 #include "mission_block.h"
@@ -53,5 +52,3 @@ public:
 	void on_activation() override;
 	void on_active() override;
 };
-
-#endif
diff --git a/src/modules/navigator/loiter.h b/src/modules/navigator/loiter.h
index 2b63721e6c..1db9dca99d 100644
--- a/src/modules/navigator/loiter.h
+++ b/src/modules/navigator/loiter.h
@@ -38,8 +38,7 @@
  * @author Julian Oes <julian@oes.ch>
  */
 
-#ifndef NAVIGATOR_LOITER_H
-#define NAVIGATOR_LOITER_H
+#pragma once
 
 #include "navigator_mode.h"
 #include "mission_block.h"
@@ -83,5 +82,3 @@ private:
 
 	bool _loiter_pos_set{false};
 };
-
-#endif
diff --git a/src/modules/navigator/mission.h b/src/modules/navigator/mission.h
index b881934eee..53f0e7347b 100644
--- a/src/modules/navigator/mission.h
+++ b/src/modules/navigator/mission.h
@@ -42,8 +42,7 @@
  * @author Lorenz Meier <lorenz@px4.io>
  */
 
-#ifndef NAVIGATOR_MISSION_H
-#define NAVIGATOR_MISSION_H
+#pragma once
 
 #include "mission_block.h"
 #include "mission_feasibility_checker.h"
@@ -271,5 +270,3 @@ private:
 		WORK_ITEM_TYPE_PRECISION_LAND
 	} _work_item_type{WORK_ITEM_TYPE_DEFAULT};	/**< current type of work to do (sub mission item) */
 };
-
-#endif
diff --git a/src/modules/navigator/mission_block.h b/src/modules/navigator/mission_block.h
index d7f454b712..8eb9f8ea43 100644
--- a/src/modules/navigator/mission_block.h
+++ b/src/modules/navigator/mission_block.h
@@ -38,8 +38,7 @@
  * @author Julian Oes <julian@oes.ch>
  */
 
-#ifndef NAVIGATOR_MISSION_BLOCK_H
-#define NAVIGATOR_MISSION_BLOCK_H
+#pragma once
 
 #include "navigator_mode.h"
 #include "navigation.h"
@@ -128,5 +127,3 @@ protected:
 
 	orb_advert_t    _actuator_pub{nullptr};
 };
-
-#endif
diff --git a/src/modules/navigator/mission_feasibility_checker.h b/src/modules/navigator/mission_feasibility_checker.h
index 65f8e3dd3f..94f36000bf 100644
--- a/src/modules/navigator/mission_feasibility_checker.h
+++ b/src/modules/navigator/mission_feasibility_checker.h
@@ -39,8 +39,7 @@
  * @author Sander Smeets <sander@droneslab.com>
  */
 
-#ifndef MISSION_FEASIBILITY_CHECKER_H_
-#define MISSION_FEASIBILITY_CHECKER_H_
+#pragma once
 
 #include <dataman/dataman.h>
 #include <uORB/topics/mission.h>
@@ -88,4 +87,3 @@ public:
 
 };
 
-#endif /* MISSION_FEASIBILITY_CHECKER_H_ */
diff --git a/src/modules/navigator/navigation.h b/src/modules/navigator/navigation.h
index 71b5dc0629..7cb7bf2ed7 100644
--- a/src/modules/navigator/navigation.h
+++ b/src/modules/navigator/navigation.h
@@ -39,8 +39,7 @@
  * @author Lorenz Meier <lm@inf.ethz.ch>
  */
 
-#ifndef NAVIGATION_H_
-#define NAVIGATION_H_
+#pragma once
 
 #include <stdint.h>
 #include <stdbool.h>
@@ -215,4 +214,3 @@ struct mission_save_point_s {
  */
 
 
-#endif
diff --git a/src/modules/navigator/navigator.h b/src/modules/navigator/navigator.h
index 15ab7eb406..4e39fb3f6f 100644
--- a/src/modules/navigator/navigator.h
+++ b/src/modules/navigator/navigator.h
@@ -39,8 +39,7 @@
  * @author Lorenz Meier <lorenz@px4.io>
  */
 
-#ifndef NAVIGATOR_H
-#define NAVIGATOR_H
+#pragma once
 
 #include "datalinkloss.h"
 #include "enginefailure.h"
@@ -389,4 +388,3 @@ private:
 
 	void		publish_vehicle_command_ack(const vehicle_command_s &cmd, uint8_t result);
 };
-#endif
diff --git a/src/modules/navigator/navigator_mode.h b/src/modules/navigator/navigator_mode.h
index 113a6f4a8f..a3a48a920a 100644
--- a/src/modules/navigator/navigator_mode.h
+++ b/src/modules/navigator/navigator_mode.h
@@ -39,8 +39,7 @@
  * @author Anton Babushkin <anton.babushkin@me.com>
  */
 
-#ifndef NAVIGATOR_MODE_H
-#define NAVIGATOR_MODE_H
+#pragma once
 
 class Navigator;
 
@@ -80,5 +79,3 @@ protected:
 private:
 	bool _active{false};
 };
-
-#endif
diff --git a/src/modules/navigator/precland.h b/src/modules/navigator/precland.h
index b0122e6514..b43a501710 100644
--- a/src/modules/navigator/precland.h
+++ b/src/modules/navigator/precland.h
@@ -38,8 +38,7 @@
  * @author Nicolas de Palezieux (Sunflower Labs) <ndepal@gmail.com>
  */
 
-#ifndef NAVIGATOR_PRECLAND_H
-#define NAVIGATOR_PRECLAND_H
+#pragma once
 
 #include <matrix/math.hpp>
 #include <geo/geo.h>
@@ -133,5 +132,3 @@ private:
 	)
 
 };
-
-#endif
diff --git a/src/modules/navigator/rcloss.h b/src/modules/navigator/rcloss.h
index c0c2ae02ce..c626f1e312 100644
--- a/src/modules/navigator/rcloss.h
+++ b/src/modules/navigator/rcloss.h
@@ -37,8 +37,7 @@
  * @author Thomas Gubler <thomasgubler@gmail.com>
  */
 
-#ifndef NAVIGATOR_RCLOSS_H
-#define NAVIGATOR_RCLOSS_H
+#pragma once
 
 #include <px4_module_params.h>
 
@@ -80,4 +79,3 @@ private:
 	void		advance_rcl();
 
 };
-#endif
diff --git a/src/modules/navigator/rtl.h b/src/modules/navigator/rtl.h
index 9807d9c388..2fddfda374 100644
--- a/src/modules/navigator/rtl.h
+++ b/src/modules/navigator/rtl.h
@@ -38,8 +38,7 @@
  * @author Anton Babushkin <anton.babushkin@me.com>
  */
 
-#ifndef NAVIGATOR_RTL_H
-#define NAVIGATOR_RTL_H
+#pragma once
 
 #include <px4_module_params.h>
 
@@ -94,5 +93,3 @@ private:
 		(ParamInt<px4::params::RTL_LAND_TYPE>) _param_rtl_land_type
 	)
 };
-
-#endif
diff --git a/src/modules/navigator/takeoff.h b/src/modules/navigator/takeoff.h
index c6d7a73876..3a734dd611 100644
--- a/src/modules/navigator/takeoff.h
+++ b/src/modules/navigator/takeoff.h
@@ -38,9 +38,7 @@
  * @author Lorenz Meier <lorenz@px4.io>
  */
 
-#ifndef NAVIGATOR_TAKEOFF_H
-#define NAVIGATOR_TAKEOFF_H
-
+#pragma once
 
 #include "navigator_mode.h"
 #include "mission_block.h"
@@ -58,5 +56,3 @@ private:
 
 	void set_takeoff_position();
 };
-
-#endif