[gtksourceview/wip/chergert/gsv-gtk4] various style cleanup
- From: Christian Hergert <chergert src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtksourceview/wip/chergert/gsv-gtk4] various style cleanup
- Date: Thu, 9 Jan 2020 23:27:10 +0000 (UTC)
commit 7b75cd3423ad38375e641352ef6c4276e0244e21
Author: Christian Hergert <chergert redhat com>
Date: Thu Jan 9 15:27:10 2020 -0800
various style cleanup
gtksourceview/gtksourcebuffer.h | 12 ++---
gtksourceview/gtksourceencoding-private.h | 4 +-
gtksourceview/gtksourceencoding.h | 32 +++++--------
gtksourceview/gtksourcefile.h | 2 +-
gtksourceview/gtksourcefilesaver.h | 8 ++--
gtksourceview/gtksourcegutter-private.h | 12 ++---
gtksourceview/gtksourcegutterrenderer.h | 6 +--
gtksourceview/gtksourceinit.h | 4 +-
gtksourceview/gtksourceregion.h | 72 +++++++++++-----------------
gtksourceview/gtksourcespacedrawer-private.h | 12 ++---
gtksourceview/gtksourcespacedrawer.h | 22 ++++-----
gtksourceview/gtksourcestyle-private.h | 18 +++----
gtksourceview/gtksourcestyleschemechooser.h | 6 +--
gtksourceview/gtksourcetag.c | 18 ++++---
gtksourceview/gtksourcetag.h | 11 ++---
gtksourceview/gtksourcetypes-private.h | 24 +++++-----
gtksourceview/gtksourceutils-private.h | 24 ++++------
17 files changed, 127 insertions(+), 160 deletions(-)
---
diff --git a/gtksourceview/gtksourcebuffer.h b/gtksourceview/gtksourcebuffer.h
index 6a791c2c..382955f6 100644
--- a/gtksourceview/gtksourcebuffer.h
+++ b/gtksourceview/gtksourcebuffer.h
@@ -94,15 +94,15 @@ struct _GtkSourceBufferClass
GtkTextBufferClass parent_class;
/* Signals */
- void (*undo) (GtkSourceBuffer *buffer);
- void (*redo) (GtkSourceBuffer *buffer);
+ void (*undo) (GtkSourceBuffer *buffer);
+ void (*redo) (GtkSourceBuffer *buffer);
void (*bracket_matched) (GtkSourceBuffer *buffer,
- GtkTextIter *iter,
- GtkSourceBracketMatchType state);
+ GtkTextIter *iter,
+ GtkSourceBracketMatchType state);
- /* Padding for future expansion */
- gpointer padding[20];
+ /*< private >*/
+ gpointer _reserved[20];
};
GTK_SOURCE_AVAILABLE_IN_ALL
diff --git a/gtksourceview/gtksourceencoding-private.h b/gtksourceview/gtksourceencoding-private.h
index 44c6f85c..89d505cd 100644
--- a/gtksourceview/gtksourceencoding-private.h
+++ b/gtksourceview/gtksourceencoding-private.h
@@ -42,7 +42,7 @@ typedef enum _GtkSourceEncodingDuplicates
} GtkSourceEncodingDuplicates;
GTK_SOURCE_INTERNAL
-GSList * _gtk_source_encoding_remove_duplicates (GSList
*encodings,
- GtkSourceEncodingDuplicates
removal_type);
+GSList *_gtk_source_encoding_remove_duplicates (GSList *encodings,
+ GtkSourceEncodingDuplicates removal_type);
G_END_DECLS
diff --git a/gtksourceview/gtksourceencoding.h b/gtksourceview/gtksourceencoding.h
index cf429883..fce777fc 100644
--- a/gtksourceview/gtksourceencoding.h
+++ b/gtksourceview/gtksourceencoding.h
@@ -35,38 +35,28 @@ G_BEGIN_DECLS
#define GTK_SOURCE_TYPE_ENCODING (gtk_source_encoding_get_type ())
GTK_SOURCE_AVAILABLE_IN_3_14
-GType gtk_source_encoding_get_type (void) G_GNUC_CONST;
-
+GType gtk_source_encoding_get_type (void) G_GNUC_CONST;
GTK_SOURCE_AVAILABLE_IN_3_14
-const GtkSourceEncoding *gtk_source_encoding_get_from_charset (const gchar
*charset);
-
+const GtkSourceEncoding *gtk_source_encoding_get_from_charset (const gchar *charset);
GTK_SOURCE_AVAILABLE_IN_3_14
-gchar *gtk_source_encoding_to_string (const GtkSourceEncoding *enc);
-
+gchar *gtk_source_encoding_to_string (const GtkSourceEncoding *enc);
GTK_SOURCE_AVAILABLE_IN_3_14
-const gchar *gtk_source_encoding_get_name (const GtkSourceEncoding *enc);
-
+const gchar *gtk_source_encoding_get_name (const GtkSourceEncoding *enc);
GTK_SOURCE_AVAILABLE_IN_3_14
-const gchar *gtk_source_encoding_get_charset (const GtkSourceEncoding *enc);
-
+const gchar *gtk_source_encoding_get_charset (const GtkSourceEncoding *enc);
GTK_SOURCE_AVAILABLE_IN_3_14
-const GtkSourceEncoding *gtk_source_encoding_get_utf8 (void);
-
+const GtkSourceEncoding *gtk_source_encoding_get_utf8 (void);
GTK_SOURCE_AVAILABLE_IN_3_14
-const GtkSourceEncoding *gtk_source_encoding_get_current (void);
-
+const GtkSourceEncoding *gtk_source_encoding_get_current (void);
GTK_SOURCE_AVAILABLE_IN_3_14
-GSList *gtk_source_encoding_get_all (void);
-
+GSList *gtk_source_encoding_get_all (void);
GTK_SOURCE_AVAILABLE_IN_3_18
-GSList *gtk_source_encoding_get_default_candidates (void);
+GSList *gtk_source_encoding_get_default_candidates (void);
/* These should not be used, they are just to make python bindings happy */
-
GTK_SOURCE_AVAILABLE_IN_3_14
-GtkSourceEncoding *gtk_source_encoding_copy (const GtkSourceEncoding *enc);
-
+GtkSourceEncoding *gtk_source_encoding_copy (const GtkSourceEncoding *enc);
GTK_SOURCE_AVAILABLE_IN_3_14
-void gtk_source_encoding_free (GtkSourceEncoding *enc);
+void gtk_source_encoding_free (GtkSourceEncoding *enc);
G_END_DECLS
diff --git a/gtksourceview/gtksourcefile.h b/gtksourceview/gtksourcefile.h
index e6a88679..382502ff 100644
--- a/gtksourceview/gtksourcefile.h
+++ b/gtksourceview/gtksourcefile.h
@@ -85,7 +85,7 @@ typedef enum _GtkSourceCompressionType
* Since: 3.14
*/
typedef GMountOperation *(*GtkSourceMountOperationFactory) (GtkSourceFile *file,
- gpointer userdata);
+ gpointer userdata);
GTK_SOURCE_AVAILABLE_IN_3_14
G_DECLARE_DERIVABLE_TYPE (GtkSourceFile, gtk_source_file, GTK_SOURCE, FILE, GObject)
diff --git a/gtksourceview/gtksourcefilesaver.h b/gtksourceview/gtksourcefilesaver.h
index 79178745..06714342 100644
--- a/gtksourceview/gtksourcefilesaver.h
+++ b/gtksourceview/gtksourcefilesaver.h
@@ -65,10 +65,10 @@ typedef enum _GtkSourceFileSaverError
*/
typedef enum _GtkSourceFileSaverFlags
{
- GTK_SOURCE_FILE_SAVER_FLAGS_NONE = 0,
- GTK_SOURCE_FILE_SAVER_FLAGS_IGNORE_INVALID_CHARS = 1 << 0,
- GTK_SOURCE_FILE_SAVER_FLAGS_IGNORE_MODIFICATION_TIME = 1 << 1,
- GTK_SOURCE_FILE_SAVER_FLAGS_CREATE_BACKUP = 1 << 2
+ GTK_SOURCE_FILE_SAVER_FLAGS_NONE = 0,
+ GTK_SOURCE_FILE_SAVER_FLAGS_IGNORE_INVALID_CHARS = 1 << 0,
+ GTK_SOURCE_FILE_SAVER_FLAGS_IGNORE_MODIFICATION_TIME = 1 << 1,
+ GTK_SOURCE_FILE_SAVER_FLAGS_CREATE_BACKUP = 1 << 2
} GtkSourceFileSaverFlags;
GTK_SOURCE_AVAILABLE_IN_3_14
diff --git a/gtksourceview/gtksourcegutter-private.h b/gtksourceview/gtksourcegutter-private.h
index ae40663e..e1ebeb8a 100644
--- a/gtksourceview/gtksourcegutter-private.h
+++ b/gtksourceview/gtksourcegutter-private.h
@@ -26,13 +26,11 @@
G_BEGIN_DECLS
G_GNUC_INTERNAL
-GtkSourceGutter * _gtk_source_gutter_new (GtkSourceView *view,
- GtkTextWindowType type);
-
+GtkSourceGutter *_gtk_source_gutter_new (GtkSourceView *view,
+ GtkTextWindowType type);
G_GNUC_INTERNAL
-void _gtk_source_gutter_draw (GtkSourceGutter *gutter,
- GtkSourceView *view,
- cairo_t *cr);
-
+void _gtk_source_gutter_draw (GtkSourceGutter *gutter,
+ GtkSourceView *view,
+ cairo_t *cr);
G_END_DECLS
diff --git a/gtksourceview/gtksourcegutterrenderer.h b/gtksourceview/gtksourcegutterrenderer.h
index bc7a06ab..baa413d5 100644
--- a/gtksourceview/gtksourcegutterrenderer.h
+++ b/gtksourceview/gtksourcegutterrenderer.h
@@ -44,9 +44,9 @@ G_BEGIN_DECLS
**/
typedef enum _GtkSourceGutterRendererState
{
- GTK_SOURCE_GUTTER_RENDERER_STATE_NORMAL = 0,
- GTK_SOURCE_GUTTER_RENDERER_STATE_CURSOR = 1 << 0,
- GTK_SOURCE_GUTTER_RENDERER_STATE_PRELIT = 1 << 1,
+ GTK_SOURCE_GUTTER_RENDERER_STATE_NORMAL = 0,
+ GTK_SOURCE_GUTTER_RENDERER_STATE_CURSOR = 1 << 0,
+ GTK_SOURCE_GUTTER_RENDERER_STATE_PRELIT = 1 << 1,
GTK_SOURCE_GUTTER_RENDERER_STATE_SELECTED = 1 << 2
} GtkSourceGutterRendererState;
diff --git a/gtksourceview/gtksourceinit.h b/gtksourceview/gtksourceinit.h
index b2efc720..87898b76 100644
--- a/gtksourceview/gtksourceinit.h
+++ b/gtksourceview/gtksourceinit.h
@@ -30,8 +30,8 @@
G_BEGIN_DECLS
GTK_SOURCE_AVAILABLE_IN_4_0
-void gtk_source_init (void);
+void gtk_source_init (void);
GTK_SOURCE_AVAILABLE_IN_4_0
-void gtk_source_finalize (void);
+void gtk_source_finalize (void);
G_END_DECLS
diff --git a/gtksourceview/gtksourceregion.h b/gtksourceview/gtksourceregion.h
index a690c42d..757fe513 100644
--- a/gtksourceview/gtksourceregion.h
+++ b/gtksourceview/gtksourceregion.h
@@ -62,62 +62,48 @@ struct _GtkSourceRegionIter
};
GTK_SOURCE_AVAILABLE_IN_3_22
-GtkSourceRegion * gtk_source_region_new (GtkTextBuffer *buffer);
-
+GtkSourceRegion *gtk_source_region_new (GtkTextBuffer *buffer);
GTK_SOURCE_AVAILABLE_IN_3_22
-GtkTextBuffer * gtk_source_region_get_buffer (GtkSourceRegion *region);
-
+GtkTextBuffer *gtk_source_region_get_buffer (GtkSourceRegion *region);
GTK_SOURCE_AVAILABLE_IN_3_22
-void gtk_source_region_add_subregion (GtkSourceRegion *region,
- const GtkTextIter *_start,
- const GtkTextIter *_end);
-
+void gtk_source_region_add_subregion (GtkSourceRegion *region,
+ const GtkTextIter *_start,
+ const GtkTextIter *_end);
GTK_SOURCE_AVAILABLE_IN_3_22
-void gtk_source_region_add_region (GtkSourceRegion *region,
- GtkSourceRegion *region_to_add);
-
+void gtk_source_region_add_region (GtkSourceRegion *region,
+ GtkSourceRegion *region_to_add);
GTK_SOURCE_AVAILABLE_IN_3_22
-void gtk_source_region_subtract_subregion (GtkSourceRegion *region,
- const GtkTextIter *_start,
- const GtkTextIter *_end);
-
+void gtk_source_region_subtract_subregion (GtkSourceRegion *region,
+ const GtkTextIter *_start,
+ const GtkTextIter *_end);
GTK_SOURCE_AVAILABLE_IN_3_22
-void gtk_source_region_subtract_region (GtkSourceRegion *region,
- GtkSourceRegion *region_to_subtract);
-
+void gtk_source_region_subtract_region (GtkSourceRegion *region,
+ GtkSourceRegion *region_to_subtract);
GTK_SOURCE_AVAILABLE_IN_3_22
-GtkSourceRegion * gtk_source_region_intersect_subregion (GtkSourceRegion *region,
- const GtkTextIter *_start,
- const GtkTextIter *_end);
-
+GtkSourceRegion *gtk_source_region_intersect_subregion (GtkSourceRegion *region,
+ const GtkTextIter *_start,
+ const GtkTextIter *_end);
GTK_SOURCE_AVAILABLE_IN_3_22
-GtkSourceRegion * gtk_source_region_intersect_region (GtkSourceRegion *region1,
- GtkSourceRegion *region2);
-
+GtkSourceRegion *gtk_source_region_intersect_region (GtkSourceRegion *region1,
+ GtkSourceRegion *region2);
GTK_SOURCE_AVAILABLE_IN_3_22
-gboolean gtk_source_region_is_empty (GtkSourceRegion *region);
-
+gboolean gtk_source_region_is_empty (GtkSourceRegion *region);
GTK_SOURCE_AVAILABLE_IN_3_22
-gboolean gtk_source_region_get_bounds (GtkSourceRegion *region,
- GtkTextIter *start,
- GtkTextIter *end);
-
+gboolean gtk_source_region_get_bounds (GtkSourceRegion *region,
+ GtkTextIter *start,
+ GtkTextIter *end);
GTK_SOURCE_AVAILABLE_IN_3_22
-void gtk_source_region_get_start_region_iter (GtkSourceRegion *region,
- GtkSourceRegionIter *iter);
-
+void gtk_source_region_get_start_region_iter (GtkSourceRegion *region,
+ GtkSourceRegionIter *iter);
GTK_SOURCE_AVAILABLE_IN_3_22
-gboolean gtk_source_region_iter_is_end (GtkSourceRegionIter *iter);
-
+gboolean gtk_source_region_iter_is_end (GtkSourceRegionIter *iter);
GTK_SOURCE_AVAILABLE_IN_3_22
-gboolean gtk_source_region_iter_next (GtkSourceRegionIter *iter);
-
+gboolean gtk_source_region_iter_next (GtkSourceRegionIter *iter);
GTK_SOURCE_AVAILABLE_IN_3_22
-gboolean gtk_source_region_iter_get_subregion (GtkSourceRegionIter *iter,
- GtkTextIter *start,
- GtkTextIter *end);
-
+gboolean gtk_source_region_iter_get_subregion (GtkSourceRegionIter *iter,
+ GtkTextIter *start,
+ GtkTextIter *end);
GTK_SOURCE_AVAILABLE_IN_3_22
-gchar * gtk_source_region_to_string (GtkSourceRegion *region);
+gchar *gtk_source_region_to_string (GtkSourceRegion *region);
G_END_DECLS
diff --git a/gtksourceview/gtksourcespacedrawer-private.h b/gtksourceview/gtksourcespacedrawer-private.h
index 49605c99..e7d3a5b4 100644
--- a/gtksourceview/gtksourcespacedrawer-private.h
+++ b/gtksourceview/gtksourcespacedrawer-private.h
@@ -21,18 +21,18 @@
#pragma once
#include <gtk/gtk.h>
+
#include "gtksourcetypes.h"
#include "gtksourcetypes-private.h"
G_BEGIN_DECLS
GTK_SOURCE_INTERNAL
-void _gtk_source_space_drawer_update_color (GtkSourceSpaceDrawer *drawer,
- GtkSourceView *view);
-
+void _gtk_source_space_drawer_update_color (GtkSourceSpaceDrawer *drawer,
+ GtkSourceView *view);
GTK_SOURCE_INTERNAL
-void _gtk_source_space_drawer_draw (GtkSourceSpaceDrawer *drawer,
- GtkSourceView *view,
- cairo_t *cr);
+void _gtk_source_space_drawer_draw (GtkSourceSpaceDrawer *drawer,
+ GtkSourceView *view,
+ cairo_t *cr);
G_END_DECLS
diff --git a/gtksourceview/gtksourcespacedrawer.h b/gtksourceview/gtksourcespacedrawer.h
index b5273e91..dff6dacc 100644
--- a/gtksourceview/gtksourcespacedrawer.h
+++ b/gtksourceview/gtksourcespacedrawer.h
@@ -49,12 +49,12 @@ G_BEGIN_DECLS
*/
typedef enum _GtkSourceSpaceTypeFlags
{
- GTK_SOURCE_SPACE_TYPE_NONE = 0,
- GTK_SOURCE_SPACE_TYPE_SPACE = 1 << 0,
- GTK_SOURCE_SPACE_TYPE_TAB = 1 << 1,
- GTK_SOURCE_SPACE_TYPE_NEWLINE = 1 << 2,
- GTK_SOURCE_SPACE_TYPE_NBSP = 1 << 3,
- GTK_SOURCE_SPACE_TYPE_ALL = 0xf
+ GTK_SOURCE_SPACE_TYPE_NONE = 0,
+ GTK_SOURCE_SPACE_TYPE_SPACE = 1 << 0,
+ GTK_SOURCE_SPACE_TYPE_TAB = 1 << 1,
+ GTK_SOURCE_SPACE_TYPE_NEWLINE = 1 << 2,
+ GTK_SOURCE_SPACE_TYPE_NBSP = 1 << 3,
+ GTK_SOURCE_SPACE_TYPE_ALL = 0xf
} GtkSourceSpaceTypeFlags;
/**
@@ -75,11 +75,11 @@ typedef enum _GtkSourceSpaceTypeFlags
*/
typedef enum _GtkSourceSpaceLocationFlags
{
- GTK_SOURCE_SPACE_LOCATION_NONE = 0,
- GTK_SOURCE_SPACE_LOCATION_LEADING = 1 << 0,
- GTK_SOURCE_SPACE_LOCATION_INSIDE_TEXT = 1 << 1,
- GTK_SOURCE_SPACE_LOCATION_TRAILING = 1 << 2,
- GTK_SOURCE_SPACE_LOCATION_ALL = 0x7
+ GTK_SOURCE_SPACE_LOCATION_NONE = 0,
+ GTK_SOURCE_SPACE_LOCATION_LEADING = 1 << 0,
+ GTK_SOURCE_SPACE_LOCATION_INSIDE_TEXT = 1 << 1,
+ GTK_SOURCE_SPACE_LOCATION_TRAILING = 1 << 2,
+ GTK_SOURCE_SPACE_LOCATION_ALL = 0x7
} GtkSourceSpaceLocationFlags;
GTK_SOURCE_AVAILABLE_IN_3_24
diff --git a/gtksourceview/gtksourcestyle-private.h b/gtksourceview/gtksourcestyle-private.h
index b0a68e0f..739ac6f6 100644
--- a/gtksourceview/gtksourcestyle-private.h
+++ b/gtksourceview/gtksourcestyle-private.h
@@ -33,15 +33,15 @@ G_BEGIN_DECLS
enum
{
- GTK_SOURCE_STYLE_USE_LINE_BACKGROUND = 1 << 0, /*< nick=use_line_background >*/
- GTK_SOURCE_STYLE_USE_BACKGROUND = 1 << 1, /*< nick=use_background >*/
- GTK_SOURCE_STYLE_USE_FOREGROUND = 1 << 2, /*< nick=use_foreground >*/
- GTK_SOURCE_STYLE_USE_ITALIC = 1 << 3, /*< nick=use_italic >*/
- GTK_SOURCE_STYLE_USE_BOLD = 1 << 4, /*< nick=use_bold >*/
- GTK_SOURCE_STYLE_USE_UNDERLINE = 1 << 5, /*< nick=use_underline >*/
- GTK_SOURCE_STYLE_USE_STRIKETHROUGH = 1 << 6, /*< nick=use_strikethrough >*/
- GTK_SOURCE_STYLE_USE_SCALE = 1 << 7, /*< nick=use_scale >*/
- GTK_SOURCE_STYLE_USE_UNDERLINE_COLOR = 1 << 8 /*< nick=use_underline_color >*/
+ GTK_SOURCE_STYLE_USE_LINE_BACKGROUND = 1 << 0, /*< nick=use_line_background >*/
+ GTK_SOURCE_STYLE_USE_BACKGROUND = 1 << 1, /*< nick=use_background >*/
+ GTK_SOURCE_STYLE_USE_FOREGROUND = 1 << 2, /*< nick=use_foreground >*/
+ GTK_SOURCE_STYLE_USE_ITALIC = 1 << 3, /*< nick=use_italic >*/
+ GTK_SOURCE_STYLE_USE_BOLD = 1 << 4, /*< nick=use_bold >*/
+ GTK_SOURCE_STYLE_USE_UNDERLINE = 1 << 5, /*< nick=use_underline >*/
+ GTK_SOURCE_STYLE_USE_STRIKETHROUGH = 1 << 6, /*< nick=use_strikethrough >*/
+ GTK_SOURCE_STYLE_USE_SCALE = 1 << 7, /*< nick=use_scale >*/
+ GTK_SOURCE_STYLE_USE_UNDERLINE_COLOR = 1 << 8, /*< nick=use_underline_color >*/
};
struct _GtkSourceStyle
diff --git a/gtksourceview/gtksourcestyleschemechooser.h b/gtksourceview/gtksourcestyleschemechooser.h
index b0e94da0..c0a67106 100644
--- a/gtksourceview/gtksourcestyleschemechooser.h
+++ b/gtksourceview/gtksourcestyleschemechooser.h
@@ -40,10 +40,10 @@ struct _GtkSourceStyleSchemeChooserInterface
GTypeInterface base_interface;
/* Methods */
- GtkSourceStyleScheme * (* get_style_scheme) (GtkSourceStyleSchemeChooser *chooser);
+ GtkSourceStyleScheme *(*get_style_scheme) (GtkSourceStyleSchemeChooser *chooser);
- void (* set_style_scheme) (GtkSourceStyleSchemeChooser *chooser,
- GtkSourceStyleScheme *scheme);
+ void (*set_style_scheme) (GtkSourceStyleSchemeChooser *chooser,
+ GtkSourceStyleScheme *scheme);
/*< private >*/
gpointer _reserved[12];
diff --git a/gtksourceview/gtksourcetag.c b/gtksourceview/gtksourcetag.c
index 38aa4c03..ad007e4c 100644
--- a/gtksourceview/gtksourcetag.c
+++ b/gtksourceview/gtksourcetag.c
@@ -37,13 +37,11 @@
* a #GtkTextTag, not a #GtkSourceTag.
*/
-typedef struct _GtkSourceTagPrivate GtkSourceTagPrivate;
-
-struct _GtkSourceTagPrivate
+typedef struct
{
guint draw_spaces : 1;
guint draw_spaces_set : 1;
-};
+} GtkSourceTagPrivate;
enum
{
@@ -56,9 +54,9 @@ G_DEFINE_TYPE_WITH_PRIVATE (GtkSourceTag, gtk_source_tag, GTK_TYPE_TEXT_TAG)
static void
gtk_source_tag_get_property (GObject *object,
- guint prop_id,
- GValue *value,
- GParamSpec *pspec)
+ guint prop_id,
+ GValue *value,
+ GParamSpec *pspec)
{
GtkSourceTagPrivate *priv;
@@ -82,9 +80,9 @@ gtk_source_tag_get_property (GObject *object,
static void
gtk_source_tag_set_property (GObject *object,
- guint prop_id,
- const GValue *value,
- GParamSpec *pspec)
+ guint prop_id,
+ const GValue *value,
+ GParamSpec *pspec)
{
GtkSourceTag *tag;
GtkSourceTagPrivate *priv;
diff --git a/gtksourceview/gtksourcetag.h b/gtksourceview/gtksourcetag.h
index 4953794c..9141b7bf 100644
--- a/gtksourceview/gtksourcetag.h
+++ b/gtksourceview/gtksourcetag.h
@@ -32,21 +32,20 @@
G_BEGIN_DECLS
-#define GTK_SOURCE_TYPE_TAG (gtk_source_tag_get_type ())
+#define GTK_SOURCE_TYPE_TAG (gtk_source_tag_get_type())
GTK_SOURCE_AVAILABLE_IN_3_20
-G_DECLARE_DERIVABLE_TYPE (GtkSourceTag, gtk_source_tag,
- GTK_SOURCE, TAG,
- GtkTextTag)
+G_DECLARE_DERIVABLE_TYPE (GtkSourceTag, gtk_source_tag, GTK_SOURCE, TAG, GtkTextTag)
struct _GtkSourceTagClass
{
GtkTextTagClass parent_class;
- gpointer padding[10];
+ /*< private >*/
+ gpointer _reserved[10];
};
GTK_SOURCE_AVAILABLE_IN_3_20
-GtkTextTag * gtk_source_tag_new (const gchar *name);
+GtkTextTag *gtk_source_tag_new (const gchar *name);
G_END_DECLS
diff --git a/gtksourceview/gtksourcetypes-private.h b/gtksourceview/gtksourcetypes-private.h
index dbafbd83..002a144d 100644
--- a/gtksourceview/gtksourcetypes-private.h
+++ b/gtksourceview/gtksourcetypes-private.h
@@ -23,18 +23,18 @@
G_BEGIN_DECLS
-typedef struct _GtkSourceBufferInputStream GtkSourceBufferInputStream;
-typedef struct _GtkSourceBufferOutputStream GtkSourceBufferOutputStream;
-typedef struct _GtkSourceCompletionContainer GtkSourceCompletionContainer;
-typedef struct _GtkSourceCompletionModel GtkSourceCompletionModel;
-typedef struct _GtkSourceContextEngine GtkSourceContextEngine;
-typedef struct _GtkSourceEngine GtkSourceEngine;
-typedef struct _GtkSourceGutterRendererLines GtkSourceGutterRendererLines;
-typedef struct _GtkSourceGutterRendererMarks GtkSourceGutterRendererMarks;
-typedef struct _GtkSourceMarksSequence GtkSourceMarksSequence;
-typedef struct _GtkSourcePixbufHelper GtkSourcePixbufHelper;
-typedef struct _GtkSourceRegex GtkSourceRegex;
-typedef struct _GtkSourceUndoManagerDefault GtkSourceUndoManagerDefault;
+typedef struct _GtkSourceBufferInputStream GtkSourceBufferInputStream;
+typedef struct _GtkSourceBufferOutputStream GtkSourceBufferOutputStream;
+typedef struct _GtkSourceCompletionContainer GtkSourceCompletionContainer;
+typedef struct _GtkSourceCompletionModel GtkSourceCompletionModel;
+typedef struct _GtkSourceContextEngine GtkSourceContextEngine;
+typedef struct _GtkSourceEngine GtkSourceEngine;
+typedef struct _GtkSourceGutterRendererLines GtkSourceGutterRendererLines;
+typedef struct _GtkSourceGutterRendererMarks GtkSourceGutterRendererMarks;
+typedef struct _GtkSourceMarksSequence GtkSourceMarksSequence;
+typedef struct _GtkSourcePixbufHelper GtkSourcePixbufHelper;
+typedef struct _GtkSourceRegex GtkSourceRegex;
+typedef struct _GtkSourceUndoManagerDefault GtkSourceUndoManagerDefault;
#ifdef _MSC_VER
/* For Visual Studio, we need to export the symbols used by the unit tests */
diff --git a/gtksourceview/gtksourceutils-private.h b/gtksourceview/gtksourceutils-private.h
index 28c08a34..25dd7b03 100644
--- a/gtksourceview/gtksourceutils-private.h
+++ b/gtksourceview/gtksourceutils-private.h
@@ -28,26 +28,22 @@
G_BEGIN_DECLS
G_GNUC_INTERNAL
-gchar ** _gtk_source_utils_get_default_dirs (const gchar *basename);
-
+gchar **_gtk_source_utils_get_default_dirs (const gchar *basename);
G_GNUC_INTERNAL
-GSList * _gtk_source_utils_get_file_list (gchar **path,
- const gchar *suffix,
- gboolean only_dirs);
-
+GSList *_gtk_source_utils_get_file_list (gchar **path,
+ const gchar *suffix,
+ gboolean only_dirs);
G_GNUC_INTERNAL
-gint _gtk_source_utils_string_to_int (const gchar *str);
-
+gint _gtk_source_utils_string_to_int (const gchar *str);
G_GNUC_INTERNAL
-gint _gtk_source_utils_int_to_string (guint value,
- const gchar **outstr);
-
+gint _gtk_source_utils_int_to_string (guint value,
+ const gchar **outstr);
G_GNUC_INTERNAL
-gchar * _gtk_source_utils_pango_font_description_to_css (const PangoFontDescription
*font_desc);
+gchar *_gtk_source_utils_pango_font_description_to_css (const PangoFontDescription *font_desc);
/* Note: it returns duplicated string. */
G_GNUC_INTERNAL
-gchar * _gtk_source_utils_dgettext (const gchar *domain,
- const gchar *msgid) G_GNUC_FORMAT(2);
+gchar *_gtk_source_utils_dgettext (const gchar *domain,
+ const gchar *msgid)
G_GNUC_FORMAT(2);
G_END_DECLS
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
