Do not include glib.h and glib/gstdio.h directly

This commit is contained in:
Yevgen Muntyan 2015-12-25 18:07:33 -08:00
parent cb85034693
commit 068e05cb2d
63 changed files with 71 additions and 67 deletions

View File

@ -20,7 +20,7 @@
#ifndef __EGG_DESKTOP_FILE_H__
#define __EGG_DESKTOP_FILE_H__
#include <glib.h>
#include <mooglib/moo-glib.h>
G_BEGIN_DECLS

View File

@ -37,7 +37,7 @@
#include "config.h"
#include "eggsmclient-private.h"
#include <glib.h>
#include <mooglib/moo-glib.h>
#include <Carbon/Carbon.h>
#include <CoreServices/CoreServices.h>

View File

@ -25,7 +25,7 @@
#include "gtksourcelanguage-private.h"
#include "gtksourcebuffer.h"
#include "gtksourcestyle-private.h"
#include <glib.h>
#include <mooglib/moo-glib.h>
#include <errno.h>
#include <string.h>

View File

@ -42,13 +42,12 @@
#include <io.h>
#endif
#include <libxml/xmlreader.h>
#include <glib/gstdio.h>
#include <mooglib/moo-glib.h>
#include "gtksourceview-i18n.h"
#include "gtksourcebuffer.h"
#include "gtksourcelanguage.h"
#include "gtksourcelanguage-private.h"
#include "gtksourcecontextengine.h"
#include <glib.h>
#define PARSER_ERROR (parser_error_quark ())
#define ATTR_NO_STYLE ""

View File

@ -21,7 +21,7 @@
#ifndef __GTK_SOURCE_LANGUAGE_PRIVATE_H__
#define __GTK_SOURCE_LANGUAGE_PRIVATE_H__
#include <glib.h>
#include <mooglib/moo-glib.h>
#include "gtksourcecontextengine.h"
#include "gtksourcelanguagemanager.h"

View File

@ -33,7 +33,7 @@
#include <fcntl.h>
#include <libxml/xmlreader.h>
#include <glib/gstdio.h>
#include <mooglib/moo-glib.h>
#include "gtksourceview-i18n.h"
#include "gtksourcelanguage-private.h"
#include "gtksourcelanguage.h"

View File

@ -21,7 +21,7 @@
#ifndef __GTK_SOURCE_LANGUAGE_H__
#define __GTK_SOURCE_LANGUAGE_H__
#include <glib.h>
#include <mooglib/moo-glib.h>
#include <glib-object.h>
#include <gtk/gtk.h>

View File

@ -21,7 +21,7 @@
#ifndef __GTK_SOURCE_VIEW_UTILS_H__
#define __GTK_SOURCE_VIEW_UTILS_H__
#include <glib.h>
#include <mooglib/moo-glib.h>
G_BEGIN_DECLS

View File

@ -46,7 +46,7 @@
#include "mooutils/moohelp.h"
#include "mooutils/moocompat.h"
#include "mooutils/mooutils-script.h"
#include <glib.h>
#include <mooglib/moo-glib.h>
#include <string.h>
#include <stdio.h>
#include <errno.h>

View File

@ -20,7 +20,7 @@
#include "mooutils/moocompat.h"
#include <gdk/gdkkeysyms.h>
#include <gtk/gtk.h>
#include <glib.h>
#include <mooglib/moo-glib.h>
#include <string.h>
#include <errno.h>

View File

@ -42,7 +42,7 @@
#include <stdio.h>
#include <errno.h>
#include <glib/gstdio.h>
#include <mooglib/moo-glib.h>
#define ENCODING_LOCALE "LOCALE"

View File

@ -22,7 +22,7 @@
#include "mooedit/mooeditfiltersettings.h"
#include "mooedit/mooedit-impl.h"
#include "mooutils/mooutils.h"
#include <glib.h>
#include <mooglib/moo-glib.h>
#include <string.h>

View File

@ -26,7 +26,7 @@
#include "mooedit/mooeditsavemult-gxml.h"
#include "mooedit/mootryencoding-gxml.h"
#include <gtk/gtk.h>
#include <glib.h>
#include <mooglib/moo-glib.h>
#include <string.h>

View File

@ -22,7 +22,7 @@
#include "mooutils/mooprefs.h"
#include "mooutils/mooutils-misc.h"
#include "mooutils/mooutils-debug.h"
#include <glib.h>
#include <mooglib/moo-glib.h>
#include <string.h>
MOO_DEBUG_INIT(filters, FALSE)

