[PATCH 11/25] Tidy up header files to have consistent coding style

["Daniel P. Berrange" <berrange redhat com>]

---
 src/vncconnection.h |    6 +++---
 src/vncdisplay.h    |   35 +++++++++++++----------------------
 2 files changed, 16 insertions(+), 25 deletions(-)

diff --git a/src/vncconnection.h b/src/vncconnection.h
index aba1e7c..68a348e 100644
--- a/src/vncconnection.h
+++ b/src/vncconnection.h
@@ -18,8 +18,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#ifndef _GVNC_H_
-#define _GVNC_H_
+#ifndef VNC_CONNECTION_H
+#define VNC_CONNECTION_H
 
 #include <glib.h>
 
@@ -198,7 +198,7 @@ gboolean vnc_connection_using_raw_keycodes(VncConnection *conn);
 
 G_END_DECLS
 
-#endif
+#endif /* VNC_CONNECTION_H */
 /*
  * Local variables:
  *  c-indent-level: 8
diff --git a/src/vncdisplay.h b/src/vncdisplay.h
index 52078e4..df01ad0 100644
--- a/src/vncdisplay.h
+++ b/src/vncdisplay.h
@@ -18,32 +18,25 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#ifndef _VNC_DISPLAY_H_
-#define _VNC_DISPLAY_H_
-
-typedef struct _VncDisplay VncDisplay;
-typedef struct _VncDisplayClass VncDisplayClass;
-typedef struct _VncDisplayPrivate VncDisplayPrivate;
+#ifndef VNC_DISPLAY_H
+#define VNC_DISPLAY_H
 
 #include <gtk/gtkdrawingarea.h>
 #include <glib.h>
 
-#define VNC_TYPE_DISPLAY (vnc_display_get_type())
-
-#define VNC_DISPLAY(obj) \
-        (G_TYPE_CHECK_INSTANCE_CAST((obj), VNC_TYPE_DISPLAY, VncDisplay))
-
-#define VNC_DISPLAY_CLASS(klass) \
-        (G_TYPE_CHECK_CLASS_CAST((klass), VNC_TYPE_DISPLAY, VncDisplayClass))
+G_BEGIN_DECLS
 
-#define VNC_IS_DISPLAY(obj) \
-        (G_TYPE_CHECK_INSTANCE_TYPE((obj), VNC_TYPE_DISPLAY))
+#define VNC_TYPE_DISPLAY            (vnc_display_get_type())
+#define VNC_DISPLAY(obj)            (G_TYPE_CHECK_INSTANCE_CAST((obj), VNC_TYPE_DISPLAY, VncDisplay))
+#define VNC_DISPLAY_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST((klass), VNC_TYPE_DISPLAY, VncDisplayClass))
+#define VNC_IS_DISPLAY(obj)         (G_TYPE_CHECK_INSTANCE_TYPE((obj), VNC_TYPE_DISPLAY))
+#define VNC_IS_DISPLAY_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), VNC_TYPE_DISPLAY))
+#define VNC_DISPLAY_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS((obj), VNC_TYPE_DISPLAY, VncDisplayClass))
 
-#define VNC_IS_DISPLAY_CLASS(klass) \
-        (G_TYPE_CHECK_CLASS_TYPE((klass), VNC_TYPE_DISPLAY))
 
-#define VNC_DISPLAY_GET_CLASS(obj) \
-        (G_TYPE_INSTANCE_GET_CLASS((obj), VNC_TYPE_DISPLAY, VncDisplayClass))
+typedef struct _VncDisplay VncDisplay;
+typedef struct _VncDisplayClass VncDisplayClass;
+typedef struct _VncDisplayPrivate VncDisplayPrivate;
 
 struct _VncDisplay
 {
@@ -91,8 +84,6 @@ typedef enum
 	 * or the enum changes size breaking ABI on set/get_depth() */
 } VncDisplayDepthColor;
 
-G_BEGIN_DECLS
-
 GType		vnc_display_get_type(void);
 GtkWidget *	vnc_display_new(void);
 
@@ -156,7 +147,7 @@ gboolean	vnc_display_request_update(VncDisplay *obj);
 
 G_END_DECLS
 
-#endif
+#endif /* VNC_DISPLAY_H */
 /*
  * Local variables:
  *  c-indent-level: 8
-- 
1.6.5.2