[gtksourceviewmm] Adapt to use std::vector.

From: Krzesimir Nowak <krnowak src gnome org>
To: commits-list gnome org
Cc:
Subject: [gtksourceviewmm] Adapt to use std::vector.
Date: Mon, 31 Jan 2011 17:23:12 +0000 (UTC)
commit 9b4d1085048b5ab08b784dec678f0fa08c3b9afb
Author: Krzesimir Nowak <qdlacz gmail com>
Date:   Mon Jan 31 14:15:31 2011 +0100

    Adapt to use std::vector.
    
    * gtksourceview/src/sourcebuffer.ccg:
    * gtksourceview/src/sourcebuffer.hg:
    * gtksourceview/src/sourcecompletion.ccg:
    * gtksourceview/src/sourcecompletion.hg:
    * gtksourceview/src/sourcecompletioncontext.ccg:
    * gtksourceview/src/sourcecompletioncontext.hg:
    * gtksourceview/src/sourcelanguage.ccg:
    * gtksourceview/src/sourcelanguage.hg:
    * gtksourceview/src/sourcelanguagemanager.ccg:
    * gtksourceview/src/sourcelanguagemanager.hg:
    * gtksourceview/src/sourcestylescheme.ccg:
    * gtksourceview/src/sourcestylescheme.hg:
    * gtksourceview/src/sourcestyleschememanager.ccg:
    * gtksourceview/src/sourcestyleschememanager.hg: Replaced container handles
    with vector utils.

 gtksourceview/src/sourcebuffer.ccg             |   14 ++++++++------
 gtksourceview/src/sourcebuffer.hg              |   20 +++++++++++---------
 gtksourceview/src/sourcecompletion.ccg         |    4 +++-
 gtksourceview/src/sourcecompletion.hg          |   13 ++++++++-----
 gtksourceview/src/sourcecompletioncontext.ccg  |    4 +++-
 gtksourceview/src/sourcecompletioncontext.hg   |   11 +++++++----
 gtksourceview/src/sourcelanguage.ccg           |    3 ++-
 gtksourceview/src/sourcelanguage.hg            |   13 ++++++++-----
 gtksourceview/src/sourcelanguagemanager.ccg    |    4 +++-
 gtksourceview/src/sourcelanguagemanager.hg     |   14 ++++++++------
 gtksourceview/src/sourcestylescheme.ccg        |    3 ++-
 gtksourceview/src/sourcestylescheme.hg         |   14 +++++++++-----
 gtksourceview/src/sourcestyleschememanager.ccg |    4 +++-
 gtksourceview/src/sourcestyleschememanager.hg  |   17 ++++++++++-------
 14 files changed, 85 insertions(+), 53 deletions(-)
---
diff --git a/gtksourceview/src/sourcebuffer.ccg b/gtksourceview/src/sourcebuffer.ccg
index 57d72d4..bb1a4f0 100644
--- a/gtksourceview/src/sourcebuffer.ccg
+++ b/gtksourceview/src/sourcebuffer.ccg
@@ -3,7 +3,7 @@
  * Copyright (C) 2004-2005 Jae Jang
  * Copyright (C) 2005-2006 Rob Page
  * Copyright (C) 2006 Dodji Seketeli
- * Copyright (C) 2009, 2010 Krzesimir Nowak
+ * Copyright (C) 2009, 2010, 2011 Krzesimir Nowak
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
@@ -19,9 +19,11 @@
  * License along with this library; if not, write to the Free
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-#include <gtksourceviewmm/sourcebuffer.h>
+
 #include <gtksourceview/gtksourcebuffer.h>
 