View File

@ -44,7 +44,7 @@
#include "mooutils/mooi18n.h"
#include "mooutils/mooencodings.h"
#include "mooutils/moolist.h"
#include <glib.h>
#include <mooglib/moo-glib.h>
#include <string.h>
#include <stdlib.h>

View File

@ -18,7 +18,7 @@
#endif
#include "mooedit/moolang-private.h"
#include "mooutils/mooi18n.h"
#include <glib/gstdio.h>
#include <mooglib/moo-glib.h>
#include <sys/stat.h>
#include <fcntl.h>
#ifdef HAVE_UNISTD_H

View File

@ -16,7 +16,7 @@
#ifndef MOO_TEXT_BTREE_H
#define MOO_TEXT_BTREE_H
#include <glib.h>
#include <mooglib/moo-glib.h>
G_BEGIN_DECLS

View File

@ -19,7 +19,7 @@
#include <gtk/gtk.h>
#include <mooedit/mooedit-enums.h>
#include <mooutils/moohistorylist.h>
#include <glib.h>
#include <mooglib/moo-glib.h>
G_BEGIN_DECLS

View File

@ -17,7 +17,7 @@
#define MOO_TEXT_SEARCH_PRIVATE_H
#include <mooedit/mootextsearch.h>
#include <glib.h>
#include <mooglib/moo-glib.h>
G_BEGIN_DECLS

View File

@ -16,7 +16,7 @@
#include "mooedit/mootextsearch-private.h"
#include "gtksourceview/gtksourceview-api.h"
#include "mooutils/mooutils-misc.h"
#include <glib.h>
#include <mooglib/moo-glib.h>
#include <string.h>

View File

@ -39,7 +39,7 @@
#include "mooutils/mooutils-gobject.h"
#include "mooedit/mooquicksearch-gxml.h"
#include <gtk/gtk.h>
#include <glib.h>
#include <mooglib/moo-glib.h>
#include <gdk/gdkkeysyms.h>
#include <string.h>

View File

@ -32,7 +32,7 @@
#include <unistd.h>
#endif
#include <gtk/gtk.h>
#include <glib/gstdio.h>
#include <mooglib/moo-glib.h>
#define COLUMN_BOOKMARK MOO_BOOKMARK_MGR_COLUMN_BOOKMARK

View File

@ -31,7 +31,7 @@
#include "mooutils/moostat.h"
#include "marshals.h"
#include "mooutils/moo-mime.h"
#include <glib/gstdio.h>
#include <mooglib/moo-glib.h>
#include <string.h>
#include <sys/types.h>
#include <sys/stat.h>

View File

@ -15,7 +15,7 @@
#include "moofileview/moofile-private.h"
#include <string.h>
#include <glib.h>
#include <mooglib/moo-glib.h>
#ifndef MOO_FILE_VIEW_AUX_H
#define MOO_FILE_VIEW_AUX_H

View File

@ -22,7 +22,7 @@
#include "mooutils/mooutils-fs.h"
#include "mooutils/mooutils-misc.h"
#include "marshals.h"
#include <glib/gstdio.h>
#include <mooglib/moo-glib.h>
#include <string.h>
#include <sys/types.h>
#include <sys/stat.h>

View File

@ -16,7 +16,7 @@
#ifndef MOO_FOLDER_MODEL_PRIVATE_H
#define MOO_FOLDER_MODEL_PRIVATE_H
#include <glib.h>
#include <mooglib/moo-glib.h>
#include <string.h>
G_BEGIN_DECLS

8
moo/mooglib/moo-glib.h Normal file
View File

@ -0,0 +1,8 @@
#pragma once
#include <glib.h>
#include <glib/gstdio.h>
// Fun redefining and undefining things goes on here
//#include <mooglib/moo-glib-wrappers.h>

View File

@ -10,7 +10,7 @@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <glib.h>
#include <mooglib/moo-glib.h>
#define lbaselib_c
#define LUA_LIB

View File

