Skip to content

Commit e276313

Browse files
Piiitclefebvre
Piiit
authored and
clefebvre
committed
Missing function headers (#256)
* Add missing function declarations for ev_annotation_..._rgba * Fix coding style issues in ev-annotation.h
1 parent ae7fa92 commit e276313

2 files changed

Lines changed: 54 additions & 49 deletions

File tree

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -187,3 +187,4 @@ intltool-update.in
187187
install-sh
188188
test-driver
189189
compile
190+
/Build (GNU)/

‎libdocument/ev-annotation.h‎

Lines changed: 53 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/* ev-annotation.h
2-
* this file is part of xreader, a mate document viewer
2+
* this file is part of xreader, a generic document viewer
33
*
44
* Copyright (C) 2009 Carlos Garcia Campos <carlosgc@gnome.org>
55
* Copyright (C) 2007 Iñigo Martinez <inigomartinez@gmail.com>
@@ -36,28 +36,28 @@
3636
G_BEGIN_DECLS
3737

3838
/* EvAnnotation */
39-
#define EV_TYPE_ANNOTATION (ev_annotation_get_type())
40-
#define EV_ANNOTATION(object) (G_TYPE_CHECK_INSTANCE_CAST((object), EV_TYPE_ANNOTATION, EvAnnotation))
41-
#define EV_ANNOTATION_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), EV_TYPE_ANNOTATION, EvAnnotationClass))
42-
#define EV_IS_ANNOTATION(object) (G_TYPE_CHECK_INSTANCE_TYPE((object), EV_TYPE_ANNOTATION))
43-
#define EV_IS_ANNOTATION_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), EV_TYPE_ANNOTATION))
44-
#define EV_ANNOTATION_GET_CLASS(object) (G_TYPE_INSTANCE_GET_CLASS((object), EV_TYPE_ANNOTATION, EvAnnotationClass))
39+
#define EV_TYPE_ANNOTATION (ev_annotation_get_type())
40+
#define EV_ANNOTATION(object) (G_TYPE_CHECK_INSTANCE_CAST((object), EV_TYPE_ANNOTATION, EvAnnotation))
41+
#define EV_ANNOTATION_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), EV_TYPE_ANNOTATION, EvAnnotationClass))
42+
#define EV_IS_ANNOTATION(object) (G_TYPE_CHECK_INSTANCE_TYPE((object), EV_TYPE_ANNOTATION))
43+
#define EV_IS_ANNOTATION_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), EV_TYPE_ANNOTATION))
44+
#define EV_ANNOTATION_GET_CLASS(object) (G_TYPE_INSTANCE_GET_CLASS((object), EV_TYPE_ANNOTATION, EvAnnotationClass))
4545

4646
/* EvAnnotationMarkup */
47-
#define EV_TYPE_ANNOTATION_MARKUP (ev_annotation_markup_get_type ())
48-
#define EV_ANNOTATION_MARKUP(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), EV_TYPE_ANNOTATION_MARKUP, EvAnnotationMarkup))
49-
#define EV_ANNOTATION_MARKUP_IFACE(k) (G_TYPE_CHECK_CLASS_CAST((k), EV_TYPE_ANNOTATION_MARKUP, EvAnnotationMarkupInterface))
50-
#define EV_IS_ANNOTATION_MARKUP(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), EV_TYPE_ANNOTATION_MARKUP))
51-
#define EV_IS_ANNOTATION_MARKUP_IFACE(k) (G_TYPE_CHECK_CLASS_TYPE ((k), EV_TYPE_ANNOTATION_MARKUP))
52-
#define EV_ANNOTATION_MARKUP_GET_IFACE(inst) (G_TYPE_INSTANCE_GET_INTERFACE ((inst), EV_TYPE_ANNOTATION_MARKUP, EvAnnotationMarkupInterface))
47+
#define EV_TYPE_ANNOTATION_MARKUP (ev_annotation_markup_get_type ())
48+
#define EV_ANNOTATION_MARKUP(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), EV_TYPE_ANNOTATION_MARKUP, EvAnnotationMarkup))
49+
#define EV_ANNOTATION_MARKUP_IFACE(k) (G_TYPE_CHECK_CLASS_CAST((k), EV_TYPE_ANNOTATION_MARKUP, EvAnnotationMarkupInterface))
50+
#define EV_IS_ANNOTATION_MARKUP(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), EV_TYPE_ANNOTATION_MARKUP))
51+
#define EV_IS_ANNOTATION_MARKUP_IFACE(k) (G_TYPE_CHECK_CLASS_TYPE ((k), EV_TYPE_ANNOTATION_MARKUP))
52+
#define EV_ANNOTATION_MARKUP_GET_IFACE(inst) (G_TYPE_INSTANCE_GET_INTERFACE ((inst), EV_TYPE_ANNOTATION_MARKUP, EvAnnotationMarkupInterface))
5353

5454
/* EvAnnotationText */
55-
#define EV_TYPE_ANNOTATION_TEXT (ev_annotation_text_get_type())
56-
#define EV_ANNOTATION_TEXT(object) (G_TYPE_CHECK_INSTANCE_CAST((object), EV_TYPE_ANNOTATION_TEXT, EvAnnotationText))
57-
#define EV_ANNOTATION_TEXT_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), EV_TYPE_ANNOTATION_TEXT, EvAnnotationTextClass))
58-
#define EV_IS_ANNOTATION_TEXT(object) (G_TYPE_CHECK_INSTANCE_TYPE((object), EV_TYPE_ANNOTATION_TEXT))
59-
#define EV_IS_ANNOTATION_TEXT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), EV_TYPE_ANNOTATION_TEXT))
60-
#define EV_ANNOTATION_TEXT_GET_CLASS(object) (G_TYPE_INSTANCE_GET_CLASS((object), EV_TYPE_ANNOTATION_TEXT, EvAnnotationTextClass))
55+
#define EV_TYPE_ANNOTATION_TEXT (ev_annotation_text_get_type())
56+
#define EV_ANNOTATION_TEXT(object) (G_TYPE_CHECK_INSTANCE_CAST((object), EV_TYPE_ANNOTATION_TEXT, EvAnnotationText))
57+
#define EV_ANNOTATION_TEXT_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), EV_TYPE_ANNOTATION_TEXT, EvAnnotationTextClass))
58+
#define EV_IS_ANNOTATION_TEXT(object) (G_TYPE_CHECK_INSTANCE_TYPE((object), EV_TYPE_ANNOTATION_TEXT))
59+
#define EV_IS_ANNOTATION_TEXT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), EV_TYPE_ANNOTATION_TEXT))
60+
#define EV_ANNOTATION_TEXT_GET_CLASS(object) (G_TYPE_INSTANCE_GET_CLASS((object), EV_TYPE_ANNOTATION_TEXT, EvAnnotationTextClass))
6161

6262
/* EvAnnotationAttachment */
6363
#define EV_TYPE_ANNOTATION_ATTACHMENT (ev_annotation_attachment_get_type())
@@ -80,22 +80,22 @@ typedef struct _EvAnnotationAttachment EvAnnotationAttachment;
8080
typedef struct _EvAnnotationAttachmentClass EvAnnotationAttachmentClass;
8181

8282
typedef enum {
83-
EV_ANNOTATION_TYPE_UNKNOWN,
84-
EV_ANNOTATION_TYPE_TEXT,
85-
EV_ANNOTATION_TYPE_ATTACHMENT
83+
EV_ANNOTATION_TYPE_UNKNOWN,
84+
EV_ANNOTATION_TYPE_TEXT,
85+
EV_ANNOTATION_TYPE_ATTACHMENT
8686
} EvAnnotationType;
8787

8888
typedef enum {
89-
EV_ANNOTATION_TEXT_ICON_NOTE,
90-
EV_ANNOTATION_TEXT_ICON_COMMENT,
91-
EV_ANNOTATION_TEXT_ICON_KEY,
92-
EV_ANNOTATION_TEXT_ICON_HELP,
93-
EV_ANNOTATION_TEXT_ICON_NEW_PARAGRAPH,
94-
EV_ANNOTATION_TEXT_ICON_PARAGRAPH,
95-
EV_ANNOTATION_TEXT_ICON_INSERT,
96-
EV_ANNOTATION_TEXT_ICON_CROSS,
97-
EV_ANNOTATION_TEXT_ICON_CIRCLE,
98-
EV_ANNOTATION_TEXT_ICON_UNKNOWN
89+
EV_ANNOTATION_TEXT_ICON_NOTE,
90+
EV_ANNOTATION_TEXT_ICON_COMMENT,
91+
EV_ANNOTATION_TEXT_ICON_KEY,
92+
EV_ANNOTATION_TEXT_ICON_HELP,
93+
EV_ANNOTATION_TEXT_ICON_NEW_PARAGRAPH,
94+
EV_ANNOTATION_TEXT_ICON_PARAGRAPH,
95+
EV_ANNOTATION_TEXT_ICON_INSERT,
96+
EV_ANNOTATION_TEXT_ICON_CROSS,
97+
EV_ANNOTATION_TEXT_ICON_CIRCLE,
98+
EV_ANNOTATION_TEXT_ICON_UNKNOWN
9999
} EvAnnotationTextIcon;
100100

101101
/* EvAnnotation */
@@ -104,59 +104,63 @@ EvAnnotationType ev_annotation_get_annotation_type (EvAnnotation
104104
EvPage *ev_annotation_get_page (EvAnnotation *annot);
105105
guint ev_annotation_get_page_index (EvAnnotation *annot);
106106
gboolean ev_annotation_equal (EvAnnotation *annot,
107-
EvAnnotation *other);
107+
EvAnnotation *other);
108108
const gchar *ev_annotation_get_contents (EvAnnotation *annot);
109109
gboolean ev_annotation_set_contents (EvAnnotation *annot,
110-
const gchar *contents);
110+
const gchar *contents);
111111
const gchar *ev_annotation_get_name (EvAnnotation *annot);
112112
gboolean ev_annotation_set_name (EvAnnotation *annot,
113-
const gchar *name);
113+
const gchar *name);
114114
const gchar *ev_annotation_get_modified (EvAnnotation *annot);
115115
gboolean ev_annotation_set_modified (EvAnnotation *annot,
116-
const gchar *modified);
116+
const gchar *modified);
117117
gboolean ev_annotation_set_modified_from_time (EvAnnotation *annot,
118-
GTime utime);
118+
GTime utime);
119119
void ev_annotation_get_color (EvAnnotation *annot,
120-
GdkColor *color);
120+
GdkColor *color);
121121
gboolean ev_annotation_set_color (EvAnnotation *annot,
122-
const GdkColor *color);
122+
const GdkColor *color);
123+
void ev_annotation_get_rgba (EvAnnotation *annot,
124+
GdkRGBA *rgba);
125+
gboolean ev_annotation_set_rgba (EvAnnotation *annot,
126+
const GdkRGBA *rgba);
123127