+#include <glibmm/vectorutils.h>
+
 namespace Gsv
 {
 
@@ -54,14 +56,14 @@ SourceBuffer::create_source_mark(const Glib::ustring& category, const Gtk::TextI
   return Glib::wrap(gtk_source_buffer_create_source_mark(gobj(), 0, category.c_str(), where.gobj()));
 }
 
-Glib::SListHandle<Glib::RefPtr<SourceMark> > SourceBuffer::get_source_marks_at_line(int line) const
+std::vector<Glib::RefPtr<SourceMark> > SourceBuffer::get_source_marks_at_line(int line) const
 {
-    return Glib::SListHandle<Glib::RefPtr<SourceMark> >(gtk_source_buffer_get_source_marks_at_line(const_cast<GtkSourceBuffer*>(gobj()), line, 0), Glib::OWNERSHIP_SHALLOW);
+    return Glib::SListHandler<Glib::RefPtr<SourceMark> >::slist_to_vector(gtk_source_buffer_get_source_marks_at_line(const_cast<GtkSourceBuffer*>(gobj()), line, 0), Glib::OWNERSHIP_SHALLOW);
 }
 
-Glib::SListHandle<Glib::RefPtr<SourceMark> > SourceBuffer::get_source_marks_at_iter(Gtk::TextIter& iter) const
+std::vector<Glib::RefPtr<SourceMark> > SourceBuffer::get_source_marks_at_iter(Gtk::TextIter& iter) const
 {
-    return Glib::SListHandle<Glib::RefPtr<SourceMark> >(gtk_source_buffer_get_source_marks_at_iter(const_cast<GtkSourceBuffer*>(gobj()), iter.gobj(), 0), Glib::OWNERSHIP_SHALLOW);
+    return Glib::SListHandler<Glib::RefPtr<SourceMark> >::slist_to_vector(gtk_source_buffer_get_source_marks_at_iter(const_cast<GtkSourceBuffer*>(gobj()), iter.gobj(), 0), Glib::OWNERSHIP_SHALLOW);
 }
 
 void
diff --git a/gtksourceview/src/sourcebuffer.hg b/gtksourceview/src/sourcebuffer.hg
index 8a792c1..f4dafd0 100644
--- a/gtksourceview/src/sourcebuffer.hg
+++ b/gtksourceview/src/sourcebuffer.hg
@@ -3,7 +3,7 @@
  * Copyright (C) 2004-2005 Jae Jang
  * Copyright (C) 2005-2006 Rob Page
  * Copyright (C) 2006 Dodji Seketeli
- * Copyright (C) 2009, 2010 Krzesimir Nowak
+ * Copyright (C) 2009, 2010, 2011 Krzesimir Nowak
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
@@ -20,6 +20,8 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
+#include <vector>
+
 #include <gtkmm/textbuffer.h>
 #include <gtksourceviewmm/sourcelanguage.h>
 #include <gtksourceviewmm/sourcemark.h>
@@ -308,8 +310,8 @@ public:
    */
   Glib::RefPtr<SourceMark> create_source_mark(const Glib::ustring& category, const Gtk::TextIter& where);
 
-#m4 _CONVERSION(`GSList*',`Glib::SListHandle<Glib::RefPtr<SourceMark> >', `$2($3, Glib::OWNERSHIP_SHALLOW)')
-#m4 _CONVERSION(`GSList*',`Glib::SListHandle<Glib::RefPtr<const SourceMark> >', `$2($3, Glib::OWNERSHIP_SHALLOW)')
+#m4 _CONVERSION(`GSList*',`std::vector<Glib::RefPtr<SourceMark> >', `Glib::SListHandler<Glib::RefPtr<SourceMark> >::slist_to_vector($3, Glib::OWNERSHIP_SHALLOW)')
+#m4 _CONVERSION(`GSList*',`std::vector<Glib::RefPtr<const SourceMark> >', `Glib::SListHandler<Glib::RefPtr<const SourceMark> >slist_to_vector($3, Glib::OWNERSHIP_SHALLOW)')
 
   /** Returns the list of marks of the given @a category at @a line.
    *
@@ -318,7 +320,7 @@ public:
    *
    * @return A list of source marks.
    */
-  _WRAP_METHOD(Glib::SListHandle<Glib::RefPtr<SourceMark> > get_source_marks_at_line(int line, const Glib::ustring& category) const, gtk_source_buffer_get_source_marks_at_line)
+  _WRAP_METHOD(std::vector<Glib::RefPtr<SourceMark> > get_source_marks_at_line(int line, const Glib::ustring& category) const, gtk_source_buffer_get_source_marks_at_line)
 
   /** Returns the list of marks of any category at @a line.
    *
@@ -326,7 +328,7 @@ public:
    *
    * @return A list of source marks.
    */
-  Glib::SListHandle<Glib::RefPtr<SourceMark> > get_source_marks_at_line(int line) const;
+  std::vector<Glib::RefPtr<SourceMark> > get_source_marks_at_line(int line) const;
 
   /** Returns the list of marks of the given @a category at @a iter.
    *
@@ -335,7 +337,7 @@ public:
    *
    * @return A list of source marks.
    */
-  _WRAP_METHOD(Glib::SListHandle<Glib::RefPtr<SourceMark> > get_source_marks_at_iter(Gtk::TextIter& iter, const Glib::ustring& category) const, gtk_source_buffer_get_source_marks_at_iter)
+  _WRAP_METHOD(std::vector<Glib::RefPtr<SourceMark> > get_source_marks_at_iter(Gtk::TextIter& iter, const Glib::ustring& category) const, gtk_source_buffer_get_source_marks_at_iter)
 
   /** Returns the list of marks of any category at @a iter.
    *
@@ -343,7 +345,7 @@ public:
    *
    * @return A list of source marks.
    */
-  Glib::SListHandle<Glib::RefPtr<SourceMark> > get_source_marks_at_iter(Gtk::TextIter& iter) const;
+  std::vector<Glib::RefPtr<SourceMark> > get_source_marks_at_iter(Gtk::TextIter& iter) const;
 
   /** Remove all marks of @a category between start and end from the buffer.
    *
@@ -405,7 +407,7 @@ public:
    */
   _WRAP_METHOD(bool iter_forward_to_context_class_toggle(Gtk::TextIter& iter, const Glib::ustring& context_class) const, gtk_source_buffer_iter_forward_to_context_class_toggle)
 
-#m4 _CONVERSION(`gchar**',`Glib::StringArrayHandle',`$2($3, Glib::OWNERSHIP_DEEP)')
+#m4 _CONVERSION(`gchar**',`std::vector<Glib::ustring>',`Glib::ArrayHandler<Glib::ustring>::array_to_vector($3, Glib::OWNERSHIP_DEEP)')
 
   /** Get all defined context classes at iter.
    *
@@ -415,7 +417,7 @@ public:
    *
    * @newin{2,10}
    */
-  _WRAP_METHOD(Glib::StringArrayHandle get_context_classes_at_iter(const Gtk::TextIter& iter) const, gtk_source_buffer_get_context_classes_at_iter)
+  _WRAP_METHOD(std::vector<Glib::ustring> get_context_classes_at_iter(const Gtk::TextIter& iter) const, gtk_source_buffer_get_context_classes_at_iter)
 
   /** Get the undo manager associated with the buffer.
    * @return A SourceUndoManager.
diff --git a/gtksourceview/src/sourcecompletion.ccg b/gtksourceview/src/sourcecompletion.ccg
index 0dea31a..ffd3973 100644
--- a/gtksourceview/src/sourcecompletion.ccg
+++ b/gtksourceview/src/sourcecompletion.ccg
@@ -1,6 +1,6 @@
 /* sourcecompletion.cc
  *
- * Copyright (C) 2009, 2010 Krzesimir Nowak
+ * Copyright (C) 2009, 2010, 2011 Krzesimir Nowak
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
@@ -19,6 +19,8 @@
 
 #include <gtksourceview/gtksourcecompletion.h>
 
+#include <glibmm/vectorutils.h>
+
 namespace Gsv
 {
 
diff --git a/gtksourceview/src/sourcecompletion.hg b/gtksourceview/src/sourcecompletion.hg
index 6e87441..6401098 100644
--- a/gtksourceview/src/sourcecompletion.hg
+++ b/gtksourceview/src/sourcecompletion.hg
@@ -1,6 +1,6 @@
 /* sourcecompletion.h
  *
- * Copyright (C) 2009, 2010 Krzesimir Nowak
+ * Copyright (C) 2009, 2010, 2011 Krzesimir Nowak
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
@@ -17,7 +17,10 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
+#include <vector>
+
 #include <glibmm/object.h>
+
 #include <gtksourceviewmm/sourcecompletioncontext.h>
 #include <gtksourceviewmm/sourcecompletionprovider.h>
 #include <gtksourceviewmm/sourceview.h>
@@ -67,16 +70,16 @@ public:
    */
   _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(`GList*',`std::vector<Glib::RefPtr<SourceCompletionProvider> >',`Glib::ListHandler<Glib::RefPtr<SourceCompletionProvider> >::list_to_vector($3, Glib::OWNERSHIP_NONE)')
   /** Get list of providers registered on completion.
    *
    * @return List of SourceCompletionProvider.
    *
    * @newin{2,10}
    */
-  _WRAP_METHOD(Glib::ListHandle<Glib::RefPtr<SourceCompletionProvider> > get_providers() const, gtk_source_completion_get_providers)
+  _WRAP_METHOD(std::vector<Glib::RefPtr<SourceCompletionProvider> > get_providers() const, gtk_source_completion_get_providers)
 
-#m4 _CONVERSION(`const Glib::ListHandle<Glib::RefPtr<SourceCompletionProvider> >&',`GList*',`($3).data()')
+#m4 _CONVERSION(`const std::vector<Glib::RefPtr<SourceCompletionProvider> >&',`GList*',`Glib::ListHandler<Glib::RefPtr<SourceCompletionProvider> >::vector_to_list($3).data()')
   /** Starts a new completion with the specified SourceCompletionContext and
    *  a list of potential candidate providers for completion.
    *
@@ -88,7 +91,7 @@ public:
    *
    * @newin{2,10}
    */
-  _WRAP_METHOD(bool show(const Glib::ListHandle<Glib::RefPtr<SourceCompletionProvider> >& providers, const Glib::RefPtr<SourceCompletionContext>& context), gtk_source_completion_show)
+  _WRAP_METHOD(bool show(const std::vector<Glib::RefPtr<SourceCompletionProvider> >& providers, const Glib::RefPtr<SourceCompletionContext>& context), gtk_source_completion_show)
 
   /** Hides the completion if it is active (visible).
    *
diff --git a/gtksourceview/src/sourcecompletioncontext.ccg b/gtksourceview/src/sourcecompletioncontext.ccg
index 54567da..9af9069 100644
--- a/gtksourceview/src/sourcecompletioncontext.ccg
+++ b/gtksourceview/src/sourcecompletioncontext.ccg
@@ -1,6 +1,6 @@
 /* sourcecompletioncontext.cc
  *
- * Copyright (C) 2009, 2010 Krzesimir Nowak
+ * Copyright (C) 2009, 2010, 2011 Krzesimir Nowak
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
@@ -19,6 +19,8 @@
 
 #include <gtksourceview/gtksourcecompletioncontext.h>
 
+#include <glibmm/vectorutils.h>
+
 namespace Gsv
 {
 
diff --git a/gtksourceview/src/sourcecompletioncontext.hg b/gtksourceview/src/sourcecompletioncontext.hg
index ca1a6ed..a64f091 100644
--- a/gtksourceview/src/sourcecompletioncontext.hg
+++ b/gtksourceview/src/sourcecompletioncontext.hg
@@ -1,6 +1,6 @@
 /* sourcecompletioncontext.h
  *
- * Copyright (C) 2009, 2010 Krzesimir Nowak
+ * Copyright (C) 2009, 2010, 2011 Krzesimir Nowak
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
@@ -17,6 +17,10 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
+#include <vector>
+
+#include <gtksourceview/gtksourceview-typebuiltins.h>
+
 #include <glibmm/object.h>
 
 #include <gtksourceviewmm/sourcecompletionactivation.h>
@@ -24,7 +28,6 @@
 #include <gtksourceviewmm/sourcecompletionprovider.h>
 #include <gtksourceviewmm/sourcecompletionproposal.h>
 #include <gtksourceviewmm/sourcecompletion.h>
-#include <gtksourceview/gtksourceview-typebuiltins.h>
 
 _DEFS(gtksourceviewmm,gtksourceview)
 _PINCLUDE(glibmm/private/object_p.h)
@@ -47,7 +50,7 @@ class SourceCompletionContext : public Glib::Object
   _CLASS_GOBJECT(SourceCompletionContext, GtkSourceCompletionContext, GTK_SOURCE_COMPLETION_CONTEXT, Glib::Object, GObject)
 public:
 #m4 _CONVERSION(`const Glib::RefPtr<SourceCompletionProvider>&',`struct _GtkSourceCompletionProvider*',`Glib::unwrap($3)')
-#m4 _CONVERSION(`const Glib::ListHandle<Glib::RefPtr<SourceCompletionProposal> >&',`GList*',`($3).data()')
+#m4 _CONVERSION(`const std::vector<Glib::RefPtr<SourceCompletionProposal> >&',`GList*',`Glib::ListHandler<Glib::RefPtr<SourceCompletionProposal> >::vector_to_list($3).data()')
 
   /** Providers can use this function to add proposals to the completion.
    *
@@ -62,7 +65,7 @@ public:
    *
    * @newin{2,10}
    */
-  _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)
+  _WRAP_METHOD(void add_proposals(const Glib::RefPtr<SourceCompletionProvider>& provider, const std::vector<Glib::RefPtr<SourceCompletionProposal> >& proposals, bool finished), gtk_source_completion_context_add_proposals)
 
   _IGNORE(gtk_source_completion_context_get_iter)
   /** Get the iter at which the completion was invoked.
diff --git a/gtksourceview/src/sourcelanguage.ccg b/gtksourceview/src/sourcelanguage.ccg
index ef6b258..7cf7934 100644
--- a/gtksourceview/src/sourcelanguage.ccg
+++ b/gtksourceview/src/sourcelanguage.ccg
@@ -1,7 +1,7 @@
 /* sourcelanguage.cc
  *
  * Copyright (C) 2006 Dodji Seketeli
- * Copyright (C) 2010 Krzesimir Nowak
+ * Copyright (C) 2010, 2011 Krzesimir Nowak
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
@@ -18,3 +18,4 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
+#include <glibmm/vectorutils.h>
diff --git a/gtksourceview/src/sourcelanguage.hg b/gtksourceview/src/sourcelanguage.hg
index acbdf6b..5dfe18f 100644
--- a/gtksourceview/src/sourcelanguage.hg
+++ b/gtksourceview/src/sourcelanguage.hg
@@ -3,7 +3,7 @@
  * Copyright (C) 2004-2005 Jae Jang
  * Copyright (C) 2005-2006 Rob Page
  * Copyright (C) 2006 Dodji Seketeli
- * Copyright (C) 2010 Krzesimir Nowak
+ * Copyright (C) 2010, 2011 Krzesimir Nowak
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
@@ -20,7 +20,10 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
+#include <vector>
+
 #include <glibmm/object.h>
+
 #include <gtksourceviewmm/sourcestylescheme.h>
 
 _DEFS(gtksourceviewmm,gtksourceview)
@@ -75,7 +78,7 @@ public:
    */
   _WRAP_METHOD(bool get_hidden() const, gtk_source_language_get_hidden)
 
