Commit 03766a1a authored by Matthias Clasen's avatar Matthias Clasen

Don't use G_DISABLE_DEPRECATED guards around deprecated functions

I'm leaving the old-style deprecation guards in place around
deprecated macros, enumeration values, etc, for now.
parent f9c2362e
......@@ -44,13 +44,11 @@ void g_async_queue_unlock (GAsyncQueue *queue);
GAsyncQueue *g_async_queue_ref (GAsyncQueue *queue);
void g_async_queue_unref (GAsyncQueue *queue);
#ifndef G_DISABLE_DEPRECATED
GLIB_DEPRECATED_FOR(g_async_queue_ref)
void g_async_queue_ref_unlocked (GAsyncQueue *queue);
GLIB_DEPRECATED_FOR(g_async_queue_unref)
void g_async_queue_unref_and_unlock (GAsyncQueue *queue);
#endif /* !G_DISABLE_DEPRECATED */
void g_async_queue_push (GAsyncQueue *queue,
gpointer data);
......
......@@ -62,11 +62,9 @@ gsize g_atomic_pointer_or (volatile void *a
gsize g_atomic_pointer_xor (volatile void *atomic,
gsize val);
#ifndef G_DISABLE_DEPRECATED
GLIB_DEPRECATED_FOR(g_atomic_add)
gint g_atomic_int_exchange_and_add (volatile gint *atomic,
gint val);
#endif
G_END_DECLS
......
......@@ -155,13 +155,11 @@ gint g_mkdir_with_parents (const gchar *pathname,
gboolean g_path_is_absolute (const gchar *file_name);
const gchar *g_path_skip_root (const gchar *file_name);
#ifndef G_DISABLE_DEPRECATED
GLIB_DEPRECATED_FOR(g_path_get_basename)
const gchar *g_basename (const gchar *file_name);
#ifndef G_DISABLE_DEPRECATED
#define g_dirname g_path_get_dirname
#endif /* G_DISABLE_DEPRECATED */
#endif
#ifndef __GTK_DOC_IGNORE__
#ifdef G_OS_WIN32
......
......@@ -111,11 +111,9 @@ GHashTable* g_hash_table_ref (GHashTable *hash_table);
void g_hash_table_unref (GHashTable *hash_table);
#ifndef G_DISABLE_DEPRECATED
#define g_hash_table_freeze(hash_table) ((void)0)
#define g_hash_table_thaw(hash_table) ((void)0)
#endif /* G_DISABLE_DEPRECATED */
#endif
/* Hash Functions
*/
......
......@@ -40,8 +40,6 @@
#include <unistd.h>
#endif
#undef G_DISABLE_DEPRECATED
#include "giochannel.h"
#include "gstrfuncs.h"
......
......@@ -173,7 +173,6 @@ void g_io_channel_init (GIOChannel *channel);
GIOChannel *g_io_channel_ref (GIOChannel *channel);
void g_io_channel_unref (GIOChannel *channel);
#ifndef G_DISABLE_DEPRECATED
GLIB_DEPRECATED_FOR(g_io_channel_read_for)
GIOError g_io_channel_read (GIOChannel *channel,
gchar *buf,
......@@ -193,7 +192,6 @@ GIOError g_io_channel_seek (GIOChannel *channel,
GLIB_DEPRECATED_FOR(g_io_channel_shutdown)
void g_io_channel_close (GIOChannel *channel);
#endif /* G_DISABLE_DEPRECATED */
GIOStatus g_io_channel_shutdown (GIOChannel *channel,
gboolean flush,
......
......@@ -98,13 +98,11 @@
#include <glib/gwin32.h>
#endif
#ifndef G_DISABLE_DEPRECATED
#include <glib/deprecated/gallocator.h>
#include <glib/deprecated/gcache.h>
#include <glib/deprecated/gcompletion.h>
#include <glib/deprecated/grel.h>
#include <glib/deprecated/gthread.h>
#endif
#undef __GLIB_H_INSIDE__
......
......@@ -407,11 +407,10 @@ void g_source_add_child_source (GSource *source,
void g_source_remove_child_source (GSource *source,
GSource *child_source);
#ifndef G_DISABLE_DEPRECATED
GLIB_DEPRECATED_FOR(g_source_get_time)
void g_source_get_current_time (GSource *source,
GTimeVal *timeval);
#endif
gint64 g_source_get_time (GSource *source);
/* void g_source_connect_closure (GSource *source,
......
......@@ -43,10 +43,8 @@ gchar *g_mapped_file_get_contents (GMappedFile *file);
GMappedFile *g_mapped_file_ref (GMappedFile *file);
void g_mapped_file_unref (GMappedFile *file);
#ifndef G_DISABLE_DEPRECATED
GLIB_DEPRECATED_FOR(g_mapped_file_unref)
void g_mapped_file_free (GMappedFile *file);
#endif
G_END_DECLS
......
......@@ -121,13 +121,12 @@ void g_warn_message (const char *domain,
int line,
const char *func,
const char *warnexpr);
#ifndef G_DISABLE_DEPRECATED
GLIB_DEPRECATED
void g_assert_warning (const char *log_domain,
const char *file,
const int line,
const char *pretty_function,
const char *expression) G_GNUC_NORETURN;
#endif /* !G_DISABLE_DEPRECATED */
#ifndef G_LOG_DOMAIN
......
......@@ -167,17 +167,10 @@ gchar* g_ascii_strdown (const gchar *str,
gchar* g_ascii_strup (const gchar *str,
gssize len) G_GNUC_MALLOC;
#ifndef G_DISABLE_DEPRECATED
/* The following four functions are deprecated and will be removed in
* the next major release. They use the locale-specific tolower and
* toupper, which is almost never the right thing.
*/
GLIB_DEPRECATED
gint g_strcasecmp (const gchar *s1,
const gchar *s2);
GLIB_DEPRECATED
gint g_strncasecmp (const gchar *s1,
const gchar *s2,
......@@ -187,7 +180,6 @@ gchar* g_strdown (gchar *string);
GLIB_DEPRECATED
gchar* g_strup (gchar *string);
#endif /* G_DISABLE_DEPRECATED */
/* String utility functions that return a newly allocated string which
* ought to be freed with g_free from the caller at some point.
......
......@@ -140,17 +140,15 @@ g_string_append_c_inline (GString *gstring,
#endif /* G_CAN_INLINE */
#ifndef G_DISABLE_DEPRECATED
GLIB_DEPRECATED
GString *g_string_down (GString *string);
GLIB_DEPRECATED
GString *g_string_up (GString *string);
#ifndef G_DISABLE_DEPRECATED
#define g_string_sprintf g_string_printf
#define g_string_sprintfa g_string_append_printf
#endif /* G_DISABLE_DEPRECATED */
#endif
G_END_DECLS
......
......@@ -73,13 +73,11 @@ void g_tree_foreach (GTree *tree,
GTraverseFunc func,
gpointer user_data);
#ifndef G_DISABLE_DEPRECATED
GLIB_DEPRECATED
void g_tree_traverse (GTree *tree,
GTraverseFunc traverse_func,
GTraverseType traverse_type,
gpointer user_data);
#endif /* G_DISABLE_DEPRECATED */
gpointer g_tree_search (GTree *tree,
GCompareFunc search_func,
......
......@@ -558,12 +558,9 @@ void g_unicode_canonical_ordering (gunichar *string,
gsize len);
#ifndef G_DISABLE_DEPRECATED
/* Deprecated. Use g_unichar_fully_decompose() */
GLIB_DEPRECATED
gunichar *g_unicode_canonical_decomposition (gunichar ch,
gsize *result_len) G_GNUC_MALLOC;
#endif
/* Array of skip-bytes-per-initial character.
*/
......
......@@ -211,10 +211,10 @@ gchar *g_format_size_full (guint64 size,
GFormatSizeFlags flags);
gchar *g_format_size (guint64 size);
#ifndef G_DISABLE_DEPRECATED
GLIB_DEPRECATED_FOR(g_format_size)
gchar *g_format_size_for_display (goffset size);
#ifndef G_DISABLE_DEPRECATED
/**
* GVoidFunc:
*
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment