gnomemm r1579 - in libgdamm/branches/libgdamm-4-0: libgda/src tools/m4

[jhs svn gnome org]

Author: jhs
Date: Mon Jun 23 12:42:47 2008
New Revision: 1579
URL: http://svn.gnome.org/viewvc/gnomemm?rev=1579&view=rev

Log:
2008-06-23  Johannes Schmid  <jhs gnome org>

	* libgda/src/Makefile_list_of_hg.am_fragment:
	* libgda/src/quarklist.ccg:
	* libgda/src/quarklist.hg:
	* libgda/src/threader.ccg:
	* libgda/src/threader.hg:
  * tools/m4/convert_libgdamm.m4:
	Wrapped missing classes
	
	* libgda/blob*:
	Restored from svn trunk

Added:
   libgdamm/branches/libgdamm-4-0/libgda/src/blob.ccg
      - copied unchanged from r1578, /libgdamm/trunk/libgda/src/blob.ccg
   libgdamm/branches/libgdamm-4-0/libgda/src/blob.hg
      - copied unchanged from r1578, /libgdamm/trunk/libgda/src/blob.hg
   libgdamm/branches/libgdamm-4-0/libgda/src/blobop.ccg
      - copied unchanged from r1578, /libgdamm/trunk/libgda/src/blobop.ccg
   libgdamm/branches/libgdamm-4-0/libgda/src/blobop.hg
      - copied unchanged from r1578, /libgdamm/trunk/libgda/src/blobop.hg
   libgdamm/branches/libgdamm-4-0/libgda/src/quarklist.ccg
   libgdamm/branches/libgdamm-4-0/libgda/src/quarklist.hg
   libgdamm/branches/libgdamm-4-0/libgda/src/threader.ccg
   libgdamm/branches/libgdamm-4-0/libgda/src/threader.hg
Modified:
   libgdamm/branches/libgdamm-4-0/libgda/src/Makefile_list_of_hg.am_fragment
   libgdamm/branches/libgdamm-4-0/tools/m4/convert_libgdamm.m4

Modified: libgdamm/branches/libgdamm-4-0/libgda/src/Makefile_list_of_hg.am_fragment
==============================================================================
--- libgdamm/branches/libgdamm-4-0/libgda/src/Makefile_list_of_hg.am_fragment	(original)
+++ libgdamm/branches/libgdamm-4-0/libgda/src/Makefile_list_of_hg.am_fragment	Mon Jun 23 12:42:47 2008
@@ -11,7 +11,8 @@
 	   handlernumerical.hg handlerbin.hg handlertype.hg \
      serverprovider.hg serveroperation.hg transactionstatus.hg \
      set.hg row.hg column.hg holder.hg statement.hg sqlparser.hg \
-     batch.hg metastore.hg metastruct.hg config.hg
+     batch.hg metastore.hg metastruct.hg config.hg threader.hg \
+     blobop.hg blob.hg quarklist.hg
 
 
 

Added: libgdamm/branches/libgdamm-4-0/libgda/src/quarklist.ccg
==============================================================================
--- (empty file)
+++ libgdamm/branches/libgdamm-4-0/libgda/src/quarklist.ccg	Mon Jun 23 12:42:47 2008
@@ -0,0 +1,32 @@
+// -*- C++ -*- // this is for the .hg, I realize gensig puts one in
+
+/* quarklist.ccg
+ *
+ * Copyright 2001      Free Software Foundation
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the Free
+ * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+ 
+#include <libgda/gda-quark-list.h>
+
+namespace Gnome
+{
+
+namespace Gda
+{
+
+} // namespace Gda
+
+} // namesoace Gnome

Added: libgdamm/branches/libgdamm-4-0/libgda/src/quarklist.hg
==============================================================================
--- (empty file)
+++ libgdamm/branches/libgdamm-4-0/libgda/src/quarklist.hg	Mon Jun 23 12:42:47 2008
@@ -0,0 +1,50 @@
+// -*- C++ -*- // this is for the .hg, I realize gensig puts one in
+
+/* quarklist.h
+ *
+ * Copyright 2001      Free Software Foundation
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the Free
+ * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+ 
+_DEFS(libgdamm,libgda)
+_PINCLUDE(glibmm/private/object_p.h)
+
+#include <libgda/gda-quark-list.h>
+
+namespace Gnome
+{
+
+namespace Gda
+{
+
+class QuarkList
+{
+  _CLASS_BOXEDTYPE(QuarkList, GdaQuarkList, gda_quark_list_new, gda_quark_list_copy, gda_quark_list_free)
+  _IGNORE(gda_blob_get_type, gda_quark_list_new, gda_quark_list_copy, gda_quark_list_free)
+  
+  public:
+    // FIXME: new from string
+    
+   _WRAP_METHOD(void clear(), gda_quark_list_clear)
+   _WRAP_METHOD(void add_from_string (const Glib::ustring& name, bool cleanup), gda_quark_list_add_from_string)
+   _WRAP_METHOD(Glib::ustring find(const Glib::ustring& name), gda_quark_list_find)
+   _WRAP_METHOD(void remove (const Glib::ustring& name), gda_quark_list_remove)
+   // TODO: foreach slot
+};
+
+} // namespace Gda
+
+} // namespace Gnome

Added: libgdamm/branches/libgdamm-4-0/libgda/src/threader.ccg
==============================================================================
--- (empty file)
+++ libgdamm/branches/libgdamm-4-0/libgda/src/threader.ccg	Mon Jun 23 12:42:47 2008
@@ -0,0 +1,29 @@
+// -*- C++ -*- // this is for the .ccg, I realize gensig puts one in
+
+/* threader.cc
+ * 
+ * Copyright 2003 libgdamm Development Team
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the Free
+ * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include <libgdamm/threader.h>
+
+namespace Gnome
+{
+
+
+} /* namespace Gnome */
+

