[gtksourceviewmm] Adapt to changed gtksourceview API.



commit b9913f1f033714022856fe7c5501f443ea396f51
Author: Murray Cumming <murrayc murrayc com>
Date:   Sat Apr 15 13:47:38 2017 +0200

    Adapt to changed gtksourceview API.

 gtksourceview/src/gtksourceview_methods.defs |   29 +++++++++++--------------
 gtksourceview/src/searchcontext.hg           |   10 ++++----
 2 files changed, 18 insertions(+), 21 deletions(-)
---
diff --git a/gtksourceview/src/gtksourceview_methods.defs b/gtksourceview/src/gtksourceview_methods.defs
index 61f33c9..aac1a6d 100644
--- a/gtksourceview/src/gtksourceview_methods.defs
+++ b/gtksourceview/src/gtksourceview_methods.defs
@@ -807,8 +807,9 @@
   (return-type "GType")
 )
 
-(define-function gtk_source_completion_item_new2
-  (c-name "gtk_source_completion_item_new2")
+(define-function gtk_source_completion_item_new
+  (c-name "gtk_source_completion_item_new")
+  (is-constructor-of "GtkSourceCompletionItem")
   (return-type "GtkSourceCompletionItem*")
 )
 
@@ -2753,9 +2754,9 @@
   )
 )
 
-(define-method forward2
+(define-method forward
   (of-object "GtkSourceSearchContext")
-  (c-name "gtk_source_search_context_forward2")
+  (c-name "gtk_source_search_context_forward")
   (return-type "gboolean")
   (parameters
     '("const-GtkTextIter*" "iter")
@@ -2777,9 +2778,9 @@
   )
 )
 
-(define-method forward_finish2
+(define-method forward_finish
   (of-object "GtkSourceSearchContext")
-  (c-name "gtk_source_search_context_forward_finish2")
+  (c-name "gtk_source_search_context_forward_finish")
   (return-type "gboolean")
   (parameters
     '("GAsyncResult*" "result")
@@ -2790,9 +2791,9 @@
   )
 )
 
-(define-method backward2
+(define-method backward
   (of-object "GtkSourceSearchContext")
-  (c-name "gtk_source_search_context_backward2")
+  (c-name "gtk_source_search_context_backward")
   (return-type "gboolean")
   (parameters
     '("const-GtkTextIter*" "iter")
@@ -2814,9 +2815,9 @@
   )
 )
 
-(define-method backward_finish2
+(define-method backward_finish
   (of-object "GtkSourceSearchContext")
-  (c-name "gtk_source_search_context_backward_finish2")
+  (c-name "gtk_source_search_context_backward_finish")
   (return-type "gboolean")
   (parameters
     '("GAsyncResult*" "result")
@@ -2827,9 +2828,9 @@
   )
 )
 
-(define-method replace2
+(define-method replace
   (of-object "GtkSourceSearchContext")
-  (c-name "gtk_source_search_context_replace2")
+  (c-name "gtk_source_search_context_replace")
   (return-type "gboolean")
   (parameters
     '("GtkTextIter*" "match_start")
@@ -3662,10 +3663,6 @@
 
 
 
-;; From stamp-gtksourceview-typebuiltins.h
-
-
-
 ;; From gtksourcecompletionwordsbuffer.h
 
 
diff --git a/gtksourceview/src/searchcontext.hg b/gtksourceview/src/searchcontext.hg
index ebda26b..8f8eb62 100644
--- a/gtksourceview/src/searchcontext.hg
+++ b/gtksourceview/src/searchcontext.hg
@@ -142,7 +142,7 @@ public:
    *
    * @newin{3,10}
    */
-  _WRAP_METHOD(bool forward(const TextBuffer::const_iterator& iter, TextBuffer::iterator& match_start, 
TextBuffer::iterator& match_end, bool& has_wrapped_around), gtk_source_search_context_forward2)
+  _WRAP_METHOD(bool forward(const TextBuffer::const_iterator& iter, TextBuffer::iterator& match_start, 
TextBuffer::iterator& match_end, bool& has_wrapped_around), gtk_source_search_context_forward)
   _IGNORE(gtk_source_search_context_forward)
 
   /** Asynchronous forward search. See the GAsyncResult documentation to know how to use this function.
@@ -166,7 +166,7 @@ public:
    *
    * @newin{3,10}
    */
-  _WRAP_METHOD(bool forward_finish(const Glib::RefPtr<Gio::AsyncResult>& result, TextBuffer::iterator& 
match_start, TextBuffer::iterator& match_end, bool& has_wrapped_around), 
gtk_source_search_context_forward_finish2, errthrow)
+  _WRAP_METHOD(bool forward_finish(const Glib::RefPtr<Gio::AsyncResult>& result, TextBuffer::iterator& 
match_start, TextBuffer::iterator& match_end, bool& has_wrapped_around), 
gtk_source_search_context_forward_finish, errthrow)
   _IGNORE(gtk_source_search_context_forward_finish)
 
   /** Synchronous backward search. It is recommended to use the asynchronous functions instead, to not block 
the user interface. However, if you are sure that the buffer
@@ -179,7 +179,7 @@ public:
    *
    * @newin{3,10}
    */
-  _WRAP_METHOD(bool backward(const TextBuffer::iterator& iter, TextBuffer::iterator& match_start, 
TextBuffer::iterator& match_end, bool& has_wrapped_around), gtk_source_search_context_backward2)
+  _WRAP_METHOD(bool backward(const TextBuffer::iterator& iter, TextBuffer::iterator& match_start, 
TextBuffer::iterator& match_end, bool& has_wrapped_around), gtk_source_search_context_backward)
   _IGNORE(gtk_source_search_context_backward)
 
   /** Asynchronous backward search. See the GAsyncResult documentation to know how to use this function.
@@ -204,7 +204,7 @@ public:
    *
    * @newin{3,10}
    */
-  _WRAP_METHOD(bool backward_finish(const Glib::RefPtr<Gio::AsyncResult>& result, TextBuffer::iterator& 
match_start, TextBuffer::iterator& match_end, bool& has_wrapped_around), 
gtk_source_search_context_backward_finish2, errthrow)
+  _WRAP_METHOD(bool backward_finish(const Glib::RefPtr<Gio::AsyncResult>& result, TextBuffer::iterator& 
match_start, TextBuffer::iterator& match_end, bool& has_wrapped_around), 
gtk_source_search_context_backward_finish, errthrow)
   _IGNORE(gtk_source_search_context_backward)
 
   /** Replaces a search match by another text. If match_start and match_end doesn't correspond to a search 
match, FALSE is returned.
@@ -222,7 +222,7 @@ public:
    *
    * @newin{3,10}
    */
-  _WRAP_METHOD(bool replace(TextBuffer::iterator& match_start, TextBuffer::iterator& match_end, const 
Glib::ustring& replace, int replace_length), gtk_source_search_context_replace2, errthrow)
+  _WRAP_METHOD(bool replace(TextBuffer::iterator& match_start, TextBuffer::iterator& match_end, const 
Glib::ustring& replace, int replace_length), gtk_source_search_context_replace, errthrow)
   _IGNORE(gtk_source_search_context_replace)
 
   /** Replaces all search matches by another text. It is a synchronous function, so it can block the user 
interface.


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]