-#m4 _CONVERSION(`gchar**',`Glib::StringArrayHandle',`Glib::StringArrayHandle($3, Glib::OWNERSHIP_DEEP)')
+#m4 _CONVERSION(`gchar**',`std::vector<Glib::ustring>',`Glib::ArrayHandler<Glib::ustring>::array_to_vector($3, Glib::OWNERSHIP_DEEP)')
 
   /** Returns the mime types associated to this language.
    *
@@ -84,7 +87,7 @@ public:
    *
    * @return An array containing the mime types.
    */
-  _WRAP_METHOD(Glib::StringArrayHandle get_mime_types() const, gtk_source_language_get_mime_types)
+  _WRAP_METHOD(std::vector<Glib::ustring> get_mime_types() const, gtk_source_language_get_mime_types)
 
   /** Returns the globs associated to this language.
    *
@@ -93,13 +96,13 @@ public:
    *
    * @return An array containing the globs.
    */
-  _WRAP_METHOD(Glib::StringArrayHandle get_globs() const, gtk_source_language_get_globs)
+  _WRAP_METHOD(std::vector<Glib::ustring> get_globs() const, gtk_source_language_get_globs)
 
   /** Returns the ids of the styles defined by this language.
    *
    * @return An array containing ids of the styles defined by this language.
    */