124128
/* EvAnnotationMarkup */
125129
GType ev_annotation_markup_get_type (void) G_GNUC_CONST;
126130
const gchar *ev_annotation_markup_get_label (EvAnnotationMarkup *markup);
127131
gboolean ev_annotation_markup_set_label (EvAnnotationMarkup *markup,
128-
const gchar *label);
132+
const gchar *label);
129133
gdouble ev_annotation_markup_get_opacity (EvAnnotationMarkup *markup);
130134
gboolean ev_annotation_markup_set_opacity (EvAnnotationMarkup *markup,
131-
gdouble opacity);
135+
gdouble opacity);
132136
gboolean ev_annotation_markup_has_popup (EvAnnotationMarkup *markup);
133137
gboolean ev_annotation_markup_set_has_popup (EvAnnotationMarkup *markup,
134-
gboolean has_popup);
138+
gboolean has_popup);
135139
void ev_annotation_markup_get_rectangle (EvAnnotationMarkup *markup,
136-
EvRectangle *ev_rect);
140+
EvRectangle *ev_rect);
137141
gboolean ev_annotation_markup_set_rectangle (EvAnnotationMarkup *markup,
138-
const EvRectangle *ev_rect);
142+
const EvRectangle *ev_rect);
139143
gboolean ev_annotation_markup_get_popup_is_open (EvAnnotationMarkup *markup);
140144
gboolean ev_annotation_markup_set_popup_is_open (EvAnnotationMarkup *markup,
141-
gboolean is_open);
145+
gboolean is_open);
142146