Added: libgdamm/branches/libgdamm-4-0/libgda/src/threader.hg
==============================================================================
--- (empty file)
+++ libgdamm/branches/libgdamm-4-0/libgda/src/threader.hg	Mon Jun 23 12:42:47 2008
@@ -0,0 +1,58 @@
+// -*- C++ -*- // this is for the .hg, I realize gensig puts one in
+
+/* threader.h
+ *
+ * Copyright 2006 libgdamm Development Team
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or(at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the Free
+ * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+_DEFS(libgdamm,libgda)
+_PINCLUDE(glibmm/private/object_p.h)
+
+#include <libgda/gda-threader.h>
+
+namespace Gnome
+{
+
+namespace Gda
+{
+
+typedef GdaThreaderFunc ThreaderFunc;
+
+/** Container for several values
+ *
+ * @ingroup Connection
+ */
+class Threader : public Glib::Object
+{
+  _CLASS_GOBJECT(Threader, GdaThreader, GDA_THREADER, Glib::Object, GObject)
+protected:
+	_CTOR_DEFAULT
+	
+public:
+  _WRAP_CREATE()
+  
+  _WRAP_METHOD(guint start_thread(GThreadFunc func, gpointer func_arg, ThreaderFunc ok_callback, ThreaderFunc cancel_callback), gda_threader_start_thread, errthrow)
+  _WRAP_METHOD(void cancel (guint job_id), gda_threader_cancel)
+  
+  _WRAP_SIGNAL(void cancelled (guint arg1, gpointer arg2), "cancelled")
+  _WRAP_SIGNAL(void finished (guint arg1, gpointer arg2), "finished")
+
+};
+
+} // namespace Gda
+} // namespace Gnome
+

Modified: libgdamm/branches/libgdamm-4-0/tools/m4/convert_libgdamm.m4
==============================================================================
--- libgdamm/branches/libgdamm-4-0/tools/m4/convert_libgdamm.m4	(original)
+++ libgdamm/branches/libgdamm-4-0/tools/m4/convert_libgdamm.m4	Mon Jun 23 12:42:47 2008
@@ -7,6 +7,7 @@
 _EQUAL(GdaSetGroup*, SetGroup*)
 _EQUAL(GdaSetSource*, SetSource*)
 _EQUAL(GdaSetNode*, SetNode*)
+_EQUAL(GdaThreaderFunc, ThreaderFunc)
 
 
 _CONVERSION(`GdaConnectionEvent*',`Glib::RefPtr<ConnectionEvent>',`Glib::wrap($3)')
@@ -34,6 +35,7 @@
 _CONVERSION(`GdaMetaStore*',`Glib::RefPtr<MetaStore>',`Glib::wrap($3)')
 _CONVERSION(`GdaConfig*',`Glib::RefPtr<Config>',`Glib::wrap($3)')
 
+_CONVERSION(`const Glib::RefPtr<BlobOp>&', `GdaBlobOp*', __CONVERT_REFPTR_TO_P)
 _CONVERSION(`const Glib::RefPtr<DataModel>&', `GdaDataModel*', __CONVERT_REFPTR_TO_P)
 _CONVERSION(`const Glib::RefPtr<DataHandler>&', `GdaDataHandler*', __CONVERT_REFPTR_TO_P)
 _CONVERSION(`const Glib::RefPtr<DataModelIter>&', `GdaDataModelIter*', __CONVERT_REFPTR_TO_P)
@@ -114,6 +116,12 @@
 _CONV_ENUM(Gda,MetaSortType)
 _CONV_ENUM(Gda,MetaGraphInfo)
 
+# structs
+_CONVERSION(`Blob&',`GdaBlob*',__FR2P)
+_CONVERSION(`GdaBlob*',`Blob', Glib::wrap($3))
+_CONVERSION(`QuarkList&',`GdaQuarkList*',__FR2P)
+_CONVERSION(`GdaQuarkList*',`QuarkList', Glib::wrap($3))
+
 # Lists
 _CONVERSION(`GSList*',`Glib::SListHandle<Glib::ustring>',__FL2H_SHALLOW)
 _CONVERSION(`const Glib::ListHandle< Glib::RefPtr<ConnectionEvent> >&',`GList*',`$3.data()')