-  _WRAP_METHOD(Glib::StringArrayHandle get_style_ids() const, gtk_source_language_get_style_ids)
+  _WRAP_METHOD(std::vector<Glib::ustring> get_style_ids() const, gtk_source_language_get_style_ids)
 
   /** Returns the name of the style with ID @a style_id defined by this
    *  language.
diff --git a/gtksourceview/src/sourcelanguagemanager.ccg b/gtksourceview/src/sourcelanguagemanager.ccg
index 8ecadc3..fa1d9e3 100644
--- a/gtksourceview/src/sourcelanguagemanager.ccg
+++ b/gtksourceview/src/sourcelanguagemanager.ccg
@@ -3,7 +3,7 @@
  * Copyright (C) 2004-2005 Jae Jang
  * Copyright (C) 2005-2006 Rob Page
  * Copyright (C) 2006 Dodji Seketeli
- * Copyright (C) 2009, 2010 Krzesimir Nowak
+ * Copyright (C) 2009, 2010, 2011 Krzesimir Nowak
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
@@ -20,6 +20,8 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
+#include <glibmm/vectorutils.h>
+
 #include "gtksourceviewmm/sourcelanguagemanager.h"
 
 namespace Gsv
diff --git a/gtksourceview/src/sourcelanguagemanager.hg b/gtksourceview/src/sourcelanguagemanager.hg
index 89e039f..8a8444b 100644
--- a/gtksourceview/src/sourcelanguagemanager.hg
+++ b/gtksourceview/src/sourcelanguagemanager.hg
@@ -3,7 +3,7 @@
  * Copyright (C) 2004-2005 Jae Jang
  * Copyright (C) 2005-2006 Rob Page
  * Copyright (C) 2006 Dodji Seketeli
- * Copyright (C) 2009, 2010 Krzesimir Nowak
+ * Copyright (C) 2009, 2010, 2011 Krzesimir Nowak
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
@@ -23,6 +23,8 @@
 /// \file
 /// \brief SourceLanguageManager class
 
+#include <vector>
+
 #include <glibmm/object.h>
 #include <gtksourceviewmm/sourcelanguage.h>
 
@@ -67,15 +69,15 @@ public:
    */
   _WRAP_METHOD(static Glib::RefPtr<SourceLanguageManager> get_default(), gtk_source_language_manager_get_default, refreturn)
 
