GNOME.org
 

[gtksourceviewmm/devel] _CONVERSION cleanup.

commit 7d087faea7dae97563949bd6312b8f7e9589a0e7
Author: Krzesimir Nowak <qdlacz gmail com>
Date:   Wed Jan 13 00:44:32 2010 +0100

    _CONVERSION cleanup.
    
    * codegen/m4/convert.m4:
    * codegen/m4/convert_gtksourceview.m4:
    * codegen/m4/convert_gtksourceviewmm.m4:
    * codegen/m4/filelist.am: Got rid of old _CONVERSION files and
    rewritten them anew.
    * gtksourceview/src/sourcecompletion.hg:
    * gtksourceview/src/sourcecompletioncontext.hg:
    * gtksourceview/src/sourcecompletioninfo.hg:
    * gtksourceview/src/sourcecompletionproposal.hg:
    * gtksourceview/src/sourcecompletionprovider.hg:
    * gtksourceview/src/sourcegutter.hg:
    * gtksourceview/src/sourcelanguagemanager.hg:
    * gtksourceview/src/sourceprintcompositor.hg:
    * gtksourceview/src/sourcestyleschememanager.hg:
    * gtksourceview/src/sourceview.hg: Move most of conversions to
    main convert file.

 codegen/m4/convert.m4                         |    4 +-
 codegen/m4/convert_gtksourceview.m4           |  148 +++++++++++++++++++++++-
 codegen/m4/convert_gtksourceviewmm.m4         |   54 ---------
 codegen/m4/filelist.am                        |    1 -
 gtksourceview/src/sourcecompletion.hg         |    8 --
 gtksourceview/src/sourcecompletioncontext.hg  |    3 -
 gtksourceview/src/sourcecompletioninfo.hg     |    2 -
 gtksourceview/src/sourcecompletionproposal.hg |    3 -
 gtksourceview/src/sourcecompletionprovider.hg |    6 -
 gtksourceview/src/sourcegutter.hg             |    7 -
 gtksourceview/src/sourcelanguagemanager.hg    |    4 +-
 gtksourceview/src/sourceprintcompositor.hg    |    6 -
 gtksourceview/src/sourcestyleschememanager.hg |    1 +
 gtksourceview/src/sourceview.hg               |    9 --
 14 files changed, 145 insertions(+), 111 deletions(-)
---
diff --git a/codegen/m4/convert.m4 b/codegen/m4/convert.m4
index ba17424..985c50b 100644
--- a/codegen/m4/convert.m4
+++ b/codegen/m4/convert.m4
@@ -1,3 +1,3 @@
-include(convert_gtkmm.m4)
-include(convert_gtksourceviewmm.m4)
+m4_include(convert_gtkmm.m4)
+m4_include(convert_gtksourceview.m4)
 
