[gtksourceview/wip/chergert/gsv-gtk4: 44/117] iter: move gtksourceiter.h to gtksourceiter-private.h



commit e2d3ddaf41a1206383f59baecadf7941e6034255
Author: Christian Hergert <chergert redhat com>
Date:   Thu Jan 9 12:43:35 2020 -0800

    iter: move gtksourceiter.h to gtksourceiter-private.h

 docs/reference/meson.build             |  2 +-
 gtksourceview/gtksourceiter-private.h  | 76 +++++++++++++++++++++++++++
 gtksourceview/gtksourceiter.c          |  2 +-
 gtksourceview/gtksourceiter.h          | 94 ----------------------------------
 gtksourceview/gtksourcesearchcontext.c |  2 +-
 gtksourceview/gtksourcespacedrawer.c   |  2 +-
 gtksourceview/gtksourceview.c          |  2 +-
 testsuite/test-iter.c                  |  2 +-
 8 files changed, 82 insertions(+), 100 deletions(-)
---
diff --git a/docs/reference/meson.build b/docs/reference/meson.build
index 45b8488a..8f47ab37 100644
--- a/docs/reference/meson.build
+++ b/docs/reference/meson.build
@@ -28,7 +28,7 @@ reference_private_h = [
   'gtksourcegutterrendererlines.h',
   'gtksourcegutterrenderermarks-private.h',
   'gtksourcegutterrenderer-private.h',
-  'gtksourceiter.h',
+  'gtksourceiter-private.h',
   'gtksourcelanguage-private.h',
   'gtksourcemarkssequence.h',
   'gtksourcepixbufhelper.h',
diff --git a/gtksourceview/gtksourceiter-private.h b/gtksourceview/gtksourceiter-private.h
new file mode 100644
index 00000000..fbb9e7e7
--- /dev/null
+++ b/gtksourceview/gtksourceiter-private.h
@@ -0,0 +1,76 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8; coding: utf-8 -*- */
+/*
+ * This file is part of GtkSourceView
+ *
+ * Copyright 2014, 2016 - Sébastien Wilmet <swilmet gnome org>
+ *
+ * GtkSourceView is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * GtkSourceView 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
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this library; if not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include <gtk/gtk.h>
+
+#include "gtksourcetypes-private.h"
+
+G_BEGIN_DECLS
+
+/* Semi-public functions. */
+
+GTK_SOURCE_INTERNAL
+gboolean _gtk_source_iter_forward_visible_word_end           (GtkTextIter       *iter);
+GTK_SOURCE_INTERNAL
+gboolean _gtk_source_iter_forward_visible_word_ends          (GtkTextIter       *iter,
+                                                              gint               count);
+GTK_SOURCE_INTERNAL
+gboolean _gtk_source_iter_backward_visible_word_start        (GtkTextIter       *iter);
+GTK_SOURCE_INTERNAL
+gboolean _gtk_source_iter_backward_visible_word_starts       (GtkTextIter       *iter,
+                                                              gint               count);
+GTK_SOURCE_INTERNAL
+void     _gtk_source_iter_extend_selection_word              (const GtkTextIter *location,
+                                                              GtkTextIter       *start,
+                                                              GtkTextIter       *end);
+GTK_SOURCE_INTERNAL
+gboolean _gtk_source_iter_starts_extra_natural_word          (const GtkTextIter *iter,
+                                                              gboolean           visible);
+GTK_SOURCE_INTERNAL
+gboolean _gtk_source_iter_ends_extra_natural_word            (const GtkTextIter *iter,
+                                                              gboolean           visible);
+GTK_SOURCE_INTERNAL
+void     _gtk_source_iter_get_leading_spaces_end_boundary    (const GtkTextIter *iter,
+                                                              GtkTextIter       *leading_end);
+GTK_SOURCE_INTERNAL
+void     _gtk_source_iter_get_trailing_spaces_start_boundary (const GtkTextIter *iter,
+                                                              GtkTextIter       *trailing_start);
+GTK_SOURCE_INTERNAL
+void     _gtk_source_iter_forward_full_word_end              (GtkTextIter       *iter);
+GTK_SOURCE_INTERNAL
+void     _gtk_source_iter_backward_full_word_start           (GtkTextIter       *iter);
+GTK_SOURCE_INTERNAL
+gboolean _gtk_source_iter_starts_full_word                   (const GtkTextIter *iter);
+GTK_SOURCE_INTERNAL
+gboolean _gtk_source_iter_ends_full_word                     (const GtkTextIter *iter);
+GTK_SOURCE_INTERNAL
+void     _gtk_source_iter_forward_extra_natural_word_end     (GtkTextIter       *iter);
+GTK_SOURCE_INTERNAL
+void     _gtk_source_iter_backward_extra_natural_word_start  (GtkTextIter       *iter);
+GTK_SOURCE_INTERNAL
+gboolean _gtk_source_iter_starts_word                        (const GtkTextIter *iter);
+GTK_SOURCE_INTERNAL
+gboolean _gtk_source_iter_ends_word                          (const GtkTextIter *iter);
+GTK_SOURCE_INTERNAL
+gboolean _gtk_source_iter_inside_word                        (const GtkTextIter *iter);
+
+G_END_DECLS
diff --git a/gtksourceview/gtksourceiter.c b/gtksourceview/gtksourceiter.c
index 33c21f84..bafc842e 100644
--- a/gtksourceview/gtksourceiter.c
+++ b/gtksourceview/gtksourceiter.c
@@ -20,7 +20,7 @@
 
 #include "config.h"
 
-#include "gtksourceiter.h"
+#include "gtksourceiter-private.h"
 
 /* GtkTextIter functions. Contains forward/backward functions for word
  * movements, with custom word boundaries that are used for word selection
diff --git a/gtksourceview/gtksourcesearchcontext.c b/gtksourceview/gtksourcesearchcontext.c
index d97bd209..38d75594 100644
--- a/gtksourceview/gtksourcesearchcontext.c
+++ b/gtksourceview/gtksourcesearchcontext.c
@@ -31,7 +31,7 @@
 #include "gtksourcestylescheme.h"
 #include "gtksourceutils.h"
 #include "gtksourceregion.h"
-#include "gtksourceiter.h"
+#include "gtksourceiter-private.h"
 #include "gtksource-enumtypes.h"
 
 /**
diff --git a/gtksourceview/gtksourcespacedrawer.c b/gtksourceview/gtksourcespacedrawer.c
index e96fdc7b..5b95e56c 100644
--- a/gtksourceview/gtksourcespacedrawer.c
+++ b/gtksourceview/gtksourcespacedrawer.c
@@ -29,7 +29,7 @@
 #include "gtksourcespacedrawer-private.h"
 #include "gtksourcebuffer.h"
 #include "gtksourcebuffer-private.h"
-#include "gtksourceiter.h"
+#include "gtksourceiter-private.h"
 #include "gtksourcestylescheme.h"
 #include "gtksourcetag.h"
 #include "gtksourceview.h"
diff --git a/gtksourceview/gtksourceview.c b/gtksourceview/gtksourceview.c
index 4a4beb87..941366ad 100644
--- a/gtksourceview/gtksourceview.c
+++ b/gtksourceview/gtksourceview.c
@@ -47,7 +47,7 @@
 #include "gtksourcegutter-private.h"
 #include "gtksourcegutterrendererlines.h"
 #include "gtksourcegutterrenderermarks-private.h"
-#include "gtksourceiter.h"
+#include "gtksourceiter-private.h"
 #include "gtksourcesearchcontext.h"
 #include "gtksourcespacedrawer.h"
 #include "gtksourcespacedrawer-private.h"
diff --git a/testsuite/test-iter.c b/testsuite/test-iter.c
index ff6cd305..0a726f3f 100644
--- a/testsuite/test-iter.c
+++ b/testsuite/test-iter.c
@@ -18,7 +18,7 @@
  * along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "gtksourceview/gtksourceiter.h"
+#include "gtksourceview/gtksourceiter-private.h"
 
 static void
 check_full_word_boundaries (gboolean     forward,


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