-#m4 _CONVERSION(`const gchar**',`Glib::ArrayHandle<std::string>',`$2($3, Glib::OWNERSHIP_NONE)')
+#m4 _CONVERSION(`const gchar**',`std::vector<std::string>',`Glib::ArrayHandler<std::string>::array_to_vector($3, Glib::OWNERSHIP_NONE)')
 
   /** Gets the list directories where language manager looks for language files.
    *
    * @return An array containg a list of language files directories.
    */
-  _WRAP_METHOD(Glib::ArrayHandle<std::string> get_search_path() const, gtk_source_language_manager_get_search_path)
+  _WRAP_METHOD(std::vector<std::string> get_search_path() const, gtk_source_language_manager_get_search_path)
 
-#m4 _CONVERSION(`const Glib::ArrayHandle<std::string>&',`gchar**',`const_cast<gchar**>(($3).data())')
+#m4 _CONVERSION(`const std::vector<std::string>&',`gchar**',`const_cast<gchar**>(Glib::ArrayHandler<std::string>::vector_to_array($3).data())')
 
   /** Sets the list of directories where the language manager looks for language
    *  files.
@@ -87,7 +89,7 @@ public:
    *
    * @param dirs An empty string terminated array of strings.
    */
-  _WRAP_METHOD(void set_search_path(const Glib::ArrayHandle<std::string>& dirs), gtk_source_language_manager_set_search_path)
+  _WRAP_METHOD(void set_search_path(const std::vector<std::string>& dirs), gtk_source_language_manager_set_search_path)
 
   /** Resets the list of directories where the language manager looks for
    *  language files to default.
@@ -103,7 +105,7 @@ public:
    *
    * @return An array of string containing the ids of the available languages.
    */
