Put include guard to every header

* ensure include guard to every header
* comment endif guard block

Signed-off-by: Boris Barbulovski <bbarbulovski@gmail.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>

54 files changed, 78 insertions, 66 deletions

diff --git a/color.h b/color.h
index e8c1b1ede..9c8d6bc8e 100644
--- a/color.h
+++ b/color.h
@@ -1,5 +1,5 @@
-#ifndef COLORS_H
-#define COLORS_H
+#ifndef COLOR_H
+#define COLOR_H
 
 /* The colors are named by picking the closest match
    from http://chir.ag/projects/name-that-color */
@@ -57,4 +57,4 @@
 // Magentas
 #define MEDIUMREDVIOLET1_HIGHER_TRANS QColor::fromRgbF( 0.7, 0.2, 0.7, 0.1 )
 
-#endif
+#endif // COLOR_H
diff --git a/deco.h b/deco.h
index 0fc6cc2e5..aa6d299dd 100644
--- a/deco.h
+++ b/deco.h
@@ -12,4 +12,4 @@ extern double buehlmann_N2_t_halflife[];
 }
 #endif
 
-#endif
+#endif // DECO_H
diff --git a/device.h b/device.h
index ad5dee6f1..d38237b4e 100644
--- a/device.h
+++ b/device.h
@@ -1,5 +1,5 @@
-#ifndef DEVICE_INFO_H
-#define DEVICE_INFO_H
+#ifndef DEVICE_H
+#define DEVICE_H
 
 #ifdef __cplusplus
 #include "dive.h"
@@ -15,4 +15,4 @@ extern void call_for_each_dc(void *f, void (*callback)(void *, const char *, uin
 }
 #endif
 
-#endif
+#endif // DEVICE_H
diff --git a/display.h b/display.h
index 196338bb4..5068027ce 100644
--- a/display.h
+++ b/display.h
@@ -69,4 +69,4 @@ extern const char *default_dive_computer_device;
 }
 #endif
 
-#endif
+#endif // DISPLAY_H
diff --git a/dive.h b/dive.h
index 625ea4351..7d0aaaee6 100644
--- a/dive.h
+++ b/dive.h
@@ -823,4 +823,4 @@ extern fraction_t string_to_fraction(const char *str);
 
 #include "pref.h"
 
-#endif /* DIVE_H */
+#endif // DIVE_H
diff --git a/divelist.h b/divelist.h
index 9cac6f082..a2bf6a080 100644
--- a/divelist.h
+++ b/divelist.h
@@ -41,4 +41,4 @@ extern void dump_trip_list(void);
 }
 #endif
 
-#endif
+#endif // DIVELIST_H
diff --git a/file.h b/file.h
index 1e1e07721..2e4d3ebde 100644
--- a/file.h
+++ b/file.h
@@ -19,4 +19,4 @@ extern timestamp_t parse_date(const char *date);
 }
 #endif
 
-#endif
+#endif // FILE_H
diff --git a/flag.h b/flag.h
index d3bd59455..6cadcecba 100644
--- a/flag.h
+++ b/flag.h
@@ -1,4 +1,6 @@
 /* GdkPixbuf RGBA C-Source image dump 1-byte-run-length-encoded */
+#ifndef FLAG_H
+#define FLAG_H
 
 static const GdkPixdata flag_pixbuf = {
   0x47646b50, /* Pixbuf magic: 'GdkP' */
@@ -73,4 +75,4 @@ static const GdkPixdata flag_pixbuf = {
   "53>t44;'\226\377\377\377\0",
 };
 
-
+#endif // FLAG_H
diff --git a/helpers.h b/helpers.h
index f7343859d..de0d4ce95 100644
--- a/helpers.h
+++ b/helpers.h
@@ -4,8 +4,8 @@
  * header file for random helper functions of Subsurface
  *
  */
-#ifndef HELPER_H
-#define HELPER_H
+#ifndef HELPERS_H
+#define HELPERS_H
 
 #include <QString>
 #include "dive.h"
@@ -42,4 +42,4 @@ extern DiveComputerList dcList;
 #else
 #define TITLE_OR_TEXT(_t,_m) _t, _m
 #endif
-#endif /* HELPER_H */
+#endif // HELPERS_H
diff --git a/libdivecomputer.h b/libdivecomputer.h
index 8285f5a9f..ec210d31b 100644
--- a/libdivecomputer.h
+++ b/libdivecomputer.h
@@ -42,4 +42,4 @@ extern char *dumpfile_name;
 }
 #endif
 
