[vte] Use standard form of stock type macros

[Christian Persch <chpe src gnome org>]

commit 08283ddc9f5516e1f15306399c909c0adc49db77
Author: Christian Persch <chpe gnome org>
Date:   Sat Apr 10 15:49:31 2010 +0200

    Use standard form of stock type macros

 src/vte.h   |   29 +++++++++--------------------
 src/vtebg.h |   15 +++++++--------
 2 files changed, 16 insertions(+), 28 deletions(-)
---
diff --git a/src/vte.h b/src/vte.h
index dac4970..b482fa9 100644
--- a/src/vte.h
+++ b/src/vte.h
@@ -46,11 +46,16 @@ G_BEGIN_DECLS
 #define _VTE_DEPRECATED(name) name
 #endif
 
-/* Private implementation details. */
-typedef struct _VteTerminalPrivate VteTerminalPrivate;
+#define VTE_TYPE_TERMINAL            (vte_terminal_get_type())
+#define VTE_TERMINAL(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), VTE_TYPE_TERMINAL, VteTerminal))
+#define VTE_TERMINAL_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass),  VTE_TYPE_TERMINAL, VteTerminalClass))
+#define VTE_IS_TERMINAL(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), VTE_TYPE_TERMINAL))
+#define VTE_IS_TERMINAL_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass),  VTE_TYPE_TERMINAL))
+#define VTE_TERMINAL_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj),  VTE_TYPE_TERMINAL, VteTerminalClass))
 
-/* The terminal widget itself. */
-typedef struct _VteTerminal VteTerminal;
+typedef struct _VteTerminal         VteTerminal;
+typedef struct _VteTerminalPrivate  VteTerminalPrivate;
+typedef struct _VteTerminalClass    VteTerminalClass;
 
 /**
  * VteTerminal:
@@ -75,9 +80,6 @@ struct _VteTerminal {
 	VteTerminalPrivate *pvt;
 };
 
-/* The widget's class structure. */
-typedef struct _VteTerminalClass VteTerminalClass;
-
 /**
  * VteTerminalClass:
  *
@@ -246,19 +248,6 @@ typedef gboolean (*VteSelectionFunc)(VteTerminal *terminal,
 /* The widget's type. */
 GType vte_terminal_get_type(void);
 
-#define VTE_TYPE_TERMINAL		(vte_terminal_get_type())
-#define VTE_TERMINAL(obj)		(G_TYPE_CHECK_INSTANCE_CAST((obj),\
-							VTE_TYPE_TERMINAL,\
-							VteTerminal))
-#define VTE_TERMINAL_CLASS(klass)	G_TYPE_CHECK_CLASS_CAST((klass),\
-							     VTE_TYPE_TERMINAL,\
-							     VteTerminalClass)
-#define VTE_IS_TERMINAL(obj)		G_TYPE_CHECK_INSTANCE_TYPE((obj),\
-						       VTE_TYPE_TERMINAL)
-#define VTE_IS_TERMINAL_CLASS(klass)	G_TYPE_CHECK_CLASS_TYPE((klass),\
-							     VTE_TYPE_TERMINAL)
-#define VTE_TERMINAL_GET_CLASS(obj)	(G_TYPE_INSTANCE_GET_CLASS ((obj), VTE_TYPE_TERMINAL, VteTerminalClass))
-
 GtkWidget *vte_terminal_new(void);
 
 VtePty *vte_terminal_pty_new (VteTerminal *terminal,
diff --git a/src/vtebg.h b/src/vtebg.h
index f9e5ef1..f2cf77b 100644
--- a/src/vtebg.h
+++ b/src/vtebg.h
@@ -16,7 +16,6 @@
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-
 #ifndef vte_vtebg_included
 #define vte_vtebg_included
 
@@ -24,6 +23,13 @@
 
 G_BEGIN_DECLS
 
+#define VTE_TYPE_BG            (vte_bg_get_type())
+#define VTE_BG(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), VTE_TYPE_BG, VteBg))
+#define VTE_BG_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass),  VTE_TYPE_BG, VteBgClass))
+#define VTE_IS_BG(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), VTE_TYPE_BG))
+#define VTE_IS_BG_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass),  VTE_TYPE_BG))
+#define VTE_BG_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj),  VTE_TYPE_BG, VteBgClass))
+
 typedef struct _VteBg         VteBg;
 typedef struct _VteBgPrivate  VteBgPrivate;
 typedef struct _VteBgClass    VteBgClass;
@@ -39,13 +45,6 @@ struct _VteBgClass {
 	GObjectClass parent_class;
 };
 
-#define VTE_TYPE_BG vte_bg_get_type()
-#define VTE_BG(obj)	       (G_TYPE_CHECK_INSTANCE_CAST((obj), VTE_TYPE_BG, VteBg))
-#define VTE_BG_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST((klass), VTE_TYPE_BG, VteBgClass)
-#define VTE_IS_BG(obj)	       G_TYPE_CHECK_INSTANCE_TYPE((obj), VTE_TYPE_BG)
-#define VTE_IS_BG_CLASS(klass) G_TYPE_CHECK_CLASS_TYPE((klass), VTE_TYPE_BG)
-#define VTE_BG_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS((obj), VTE_TYPE_BG, VteBgClass))
-
 GType vte_bg_get_type(void);
 
 VteBg *vte_bg_get_for_screen(GdkScreen *screen);