-  _WRAP_METHOD(Glib::ArrayHandle<std::string> get_language_ids() const, gtk_source_language_manager_get_language_ids)
+  _WRAP_METHOD(std::vector<std::string> get_language_ids() const, gtk_source_language_manager_get_language_ids)
 
   /** Gets the SourceLanguage identified by the given @a id in the language
    *  manager.
diff --git a/gtksourceview/src/sourcestylescheme.ccg b/gtksourceview/src/sourcestylescheme.ccg
index 925994c..e64b4f5 100644
--- a/gtksourceview/src/sourcestylescheme.ccg
+++ b/gtksourceview/src/sourcestylescheme.ccg
@@ -3,7 +3,7 @@
  * Copyright (C) 2004-2005 Jae Jang
  * Copyright (C) 2005-2006 Rob Page
  * Copyright (C) 2006 Dodji Seketeli
- * Copyright (C) 2009, 2010 Krzesimir Nowak
+ * Copyright (C) 2009, 2010, 2011 Krzesimir Nowak
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
@@ -20,3 +20,4 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
+#include <glibmm/vectorutils.h>
diff --git a/gtksourceview/src/sourcestylescheme.hg b/gtksourceview/src/sourcestylescheme.hg
index 9f8ccd7..74af1d0 100644
--- a/gtksourceview/src/sourcestylescheme.hg
+++ b/gtksourceview/src/sourcestylescheme.hg
@@ -3,7 +3,7 @@
  * Copyright (C) 2004-2005 Jae Jang
  * Copyright (C) 2005-2006 Rob Page
  * Copyright (C) 2006 Dodji Seketeli
- * Copyright (C) 2009, 2010 Krzesimir Nowak
+ * Copyright (C) 2009, 2010, 2011 Krzesimir Nowak
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
@@ -20,9 +20,13 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
+#include <vector>
+
+#include <gtksourceview/gtksourcestylescheme.h>
+
 #include <glibmm/object.h>
+
 #include <gtksourceviewmm/sourcestyle.h>
-#include <gtksourceview/gtksourcestylescheme.h>
 
 _DEFS(gtksourceviewmm,gtksourceview)
 _PINCLUDE(glibmm/private/object_p.h)
@@ -32,7 +36,7 @@ namespace Gsv
 
 
 
-/** Object controlling apperance of SourceView.
+/** Object controlling appearance of SourceView.
  *
  * SourceStyleScheme contains all the text styles to be used in SourceView and
  * SourceBuffer. For instance, it contains text styles for syntax highlighting,
@@ -74,7 +78,7 @@ public:
    */
   _WRAP_METHOD(Glib::ustring get_description() const, gtk_source_style_scheme_get_description)
 