-#endif
+#endif // LIBDIVECOMPUTER_H
diff --git a/planner.h b/planner.h
index 330d7df60..8141860c7 100644
--- a/planner.h
+++ b/planner.h
@@ -24,4 +24,4 @@ extern double plangflow, plangfhigh;
 #ifdef __cplusplus
 }
 #endif
-#endif /* PLANNER_H */
+#endif // PLANNER_H
diff --git a/pref.h b/pref.h
index e3f0a545a..415743562 100644
--- a/pref.h
+++ b/pref.h
@@ -66,4 +66,4 @@ extern void save_preferences(void);
 }
 #endif
 
-#endif /* PREF_H */
+#endif // PREF_H
diff --git a/profile.h b/profile.h
index 82d6d58e7..6e6e6828a 100644
--- a/profile.h
+++ b/profile.h
@@ -126,4 +126,4 @@ void setup_pp_limits(struct graphics_context *gc);
 #ifdef __cplusplus
 }
 #endif
-#endif
+#endif // PROFILE_H
diff --git a/qt-gui.h b/qt-gui.h
index 43a006a4c..80a2daf6a 100644
--- a/qt-gui.h
+++ b/qt-gui.h
@@ -7,4 +7,4 @@ void init_qt_ui(int *argcp, char ***argvp, char *errormessage);
 void run_ui(void);
 void exit_ui(void);
 
-#endif
+#endif // QT_GUI_H
diff --git a/qt-ui/about.h b/qt-ui/about.h
index 0a4c8ddb5..4ec7dd8ce 100644
--- a/qt-ui/about.h
+++ b/qt-ui/about.h
@@ -17,4 +17,4 @@ private:
 	Ui::SubsurfaceAbout ui;
 };
 
-#endif
+#endif // ABOUT_H
diff --git a/qt-ui/completionmodels.h b/qt-ui/completionmodels.h
index 2ac9f17a1..859b8c007 100644
--- a/qt-ui/completionmodels.h
+++ b/qt-ui/completionmodels.h
@@ -33,4 +33,4 @@ public:
 	void updateModel();
 };
 
-#endif
+#endif // COMPLETIONMODELS_H
diff --git a/qt-ui/divecomputermanagementdialog.h b/qt-ui/divecomputermanagementdialog.h
index 008e6aba2..aba98040b 100644
--- a/qt-ui/divecomputermanagementdialog.h
+++ b/qt-ui/divecomputermanagementdialog.h
@@ -25,4 +25,4 @@ private:
 	DiveComputerModel *model;
 };
 
-#endif
+#endif // DIVECOMPUTERMANAGEMENTDIALOG_H
diff --git a/qt-ui/diveplanner.h b/qt-ui/diveplanner.h
index 3c81c8620..364d0396d 100644
--- a/qt-ui/diveplanner.h
+++ b/qt-ui/diveplanner.h
@@ -241,4 +241,4 @@ private:
 	Ui::DivePlanner ui;
 };
 
-#endif
+#endif // DIVEPLANNER_H
diff --git a/qt-ui/downloadfromdivecomputer.h b/qt-ui/downloadfromdivecomputer.h
index c1c5aab7b..65bc69dfe 100644
--- a/qt-ui/downloadfromdivecomputer.h
+++ b/qt-ui/downloadfromdivecomputer.h
@@ -78,4 +78,4 @@ public:
 
 };
 