@ -26,8 +26,7 @@
#ifdef __WIN32__
#include <io.h>
#endif
#include <glib.h>
#include <glib/gstdio.h>
#include <mooglib/moo-glib.h>
void
lua_push_utf8string (lua_State *L,

View File

@ -1,7 +1,7 @@
#ifndef MEDIT_PYTHON_H
#define MEDIT_PYTHON_H
#include <glib.h>
#include <mooglib/moo-glib.h>
G_BEGIN_DECLS

View File

@ -16,7 +16,7 @@
#ifndef MOO_PYTHON_BUILTIN_H
#define MOO_PYTHON_BUILTIN_H
#include <glib.h>
#include <mooglib/moo-glib.h>
G_BEGIN_DECLS

View File

@ -23,7 +23,7 @@
#include "moopython/moopython-utils.h"
#include <pygobject.h> /* _PyGObjectAPI lives here */
#include <pygtk/pygtk.h>
#include <glib.h>
#include <mooglib/moo-glib.h>
#include "moopython/moopython-pygtkmod.h"
#include <mooutils/moostock.h>

View File

@ -17,7 +17,7 @@
#define MOO_PYGTK_H
#include <Python.h>
#include <glib.h>
#include <mooglib/moo-glib.h>
G_BEGIN_DECLS

View File

@ -16,7 +16,7 @@
#ifndef MOO_MIME_H
#define MOO_MIME_H
#include <glib.h>
#include <mooglib/moo-glib.h>
G_BEGIN_DECLS

View File

@ -17,7 +17,7 @@
#define MOO_TEST_MACROS_H
#include "moo-test-utils.h"
#include <glib.h>
#include <mooglib/moo-glib.h>
#include <string.h>
#include <stdlib.h>
#include <stdarg.h>

View File

@ -16,7 +16,7 @@
#ifndef MOO_TEST_UTILS_H
#define MOO_TEST_UTILS_H
#include <glib.h>
#include <mooglib/moo-glib.h>
#include <string.h>
#include <stdarg.h>
#include <mooutils/mooutils-macros.h>

View File

@ -16,7 +16,7 @@
#ifndef MOO_APP_INPUT_H
#define MOO_APP_INPUT_H
#include <glib.h>
#include <mooglib/moo-glib.h>
G_BEGIN_DECLS

View File

@ -1,7 +1,7 @@
#ifndef MOO_GTK_H
#define MOO_GTK_H
#include <glib.h>
#include <mooglib/moo-glib.h>
#include <gtk/gtk.h>
#ifndef GTK_WIDGET_REALIZED

View File

@ -20,7 +20,7 @@
#include "mooutils/mooutils-debug.h"
#include "mooutils/moostock.h"
#include "moo-pixbufs.h"
#include <glib/gstdio.h>
#include <mooglib/moo-glib.h>
#include <gtk/gtk.h>
#include <sys/stat.h>
#include <string.h>

View File

@ -35,7 +35,7 @@
#include <time.h>
#endif
#include <glib/gstdio.h>
#include <mooglib/moo-glib.h>
#include <sys/stat.h>
#include <sys/types.h>
#include <errno.h>

View File

@ -24,8 +24,7 @@
#include <stdio.h>
#include <string.h>
#include <errno.h>
#include <glib/gstdio.h>
#include <glib.h>
#include <mooglib/moo-glib.h>
#include <gio/gio.h>
#ifdef HAVE_UNISTD_H
#include <unistd.h>

View File

@ -16,7 +16,7 @@
#include "mooutils/mooi18n.h"
#include "mooutils/mooutils-misc.h"
#include "mooutils/mooutils-tests.h"
#include <glib.h>
#include <mooglib/moo-glib.h>
/**

View File

@ -17,7 +17,7 @@
#define MOO_I18N_H
#include <config.h>
#include <glib.h>
#include <mooglib/moo-glib.h>
#ifdef ENABLE_NLS

View File

@ -1,7 +1,7 @@
#ifndef MOO_LIST_H
#define MOO_LIST_H
#include <glib.h>
#include <mooglib/moo-glib.h>
#define _MOO_DEFINE_LIST(GListType, glisttype, \
ListType, list_type, ElmType) \

View File

@ -19,7 +19,7 @@
#include "mooutils/mooutils-misc.h"
#include "mooutils/mootype-macros.h"
#include <string.h>
#include <glib.h>
#include <mooglib/moo-glib.h>
typedef struct {

View File

@ -1,7 +1,7 @@
#ifndef MOO_ONCE_H
#define MOO_ONCE_H
#include <glib.h>
#include <mooglib/moo-glib.h>
#include <mooutils/mooutils-macros.h>
#define MOO_DO_ONCE_BEGIN \

View File

@ -23,7 +23,7 @@
#include <string.h>
#include <errno.h>
#include <gobject/gvaluecollector.h>
#include <glib.h>
#include <mooglib/moo-glib.h>
#define MOO_PREFS_ELEMENT "moo-prefs"
#define PROP_VERSION "version"

View File

@ -1,7 +1,7 @@
#ifndef MOO_STAT_H
#define MOO_STAT_H
#include <glib/gstdio.h>
#include <mooglib/moo-glib.h>
#undef MOO_G_STAT_BROKEN

View File

@ -16,7 +16,7 @@
#ifndef MOO_UTILS_DEBUG_H
#define MOO_UTILS_DEBUG_H
#include <glib.h>
#include <mooglib/moo-glib.h>
#include <stdarg.h>
#include <mooutils/mooutils-messages.h>

View File

@ -31,7 +31,7 @@
#include <sys/types.h>
#include <errno.h>
#include <glib/gstdio.h>
#include <glib.h>
#include <mooglib/moo-glib.h>
#ifdef __WIN32__
#include <windows.h>
@ -1319,7 +1319,7 @@ _moo_rename (const char *old_name,
*/
#define MOO_GLOB_REGEX
#include <glib.h>
#include <mooglib/moo-glib.h>
typedef struct _MooGlob {
#ifdef MOO_GLOB_REGEX

View File

@ -16,7 +16,7 @@
#ifndef MOO_UTILS_FS_H
#define MOO_UTILS_FS_H
#include <glib.h>
#include <mooglib/moo-glib.h>
#include <gtk/gtk.h>
/* MSVC */

View File

@ -16,7 +16,7 @@
#ifndef MOO_UTILS_MEM_H
#define MOO_UTILS_MEM_H
#include <glib.h>
#include <mooglib/moo-glib.h>
#include <string.h>

View File

@ -18,7 +18,7 @@
#include <mooutils/mooutils-macros.h>
#include <stdarg.h>
#include <glib.h>
#include <mooglib/moo-glib.h>
G_BEGIN_DECLS

View File

@ -29,8 +29,7 @@
#include "mooutils/mooarray.h"
#include "mooutils/moologwindow-gxml.h"
#include <gtk/gtk.h>
#include <glib.h>
#include <glib/gstdio.h>
#include <mooglib/moo-glib.h>
#ifdef HAVE_UNISTD_H
#include <unistd.h>
#endif

View File

@ -16,7 +16,7 @@
#ifndef MOO_UTILS_WIN32_H
#define MOO_UTILS_WIN32_H
#include <glib.h>
#include <mooglib/moo-glib.h>
G_BEGIN_DECLS

View File

@ -1,7 +1,7 @@
#ifndef MOO_NETINET_IN_H
#define MOO_NETINET_IN_H
#include <glib.h>
#include <mooglib/moo-glib.h>
#define ntohl g_ntohl
#define ntohs g_ntohs

View File

@ -1,7 +1,7 @@
#ifndef MOO_SYS_MMAN_H
#define MOO_SYS_MMAN_H
#include <glib.h>
#include <mooglib/moo-glib.h>
#define mmap _moo_win32_mmap
#define munmap _moo_win32_munmap

View File

@ -1,7 +1,7 @@
#ifndef MOO_NETINET_IN_H
#define MOO_NETINET_IN_H
#include <glib.h>
#include <mooglib/moo-glib.h>
#define ntohl g_ntohl
#define ntohs g_ntohs

View File

@ -1,7 +1,7 @@
#ifndef MOO_SYS_MMAN_H
#define MOO_SYS_MMAN_H
#include <glib.h>
#include <mooglib/moo-glib.h>
#define mmap _moo_win32_mmap
#define munmap _moo_win32_munmap

View File

@ -45,7 +45,7 @@
#include <gmodule.h>
#include <gtk/gtk.h>
#include <gdk/gdkkeysyms.h>
#include <glib/gstdio.h>
#include <mooglib/moo-glib.h>
#include <string.h>
#include <errno.h>
#include <sys/stat.h>

View File

@ -16,7 +16,7 @@
#ifndef MOO_EDIT_PLUGINS_H
#define MOO_EDIT_PLUGINS_H
#include <glib.h>
#include <mooglib/moo-glib.h>
G_BEGIN_DECLS

View File

@ -28,7 +28,7 @@
#include "mooutils/mooutils-misc.h"
#include "mooutils/mootype-macros.h"
#include <gtk/gtk.h>
#include <glib/gstdio.h>
#include <mooglib/moo-glib.h>
#include <string.h>
#include <stdio.h>

View File

@ -22,7 +22,7 @@
#include "mooutils/mooutils-misc.h"
#include "mooutils/moomarkup.h"
#include "mooutils/mooi18n.h"
#include <glib.h>
#include <mooglib/moo-glib.h>
#include <string.h>
#define FILTERS_VERSION "1.0"