-#m4 _CONVERSION(`const gchar**',`Glib::StringArrayHandle',`$2($3)')
+#m4 _CONVERSION(`const gchar**',`std::vector<Glib::ustring>',`Glib::ArrayHandler<Glib::ustring>::array_to_vector($3, Glib::OWNERSHIP_NONE)')
 
   /** Gets scheme authors.
    *
@@ -82,7 +86,7 @@ public:
    *
    * @newin{2,2}
    */
-  _WRAP_METHOD(Glib::StringArrayHandle get_authors() const, gtk_source_style_scheme_get_authors)
+  _WRAP_METHOD(std::vector<Glib::ustring> get_authors() const, gtk_source_style_scheme_get_authors)
 
   /** Gets scheme filename.
    *
diff --git a/gtksourceview/src/sourcestyleschememanager.ccg b/gtksourceview/src/sourcestyleschememanager.ccg
index cfb821e..1d48afa 100644
--- a/gtksourceview/src/sourcestyleschememanager.ccg
+++ b/gtksourceview/src/sourcestyleschememanager.ccg
@@ -3,7 +3,7 @@
  * Copyright (C) 2004-2005 Jae Jang
  * Copyright (C) 2005-2006 Rob Page
  * Copyright (C) 2006 Dodji Seketeli
- * Copyright (C) 2009, 2010 Krzesimir Nowak
+ * Copyright (C) 2009, 2010, 2011 Krzesimir Nowak
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
@@ -20,6 +20,8 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
+#include <glibmm/vectorutils.h>
+
 namespace Gsv
 {
 
diff --git a/gtksourceview/src/sourcestyleschememanager.hg b/gtksourceview/src/sourcestyleschememanager.hg
index 34a64c0..a589cc9 100644
--- a/gtksourceview/src/sourcestyleschememanager.hg
+++ b/gtksourceview/src/sourcestyleschememanager.hg
@@ -1,7 +1,7 @@
 /* sourcestyleschememanager.h
  *
  * Copyright (C) 2008 Jonathon Jongsma
- * Copyright (C) 2009, 2010 Krzesimir Nowak
+ * Copyright (C) 2009, 2010, 2011 Krzesimir Nowak
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
@@ -18,9 +18,12 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <gtksourceviewmm/sourcestylescheme.h>
+#include <vector>
+
 #include <gtksourceview/gtksourcestyleschememanager.h>
 
+#include <gtksourceviewmm/sourcestylescheme.h>
+
 _DEFS(gtksourceviewmm,gtksourceview)
 _PINCLUDE(glibmm/private/object_p.h)
 
@@ -52,7 +55,7 @@ public:
    */
   _WRAP_METHOD(static Glib::RefPtr<SourceStyleSchemeManager> get_default(), gtk_source_style_scheme_manager_get_default, refreturn)
 
