diff options
Diffstat (limited to 'glib')
| -rw-r--r-- | glib/docs.c | 2 | ||||
| -rw-r--r-- | glib/gconvert.c | 2 | ||||
| -rw-r--r-- | glib/gerror.c | 2 | ||||
| -rw-r--r-- | glib/ggettext.c | 6 | ||||
| -rw-r--r-- | glib/glib-init.c | 2 | ||||
| -rw-r--r-- | glib/gmain.c | 8 | ||||
| -rw-r--r-- | glib/gmain.h | 8 | ||||
| -rw-r--r-- | glib/gmessages.c | 8 | ||||
| -rw-r--r-- | glib/goption.c | 2 | ||||
| -rw-r--r-- | glib/gquark.c | 2 | ||||
| -rw-r--r-- | glib/gtypes.h | 2 | ||||
| -rw-r--r-- | glib/gutf8.c | 2 | ||||
| -rw-r--r-- | glib/gutils.c | 6 | ||||
| -rw-r--r-- | glib/gwin32.c | 4 |
14 files changed, 28 insertions, 28 deletions
diff --git a/glib/docs.c b/glib/docs.c index 69d81c09a..450616eb9 100644 --- a/glib/docs.c +++ b/glib/docs.c @@ -1068,7 +1068,7 @@ * @title: Type Conversion Macros * @short_description: portably storing integers in pointer variables * - * Many times GLib, GTK+, and other libraries allow you to pass "user + * Many times GLib, GTK, and other libraries allow you to pass "user * data" to a callback, in the form of a void pointer. From time to time * you want to pass an integer instead of a pointer. You could allocate * an integer, with something like: diff --git a/glib/gconvert.c b/glib/gconvert.c index 829fe38de..baf970244 100644 --- a/glib/gconvert.c +++ b/glib/gconvert.c @@ -85,7 +85,7 @@ * Character: P r e s e n t a c i รณ n . s x i * Hex code: 50 72 65 73 65 6e 74 61 63 69 c3 b3 6e 2e 73 78 69 * ]| - * Glib uses UTF-8 for its strings, and GUI toolkits like GTK+ that use + * Glib uses UTF-8 for its strings, and GUI toolkits like GTK that use * GLib do the same thing. If you get a file name from the file system, * for example, from readdir() or from g_dir_read_name(), and you wish * to display the file name to the user, you will need to convert it diff --git a/glib/gerror.c b/glib/gerror.c index 7ac85fc66..ea168e020 100644 --- a/glib/gerror.c +++ b/glib/gerror.c @@ -53,7 +53,7 @@ * These two kinds of errors are fundamentally different: runtime errors * should be handled or reported to the user, programming errors should * be eliminated by fixing the bug in the program. This is why most - * functions in GLib and GTK+ do not use the #GError facility. + * functions in GLib and GTK do not use the #GError facility. * * Functions that can fail take a return location for a #GError as their * last argument. On error, a new #GError instance will be allocated and diff --git a/glib/ggettext.c b/glib/ggettext.c index 42f3d0e72..71654fb84 100644 --- a/glib/ggettext.c +++ b/glib/ggettext.c @@ -362,12 +362,12 @@ _g_dgettext_should_translate (void) * translations for the current locale. * * The advantage of using this function over dgettext() proper is that - * libraries using this function (like GTK+) will not use translations + * libraries using this function (like GTK) will not use translations * if the application using the library does not have translations for * the current locale. This results in a consistent English-only * interface instead of one having partial translations. For this * feature to work, the call to textdomain() and setlocale() should - * precede any g_dgettext() invocations. For GTK+, it means calling + * precede any g_dgettext() invocations. For GTK, it means calling * textdomain() before gtk_init or its variants. * * This function disables translations if and only if upon its first @@ -385,7 +385,7 @@ _g_dgettext_should_translate (void) * * Note that this behavior may not be desired for example if an application * has its untranslated messages in a language other than English. In those - * cases the application should call textdomain() after initializing GTK+. + * cases the application should call textdomain() after initializing GTK. * * Applications should normally not use this function directly, * but use the _() macro for translations. diff --git a/glib/glib-init.c b/glib/glib-init.c index c513f5190..933f891da 100644 --- a/glib/glib-init.c +++ b/glib/glib-init.c @@ -220,7 +220,7 @@ G_STATIC_ASSERT (sizeof (int) == sizeof (gint32)); * * Parses a string containing debugging options * into a %guint containing bit flags. This is used - * within GDK and GTK+ to parse the debug options passed on the + * within GDK and GTK to parse the debug options passed on the * command line or through environment variables. * * If @string is equal to "all", all flags are set. Any flags diff --git a/glib/gmain.c b/glib/gmain.c index b994b59b1..b91e68d36 100644 --- a/glib/gmain.c +++ b/glib/gmain.c @@ -133,7 +133,7 @@ * @short_description: manages all available sources of events * * The main event loop manages all the available sources of events for - * GLib and GTK+ applications. These events can come from any number of + * GLib and GTK applications. These events can come from any number of * different types of sources such as file descriptors (plain files, * pipes or sockets) and timeouts. New types of event sources can also * be added using g_source_attach(). @@ -165,12 +165,12 @@ * exit the main loop, and g_main_loop_run() returns. * * It is possible to create new instances of #GMainLoop recursively. - * This is often used in GTK+ applications when showing modal dialog + * This is often used in GTK applications when showing modal dialog * boxes. Note that event sources are associated with a particular * #GMainContext, and will be checked and dispatched for all main * loops associated with that GMainContext. * - * GTK+ contains wrappers of some of these functions, e.g. gtk_main(), + * GTK contains wrappers of some of these functions, e.g. gtk_main(), * gtk_main_quit() and gtk_events_pending(). * * ## Creating new source types @@ -2197,7 +2197,7 @@ g_source_set_name_full (GSource *source, * * The source name should describe in a human-readable way * what the source does. For example, "X11 event queue" - * or "GTK+ repaint idle handler" or whatever it is. + * or "GTK repaint idle handler" or whatever it is. * * It is permitted to call this function multiple times, but is not * recommended due to the potential performance impact. For example, diff --git a/glib/gmain.h b/glib/gmain.h index 7109e63dc..14a1d2b06 100644 --- a/glib/gmain.h +++ b/glib/gmain.h @@ -73,7 +73,7 @@ typedef struct _GMainContext GMainContext; * GMainLoop: * * The `GMainLoop` struct is an opaque data type - * representing the main event loop of a GLib or GTK+ application. + * representing the main event loop of a GLib or GTK application. */ typedef struct _GMainLoop GMainLoop; @@ -324,7 +324,7 @@ struct _GSourceFuncs * * Use this for high priority event sources. * - * It is not used within GLib or GTK+. + * It is not used within GLib or GTK. */ #define G_PRIORITY_HIGH -100 @@ -344,7 +344,7 @@ struct _GSourceFuncs * * Use this for high priority idle functions. * - * GTK+ uses %G_PRIORITY_HIGH_IDLE + 10 for resizing operations, + * GTK uses %G_PRIORITY_HIGH_IDLE + 10 for resizing operations, * and %G_PRIORITY_HIGH_IDLE + 20 for redrawing operations. (This is * done to ensure that any pending resizes are processed before any * pending redraws, so that widgets are not redrawn twice unnecessarily.) @@ -366,7 +366,7 @@ struct _GSourceFuncs * * Use this for very low priority background tasks. * - * It is not used within GLib or GTK+. + * It is not used within GLib or GTK. */ #define G_PRIORITY_LOW 300 diff --git a/glib/gmessages.c b/glib/gmessages.c index 541b08130..45906a754 100644 --- a/glib/gmessages.c +++ b/glib/gmessages.c @@ -241,7 +241,7 @@ * not advisable, as it cannot be filtered against using the `G_MESSAGES_DEBUG` * environment variable. * - * For example, GTK+ uses this in its `Makefile.am`: + * For example, GTK uses this in its `Makefile.am`: * |[ * AM_CPPFLAGS = -DG_LOG_DOMAIN=\"Gtk\" * ]| @@ -831,7 +831,7 @@ g_log_set_fatal_mask (const gchar *log_domain, * | G_LOG_FLAG_RECURSION, my_log_handler, NULL); * ]| * - * This example adds a log handler for all critical messages from GTK+: + * This example adds a log handler for all critical messages from GTK: * * |[<!-- language="C" --> * g_log_set_handler ("Gtk", G_LOG_LEVEL_CRITICAL | G_LOG_FLAG_FATAL @@ -3295,7 +3295,7 @@ g_log_default_handler (const gchar *log_domain, * Any messages passed to g_print() will be output via * the new handler. The default handler outputs * the encoded message to stdout. By providing your own handler - * you can redirect the output, to a GTK+ widget or a + * you can redirect the output, to a GTK widget or a * log file for example. * * Since 2.76 this functions always returns a valid @@ -3424,7 +3424,7 @@ g_print (const gchar *format, * Any messages passed to g_printerr() will be output via * the new handler. The default handler outputs the encoded * message to stderr. By providing your own handler you can - * redirect the output, to a GTK+ widget or a log file for + * redirect the output, to a GTK widget or a log file for * example. * * Since 2.76 this functions always returns a valid diff --git a/glib/goption.c b/glib/goption.c index 64aed7a03..ee40e90bd 100644 --- a/glib/goption.c +++ b/glib/goption.c @@ -65,7 +65,7 @@ * Help Options: * -h, --help Show help options * --help-all Show all help options - * --help-gtk Show GTK+ Options + * --help-gtk Show GTK Options * * Application Options: * -r, --repeats=N Average over N repetitions diff --git a/glib/gquark.c b/glib/gquark.c index cdd9bdf9a..42cb39364 100644 --- a/glib/gquark.c +++ b/glib/gquark.c @@ -246,7 +246,7 @@ g_quark_from_string (const gchar *string) * with statically allocated strings in the main program, but not with * statically allocated memory in dynamically loaded modules, if you * expect to ever unload the module again (e.g. do not use this - * function in GTK+ theme engines). + * function in GTK theme engines). * * This function must not be used before library constructors have finished * running. In particular, this means it cannot be used to initialize global diff --git a/glib/gtypes.h b/glib/gtypes.h index 9d68f93a7..9d912d523 100644 --- a/glib/gtypes.h +++ b/glib/gtypes.h @@ -165,7 +165,7 @@ typedef gpointer (*GCopyFunc) (gconstpointer src, * * Declares a type of function which takes an arbitrary * data pointer argument and has no return value. It is - * not currently used in GLib or GTK+. + * not currently used in GLib or GTK. */ typedef void (*GFreeFunc) (gpointer data); diff --git a/glib/gutf8.c b/glib/gutf8.c index a018f2a8d..3fa2def66 100644 --- a/glib/gutf8.c +++ b/glib/gutf8.c @@ -1678,7 +1678,7 @@ fast_validate_len (const char *str, * Note that g_utf8_validate() returns %FALSE if @max_len is * positive and any of the @max_len bytes are nul. * - * Returns %TRUE if all of @str was valid. Many GLib and GTK+ + * Returns %TRUE if all of @str was valid. Many GLib and GTK * routines require valid UTF-8 as input; so data read from a file * or the network should be checked with g_utf8_validate() before * doing anything else with it. diff --git a/glib/gutils.c b/glib/gutils.c index dce7cbee5..dddfa9b90 100644 --- a/glib/gutils.c +++ b/glib/gutils.c @@ -1138,7 +1138,7 @@ static const gchar *g_prgname = NULL; /* always a quark */ * in contrast to g_get_application_name(). * * If you are using #GApplication the program name is set in - * g_application_run(). In case of GDK or GTK+ it is set in + * g_application_run(). In case of GDK or GTK it is set in * gdk_init(), which is called by gtk_init() and the * #GtkApplication::startup handler. The program name is found by * taking the last component of @argv[0]. @@ -1167,7 +1167,7 @@ g_get_prgname (void) * in contrast to g_set_application_name(). * * If you are using #GApplication the program name is set in - * g_application_run(). In case of GDK or GTK+ it is set in + * g_application_run(). In case of GDK or GTK it is set in * gdk_init(), which is called by gtk_init() and the * #GtkApplication::startup handler. The program name is found by * taking the last component of @argv[0]. @@ -2584,7 +2584,7 @@ g_win32_get_system_data_dirs_for_module_real (void (*address_of_function)(void)) /* Using the above subfolders of Documents and Settings perhaps * makes sense from a Windows perspective. * - * But looking at the actual use cases of this function in GTK+ + * But looking at the actual use cases of this function in GTK * and GNOME software, what we really want is the "share" * subdirectory of the installation directory for the package * our caller is a part of. diff --git a/glib/gwin32.c b/glib/gwin32.c index 85053c079..ab9e4b571 100644 --- a/glib/gwin32.c +++ b/glib/gwin32.c @@ -123,8 +123,8 @@ g_win32_getlocale (void) const gchar *script = NULL; /* Let the user override the system settings through environment - * variables, as on POSIX systems. Note that in GTK+ applications - * since GTK+ 2.10.7 setting either LC_ALL or LANG also sets the + * variables, as on POSIX systems. Note that in GTK applications + * since GTK 2.10.7 setting either LC_ALL or LANG also sets the * Win32 locale and C library locale through code in gtkmain.c. */ if (((ev = g_getenv ("LC_ALL")) != NULL && ev[0] != '\0') |