143147
/* EvAnnotationText */
144148
GType ev_annotation_text_get_type (void) G_GNUC_CONST;
145149
EvAnnotation *ev_annotation_text_new (EvPage *page);
146150
EvAnnotationTextIcon ev_annotation_text_get_icon (EvAnnotationText *text);
147151
gboolean ev_annotation_text_set_icon (EvAnnotationText *text,
148-
EvAnnotationTextIcon icon);
152+
EvAnnotationTextIcon icon);
149153
gboolean ev_annotation_text_get_is_open (EvAnnotationText *text);
150154
gboolean ev_annotation_text_set_is_open (EvAnnotationText *text,
151-
gboolean is_open);
155+
gboolean is_open);
152156

153157
/* EvAnnotationAttachment */
154158
GType ev_annotation_attachment_get_type (void) G_GNUC_CONST;
155159
EvAnnotation *ev_annotation_attachment_new (EvPage *page,
156-
EvAttachment *attachment);
160+
EvAttachment *attachment);
157161
EvAttachment *ev_annotation_attachment_get_attachment (EvAnnotationAttachment *annot);
158162
gboolean ev_annotation_attachment_set_attachment (EvAnnotationAttachment *annot,
159-
EvAttachment *attachment);
163+
EvAttachment *attachment);
160164

161165
G_END_DECLS
162166

0 commit comments

Comments
 (0)