-#m4 _CONVERSION(`const gchar**',`Glib::ArrayHandle<std::string>',`$2($3, Glib::OWNERSHIP_NONE)')
+#m4 _CONVERSION(`const gchar**',`std::vector<std::string>',`Glib::ArrayHandler<std::string>::array_to_vector($3, Glib::OWNERSHIP_NONE)')
 
   /** Returns the current search path for the manager.
    *
@@ -60,16 +63,16 @@ public:
    *
    * @return An array of string containing the search path.
    */
-  _WRAP_METHOD(Glib::ArrayHandle<std::string> get_search_path() const, gtk_source_style_scheme_manager_get_search_path)
+  _WRAP_METHOD(std::vector<std::string> get_search_path() const, gtk_source_style_scheme_manager_get_search_path)
 
-#m4 _CONVERSION(`const Glib::ArrayHandle<std::string>&',`gchar**',`const_cast<gchar**>(($3).data())')
+#m4 _CONVERSION(`const std::vector<std::string>&',`gchar**',`const_cast<gchar**>(Glib::ArrayHandler<std::string>::vector_to_array($3).data())')
 
   /** Sets the list of directories where the manager looks for style scheme
    *  files.
    *
    * @param path An empty string terminated array of strings.
    */
-  _WRAP_METHOD(void set_search_path(const Glib::ArrayHandle<std::string>& path), gtk_source_style_scheme_manager_set_search_path)
+  _WRAP_METHOD(void set_search_path(const std::vector<std::string>& path), gtk_source_style_scheme_manager_set_search_path)
 
   /** Resets the list of directories where the manager looks for style scheme
    *  files to default.
@@ -109,7 +112,7 @@ public:
    * @return An array of string containing the ids of the available style
    * schemes.
    */
-  _WRAP_METHOD(Glib::ArrayHandle<std::string> get_scheme_ids() const, gtk_source_style_scheme_manager_get_scheme_ids)
+  _WRAP_METHOD(std::vector<std::string> get_scheme_ids() const, gtk_source_style_scheme_manager_get_scheme_ids)
 
   _WRAP_PROPERTY("search-path", std::vector<std::string>)
   _WRAP_PROPERTY("scheme-ids", std::vector<std::string>)
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]