luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-04-01 21:33:09 +02:00
Code Issues Packages Projects Releases Wiki Activity

Move deprecated GCompletion to deprecated/

Browse Source 
Keep the docs for now, though.  We'll remove them after a few more
cycles.

https://bugzilla.gnome.org/show_bug.cgi?id=659427
This commit is contained in:
Ryan Lortie 2011-09-18 20:36:30 -04:00
parent c3fc0c285f
commit e88a12caa0
4 changed files with 9 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
glib/Makefile.am
View File

@ -113,6 +113,7 @@ uninstall-ms-lib:
deprecated_sources = \ deprecated_sources = \
deprecated/gallocator.c \ deprecated/gallocator.c \
deprecated/gcompletion.c \
deprecated/grel.c deprecated/grel.c
libglib_2_0_la_SOURCES = \ libglib_2_0_la_SOURCES = \
@ -130,7 +131,6 @@ libglib_2_0_la_SOURCES = \
gbufferprivate.h \ gbufferprivate.h \
gcache.c \ gcache.c \
gchecksum.c \ gchecksum.c \
gcompletion.c \
gconvert.c \ gconvert.c \
gdataset.c \ gdataset.c \
gdatasetprivate.h \ gdatasetprivate.h \
@ -237,6 +237,7 @@ glibinclude_HEADERS = \
deprecatedincludedir=$(includedir)/glib-2.0/glib/deprecated deprecatedincludedir=$(includedir)/glib-2.0/glib/deprecated
deprecatedinclude_HEADERS = \ deprecatedinclude_HEADERS = \
deprecated/gallocator.h \ deprecated/gallocator.h \
deprecated/gcompletion.h \
deprecated/grel.h deprecated/grel.h
glibsubincludedir=$(includedir)/glib-2.0/glib glibsubincludedir=$(includedir)/glib-2.0/glib
@ -251,7 +252,6 @@ glibsubinclude_HEADERS = \
gbookmarkfile.h \ gbookmarkfile.h \
gcache.h \ gcache.h \
gchecksum.h \ gchecksum.h \
gcompletion.h \
gconvert.h \ gconvert.h \
gdataset.h \ gdataset.h \
gdate.h \ gdate.h \

14
glib/gcompletion.c → glib/deprecated/gcompletion.c
View File

@ -30,16 +30,14 @@
#include "config.h" #include "config.h"
#include <string.h>
#include "gstrfuncs.h"
#include "gmessages.h"
#include "gunicode.h"
#undef G_DISABLE_DEPRECATED
#include "gcompletion.h" #include "gcompletion.h"
#include <glib/gstrfuncs.h>
#include <glib/gmessages.h>
#include <glib/gunicode.h>
#include <string.h>
/** /**
* SECTION:completion * SECTION:completion
* @title: Automatic String Completion * @title: Automatic String Completion

4
glib/gcompletion.h → glib/deprecated/gcompletion.h
View File

@ -56,8 +56,6 @@ struct _GCompletion
GCompletionStrncmpFunc strncmp_func; GCompletionStrncmpFunc strncmp_func;
}; };
#ifndef G_DISABLE_DEPRECATED
GCompletion* g_completion_new (GCompletionFunc func); GCompletion* g_completion_new (GCompletionFunc func);
void g_completion_add_items (GCompletion* cmp, void g_completion_add_items (GCompletion* cmp,
GList* items); GList* items);
@ -74,8 +72,6 @@ void g_completion_set_compare (GCompletion *cmp,
GCompletionStrncmpFunc strncmp_func); GCompletionStrncmpFunc strncmp_func);
void g_completion_free (GCompletion* cmp); void g_completion_free (GCompletion* cmp);
#endif
G_END_DECLS G_END_DECLS
#endif /* __G_COMPLETION_H__ */ #endif /* __G_COMPLETION_H__ */

2
glib/glib.h
View File

@ -39,7 +39,6 @@
#include <glib/gbookmarkfile.h> #include <glib/gbookmarkfile.h>
#include <glib/gcache.h> #include <glib/gcache.h>
#include <glib/gchecksum.h> #include <glib/gchecksum.h>
#include <glib/gcompletion.h>
#include <glib/gconvert.h> #include <glib/gconvert.h>
#include <glib/gdataset.h> #include <glib/gdataset.h>
#include <glib/gdate.h> #include <glib/gdate.h>
@ -96,6 +95,7 @@
#ifndef G_DISABLE_DEPRECATED #ifndef G_DISABLE_DEPRECATED
#include <glib/deprecated/gallocator.h> #include <glib/deprecated/gallocator.h>
#include <glib/deprecated/gcompletion.h>
#include <glib/deprecated/grel.h> #include <glib/deprecated/grel.h>
#endif #endif