-#endif
+#endif // DOWNLOADFROMDIVECOMPUTER_H
diff --git a/qt-ui/exif.h b/qt-ui/exif.h
index a05399f92..a3e6706b9 100644
--- a/qt-ui/exif.h
+++ b/qt-ui/exif.h
@@ -49,8 +49,8 @@
    NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
    EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
-#ifndef __EXIF_H
-#define __EXIF_H
+#ifndef EXIF_H
+#define EXIF_H
 
 #include <string>
 
@@ -140,4 +140,4 @@ class EXIFInfo {
 // EXIF header was found, but data was corrupted.
 #define PARSE_EXIF_ERROR_CORRUPT              1985
 
-#endif
+#endif // EXIF_H
diff --git a/qt-ui/globe.h b/qt-ui/globe.h
index e057895ff..dad3cf99f 100644
--- a/qt-ui/globe.h
+++ b/qt-ui/globe.h
@@ -39,4 +39,4 @@ public slots:
 
 };
 
-#endif
+#endif // GLOBE_H
diff --git a/qt-ui/graphicsview-common.h b/qt-ui/graphicsview-common.h
index 5f9dd19b7..50fd00605 100644
--- a/qt-ui/graphicsview-common.h
+++ b/qt-ui/graphicsview-common.h
@@ -43,4 +43,4 @@ struct text_render_options {
 };
 
 typedef text_render_options text_render_options_t;
-#endif
+#endif // GRAPHICSVIEW_COMMON_H
diff --git a/qt-ui/groupedlineedit.h b/qt-ui/groupedlineedit.h
index 60035739c..d0b675e98 100644
--- a/qt-ui/groupedlineedit.h
+++ b/qt-ui/groupedlineedit.h
@@ -27,8 +27,8 @@
  * Boston, MA 02110-1301, USA.
  */
 
-#ifndef __GROUPEDLINEEDIT_H__
-#define __GROUPEDLINEEDIT_H__
+#ifndef GROUPEDLINEEDIT_H
+#define GROUPEDLINEEDIT_H
 
 #include <QPlainTextEdit>
 #include <QStringList>
@@ -69,4 +69,4 @@ private:
 	struct Private;
 	Private *d;
 };
-#endif
+#endif // GROUPEDLINEEDIT_H
diff --git a/qt-ui/kmessagewidget.h b/qt-ui/kmessagewidget.h
index 88fb4ad37..548421103 100644
--- a/qt-ui/kmessagewidget.h
+++ b/qt-ui/kmessagewidget.h
@@ -236,4 +236,4 @@ public:
 	int bestContentHeight() const;
 };
 
-#endif /* KMESSAGEWIDGET_H */
+#endif // KMESSAGEWIDGET_H
diff --git a/qt-ui/maintab.h b/qt-ui/maintab.h
index 1edeebab6..a1e588f77 100644
--- a/qt-ui/maintab.h
+++ b/qt-ui/maintab.h
@@ -114,4 +114,4 @@ private:
 	void updateGpsCoordinates(const struct dive *dive);
 };
 
-#endif
+#endif // MAINTAB_H
diff --git a/qt-ui/mainwindow.h b/qt-ui/mainwindow.h
index 2d9174557..a1b678296 100644
--- a/qt-ui/mainwindow.h
+++ b/qt-ui/mainwindow.h
@@ -148,4 +148,4 @@ private:
 
 MainWindow *mainWindow();
 
-#endif
+#endif // MAINWINDOW_H
diff --git a/qt-ui/modeldelegates.h b/qt-ui/modeldelegates.h
index 72f75b0da..a2ecf2900 100644
--- a/qt-ui/modeldelegates.h
+++ b/qt-ui/modeldelegates.h
@@ -79,4 +79,4 @@ public:
 	void paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const;
 };
 
-#endif
+#endif // MODELDELEGATES_H
diff --git a/qt-ui/models.h b/qt-ui/models.h
index 505d7dcb5..df991047d 100644
--- a/qt-ui/models.h
+++ b/qt-ui/models.h
@@ -325,4 +325,4 @@ private:
 
 	QStringList languages;
 };
