[glibmm] Remove non-glibmm .m4 files.

[Murray Cumming <murrayc src gnome org>]

commit ac5deb9dad49a2919aa7b5e1b4e50fba81b64c03
Author: Murray Cumming <murrayc murrayc com>
Date:   Thu Dec 9 15:39:53 2010 +0100

    Remove non-glibmm .m4 files.
    
    * tools/m4/class_gtkobject.m4:
    * tools/m4/convert_atk.m4:
    * tools/m4/convert_gdk.m4:
    * tools/m4/convert_gtk.m4:
    * tools/m4/convert_gtkmm.m4:
    * tools/m4/convert_pango.m4: Remove conversions and macros for non-glibmm
    types. These will be moved to atkmm, pangomm and gtkmm instead.

 ChangeLog                        |   12 ++
 gio/src/socketservice.hg         |    1 +
 gio/src/threadedsocketservice.hg |    1 +
 tools/m4/base.m4                 |    2 +-
 tools/m4/class_gtkobject.m4      |  233 ----------------------
 tools/m4/convert.m4              |    2 +-
 tools/m4/convert_atk.m4          |   34 ----
 tools/m4/convert_base.m4         |    8 +-
 tools/m4/convert_gdk.m4          |  231 ----------------------
 tools/m4/convert_glib.m4         |   39 ++++
 tools/m4/convert_glibmm.m4       |    6 +
 tools/m4/convert_gtk.m4          |  394 --------------------------------------
 tools/m4/convert_gtkmm.m4        |    9 -
 tools/m4/convert_pango.m4        |  137 -------------
 tools/m4/filelist.am             |    7 +-
 15 files changed, 66 insertions(+), 1050 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 2024937..5c9a14f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2010-12-09  Murray Cumming  <murrayc murrayc com>
+
+	Remove non-glibmm .m4 files.
+
+	* tools/m4/class_gtkobject.m4:
+	* tools/m4/convert_atk.m4:
+	* tools/m4/convert_gdk.m4:
+	* tools/m4/convert_gtk.m4:
+	* tools/m4/convert_gtkmm.m4:
+	* tools/m4/convert_pango.m4: Remove conversions and macros for non-glibmm 
+	types. These will be moved to atkmm, pangomm and gtkmm instead.
+	
 2010-12-09  José Alburquerque  <jaalburqu svn gnome org>
 
 	DBusProxy: Add a non-cancellable call_sync() method.
diff --git a/gio/src/socketservice.hg b/gio/src/socketservice.hg
index 884221a..ebe454b 100644
--- a/gio/src/socketservice.hg
+++ b/gio/src/socketservice.hg
@@ -71,6 +71,7 @@ public:
     _WRAP_METHOD(void stop(), g_socket_service_stop)
     _WRAP_METHOD(bool is_active(), g_socket_service_is_active)
 
+#m4 _CONVERSION(`GObject*',`const Glib::RefPtr<Glib::Object>&',`Glib::wrap($3, true)')
     _WRAP_SIGNAL(bool incoming(const Glib::RefPtr<SocketConnection>& connection, const Glib::RefPtr<Glib::Object>& source_object), "incoming")
 };
 
diff --git a/gio/src/threadedsocketservice.hg b/gio/src/threadedsocketservice.hg
index 64bba1b..cccc8bf 100644
--- a/gio/src/threadedsocketservice.hg
+++ b/gio/src/threadedsocketservice.hg
@@ -57,6 +57,7 @@ protected:
 public:
     _WRAP_CREATE(int max_threads)
 
+#m4 _CONVERSION(`GObject*',`const Glib::RefPtr<Glib::Object>&',`Glib::wrap($3, true)')
     _WRAP_SIGNAL(bool run(const Glib::RefPtr<SocketConnection>& connection, const Glib::RefPtr<Glib::Object>& source_object), "run")
     _WRAP_PROPERTY("max-threads", int)
 };
diff --git a/tools/m4/base.m4 b/tools/m4/base.m4
index e6782a4..b09e39f 100644
--- a/tools/m4/base.m4
+++ b/tools/m4/base.m4
@@ -425,7 +425,7 @@ _POP()
 m4_include(class_shared.m4)
 m4_include(class_generic.m4)
 m4_include(class_gobject.m4)
-m4_include(class_gtkobject.m4)
+dnl m4_include(class_gtkobject.m4)
 m4_include(class_boxedtype.m4)
 m4_include(class_boxedtype_static.m4)
 m4_include(class_interface.m4)
diff --git a/tools/m4/convert.m4 b/tools/m4/convert.m4
index fa0df9c..9813f39 100644
--- a/tools/m4/convert.m4
+++ b/tools/m4/convert.m4
@@ -3,4 +3,4 @@ dnl $Id$
 # Other libraries, such as libgnomeuimm, can provide their own convert.m4 files,
 # Maybe choosing to include the same files as this one.
 