diff --git a/codegen/m4/convert_gtksourceview.m4 b/codegen/m4/convert_gtksourceview.m4
index fcc0a58..1c20ec1 100644
--- a/codegen/m4/convert_gtksourceview.m4
+++ b/codegen/m4/convert_gtksourceview.m4
@@ -1,8 +1,142 @@
+#
+## GDK
+#
+
+# Gdk::Color -> GdkColor
+_CONVERSION(`const Gdk::Color&',`const GdkColor*',`($3).gobj()')
+_CONVERSION(`Gdk::Color&',`GdkColor*',`($3).gobj()')
+
+#
+## GTK
+#
+
+# GtkCellRenderer -> Gtk::CellRenderer
+_CONVERSION(`GtkCellRenderer*',`Gtk::CellRenderer*',`Glib::wrap($3)')
+
+
+# Gtk::CellRenderer -> GtkCellRenderer
+_CONVERSION(`Gtk::CellRenderer*',`GtkCellRenderer*',`Glib::unwrap($3)')
+
+
+# Gtk::PrintContext -> GtkPrintContext
+_CONVERSION(`const Glib::RefPtr<Gtk::PrintContext>&',`GtkPrintContext*',`Glib::unwrap($3)')
+
+
+# GtkTextIter -> Gtk::TextIter
+_CONVERSION(`GtkTextIter*',`const Gtk::TextIter&',`Glib::wrap($3)')
+_CONVERSION(`GtkTextIter*',`Gtk::TextIter&',`Glib::wrap($3)')
+
+
+# Gtk::TextIter -> GtkTextIter
+_CONVERSION(`const Gtk::TextIter&',`GtkTextIter*',`const_cast<GtkTextIter*>(($3).gobj())')
+_CONVERSION(`Gtk::TextIter&',`GtkTextIter*',`($3).gobj()')
+_CONVERSION(`const Gtk::TextIter&',`const GtkTextIter*',`($3).gobj()')
+
+
+# Gtk::TextTagTable -> GtkTextTagTable
+_CONVERSION(`const Glib::RefPtr<Gtk::TextTagTable>&',`GtkTextTagTable*',`Glib::unwrap($3)')
+
+
+# Gtk::TextView -> GtkTextView
+_CONVERSION(`const Gtk::TextView&',`GtkTextView*',`const_cast<GtkTextView*>(($3).gobj())')
+
+
+# GtkTooltip -> Gtk::Tooltip
+_CONVERSION(`GtkTooltip*',`const Glib::RefPtr<Gtk::Tooltip>&',`Glib::wrap($3)')
+
+
+# Gtk::Tooltip -> GtkTooltip
+_CONVERSION(`const Glib::RefPtr<Gtk::Tooltip>&',`GtkTooltip*',`const_cast<GtkTooltip*>(Glib::unwrap($3))')
+
+
+#
+## GTKSOURCE
+#
+
+# GtkSourceBuffer -> gtksourceview::SourceBuffer
+_CONVERSION(`GtkSourceBuffer*',`Glib::RefPtr<SourceBuffer>',`Glib::wrap($3)')
+
+
+# gtksourceview::SourceBuffer -> GtkSourceBuffer
+_CONVERSION(`const Glib::RefPtr<SourceBuffer>&',`GtkSourceBuffer*',__CONVERT_REFPTR_TO_P)
+
+
+# GtkSourceCompletion -> gtksourceview::SourceCompletion
+_CONVERSION(`GtkSourceCompletion*',`SourceCompletion*',`Glib::wrap($3)')
+_CONVERSION(`GtkSourceCompletion*',`const SourceCompletion*',`Glib::wrap($3)')
+
+
+# GtkSourceCompletionContext -> gtksourceview::SourceCompletionContext
+_CONVERSION(`GtkSourceCompletionContext*',`Glib::RefPtr<SourceCompletionContext>',`Glib::wrap($3)')
+_CONVERSION(`GtkSourceCompletionContext*',`const Glib::RefPtr<SourceCompletionContext>&',`Glib::wrap($3)')
+
+
+# gtksourceview::SourceCompletionContext -> GtkSourceCompletionContext
+_CONVERSION(`const Glib::RefPtr<SourceCompletionContext>&',`GtkSourceCompletionContext*',`Glib::unwrap($3)')
+_CONVERSION(`const Glib::RefPtr<const SourceCompletionContext>&',`GtkSourceCompletionContext*',`const_cast<GtkSourceCompletionContext*>(Glib::unwrap($3))')
+
+
+# GtkSourceCompletionInfo -> gtksourceview::SourceCompletionInfo
+_CONVERSION(`GtkSourceCompletionInfo*',`SourceCompletionInfo*',`Glib::wrap($3)')
+
+
+# gtksourceview::SourceCompletionInfo -> GtkSourceCompletionInfo
+_CONVERSION(`const SourceCompletionInfo&',`GtkSourceCompletionInfo*',`const_cast<GtkSourceCompletionInfo*>(($3).gobj())')
+
+
+# gtksourceview::SourceCompletionProposal -> GtkSourceCompletionProposal
+_CONVERSION(`const Glib::RefPtr<const SourceCompletionProposal>&',`GtkSourceCompletionProposal*',`const_cast<GtkSourceCompletionProposal*>(Glib::unwrap($3))')
+_CONVERSION(`const Glib::RefPtr<SourceCompletionProposal>&',`GtkSourceCompletionProposal*',`Glib::unwrap($3)')
+
+
+# gtksourceview::SourceCompletionProvider -> GtkSourceCompletionProvider
+_CONVERSION(`const Glib::RefPtr<SourceCompletionProvider>&',`GtkSourceCompletionProvider*',`Glib::unwrap($3)')
+
+
+# GtkSourceGutter -> gtksourceview::SourceGutter
+_CONVERSION(`GtkSourceGutter*',`Glib::RefPtr<SourceGutter>',`Glib::wrap($3)')
+_CONVERSION(`GtkSourceGutter*',`Glib::RefPtr<const SourceGutter>',`Glib::wrap($3)')
+
+
+# GtkSourceLanguage -> gtksourceview::SourceLanguage
 _CONVERSION(`GtkSourceLanguage*',`Glib::RefPtr<SourceLanguage>',`Glib::wrap($3)')
-_CONVERSION(`GtkSourceLanguage*',`Glib::RefPtr<const SourceLanguage>',`Glib::wrap($3)')
-#_CONVERSION(`Glib::RefPtr<SourceLanguage>',`GtkSourceLanguage*',__CONVERT_REFPTR_TO_P)
-_CONVERSION(`const Glib::SListHandle<Glib::ustring>&', `GSList*',`$3.data()')
-_CONVERSION(`GtkSourceMarker*',`Glib::RefPtr<SourceMarker>',`Glib::wrap($3)')
-_CONVERSION(`GtkSourceMarker*',`Glib::RefPtr<const SourceMarker>',`Glib::wrap($3)')
-#_CONVERSION(`Glib::RefPtr<SourceMarker>',`GtkSourceMarker*',__CONVERT_REFPTR_TO_P)
-_CONVERSION(`GSList*', `Glib::SListHandle<Glib::RefPtr<SourceMarker> >', `$2($3, Glib::OWNERSHIP_DEEP)')
+
+
+# gtksourceview::SourceLanguage -> GtkSourceLanguage
+_CONVERSION(`const Glib::RefPtr<SourceLanguage>&',`GtkSourceLanguage*',`Glib::unwrap($3)')
+
+
+# GtkSourceLanguageManager -> gtksourceview::SourceLanguageManager
+_CONVERSION(`GtkSourceLanguageManager*',`Glib::RefPtr<SourceLanguageManager>',`Glib::wrap($3)')
+
+
+# GtkSourceMark -> gtksourceview::SourceMark
+_CONVERSION(`GtkSourceMark*',`Glib::RefPtr<SourceMark>',`Glib::wrap($3)')
+
+
+# GtkSourceStyle -> gtksourceview::SourceStyle
+_CONVERSION(`GtkSourceStyle*',`Glib::RefPtr<SourceStyle>',`Glib::wrap($3)')
+
+
+# GtkSourceStyleScheme -> gtksourceview::SourceStyleScheme
+_CONVERSION(`GtkSourceStyleScheme*',`Glib::RefPtr<SourceStyleScheme>',`Glib::wrap($3)')
+
+
+# gtksourceview::SourceStyleScheme -> GtkSourceStyleScheme
+_CONVERSION(`const Glib::RefPtr<SourceStyleScheme>&',`GtkSourceStyleScheme*',`Glib::unwrap($3)')
+
+
+# GtkSourceStyleSchemeManager -> gtksourceview::SourceStyleSchemeManager
+_CONVERSION(`GtkSourceStyleSchemeManager*',`Glib::RefPtr<SourceStyleSchemeManager>',`Glib::wrap($3)')
+
+
+# GtkSourceView -> Gtk::SourceView
+_CONVERSION(`GtkSourceView*',`SourceView*',`Glib::wrap($3)')
+
+#
+## ENUMS
+#
+
+_CONV_ENUM(Gtk,SourceSmartHomeEndType)
+_CONV_ENUM(Gtk,SourceDrawSpacesFlags)
+_CONV_ENUM(Gtk,SourceCompletionActivation)
diff --git a/codegen/m4/filelist.am b/codegen/m4/filelist.am
index e668315..96b9925 100644
--- a/codegen/m4/filelist.am
+++ b/codegen/m4/filelist.am
@@ -1,3 +1,2 @@
 files_codegen_m4 = convert_gtksourceview.m4	\
-	convert_gtksourceviewmm.m4 		\
 	convert.m4
diff --git a/gtksourceview/src/sourcecompletion.hg b/gtksourceview/src/sourcecompletion.hg
index 22470ef..a0d5c48 100644
--- a/gtksourceview/src/sourcecompletion.hg
+++ b/gtksourceview/src/sourcecompletion.hg
@@ -38,13 +38,11 @@ class SourceCompletion : public Gtk::Object
 {
   _CLASS_GTKOBJECT(SourceCompletion, GtkSourceCompletion, GTK_SOURCE_COMPLETION, Gtk::Object, GtkObject)
 public:
-#m4 _CONVERSION(`const Glib::RefPtr<SourceCompletionProvider>&',`GtkSourceCompletionProvider*',`($3)->gobj()')
   _WRAP_METHOD(bool add_provider(const Glib::RefPtr<SourceCompletionProvider>& provider), gtk_source_completion_add_provider, errthrow)
 
   _WRAP_METHOD(bool remove_provider(const Glib::RefPtr<SourceCompletionProvider>& provider), gtk_source_completion_remove_provider, errthrow)
 
 #m4 _CONVERSION(`GList*',`Glib::ListHandle<Glib::RefPtr<SourceCompletionProvider> >',`$2($3, Glib::OWNERSHIP_NONE)')
-#m4 _CONVERSION(`const Glib::RefPtr<SourceCompletionContext>&',`GtkSourceCompletionContext*',`($3)->gobj()')
   _WRAP_METHOD(Glib::ListHandle<Glib::RefPtr<SourceCompletionProvider> > get_providers() const, gtk_source_completion_get_providers)
 
 #m4 _CONVERSION(`const Glib::ListHandle<Glib::RefPtr<SourceCompletionProvider> >&',`GList*',`($3).data()')
@@ -52,14 +50,10 @@ public:
 
   _WRAP_METHOD(void hide(), gtk_source_completion_hide)
 
-#m4 _CONVERSION(`GtkSourceCompletionInfo*',`SourceCompletionInfo*',`Glib::wrap($3)')
   _WRAP_METHOD(SourceCompletionInfo* get_info_window() const, gtk_source_completion_get_info_window)
 
-#m4 _CONVERSION(`GtkSourceView*',`SourceView*',`Glib::wrap($3)')
   _WRAP_METHOD(SourceView* get_view() const, gtk_source_completion_get_view)
 
-#m4 _CONVERSION(`GtkSourceCompletionContext*',`Glib::RefPtr<SourceCompletionContext>',`Glib::wrap($3)')
-#m4 _CONVERSION(`const Gtk::TextIter&',`GtkTextIter*',`const_cast<GtkTextIter*>(($3).gobj())')
   _WRAP_METHOD(Glib::RefPtr<SourceCompletionContext> create_context(const Gtk::TextIter& position), gtk_source_completion_create_context)
   Glib::RefPtr<SourceCompletionContext> create_context();
 
@@ -69,8 +63,6 @@ public:
   _WRAP_METHOD(void unblock_interactive(), gtk_source_completion_unblock_interactive)
 
   _WRAP_SIGNAL(void hide(), "hide")
-#m4 _CONVERSION(`GtkSourceCompletionContext*',`const Glib::RefPtr<SourceCompletionContext>&',`Glib::wrap($3)')
-#m4 _CONVERSION(`const Glib::RefPtr<SourceCompletionContext>&',`GtkSourceCompletionContext*',`($3)->gobj()')
   _WRAP_SIGNAL(void populate_context(const Glib::RefPtr<SourceCompletionContext>& context), "populate-context")
   _WRAP_SIGNAL(void show(), "show")
 // those are keybinding signals, so ignore them
diff --git a/gtksourceview/src/sourcecompletioncontext.hg b/gtksourceview/src/sourcecompletioncontext.hg
index 768aaa1..76d71b5 100644
--- a/gtksourceview/src/sourcecompletioncontext.hg
+++ b/gtksourceview/src/sourcecompletioncontext.hg
@@ -46,9 +46,6 @@ public:
 #m4 _CONVERSION(`const Glib::ListHandle<Glib::RefPtr<SourceCompletionProposal> >&',`GList*',`($3).data()')
   _WRAP_METHOD(void add_proposals(const Glib::RefPtr<SourceCompletionProvider>& provider, const Glib::ListHandle<Glib::RefPtr<SourceCompletionProposal> >& proposals, bool finished), gtk_source_completion_context_add_proposals)
 
-#m4 _CONVERSION(`GtkSourceView*',`SourceView*',`Glib::wrap($3)')
-  _WRAP_METHOD(SourceView* get_view(), gtk_source_completion_context_get_view)
-  _WRAP_METHOD(const SourceView* get_view() const, gtk_source_completion_context_get_view, constversion)
   _IGNORE(gtk_source_completion_context_get_iter)
   SourceIter get_iter() const;
 
diff --git a/gtksourceview/src/sourcecompletioninfo.hg b/gtksourceview/src/sourcecompletioninfo.hg
index ec44daa..f1ec3bd 100644
--- a/gtksourceview/src/sourcecompletioninfo.hg
+++ b/gtksourceview/src/sourcecompletioninfo.hg
@@ -35,8 +35,6 @@ class SourceCompletionInfo : public Gtk::Window
 public:
   SourceCompletionInfo();
 
-#m4 _CONVERSION(`const Gtk::TextView&',`GtkTextView*',`const_cast<GtkTextView*>(($3).gobj())')
-#m4 _CONVERSION(`const Gtk::TextIter&',`GtkTextIter*',`const_cast<GtkTextIter*>(($3).gobj())')
   _WRAP_METHOD(void move_to_iter(const Gtk::TextView& view, const Gtk::TextIter& iter), gtk_source_completion_info_move_to_iter)
   void move_to_iter(const Gtk::TextView& view);
   _WRAP_METHOD(void set_sizing(int width, int height, bool shrink_width, bool shrink_height), gtk_source_completion_info_set_sizing)
diff --git a/gtksourceview/src/sourcecompletionproposal.hg b/gtksourceview/src/sourcecompletionproposal.hg
index 6d6a45e..8eff078 100644
--- a/gtksourceview/src/sourcecompletionproposal.hg
+++ b/gtksourceview/src/sourcecompletionproposal.hg
@@ -41,9 +41,6 @@ public:
   _WRAP_METHOD(Glib::ustring get_info() const, gtk_source_completion_proposal_get_info)
   _WRAP_METHOD(void changed(), gtk_source_completion_proposal_changed)
   _WRAP_METHOD(guint hash() const, gtk_source_completion_proposal_hash)
-
-  // TODO: think about `const Glib::RefPtr<const SourceCompletionProposal>&'
-#m4 _CONVERSION(`const Glib::RefPtr<const SourceCompletionProposal>&',`GtkSourceCompletionProposal*',`const_cast<GtkSourceCompletionProposal*>(($3)->gobj())')
   _WRAP_METHOD(bool equal(const Glib::RefPtr<const SourceCompletionProposal>& other) const, gtk_source_completion_proposal_equal)
 
   _WRAP_SIGNAL(void changed(), "changed")
diff --git a/gtksourceview/src/sourcecompletionprovider.hg b/gtksourceview/src/sourcecompletionprovider.hg
index 4ed0770..d4dd419 100644
--- a/gtksourceview/src/sourcecompletionprovider.hg
+++ b/gtksourceview/src/sourcecompletionprovider.hg
@@ -42,22 +42,16 @@ public:
   _WRAP_METHOD(Glib::RefPtr<Gdk::Pixbuf> get_icon(), gtk_source_completion_provider_get_icon, refreturn)
   _WRAP_METHOD(Glib::RefPtr<const Gdk::Pixbuf> get_icon() const, gtk_source_completion_provider_get_icon, refreturn, constversion)
 
-#m4 _CONVERSION(`const Glib::RefPtr<SourceCompletionContext>&',`GtkSourceCompletionContext*',`($3)->gobj()')
   _WRAP_METHOD(void populate(const Glib::RefPtr<SourceCompletionContext>& context), gtk_source_completion_provider_populate)
 
-#m4 _CONVERSION(`const Glib::RefPtr<const SourceCompletionContext>&',`GtkSourceCompletionContext*',`const_cast<GtkSourceCompletionContext*>(($3)->gobj())')
   _WRAP_METHOD(bool match(const Glib::RefPtr<const SourceCompletionContext>& context) const, gtk_source_completion_provider_match)
 
-#m4 _CONVERSION(`const Glib::RefPtr<const SourceCompletionProposal>&',`GtkSourceCompletionProposal*',`const_cast<GtkSourceCompletionProposal*>(($3)->gobj())')
   _WRAP_METHOD(Gtk::Widget* get_info_widget(const Glib::RefPtr<const SourceCompletionProposal>& proposal) const, gtk_source_completion_provider_get_info_widget)
 
-#m4 _CONVERSION(`const SourceCompletionInfo&',`GtkSourceCompletionInfo*',`const_cast<GtkSourceCompletionInfo*>(($3).gobj())')
   _WRAP_METHOD(void update_info(const Glib::RefPtr<const SourceCompletionProposal>& proposal, const SourceCompletionInfo& info), gtk_source_completion_provider_update_info)
 
   _WRAP_METHOD(bool get_start_iter(const Glib::RefPtr<const SourceCompletionContext>& context, const Glib::RefPtr<const SourceCompletionProposal>& proposal, Gtk::TextIter& iter), gtk_source_completion_provider_get_start_iter)
 
-#m4 _CONVERSION(`const Glib::RefPtr<SourceCompletionProposal>&',`GtkSourceCompletionProposal*',`($3)->gobj()')
-#m4 _CONVERSION(`const Gtk::TextIter&',`GtkTextIter*',`const_cast<GtkTextIter*>(($3).gobj())')
   _WRAP_METHOD(bool activate_proposal(const Glib::RefPtr<SourceCompletionProposal>& proposal, const Gtk::TextIter& iter), gtk_source_completion_provider_activate_proposal)
 
   _WRAP_METHOD(SourceCompletionActivation get_activation() const, gtk_source_completion_provider_get_activation)
diff --git a/gtksourceview/src/sourcegutter.hg b/gtksourceview/src/sourcegutter.hg
index 17369c0..f3f0b16 100644
--- a/gtksourceview/src/sourcegutter.hg
+++ b/gtksourceview/src/sourcegutter.hg
@@ -48,7 +48,6 @@ public:
   _WRAP_METHOD(Glib::RefPtr<Gdk::Window> get_window(), gtk_source_gutter_get_window, refreturn)
   _WRAP_METHOD(Glib::RefPtr<const Gdk::Window> get_window() const, gtk_source_gutter_get_window, constversion, refreturn)
 
-#m4 _CONVERSION(`Gtk::CellRenderer*',`GtkCellRenderer*',`($3)->gobj()')
   _WRAP_METHOD(void insert(Gtk::CellRenderer* renderer, int position), gtk_source_gutter_insert)
   _WRAP_METHOD(void reorder(Gtk::CellRenderer* renderer, int position), gtk_source_gutter_reorder)
   _WRAP_METHOD(void remove(Gtk::CellRenderer* renderer), gtk_source_gutter_remove)
@@ -70,12 +69,6 @@ public:
   _WRAP_PROPERTY("view", SourceView*)
   _WRAP_PROPERTY("window-type", Gtk::TextWindowType)
 
-#m4 _CONVERSION(`GtkCellRenderer*',`Gtk::CellRenderer*',`Glib::wrap($3)')
-#m4 _CONVERSION(`GtkTextIter*',`const Gtk::TextIter&',`Glib::wrap($3)')
-#m4 _CONVERSION(`Gtk::CellRenderer*',`GtkCellRenderer*',`const_cast<GtkCellRenderer*>(($3)->gobj())')
-#m4 _CONVERSION(`const Gtk::TextIter&',`GtkTextIter*',`const_cast<GtkTextIter*>(($3).gobj())')
-#m4 _CONVERSION(`GtkTooltip*',`const Glib::RefPtr<Gtk::Tooltip>&',`Glib::wrap($3)')
-#m4 _CONVERSION(`const Glib::RefPtr<Gtk::Tooltip>&',`GtkTooltip*',`const_cast<GtkTooltip*>(($3)->gobj())')
   _WRAP_SIGNAL(void cell_activated(Gtk::CellRenderer* renderer, const Gtk::TextIter& iter, GdkEvent* event), "cell-activated")
   _WRAP_SIGNAL(bool query_tooltip(Gtk::CellRenderer* renderer, const Gtk::TextIter& iter, const Glib::RefPtr<Gtk::Tooltip>& tooltip), "query-tooltip")
 
diff --git a/gtksourceview/src/sourcelanguagemanager.hg b/gtksourceview/src/sourcelanguagemanager.hg
index 8b43a98..b79d25b 100644
--- a/gtksourceview/src/sourcelanguagemanager.hg
+++ b/gtksourceview/src/sourcelanguagemanager.hg
@@ -52,6 +52,7 @@ public:
 
 #m4 _CONVERSION(`const gchar**',`Glib::StringArrayHandle',`$2($3)')
   _WRAP_METHOD(Glib::StringArrayHandle get_search_path() const, gtk_source_language_manager_get_search_path)
+#m4 _CONVERSION(`const Glib::StringArrayHandle&',`gchar**',`const_cast<gchar**>(($3).data())')
   _WRAP_METHOD(void set_search_path(const Glib::StringArrayHandle& dirs), gtk_source_language_manager_set_search_path)
 
   void reset_search_path();
@@ -60,9 +61,6 @@ public:
 
   _WRAP_METHOD(Glib::RefPtr<SourceLanguage> get_language(const Glib::ustring& id), gtk_source_language_manager_get_language, refreturn)
   _WRAP_METHOD(Glib::RefPtr<const SourceLanguage> get_language(const Glib::ustring& id) const, gtk_source_language_manager_get_language, constversion, refreturn)
-// XXX: wrapped by hand, because empty string means NULL.
-//  _WRAP_METHOD(Glib::RefPtr<SourceLanguage> guess_language(const Glib::ustring& filename, const Glib::ustring& content_type), gtk_source_language_manager_guess_language, filename, content_type, refreturn)
-//  _WRAP_METHOD(Glib::RefPtr<const SourceLanguage> guess_language(const Glib::ustring& filename, const Glib::ustring& content_type) const, gtk_source_language_manager_guess_language, filename, content_type, constversion, refreturn)
   _WRAP_METHOD_DOCS_ONLY(gtk_source_language_manager_guess_language)
 // TODO: change filename parameter to std::string, when we break API/ABI.
   Glib::RefPtr<SourceLanguage> guess_language(const Glib::ustring& filename, const Glib::ustring& content_type);
diff --git a/gtksourceview/src/sourceprintcompositor.hg b/gtksourceview/src/sourceprintcompositor.hg
index cebcccc..4ff9a9e 100644
--- a/gtksourceview/src/sourceprintcompositor.hg
+++ b/gtksourceview/src/sourceprintcompositor.hg
@@ -39,7 +39,6 @@ public:
   _WRAP_CREATE(const Glib::RefPtr<SourceBuffer>& buffer)
   _WRAP_CREATE(const SourceView& view)
 
-#m4 _CONVERSION(`GtkSourceBuffer*',`Glib::RefPtr<SourceBuffer>',`Glib::wrap($3)')
   _WRAP_METHOD(Glib::RefPtr<SourceBuffer> get_buffer(), gtk_source_print_compositor_get_buffer, refreturn)
   _WRAP_METHOD(Glib::RefPtr<const SourceBuffer> get_buffer() const, gtk_source_print_compositor_get_buffer, refreturn, constversion)
 
@@ -86,17 +85,12 @@ public:
   _WRAP_METHOD(void set_print_footer(bool print), gtk_source_print_compositor_set_print_footer)
   _WRAP_METHOD(bool get_print_footer() const, gtk_source_print_compositor_get_print_footer)
 
-// XXX: wrapped by hand, because here NULL could be passed.
-//  _WRAP_METHOD(void set_header_format(bool separator, const Glib::ustring& left, const Glib::ustring& center, const Glib::ustring& right), gtk_source_print_compositor_set_header_format)
-//  _WRAP_METHOD(void set_footer_format(bool separator, const Glib::ustring& left, const Glib::ustring& center, const Glib::ustring& right), gtk_source_print_compositor_set_footer_format)
-
   _WRAP_METHOD_DOCS_ONLY(gtk_source_print_compositor_set_header_format)
   void set_header_format(bool separator, const Glib::ustring& left, const Glib::ustring& center, const Glib::ustring& right);
   _WRAP_METHOD_DOCS_ONLY(gtk_source_print_compositor_set_footer_format)
   void set_footer_format(bool separator, const Glib::ustring& left, const Glib::ustring& center, const Glib::ustring& right);
 
   _WRAP_METHOD(int get_n_pages() const, gtk_source_print_compositor_get_n_pages)
-#m4 _CONVERSION(`const Glib::RefPtr<Gtk::PrintContext>&',`GtkPrintContext*',__CONVERT_REFPTR_TO_P($3))
   _WRAP_METHOD(bool paginate(const Glib::RefPtr<Gtk::PrintContext>& context), gtk_source_print_compositor_paginate)
   _WRAP_METHOD(double get_pagination_process(), gtk_source_print_compositor_get_pagination_progress)
   _WRAP_METHOD(void draw_page(const Glib::RefPtr<Gtk::PrintContext>& context, int page_nr), gtk_source_print_compositor_draw_page)
diff --git a/gtksourceview/src/sourcestyleschememanager.hg b/gtksourceview/src/sourcestyleschememanager.hg
index 441cfbe..f645bb8 100644
--- a/gtksourceview/src/sourcestyleschememanager.hg
+++ b/gtksourceview/src/sourcestyleschememanager.hg
@@ -42,6 +42,7 @@ public:
 
   _WRAP_METHOD(static Glib::RefPtr<SourceStyleSchemeManager> get_default(), gtk_source_style_scheme_manager_get_default, refreturn)
 
+#m4 _CONVERSION(`const Glib::StringArrayHandle&',`gchar**',`const_cast<gchar**>(($3).data())')
   _WRAP_METHOD(void set_search_path(const Glib::StringArrayHandle& path), gtk_source_style_scheme_manager_set_search_path)
 
   /** Set the search path to the default.
diff --git a/gtksourceview/src/sourceview.hg b/gtksourceview/src/sourceview.hg
index a04fe7c..3873bda 100644
--- a/gtksourceview/src/sourceview.hg
+++ b/gtksourceview/src/sourceview.hg
@@ -242,17 +242,12 @@ public:
 #endif // GTKSOURCEVIEWMM_DISABLE_DEPRECATED
 
   _WRAP_METHOD(void set_mark_category_icon(const Glib::ustring& category, const Glib::RefPtr<Gdk::Pixbuf>& pixbuf), gtk_source_view_set_mark_category_icon_from_pixbuf)
-// XXX: wrapped by hand, because stock_id or icon_name could be empty, which means NULL.
-//  _WRAP_METHOD(void set_mark_category_icon(const Glib::ustring& category, const Gtk::StockID& stock_id), gtk_source_view_set_mark_category_icon_from_stock)
-//  _WRAP_METHOD(void set_mark_category_icon(const Glib::ustring& category, const Glib::ustring& icon_name), gtk_source_view_set_mark_category_icon_from_icon_name)
   _WRAP_METHOD_DOCS_ONLY(gtk_source_view_set_mark_category_icon_from_stock)
   void set_mark_category_icon(const Glib::ustring& category, const Gtk::StockID& stock_id);
   _WRAP_METHOD_DOCS_ONLY(gtk_source_view_set_mark_category_icon_from_icon_name)
   void set_mark_category_icon(const Glib::ustring& category, const Glib::ustring& icon_name);
 
-#m4 _CONVERSION(`const Gdk::Color&',`const GdkColor*',`($3).gobj()')
   _WRAP_METHOD(void set_mark_category_background(const Glib::ustring& category, const Gdk::Color& color), gtk_source_view_set_mark_category_background)
-#m4 _CONVERSION(`Gdk::Color&',`GdkColor*',`($3).gobj()')
   _WRAP_METHOD(bool set_mark_category_background(const Glib::ustring& category, Gdk::Color& dest) const, gtk_source_view_get_mark_category_background)
   /// \brief Set if and how the spaces should be visualized.
   ///
@@ -273,13 +268,9 @@ public:
   void set_mark_category_tooltip_func(const Glib::ustring& category, const SlotMarkTooltip& slot);
   void set_mark_category_tooltip_markup_func(const Glib::ustring& category, const SlotMarkTooltip& slot);
   void unset_mark_category_tooltip_func(const Glib::ustring& category);
-#m4 _CONVERSION(`GtkSourceGutter*',`Glib::RefPtr<SourceGutter>',`Glib::wrap($3)')
-#m4 _CONVERSION(`GtkSourceGutter*',`Glib::RefPtr<const SourceGutter>',`Glib::wrap($3)')
   _WRAP_METHOD(Glib::RefPtr<SourceGutter> get_gutter(Gtk::TextWindowType window_type), gtk_source_view_get_gutter, refreturn)
   _WRAP_METHOD(Glib::RefPtr<const SourceGutter> get_gutter(Gtk::TextWindowType window_type) const, gtk_source_view_get_gutter, refreturn, constversion)
 
-#m4 _CONVERSION(`GtkSourceCompletion*',`SourceCompletion*',`Glib::wrap($3)')
-#m4 _CONVERSION(`GtkSourceCompletion*',`const SourceCompletion*',`Glib::wrap($3)')
   _WRAP_METHOD(SourceCompletion* get_completion(), gtk_source_view_get_completion, refreturn)
   _WRAP_METHOD(const SourceCompletion* get_completion() const, gtk_source_view_get_completion, refreturn, constversion)
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]