-#endif
+#endif // MODELS_H
diff --git a/qt-ui/preferences.h b/qt-ui/preferences.h
index d7cf77572..fb3d1f089 100644
--- a/qt-ui/preferences.h
+++ b/qt-ui/preferences.h
@@ -1,5 +1,5 @@
-#ifndef PREFERENCES_DIALOG_H
-#define PREFERENCES_DIALOG_H
+#ifndef PREFERENCES_H
+#define PREFERENCES_H
 
 #include <QDialog>
 #include "../dive.h"
@@ -34,4 +34,4 @@ private:
 	struct preferences oldPrefs;
 };
 
-#endif
+#endif // PREFERENCES_H
diff --git a/qt-ui/printdialog.h b/qt-ui/printdialog.h
index ebaea846a..44c2de66d 100644
--- a/qt-ui/printdialog.h
+++ b/qt-ui/printdialog.h
@@ -29,4 +29,4 @@ private slots:
 	void onPaintRequested(QPrinter *);
 };
 
-#endif
+#endif // PRINTDIALOG_H
diff --git a/qt-ui/printlayout.h b/qt-ui/printlayout.h
index e55d23dd1..393bfc54b 100644
--- a/qt-ui/printlayout.h
+++ b/qt-ui/printlayout.h
@@ -46,4 +46,4 @@ signals:
     void signalProgress(int);
 };
 
-#endif
+#endif // PRINTLAYOUT_H
diff --git a/qt-ui/printoptions.h b/qt-ui/printoptions.h
index 0f1e9e848..29fc61a75 100644
--- a/qt-ui/printoptions.h
+++ b/qt-ui/printoptions.h
@@ -36,4 +36,4 @@ private slots:
 	void profileOnTopClicked(bool check);
 };
 
-#endif
+#endif // PRINTOPTIONS_H
diff --git a/qt-ui/profile/animationfunctions.h b/qt-ui/profile/animationfunctions.h
index ed0815af9..2ab8c9e47 100644
--- a/qt-ui/profile/animationfunctions.h
+++ b/qt-ui/profile/animationfunctions.h
@@ -13,4 +13,4 @@ namespace Animations{
 	void animDelete(QObject *obj);
 }
 
-#endif
+#endif // ANIMATIONFUNCTIONS_H
diff --git a/qt-ui/profile/divecartesianaxis.h b/qt-ui/profile/divecartesianaxis.h
index 753a3e44d..fe34e3c62 100644
--- a/qt-ui/profile/divecartesianaxis.h
+++ b/qt-ui/profile/divecartesianaxis.h
@@ -115,4 +115,4 @@ private:
 	qreal verticalSize;
 	qreal horizontalSize;
 };
-#endif
+#endif // DIVECARTESIANAXIS_H
diff --git a/qt-ui/profile/diveeventitem.h b/qt-ui/profile/diveeventitem.h
index 5b0d23479..cd55f5678 100644
--- a/qt-ui/profile/diveeventitem.h
+++ b/qt-ui/profile/diveeventitem.h
@@ -26,4 +26,4 @@ private:
 	struct event* internalEvent;
 };
 
-#endif
+#endif // DIVEEVENTITEM_H
diff --git a/qt-ui/profile/divelineitem.h b/qt-ui/profile/divelineitem.h
index fbe898924..3643d6e60 100644
--- a/qt-ui/profile/divelineitem.h
+++ b/qt-ui/profile/divelineitem.h
@@ -14,4 +14,4 @@ public:
 	void animateMoveTo(qreal x, qreal y);
 };
 
-#endif
+#endif // DIVELINEITEM_H
diff --git a/qt-ui/profile/divepixmapitem.h b/qt-ui/profile/divepixmapitem.h
index addbbb12d..855a0d2d7 100644
--- a/qt-ui/profile/divepixmapitem.h
+++ b/qt-ui/profile/divepixmapitem.h
@@ -14,4 +14,4 @@ public:
 	DivePixmapItem(QObject* parent = 0);
 };
 
