Skip to content

Commit 9456412

Browse files
committed
libgimpconfig: fix a lot of gtk-doc warnings
1 parent 1af54c7 commit 9456412

8 files changed

+36
-21
lines changed

devel-docs/libgimpconfig/libgimpconfig-sections.txt

+3
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,11 @@
33
<TITLE>GimpConfig</TITLE>
44
GimpConfig
55
GimpConfigInterface
6+
gimp_config_serialize
67
gimp_config_serialize_to_file
78
gimp_config_serialize_to_fd
89
gimp_config_serialize_to_string
10+
gimp_config_deserialize
911
gimp_config_deserialize_file
1012
gimp_config_deserialize_string
1113
gimp_config_deserialize_return
@@ -63,6 +65,7 @@ GIMP_CONFIG_INSTALL_PROP_POINTER
6365

6466
<SECTION>
6567
<FILE>gimpconfig-path</FILE>
68+
GimpConfigPath
6669
GimpConfigPathType
6770
gimp_param_spec_config_path
6871
gimp_param_spec_config_path_type
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
#include <glib-object.h>
22
#include <libgimpconfig/gimpconfig.h>
33

4+
gimp_config_interface_get_type
45
gimp_color_config_get_type

libgimpconfig/gimpconfig-deserialize.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ scanner_string_utf8_valid (GScanner *scanner,
112112
* gimp_config_deserialize_properties:
113113
* @config: a #GimpConfig.
114114
* @scanner: a #GScanner.
115-
* @nest_level:
115+
* @nest_level: the nest level
116116
*
117117
* This function uses the @scanner to configure the properties of @config.
118118
*
@@ -213,7 +213,7 @@ gimp_config_deserialize_properties (GimpConfig *config,
213213
* gimp_config_deserialize_property:
214214
* @config: a #GimpConfig.
215215
* @scanner: a #GScanner.
216-
* @nest_level:
216+
* @nest_level: the nest level
217217
*
218218
* This function deserializes a single property of @config. You
219219
* shouldn't need to call this function directly. If possible, use

libgimpconfig/gimpconfig-error.h

+15-5
Original file line numberDiff line numberDiff line change
@@ -26,13 +26,23 @@ G_BEGIN_DECLS
2626
/* For information look into the C source or the html documentation */
2727

2828

29+
/**
30+
* GimpConfigError:
31+
* @GIMP_CONFIG_ERROR_OPEN: open failed
32+
* @GIMP_CONFIG_ERROR_OPEN_ENOENT: file does not exist
33+
* @GIMP_CONFIG_ERROR_WRITE: write failed
34+
* @GIMP_CONFIG_ERROR_PARSE: parser error
35+
* @GIMP_CONFIG_ERROR_VERSION: parser failed due to version mismatch
36+
*
37+
* The possible values of a #GError thrown by libgimpconfig.
38+
**/
2939
typedef enum
3040
{
31-
GIMP_CONFIG_ERROR_OPEN, /* open failed */
32-
GIMP_CONFIG_ERROR_OPEN_ENOENT, /* file does not exist */
33-
GIMP_CONFIG_ERROR_WRITE, /* write failed */
34-
GIMP_CONFIG_ERROR_PARSE, /* parser error */
35-
GIMP_CONFIG_ERROR_VERSION /* parser failed due to version mismatch */
41+
GIMP_CONFIG_ERROR_OPEN,
42+
GIMP_CONFIG_ERROR_OPEN_ENOENT,
43+
GIMP_CONFIG_ERROR_WRITE,
44+
GIMP_CONFIG_ERROR_PARSE,
45+
GIMP_CONFIG_ERROR_VERSION
3646
} GimpConfigError;
3747

3848
#define GIMP_CONFIG_ERROR (gimp_config_error_quark ())

libgimpconfig/gimpconfig-iface.c

+10-10
Original file line numberDiff line numberDiff line change
@@ -263,7 +263,7 @@ gimp_config_iface_copy (GimpConfig *src,
263263
* @header: optional file header (must be ASCII only)
264264
* @footer: optional file footer (must be ASCII only)
265265
* @data: user data passed to the serialize implementation.
266-
* @error:
266+
* @error: return location for a possible error
267267
*
268268
* Serializes the object properties of @config to the file specified
269269
* by @filename. If a file with that name already exists, it is
@@ -336,7 +336,7 @@ gimp_config_serialize_to_fd (GimpConfig *config,
336336
*
337337
* Serializes the object properties of @config to a string.
338338
*
339-
* Return value: a newly allocated %NUL-terminated string.
339+
* Return value: a newly allocated NUL-terminated string.
340340
*
341341
* Since: GIMP 2.4
342342
**/
@@ -364,7 +364,7 @@ gimp_config_serialize_to_string (GimpConfig *config,
364364
* @config: a #GObject that implements the #GimpConfigInterface.
365365
* @filename: the name of the file to read configuration from.
366366
* @data: user data passed to the deserialize implementation.
367-
* @error:
367+
* @error: return location for a possible error
368368
*
369369
* Opens the file specified by @filename, reads configuration data
370370
* from it and configures @config accordingly. Basically this function
@@ -409,11 +409,11 @@ gimp_config_deserialize_file (GimpConfig *config,
409409

410410
/**
411411
* gimp_config_deserialize_string:
412-
* @config: a #GObject that implements the #GimpConfigInterface.
413-
* @text: string to deserialize (in UTF-8 encoding)
412+
* @config: a #GObject that implements the #GimpConfigInterface.
413+
* @text: string to deserialize (in UTF-8 encoding)
414414
* @text_len: length of @text in bytes or -1
415-
* @data:
416-
* @error:
415+
* @data: client data
416+
* @error: return location for a possible error
417417
*
418418
* Configures @config from @text. Basically this function creates a
419419
* properly configured #GScanner for you and calls the deserialize
@@ -456,9 +456,9 @@ gimp_config_deserialize_string (GimpConfig *config,
456456

457457
/**
458458
* gimp_config_deserialize_return:
459-
* @scanner:
460-
* @expected_token:
461-
* @nest_level:
459+
* @scanner: a #GScanner
460+
* @expected_token: the expected token
461+
* @nest_level: the next level
462462
*
463463
* Returns:
464464
*

libgimpconfig/gimpconfig-path.c

+3-3
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ gimp_param_config_path_class_init (GParamSpecClass *class)
131131
* @name: Canonical name of the param
132132
* @nick: Nickname of the param
133133
* @blurb: Brief desciption of param.
134-
* @type: a #GimpParamConfigPathType value.
134+
* @type: a #GimpConfigPathType value.
135135
* @default_value: Value to use if none is assigned.
136136
* @flags: a combination of #GParamFlags
137137
*
@@ -269,7 +269,7 @@ gimp_config_build_writable_path (const gchar *name)
269269

270270
/**
271271
* gimp_config_path_expand:
272-
* @path: a %NUL-terminated string in UTF-8 encoding
272+
* @path: a NUL-terminated string in UTF-8 encoding
273273
* @recode: whether to convert to the filesystem's encoding
274274
* @error: return location for errors
275275
*
@@ -281,7 +281,7 @@ gimp_config_build_writable_path (const gchar *name)
281281
* substitution for you and can also attempt to convert to the
282282
* filesystem encoding.
283283
*
284-
* Return value: a newly allocated %NUL-terminated string
284+
* Return value: a newly allocated NUL-terminated string
285285
*
286286
* Since: GIMP 2.4
287287
**/

libgimpconfig/gimpconfig-serialize.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -347,7 +347,7 @@ gimp_config_serialize_property_by_name (GimpConfig *config,
347347
/**
348348
* gimp_config_serialize_value:
349349
* @value: a #GValue.
350-
* @str: a #Gstring.
350+
* @str: a #GString.
351351
* @escaped: whether to escape string values.
352352
*
353353
* This utility function appends a string representation of #GValue to @str.

libgimpconfig/gimpconfigtypes.h

+1
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828

2929
typedef struct _GimpConfig GimpConfig; /* dummy typedef */
3030
typedef struct _GimpConfigWriter GimpConfigWriter;
31+
typedef gchar * GimpConfigPath; /* to satisfy docs */
3132

3233

3334
#include <libgimpconfig/gimpcolorconfig-enums.h>

0 commit comments

Comments
 (0)