From 220de9aafbdb76fa620531fc5c0b01ffa6616d7b Mon Sep 17 00:00:00 2001
From: Philip Kaufmann <phil.kaufmann@t-online.de>
Date: Thu, 8 Nov 2012 21:45:32 +0100
Subject: [PATCH] Qt: small header changes / fixes

- ensure header inclusion guard is named after the header file
- add missing comments at the end of some inclusion guards
- add a small Qt5 compatibility fix in macdockiconhandler.h
---
 src/qt/addressbookpage.h       | 2 +-
 src/qt/bitcoinamountfield.h    | 6 +++---
 src/qt/bitcoingui.h            | 2 +-
 src/qt/macdockiconhandler.h    | 2 +-
 src/qt/transactiontablemodel.h | 3 +--
 5 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/src/qt/addressbookpage.h b/src/qt/addressbookpage.h
index 1a97f3d6023..d885c768c91 100644
--- a/src/qt/addressbookpage.h
+++ b/src/qt/addressbookpage.h
@@ -56,4 +56,4 @@ private slots:
     void selectionChanged();
 };
 
-#endif // ADDRESSBOOKDIALOG_H
+#endif // ADDRESSBOOKPAGE_H
diff --git a/src/qt/bitcoinamountfield.h b/src/qt/bitcoinamountfield.h
index 66792e00a9e..4797c4c882a 100644
--- a/src/qt/bitcoinamountfield.h
+++ b/src/qt/bitcoinamountfield.h
@@ -1,5 +1,5 @@
-#ifndef BITCOINFIELD_H
-#define BITCOINFIELD_H
+#ifndef BITCOINAMOUNTFIELD_H
+#define BITCOINAMOUNTFIELD_H
 
 #include <QWidget>
 
@@ -57,4 +57,4 @@ private slots:
 };
 
 
-#endif // BITCOINFIELD_H
+#endif // BITCOINAMOUNTFIELD_H
diff --git a/src/qt/bitcoingui.h b/src/qt/bitcoingui.h
index 65340775cd6..f56eecf01b1 100644
--- a/src/qt/bitcoingui.h
+++ b/src/qt/bitcoingui.h
@@ -157,4 +157,4 @@ private slots:
     void unlockWallet();
 };
 
-#endif
+#endif // BITCOINGUI_H
diff --git a/src/qt/macdockiconhandler.h b/src/qt/macdockiconhandler.h
index d02c148f910..d39c780233f 100644
--- a/src/qt/macdockiconhandler.h
+++ b/src/qt/macdockiconhandler.h
@@ -1,7 +1,7 @@
 #ifndef MACDOCKICONHANDLER_H
 #define MACDOCKICONHANDLER_H
 
-#include <QtCore/QObject>
+#include <QObject>
 
 class QMenu;
 class QIcon;
diff --git a/src/qt/transactiontablemodel.h b/src/qt/transactiontablemodel.h
index 3efeaa61bca..bcd35b80e6c 100644
--- a/src/qt/transactiontablemodel.h
+++ b/src/qt/transactiontablemodel.h
@@ -80,5 +80,4 @@ public slots:
     friend class TransactionTablePriv;
 };
 
-#endif
-
+#endif // TRANSACTIONTABLEMODEL_H