-#endif
+#endif // DIVEPIXMAPITEM_H
diff --git a/qt-ui/profile/diveplotdatamodel.h b/qt-ui/profile/diveplotdatamodel.h
index 34af0daad..19d2f4360 100644
--- a/qt-ui/profile/diveplotdatamodel.h
+++ b/qt-ui/profile/diveplotdatamodel.h
@@ -36,4 +36,4 @@ private:
 	int dcNr;
 };
 
-#endif
+#endif // DIVEPLOTDATAMODEL_H
diff --git a/qt-ui/profile/diveprofileitem.h b/qt-ui/profile/diveprofileitem.h
index 41213658d..640b0d4a6 100644
--- a/qt-ui/profile/diveprofileitem.h
+++ b/qt-ui/profile/diveprofileitem.h
@@ -158,4 +158,4 @@ private:
 	QColor normalColor;
 	QColor alertColor;
 };
-#endif
+#endif // DIVEPROFILEITEM_H
diff --git a/qt-ui/profile/diverectitem.h b/qt-ui/profile/diverectitem.h
index 6d073d335..9216fe9a1 100644
--- a/qt-ui/profile/diverectitem.h
+++ b/qt-ui/profile/diverectitem.h
@@ -14,4 +14,4 @@ public:
 	DiveRectItem(QObject *parent = 0, QGraphicsItem *parentItem = 0);
 };
 
-#endif
+#endif // DIVERECTITEM_H
diff --git a/qt-ui/profile/divetextitem.h b/qt-ui/profile/divetextitem.h
index 774693c0c..f7a9591ef 100644
--- a/qt-ui/profile/divetextitem.h
+++ b/qt-ui/profile/divetextitem.h
@@ -29,4 +29,4 @@ private:
 	QBrush brush;
 };
 
-#endif
+#endif // DIVETEXTITEM_H
diff --git a/qt-ui/profile/divetooltipitem.h b/qt-ui/profile/divetooltipitem.h
index 36a44d628..860d79310 100644
--- a/qt-ui/profile/divetooltipitem.h
+++ b/qt-ui/profile/divetooltipitem.h
@@ -58,4 +58,4 @@ private:
 	plot_info pInfo;
 };
 
-#endif
+#endif // DIVETOOLTIPITEM_H
diff --git a/qt-ui/profile/profilewidget2.h b/qt-ui/profile/profilewidget2.h
index 1378bd152..41a5d26fb 100644
--- a/qt-ui/profile/profilewidget2.h
+++ b/qt-ui/profile/profilewidget2.h
@@ -99,4 +99,4 @@ private:
 	PartialPressureGasItem *po2GasItem;
 };
 
-#endif
+#endif // PROFILEWIDGET2_H
diff --git a/qt-ui/profilegraphics.h b/qt-ui/profilegraphics.h
index 9080141ef..42006bdf8 100644
--- a/qt-ui/profilegraphics.h
+++ b/qt-ui/profilegraphics.h
@@ -172,4 +172,4 @@ private:
 	enum Mode mode;
 };
 
-#endif
+#endif // PROFILEGRAPHICS_H
diff --git a/qt-ui/simplewidgets.h b/qt-ui/simplewidgets.h
index d17bac016..6cf5bcda0 100644
--- a/qt-ui/simplewidgets.h
+++ b/qt-ui/simplewidgets.h
@@ -69,4 +69,4 @@ private:
 
 bool isGnome3Session();
 
-#endif
+#endif // SIMPLEWIDGETS_H
diff --git a/qt-ui/subsurfacewebservices.h b/qt-ui/subsurfacewebservices.h
index 400f4086e..4d1ec0002 100644
--- a/qt-ui/subsurfacewebservices.h
+++ b/qt-ui/subsurfacewebservices.h
@@ -91,4 +91,4 @@ private:
 	bool uploadMode;
 };
 