-include(convert_gtkmm.m4)
+include(convert_glibmm.m4)
diff --git a/tools/m4/convert_base.m4 b/tools/m4/convert_base.m4
index e8e0df6..e64e4bc 100644
--- a/tools/m4/convert_base.m4
+++ b/tools/m4/convert_base.m4
@@ -63,9 +63,9 @@ define(`__CONVERT_CONST_REFPTR_TO_P',`const_cast<$`'2>(Glib::unwrap($`'3))')
 define(`__CONVERT_CONST_REFPTR_TO_P_SUN',`const_cast<$`'2>(Glib::unwrap<$1>($`'3))')
 
 
-include(convert_gtk.m4)
-include(convert_pango.m4)
-include(convert_gdk.m4)
-include(convert_atk.m4)
+#include(convert_gtk.m4)
+#include(convert_pango.m4)
+#include(convert_gdk.m4)
+#include(convert_atk.m4)
 include(convert_glib.m4)
 
diff --git a/tools/m4/convert_glib.m4 b/tools/m4/convert_glib.m4
index 92df0d5..086b78a 100644
--- a/tools/m4/convert_glib.m4
+++ b/tools/m4/convert_glib.m4
@@ -17,6 +17,45 @@ _EQUAL(const gchar*,const char*)
 _EQUAL(const-gchar*,const char*)
 _EQUAL(gpointer*,void**)
 
+_EQUAL(gboolean,int)
+_EQUAL(gint,int)
+_EQUAL(gint*,int*)
+_EQUAL(gint&,int&)
+_EQUAL(guint,unsigned int)
+_EQUAL(guint*,unsigned int*)
+_EQUAL(guint&,unsigned int&)
+_EQUAL(gdouble,double)
+_EQUAL(gdouble*,double*)
+_EQUAL(gfloat, float)
+_EQUAL(float*,gfloat[])
+
+_EQUAL(GdkAtom,Gdk::Atom)
+_EQUAL(const-char*,const-gchar*)
+_EQUAL(return-char*,return-gchar*)
+_EQUAL(gpointer,void*)
+_EQUAL(gconstpointer,const void*)
+
+# Basic Types
+_CONVERSION(`int',`bool',`$3')
+_CONVERSION(`bool',`int',`static_cast<int>($3)')
+_CONVERSION(`unsigned int',`bool',`$3')
+_CONVERSION(`bool',`unsigned int',`static_cast<unsigned int>($3)')
+_CONVERSION(`int&',`gint*',`&($3)')
+_CONVERSION(`gint*',`int&',`*($3)')
+_CONVERSION(`guint&',`guint*',`&($3)')
+_CONVERSION(`double&',`gdouble*',`&($3)')
+_CONVERSION(`float&',`gfloat*',`&($3)')
+_CONVERSION(`gchar**',`char**',`$3')
+_CONVERSION(`char**',`gchar**',`$3')
+_CONVERSION(`gpointer&',`gpointer*',`&($3)')
+_CONVERSION(`void*&',`gpointer*',`&($3)')
+
+_CONVERSION(`GError*&',`GError**',`&($3)')
+
+dnl
+dnl # These are for fixmegtkconst
+_CONVERSION(`const guchar*',`guchar*',`const_cast<guchar*>($3)',`$3')
+
 _CONV_GLIB_ENUM(IOStatus)
 _CONV_GLIB_ENUM(IOFlags)
 _CONV_GLIB_ENUM(IOCondition)
diff --git a/tools/m4/convert_glibmm.m4 b/tools/m4/convert_glibmm.m4
new file mode 100644
index 0000000..2da764e
--- /dev/null
+++ b/tools/m4/convert_glibmm.m4
@@ -0,0 +1,6 @@
+dnl $Id$
+
+include(convert_base.m4)
+include(convert_glib.m4)
+include(convert_gio.m4)
+
diff --git a/tools/m4/filelist.am b/tools/m4/filelist.am
index 46988a7..7dbbd78 100644
--- a/tools/m4/filelist.am
+++ b/tools/m4/filelist.am
@@ -6,21 +6,16 @@ files_codegen_m4 =			\
 	class_boxedtype_static.m4	\
 	class_generic.m4		\
 	class_gobject.m4		\
-	class_gtkobject.m4		\
 	class_interface.m4		\
 	class_opaque_copyable.m4	\
 	class_opaque_refcounted.m4	\
 	class_shared.m4			\
 	compare.m4			\
 	convert.m4			\
-	convert_atk.m4			\
 	convert_base.m4			\
-	convert_gdk.m4			\
 	convert_gio.m4			\
 	convert_glib.m4			\
-	convert_gtk.m4			\
-	convert_gtkmm.m4		\
-	convert_pango.m4		\
+	convert_glibmm.m4		\
 	ctor.m4				\
 	doc.m4				\
 	enum.m4				\