-#endif
+#endif // SUBSURFACEWEBSERVICES_H
diff --git a/qt-ui/tableview.h b/qt-ui/tableview.h
index fc22425d3..f89a7b6ba 100644
--- a/qt-ui/tableview.h
+++ b/qt-ui/tableview.h
@@ -41,4 +41,4 @@ private:
 	QPushButton *plusBtn;
 };
 
-#endif
+#endif // TABLEVIEW_H
diff --git a/qt-ui/tagwidget.h b/qt-ui/tagwidget.h
index b69bbdc24..5f8fb331b 100644
--- a/qt-ui/tagwidget.h
+++ b/qt-ui/tagwidget.h
@@ -1,5 +1,5 @@
-#ifndef __TAGWIDGET_H
-#define __TAGWIDGET_H
+#ifndef TAGWIDGET_H
+#define TAGWIDGET_H
 
 #include "groupedlineedit.h"
 #include <QCompleter>
@@ -26,4 +26,4 @@ private:
 	QCompleter *m_completer;
 };
 
-#endif /* __TAGWIDGET_H */
+#endif // TAGWIDGET_H
diff --git a/sha1.h b/sha1.h
index b77454aca..68470d46a 100644
--- a/sha1.h
+++ b/sha1.h
@@ -5,6 +5,8 @@
  * This was initially based on the Mozilla SHA1 implementation, although
  * none of the original Mozilla code remains.
  */
+#ifndef SHA1_H
+#define SHA1_H
 
 typedef struct {
 	unsigned long long size;
@@ -31,3 +33,5 @@ static inline void SHA1(const void *dataIn, unsigned long len, unsigned char has
 	SHA1_Update(&ctx, dataIn, len);
 	SHA1_Final(hashout, &ctx);
 }
+
+#endif // SHA1_H
diff --git a/statistics.h b/statistics.h
index 5f6e306c4..36027421c 100644
--- a/statistics.h
+++ b/statistics.h
@@ -51,4 +51,4 @@ extern void process_selected_dives(void);
 }
 #endif
 
-#endif
+#endif // STATISTICS_H
diff --git a/subsurface-icon.h b/subsurface-icon.h
index 0478f674d..c47b4d103 100644
--- a/subsurface-icon.h
+++ b/subsurface-icon.h
@@ -1,4 +1,6 @@
 /* GdkPixbuf RGBA C-Source image dump 1-byte-run-length-encoded */
+#ifndef SUBSURFACE_ICON_H
+#define SUBSURFACE_ICON_H
 
 static const GdkPixdata subsurface_icon_pixbuf = {
   0x47646b50, /* Pixbuf magic: 'GdkP' */
@@ -5239,4 +5241,4 @@ static const GdkPixdata subsurface_icon_pixbuf = {
   "\316\377\323\332\317\377\233!H\211\0",
 };
 
-
+#endif // SUBSURFACE_ICON_H
diff --git a/subsurfacestartup.h b/subsurfacestartup.h
index b09556fa1..8eaaaa091 100644
--- a/subsurfacestartup.h
+++ b/subsurfacestartup.h
@@ -20,4 +20,4 @@ void parse_argument(const char *arg);
 }
 #endif
 
-#endif
+#endif // SUBSURFACESTARTUP_H
diff --git a/uemis.h b/uemis.h
index 66a2b9153..2b9e5efc3 100644
--- a/uemis.h
+++ b/uemis.h
@@ -49,4 +49,4 @@ typedef struct {
 }
 #endif
 
-#endif /* UEMIS_H */
+#endif // UEMIS_H
diff --git a/webservice.h b/webservice.h
index 739f1057e..052b8aae7 100644
--- a/webservice.h
+++ b/webservice.h
@@ -1,3 +1,6 @@
+#ifndef WEBSERVICE_H
+#define WEBSERVICE_H
+
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -18,3 +21,4 @@ enum {
 #ifdef __cplusplus
 }
 #endif
+#endif // WEBSERVICE_H