From a6381e5b8ae922a1566e09f66ffd55d88f4243b6 Mon Sep 17 00:00:00 2001 From: Yevgen Muntyan <17531749+muntyan@users.noreply.github.com> Date: Mon, 26 Sep 2011 00:41:51 -0700 Subject: [PATCH] Fixed compilation with DISABLE_SINGLE_INCLUDES --- m4/moo-flags.m4 | 9 +++++++++ moo/gtksourceview/gtksourcecontextengine.c | 2 +- moo/gtksourceview/gtksourceengine.h | 2 +- moo/gtksourceview/gtksourceiter.h | 2 +- moo/gtksourceview/gtksourcelanguage-parser-2.c | 2 +- moo/gtksourceview/gtksourcestyle-private.h | 2 +- moo/gtksourceview/gtksourcestylescheme.h | 2 +- moo/gtksourceview/gtktextregion.h | 2 +- moo/mooapp/mooapp.c | 2 +- moo/mooapp/moohtml.c | 2 +- moo/mooapp/moohtml.h | 2 +- moo/mooapp/moolinklabel.h | 2 +- moo/mooedit/mooeditaction-factory.h | 1 - moo/mooedit/mooeditaction.c | 2 +- moo/mooedit/mooeditdialogs.c | 2 +- moo/mooedit/mooeditfiltersettings.c | 2 +- moo/mooedit/mooeditor.c | 2 +- moo/mooedit/moolinebuffer.h | 2 +- moo/mooedit/moolinemark.h | 2 +- moo/mooedit/mootextbuffer.h | 2 +- moo/mooedit/mootextfind.h | 5 ++--- moo/mooedit/mootextiter.h | 2 +- moo/mooedit/mootextsearch-private.h | 2 +- moo/mooedit/mootextsearch.c | 2 +- moo/mooedit/mootextstylescheme.h | 3 +-- moo/mooedit/mootextview.c | 2 +- moo/mooedit/mootextview.h | 2 +- moo/moofileview/moobookmarkmgr.h | 3 +-- moo/moofileview/moobookmarkview.h | 2 +- moo/moofileview/moofile.c | 4 +--- moo/moofileview/moofile.h | 2 +- moo/moofileview/moofilesystem.h | 2 +- moo/moofileview/moofileview-dialogs.h | 2 +- moo/moofileview/moofileview-impl.h | 3 +-- moo/moofileview/moofileview-private.h | 3 +-- moo/moofileview/moofolder.c | 4 +--- moo/moofileview/moofoldermodel.c | 2 +- moo/moofileview/mooiconview.h | 5 +---- moo/moofileview/mootreeview.h | 2 +- moo/mooutils/mooaccelbutton.h | 2 +- moo/mooutils/mooaction-private.h | 2 +- moo/mooutils/mooaction.h | 2 +- moo/mooutils/mooactionbase-private.h | 2 +- moo/mooutils/mooactionbase.h | 2 +- moo/mooutils/mooactioncollection.h | 2 +- moo/mooutils/mooactionfactory.h | 2 +- moo/mooutils/moobigpaned.h | 1 - moo/mooutils/moocombo.h | 3 +-- moo/mooutils/moodialogs.h | 2 +- moo/mooutils/mooentry.c | 5 +---- moo/mooutils/mooentry.h | 2 +- moo/mooutils/moofiledialog.h | 2 +- moo/mooutils/moofileicon.h | 2 +- moo/mooutils/moofilewriter.c | 2 +- moo/mooutils/moofontsel.h | 4 +--- moo/mooutils/mooglade.h | 2 +- moo/mooutils/moohelp.h | 2 +- moo/mooutils/moohistorylist.h | 2 +- moo/mooutils/mooi18n.h | 2 +- moo/mooutils/moomenu.h | 2 +- moo/mooutils/moomenumgr.h | 2 +- moo/mooutils/moomenutoolbutton.h | 2 +- moo/mooutils/moonotebook.h | 3 +-- moo/mooutils/moopane.h | 2 +- moo/mooutils/moopaned.h | 1 - moo/mooutils/mooprefs.c | 2 +- moo/mooutils/moostock.h | 3 +-- moo/mooutils/mooutils-fs.c | 5 ++--- moo/mooutils/mooutils-fs.h | 2 +- moo/mooutils/mooutils-gobject.h | 2 +- moo/mooutils/mooutils-misc.c | 2 +- moo/plugins/ctags/ctags-view.h | 2 +- moo/plugins/moofind.c | 4 +--- moo/plugins/usertools/moocommand.h | 2 +- moo/plugins/usertools/moocommanddisplay.h | 3 +-- moo/plugins/usertools/moooutputfilterregex.c | 2 +- moo/plugins/usertools/moousertools-prefs.h | 2 +- 77 files changed, 84 insertions(+), 102 deletions(-) diff --git a/m4/moo-flags.m4 b/m4/moo-flags.m4 index 50bcda46..870dd03b 100644 --- a/m4/moo-flags.m4 +++ b/m4/moo-flags.m4 @@ -75,6 +75,15 @@ AC_ARG_ENABLE(dev-mode, ]) AM_CONDITIONAL(MOO_DEV_MODE, test x$MOO_DEV_MODE = "xyes") +AC_ARG_ENABLE(strict-gtk, + AC_HELP_STRING([--enable-strict-gtk],[GTK_DISABLE_DEPRECATED, GTK_DISABLE_SINGLE_INCLUDES, etc.]),[ + if test "x$enable_strict_gtk" = "xyes"; then + # MOO_CPPFLAGS="$MOO_CPPFLAGS -DGDK_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED" + MOO_CPPFLAGS="$MOO_CPPFLAGS -DGTK_DISABLE_SINGLE_INCLUDES -DGDK_PIXBUF_DISABLE_SINGLE_INCLUDES -DG_DISABLE_SINGLE_INCLUDES" + # MOO_CPPFLAGS="$MOO_CPPFLAGS -DGDK_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED -DGTK_DISABLE_SINGLE_INCLUDES -DGSEAL_ENABLE" + fi +]) + MOO_COMPILER _MOO_AC_CHECK_COMPILER_OPTIONS([dnl diff --git a/moo/gtksourceview/gtksourcecontextengine.c b/moo/gtksourceview/gtksourcecontextengine.c index 68520050..1b7053cc 100644 --- a/moo/gtksourceview/gtksourcecontextengine.c +++ b/moo/gtksourceview/gtksourcecontextengine.c @@ -25,7 +25,7 @@ #include "gtksourcelanguage-private.h" #include "gtksourcebuffer.h" #include "gtksourcestyle-private.h" -#include +#include #include #include diff --git a/moo/gtksourceview/gtksourceengine.h b/moo/gtksourceview/gtksourceengine.h index bc087e94..6c44be10 100644 --- a/moo/gtksourceview/gtksourceengine.h +++ b/moo/gtksourceview/gtksourceengine.h @@ -22,7 +22,7 @@ #ifndef __GTK_SOURCE_ENGINE_H__ #define __GTK_SOURCE_ENGINE_H__ -#include +#include #include G_BEGIN_DECLS diff --git a/moo/gtksourceview/gtksourceiter.h b/moo/gtksourceview/gtksourceiter.h index 069febe2..8fb6338a 100644 --- a/moo/gtksourceview/gtksourceiter.h +++ b/moo/gtksourceview/gtksourceiter.h @@ -22,7 +22,7 @@ #ifndef __GTK_SOURCE_ITER_H__ #define __GTK_SOURCE_ITER_H__ -#include +#include G_BEGIN_DECLS diff --git a/moo/gtksourceview/gtksourcelanguage-parser-2.c b/moo/gtksourceview/gtksourcelanguage-parser-2.c index 2260c0fa..6cd1f819 100644 --- a/moo/gtksourceview/gtksourcelanguage-parser-2.c +++ b/moo/gtksourceview/gtksourcelanguage-parser-2.c @@ -48,7 +48,7 @@ #include "gtksourcelanguage.h" #include "gtksourcelanguage-private.h" #include "gtksourcecontextengine.h" -#include +#include #define PARSER_ERROR (parser_error_quark ()) #define ATTR_NO_STYLE "" diff --git a/moo/gtksourceview/gtksourcestyle-private.h b/moo/gtksourceview/gtksourcestyle-private.h index 844468bc..19bfe8a8 100644 --- a/moo/gtksourceview/gtksourcestyle-private.h +++ b/moo/gtksourceview/gtksourcestyle-private.h @@ -22,7 +22,7 @@ #define __GTK_SOURCE_STYLE_PRIVATE_H__ #include "gtksourcestyle.h" -#include +#include G_BEGIN_DECLS diff --git a/moo/gtksourceview/gtksourcestylescheme.h b/moo/gtksourceview/gtksourcestylescheme.h index 807f4e09..0e6f95fc 100644 --- a/moo/gtksourceview/gtksourcestylescheme.h +++ b/moo/gtksourceview/gtksourcestylescheme.h @@ -21,7 +21,7 @@ #ifndef __GTK_SOURCE_STYLE_SCHEME_H__ #define __GTK_SOURCE_STYLE_SCHEME_H__ -#include +#include #include G_BEGIN_DECLS diff --git a/moo/gtksourceview/gtktextregion.h b/moo/gtksourceview/gtktextregion.h index e3611510..8f79471e 100644 --- a/moo/gtksourceview/gtktextregion.h +++ b/moo/gtksourceview/gtktextregion.h @@ -24,7 +24,7 @@ #ifndef __GTK_TEXT_REGION_H__ #define __GTK_TEXT_REGION_H__ -#include +#include G_BEGIN_DECLS diff --git a/moo/mooapp/mooapp.c b/moo/mooapp/mooapp.c index 41553048..fe9ee4df 100644 --- a/moo/mooapp/mooapp.c +++ b/moo/mooapp/mooapp.c @@ -47,7 +47,7 @@ #include "mooutils/moohelp.h" #include "mooutils/moocompat.h" #include "mooutils/mooutils-script.h" -#include +#include #include #include #include diff --git a/moo/mooapp/moohtml.c b/moo/mooapp/moohtml.c index 60014404..9b1c5276 100644 --- a/moo/mooapp/moohtml.c +++ b/moo/mooapp/moohtml.c @@ -20,7 +20,7 @@ #include "mooutils/moocompat.h" #include #include -#include +#include #include #include diff --git a/moo/mooapp/moohtml.h b/moo/mooapp/moohtml.h index c5366496..4d882011 100644 --- a/moo/mooapp/moohtml.h +++ b/moo/mooapp/moohtml.h @@ -16,7 +16,7 @@ #ifndef MOO_HTML_H #define MOO_HTML_H -#include +#include G_BEGIN_DECLS diff --git a/moo/mooapp/moolinklabel.h b/moo/mooapp/moolinklabel.h index e233ca36..bcc7a7f8 100644 --- a/moo/mooapp/moolinklabel.h +++ b/moo/mooapp/moolinklabel.h @@ -16,7 +16,7 @@ #ifndef MOO_LINK_LABEL_H #define MOO_LINK_LABEL_H -#include +#include G_BEGIN_DECLS diff --git a/moo/mooedit/mooeditaction-factory.h b/moo/mooedit/mooeditaction-factory.h index 13188bad..d8ab7b0e 100644 --- a/moo/mooedit/mooeditaction-factory.h +++ b/moo/mooedit/mooeditaction-factory.h @@ -18,7 +18,6 @@ #include #include -#include G_BEGIN_DECLS diff --git a/moo/mooedit/mooeditaction.c b/moo/mooedit/mooeditaction.c index 1b6f70f9..08da00b9 100644 --- a/moo/mooedit/mooeditaction.c +++ b/moo/mooedit/mooeditaction.c @@ -23,7 +23,7 @@ #include "mooedit/mooeditfiltersettings.h" #include "mooedit/mooedit-impl.h" #include "mooutils/mooutils.h" -#include +#include #include diff --git a/moo/mooedit/mooeditdialogs.c b/moo/mooedit/mooeditdialogs.c index abc3f1f1..b1ad9e15 100644 --- a/moo/mooedit/mooeditdialogs.c +++ b/moo/mooedit/mooeditdialogs.c @@ -27,7 +27,7 @@ #include "mooedit/mooeditsavemult-gxml.h" #include "mooedit/mootryencoding-gxml.h" #include -#include +#include #include diff --git a/moo/mooedit/mooeditfiltersettings.c b/moo/mooedit/mooeditfiltersettings.c index 66ed38a5..a17ea9b2 100644 --- a/moo/mooedit/mooeditfiltersettings.c +++ b/moo/mooedit/mooeditfiltersettings.c @@ -23,7 +23,7 @@ #include "mooutils/mooprefs.h" #include "mooutils/mooutils-misc.h" #include "mooutils/mooutils-debug.h" -#include +#include #include MOO_DEBUG_INIT(filters, FALSE) diff --git a/moo/mooedit/mooeditor.c b/moo/mooedit/mooeditor.c index 6d5a2d37..d85f6a6a 100644 --- a/moo/mooedit/mooeditor.c +++ b/moo/mooedit/mooeditor.c @@ -43,7 +43,7 @@ #include "mooutils/mooi18n.h" #include "mooutils/mooencodings.h" #include "mooutils/moolist.h" -#include +#include #include #include diff --git a/moo/mooedit/moolinebuffer.h b/moo/mooedit/moolinebuffer.h index 45b9d81a..acbc67ef 100644 --- a/moo/mooedit/moolinebuffer.h +++ b/moo/mooedit/moolinebuffer.h @@ -20,7 +20,7 @@ #ifndef MOO_LINE_BUFFER_H #define MOO_LINE_BUFFER_H -#include +#include #include "mooedit/mootextbtree.h" #include "mooedit/mootextbuffer.h" diff --git a/moo/mooedit/moolinemark.h b/moo/mooedit/moolinemark.h index 8fc5e1bd..229f5843 100644 --- a/moo/mooedit/moolinemark.h +++ b/moo/mooedit/moolinemark.h @@ -16,7 +16,7 @@ #ifndef MOO_LINE_MARK_H #define MOO_LINE_MARK_H -#include +#include G_BEGIN_DECLS diff --git a/moo/mooedit/mootextbuffer.h b/moo/mooedit/mootextbuffer.h index e2d88239..eaaa639c 100644 --- a/moo/mooedit/mootextbuffer.h +++ b/moo/mooedit/mootextbuffer.h @@ -16,7 +16,7 @@ #ifndef MOO_TEXT_BUFFER_H #define MOO_TEXT_BUFFER_H -#include +#include #include #include diff --git a/moo/mooedit/mootextfind.h b/moo/mooedit/mootextfind.h index 96910a71..c14e1dad 100644 --- a/moo/mooedit/mootextfind.h +++ b/moo/mooedit/mootextfind.h @@ -16,11 +16,10 @@ #ifndef MOO_TEXT_FIND_H #define MOO_TEXT_FIND_H -#include -#include +#include #include #include -#include +#include G_BEGIN_DECLS diff --git a/moo/mooedit/mootextiter.h b/moo/mooedit/mootextiter.h index 9ceffe48..e851a11f 100644 --- a/moo/mooedit/mootextiter.h +++ b/moo/mooedit/mootextiter.h @@ -16,7 +16,7 @@ #ifndef MOO_TEXT_ITER_H #define MOO_TEXT_ITER_H -#include +#include G_BEGIN_DECLS diff --git a/moo/mooedit/mootextsearch-private.h b/moo/mooedit/mootextsearch-private.h index 3abb8656..3a9c7c16 100644 --- a/moo/mooedit/mootextsearch-private.h +++ b/moo/mooedit/mootextsearch-private.h @@ -17,7 +17,7 @@ #define MOO_TEXT_SEARCH_PRIVATE_H #include -#include +#include G_BEGIN_DECLS diff --git a/moo/mooedit/mootextsearch.c b/moo/mooedit/mootextsearch.c index bdc08abc..9a841267 100644 --- a/moo/mooedit/mootextsearch.c +++ b/moo/mooedit/mootextsearch.c @@ -16,7 +16,7 @@ #include "mooedit/mootextsearch-private.h" #include "gtksourceview/gtksourceview-api.h" #include "mooutils/mooutils-misc.h" -#include +#include #include diff --git a/moo/mooedit/mootextstylescheme.h b/moo/mooedit/mootextstylescheme.h index 51c9e558..006b3e6b 100644 --- a/moo/mooedit/mootextstylescheme.h +++ b/moo/mooedit/mootextstylescheme.h @@ -16,8 +16,7 @@ #ifndef MOO_TEXT_STYLE_SCHEME_H #define MOO_TEXT_STYLE_SCHEME_H -#include -#include +#include G_BEGIN_DECLS diff --git a/moo/mooedit/mootextview.c b/moo/mooedit/mootextview.c index e08e733e..e695ba7d 100644 --- a/moo/mooedit/mootextview.c +++ b/moo/mooedit/mootextview.c @@ -40,7 +40,7 @@ #include "mooutils/mooutils-gobject.h" #include "mooedit/mooquicksearch-gxml.h" #include -#include +#include #include #include diff --git a/moo/mooedit/mootextview.h b/moo/mooedit/mootextview.h index c94c50df..eb9af4c7 100644 --- a/moo/mooedit/mootextview.h +++ b/moo/mooedit/mootextview.h @@ -16,7 +16,7 @@ #ifndef MOO_TEXT_VIEW_H #define MOO_TEXT_VIEW_H -#include +#include #include #include #include diff --git a/moo/moofileview/moobookmarkmgr.h b/moo/moofileview/moobookmarkmgr.h index 8658a33d..4d0ca927 100644 --- a/moo/moofileview/moobookmarkmgr.h +++ b/moo/moofileview/moobookmarkmgr.h @@ -16,8 +16,7 @@ #ifndef MOO_BOOKMARK_MGR_H #define MOO_BOOKMARK_MGR_H -#include -#include +#include #include G_BEGIN_DECLS diff --git a/moo/moofileview/moobookmarkview.h b/moo/moofileview/moobookmarkview.h index ac1cd2a0..ddd43646 100644 --- a/moo/moofileview/moobookmarkview.h +++ b/moo/moofileview/moobookmarkview.h @@ -21,7 +21,7 @@ #define MOO_BOOKMARK_VIEW_H #include -#include +#include G_BEGIN_DECLS diff --git a/moo/moofileview/moofile.c b/moo/moofileview/moofile.c index 0bd6b951..2a1c291a 100644 --- a/moo/moofileview/moofile.c +++ b/moo/moofileview/moofile.c @@ -44,9 +44,7 @@ #if defined(HAVE_CARBON) #include #endif -#include -#include -#include +#include MOO_DEBUG_INIT(file, FALSE) diff --git a/moo/moofileview/moofile.h b/moo/moofileview/moofile.h index 87751ee2..7045b9c7 100644 --- a/moo/moofileview/moofile.h +++ b/moo/moofileview/moofile.h @@ -16,7 +16,7 @@ #ifndef MOO_FILE_H #define MOO_FILE_H -#include +#include G_BEGIN_DECLS diff --git a/moo/moofileview/moofilesystem.h b/moo/moofileview/moofilesystem.h index 286831f3..ac6d81c8 100644 --- a/moo/moofileview/moofilesystem.h +++ b/moo/moofileview/moofilesystem.h @@ -28,7 +28,7 @@ #include "moofileview/moofolder.h" #include -#include +#include G_BEGIN_DECLS diff --git a/moo/moofileview/moofileview-dialogs.h b/moo/moofileview/moofileview-dialogs.h index b13cf931..17793fce 100644 --- a/moo/moofileview/moofileview-dialogs.h +++ b/moo/moofileview/moofileview-dialogs.h @@ -21,7 +21,7 @@ #define MOO_FILE_VIEW_DIALOGS_H #include "moofileview/moofile.h" -#include +#include G_BEGIN_DECLS diff --git a/moo/moofileview/moofileview-impl.h b/moo/moofileview/moofileview-impl.h index d7fb6d37..d609f692 100644 --- a/moo/moofileview/moofileview-impl.h +++ b/moo/moofileview/moofileview-impl.h @@ -14,8 +14,7 @@ */ #include -#include -#include +#include #ifndef MOO_FILE_VIEW_IMPL_H #define MOO_FILE_VIEW_IMPL_H diff --git a/moo/moofileview/moofileview-private.h b/moo/moofileview/moofileview-private.h index c843f659..c6c82aca 100644 --- a/moo/moofileview/moofileview-private.h +++ b/moo/moofileview/moofileview-private.h @@ -18,8 +18,7 @@ #endif #include -#include -#include +#include #ifndef MOO_FILE_VIEW_PRIVATE_H #define MOO_FILE_VIEW_PRIVATE_H diff --git a/moo/moofileview/moofolder.c b/moo/moofileview/moofolder.c index ae673fb7..b59c24c6 100644 --- a/moo/moofileview/moofolder.c +++ b/moo/moofileview/moofolder.c @@ -32,9 +32,7 @@ #endif #include #include -#include -#include -#include +#include #define NORMAL_PRIORITY G_PRIORITY_DEFAULT_IDLE #define NORMAL_TIMEOUT 0.04 diff --git a/moo/moofileview/moofoldermodel.c b/moo/moofileview/moofoldermodel.c index 5450fb9c..d8c99513 100644 --- a/moo/moofileview/moofoldermodel.c +++ b/moo/moofileview/moofoldermodel.c @@ -18,7 +18,7 @@ #include "moofile-private.h" #include "moofolder-private.h" #include "moofoldermodel-private.h" -#include +#include struct _MooFolderModelPrivate { diff --git a/moo/moofileview/mooiconview.h b/moo/moofileview/mooiconview.h index 24df4910..b89789cf 100644 --- a/moo/moofileview/mooiconview.h +++ b/moo/moofileview/mooiconview.h @@ -20,10 +20,7 @@ #ifndef MOO_ICON_VIEW_H #define MOO_ICON_VIEW_H -#include -#include -#include -#include +#include G_BEGIN_DECLS diff --git a/moo/moofileview/mootreeview.h b/moo/moofileview/mootreeview.h index cb422261..76aa0c16 100644 --- a/moo/moofileview/mootreeview.h +++ b/moo/moofileview/mootreeview.h @@ -20,7 +20,7 @@ #ifndef MOO_TREE_VIEW_H #define MOO_TREE_VIEW_H -#include +#include #include "moofileview/mooiconview.h" G_BEGIN_DECLS diff --git a/moo/mooutils/mooaccelbutton.h b/moo/mooutils/mooaccelbutton.h index 35776547..3a5e2fb1 100644 --- a/moo/mooutils/mooaccelbutton.h +++ b/moo/mooutils/mooaccelbutton.h @@ -16,7 +16,7 @@ #ifndef MOO_ACCEL_BUTTON_H #define MOO_ACCEL_BUTTON_H -#include +#include G_BEGIN_DECLS diff --git a/moo/mooutils/mooaction-private.h b/moo/mooutils/mooaction-private.h index ec93671f..d6482888 100644 --- a/moo/mooutils/mooaction-private.h +++ b/moo/mooutils/mooaction-private.h @@ -18,7 +18,7 @@ #include #include -#include +#include G_BEGIN_DECLS diff --git a/moo/mooutils/mooaction.h b/moo/mooutils/mooaction.h index d9d6e164..a250de68 100644 --- a/moo/mooutils/mooaction.h +++ b/moo/mooutils/mooaction.h @@ -16,7 +16,7 @@ #ifndef MOO_ACTION_H #define MOO_ACTION_H -#include +#include G_BEGIN_DECLS diff --git a/moo/mooutils/mooactionbase-private.h b/moo/mooutils/mooactionbase-private.h index 2031b855..e608289d 100644 --- a/moo/mooutils/mooactionbase-private.h +++ b/moo/mooutils/mooactionbase-private.h @@ -17,7 +17,7 @@ #define MOO_ACTION_BASE_PRIVATE_H #include -#include +#include G_BEGIN_DECLS diff --git a/moo/mooutils/mooactionbase.h b/moo/mooutils/mooactionbase.h index 91fc18f2..cc1a3975 100644 --- a/moo/mooutils/mooactionbase.h +++ b/moo/mooutils/mooactionbase.h @@ -16,7 +16,7 @@ #ifndef MOO_ACTION_BASE_H #define MOO_ACTION_BASE_H -#include +#include G_BEGIN_DECLS diff --git a/moo/mooutils/mooactioncollection.h b/moo/mooutils/mooactioncollection.h index 52b226ca..05e7ea66 100644 --- a/moo/mooutils/mooactioncollection.h +++ b/moo/mooutils/mooactioncollection.h @@ -16,7 +16,7 @@ #ifndef MOO_ACTION_COLLECTION_H #define MOO_ACTION_COLLECTION_H -#include +#include G_BEGIN_DECLS diff --git a/moo/mooutils/mooactionfactory.h b/moo/mooutils/mooactionfactory.h index 7ad93f81..91c10334 100644 --- a/moo/mooutils/mooactionfactory.h +++ b/moo/mooutils/mooactionfactory.h @@ -16,7 +16,7 @@ #ifndef MOO_ACTION_FACTORY_H #define MOO_ACTION_FACTORY_H -#include +#include G_BEGIN_DECLS diff --git a/moo/mooutils/moobigpaned.h b/moo/mooutils/moobigpaned.h index a47db392..60f33f82 100644 --- a/moo/mooutils/moobigpaned.h +++ b/moo/mooutils/moobigpaned.h @@ -16,7 +16,6 @@ #ifndef MOO_BIG_PANED_H #define MOO_BIG_PANED_H -#include #include "moopaned.h" G_BEGIN_DECLS diff --git a/moo/mooutils/moocombo.h b/moo/mooutils/moocombo.h index 042d4eb6..bc9603c6 100644 --- a/moo/mooutils/moocombo.h +++ b/moo/mooutils/moocombo.h @@ -16,8 +16,7 @@ #ifndef MOO_COMBO_H #define MOO_COMBO_H -#include -#include +#include G_BEGIN_DECLS diff --git a/moo/mooutils/moodialogs.h b/moo/mooutils/moodialogs.h index d111151c..13688cb4 100644 --- a/moo/mooutils/moodialogs.h +++ b/moo/mooutils/moodialogs.h @@ -16,7 +16,7 @@ #ifndef MOOUTILS_DIALOGS_H #define MOOUTILS_DIALOGS_H -#include +#include #include "mooutils/moofiledialog.h" G_BEGIN_DECLS diff --git a/moo/mooutils/mooentry.c b/moo/mooutils/mooentry.c index 07521309..37a4fa62 100644 --- a/moo/mooutils/mooentry.c +++ b/moo/mooutils/mooentry.c @@ -24,10 +24,7 @@ #include "mooutils/mooutils-gobject.h" #include "mooutils/mooeditops.h" #include "mooutils/mooi18n.h" -#include -#include -#include -#include +#include #include #include diff --git a/moo/mooutils/mooentry.h b/moo/mooutils/mooentry.h index 43d13f65..20abe999 100644 --- a/moo/mooutils/mooentry.h +++ b/moo/mooutils/mooentry.h @@ -16,7 +16,7 @@ #ifndef MOO_ENTRY_H #define MOO_ENTRY_H -#include +#include G_BEGIN_DECLS diff --git a/moo/mooutils/moofiledialog.h b/moo/mooutils/moofiledialog.h index 97151d3f..9735d609 100644 --- a/moo/mooutils/moofiledialog.h +++ b/moo/mooutils/moofiledialog.h @@ -16,7 +16,7 @@ #ifndef MOO_FILE_DIALOG_H #define MOO_FILE_DIALOG_H -#include +#include #include G_BEGIN_DECLS diff --git a/moo/mooutils/moofileicon.h b/moo/mooutils/moofileicon.h index 858ba4e2..9bc0d873 100644 --- a/moo/mooutils/moofileicon.h +++ b/moo/mooutils/moofileicon.h @@ -16,7 +16,7 @@ #ifndef MOO_FILE_ICON_H #define MOO_FILE_ICON_H -#include +#include #include G_BEGIN_DECLS diff --git a/moo/mooutils/moofilewriter.c b/moo/mooutils/moofilewriter.c index f4205d07..5395385d 100644 --- a/moo/mooutils/moofilewriter.c +++ b/moo/mooutils/moofilewriter.c @@ -25,7 +25,7 @@ #include #include #include -#include +#include #include #ifdef HAVE_UNISTD_H #include diff --git a/moo/mooutils/moofontsel.h b/moo/mooutils/moofontsel.h index dff7ca04..4855bf8d 100644 --- a/moo/mooutils/moofontsel.h +++ b/moo/mooutils/moofontsel.h @@ -36,9 +36,7 @@ #define MOO_FONTSEL_H -#include -#include -#include +#include G_BEGIN_DECLS diff --git a/moo/mooutils/mooglade.h b/moo/mooutils/mooglade.h index fecbe671..03942eb7 100644 --- a/moo/mooutils/mooglade.h +++ b/moo/mooutils/mooglade.h @@ -16,7 +16,7 @@ #ifndef MOO_GLADE_H #define MOO_GLADE_H -#include +#include G_BEGIN_DECLS diff --git a/moo/mooutils/moohelp.h b/moo/mooutils/moohelp.h index 2c25b2b5..2a6a84b3 100644 --- a/moo/mooutils/moohelp.h +++ b/moo/mooutils/moohelp.h @@ -16,7 +16,7 @@ #ifndef MOO_HELP_H #define MOO_HELP_H -#include +#include G_BEGIN_DECLS diff --git a/moo/mooutils/moohistorylist.h b/moo/mooutils/moohistorylist.h index db9f6965..05ed0ebe 100644 --- a/moo/mooutils/moohistorylist.h +++ b/moo/mooutils/moohistorylist.h @@ -16,7 +16,7 @@ #ifndef MOO_HISTORY_LIST_H #define MOO_HISTORY_LIST_H -#include +#include #include G_BEGIN_DECLS diff --git a/moo/mooutils/mooi18n.h b/moo/mooutils/mooi18n.h index 3d482a1b..dbb71c33 100644 --- a/moo/mooutils/mooi18n.h +++ b/moo/mooutils/mooi18n.h @@ -17,7 +17,7 @@ #define MOO_I18N_H #include -#include +#include #ifdef ENABLE_NLS diff --git a/moo/mooutils/moomenu.h b/moo/mooutils/moomenu.h index 05f2f686..e7ddb46d 100644 --- a/moo/mooutils/moomenu.h +++ b/moo/mooutils/moomenu.h @@ -16,7 +16,7 @@ #ifndef MOO_MENU_H #define MOO_MENU_H -#include +#include G_BEGIN_DECLS diff --git a/moo/mooutils/moomenumgr.h b/moo/mooutils/moomenumgr.h index f7256841..fa73ddb1 100644 --- a/moo/mooutils/moomenumgr.h +++ b/moo/mooutils/moomenumgr.h @@ -16,7 +16,7 @@ #ifndef MOO_MENU_MGR_H #define MOO_MENU_MGR_H -#include +#include G_BEGIN_DECLS diff --git a/moo/mooutils/moomenutoolbutton.h b/moo/mooutils/moomenutoolbutton.h index 94e82aa7..110956c7 100644 --- a/moo/mooutils/moomenutoolbutton.h +++ b/moo/mooutils/moomenutoolbutton.h @@ -16,7 +16,7 @@ #ifndef MOO_MENU_TOOL_BUTTON_H #define MOO_MENU_TOOL_BUTTON_H -#include +#include G_BEGIN_DECLS diff --git a/moo/mooutils/moonotebook.h b/moo/mooutils/moonotebook.h index 50318a17..74c1a093 100644 --- a/moo/mooutils/moonotebook.h +++ b/moo/mooutils/moonotebook.h @@ -16,8 +16,7 @@ #ifndef MOO_NOTEBOOK_H #define MOO_NOTEBOOK_H -#include -#include +#include G_BEGIN_DECLS diff --git a/moo/mooutils/moopane.h b/moo/mooutils/moopane.h index fb5a3cfd..a55d1bef 100644 --- a/moo/mooutils/moopane.h +++ b/moo/mooutils/moopane.h @@ -16,7 +16,7 @@ #ifndef MOO_PANE_H #define MOO_PANE_H -#include +#include G_BEGIN_DECLS diff --git a/moo/mooutils/moopaned.h b/moo/mooutils/moopaned.h index 57cddf71..16314996 100644 --- a/moo/mooutils/moopaned.h +++ b/moo/mooutils/moopaned.h @@ -17,7 +17,6 @@ #define MOO_PANED_H #include "moopane.h" -#include G_BEGIN_DECLS diff --git a/moo/mooutils/mooprefs.c b/moo/mooutils/mooprefs.c index 52ef37f7..52ceb0e8 100644 --- a/moo/mooutils/mooprefs.c +++ b/moo/mooutils/mooprefs.c @@ -23,7 +23,7 @@ #include #include #include -#include +#include #define MOO_PREFS_ELEMENT "moo-prefs" #define PROP_VERSION "version" diff --git a/moo/mooutils/moostock.h b/moo/mooutils/moostock.h index 1263a14a..ca1075c6 100644 --- a/moo/mooutils/moostock.h +++ b/moo/mooutils/moostock.h @@ -16,8 +16,7 @@ #ifndef MOOUTILS_STOCK_H #define MOOUTILS_STOCK_H -#include -#include +#include G_BEGIN_DECLS diff --git a/moo/mooutils/mooutils-fs.c b/moo/mooutils/mooutils-fs.c index 232ad274..f0907e73 100644 --- a/moo/mooutils/mooutils-fs.c +++ b/moo/mooutils/mooutils-fs.c @@ -31,8 +31,7 @@ #include #include #include -/* for glib-2.6 */ -#include +#include #ifdef __WIN32__ #include @@ -1320,7 +1319,7 @@ _moo_rename (const char *old_name, */ #define MOO_GLOB_REGEX -#include +#include typedef struct _MooGlob { #ifdef MOO_GLOB_REGEX diff --git a/moo/mooutils/mooutils-fs.h b/moo/mooutils/mooutils-fs.h index d6670818..99ddfd49 100644 --- a/moo/mooutils/mooutils-fs.h +++ b/moo/mooutils/mooutils-fs.h @@ -17,7 +17,7 @@ #define MOO_UTILS_FS_H #include -#include +#include /* MSVC */ #if defined(WIN32) && !defined(__GNUC__) diff --git a/moo/mooutils/mooutils-gobject.h b/moo/mooutils/mooutils-gobject.h index c8c9e8c3..23f1268e 100644 --- a/moo/mooutils/mooutils-gobject.h +++ b/moo/mooutils/mooutils-gobject.h @@ -16,7 +16,7 @@ #ifndef MOO_UTILS_GOBJECT_H #define MOO_UTILS_GOBJECT_H -#include +#include #include G_BEGIN_DECLS diff --git a/moo/mooutils/mooutils-misc.c b/moo/mooutils/mooutils-misc.c index 80c3354f..ebda2bbb 100644 --- a/moo/mooutils/mooutils-misc.c +++ b/moo/mooutils/mooutils-misc.c @@ -29,7 +29,7 @@ #include "mooutils/mooarray.h" #include "mooutils/moologwindow-gxml.h" #include -#include +#include #include #ifdef HAVE_UNISTD_H #include diff --git a/moo/plugins/ctags/ctags-view.h b/moo/plugins/ctags/ctags-view.h index 26022eb5..59109cc5 100644 --- a/moo/plugins/ctags/ctags-view.h +++ b/moo/plugins/ctags/ctags-view.h @@ -16,7 +16,7 @@ #ifndef CTAGS_VIEW_H #define CTAGS_VIEW_H -#include +#include #define MOO_TYPE_CTAGS_VIEW (_moo_ctags_view_get_type ()) #define MOO_CTAGS_VIEW(object) (G_TYPE_CHECK_INSTANCE_CAST ((object), MOO_TYPE_CTAGS_VIEW, MooCtagsView)) diff --git a/moo/plugins/moofind.c b/moo/plugins/moofind.c index c5cab414..fbb2052c 100644 --- a/moo/plugins/moofind.c +++ b/moo/plugins/moofind.c @@ -33,9 +33,7 @@ #include "plugins/moofind-gxml.h" #include "plugins/moogrep-gxml.h" #include "moo-help-sections.h" -#include -#include -#include +#include #include #ifndef __WIN32__ #include diff --git a/moo/plugins/usertools/moocommand.h b/moo/plugins/usertools/moocommand.h index 285e678f..2727b84b 100644 --- a/moo/plugins/usertools/moocommand.h +++ b/moo/plugins/usertools/moocommand.h @@ -16,7 +16,7 @@ #ifndef MOO_COMMAND_H #define MOO_COMMAND_H -#include +#include #include "moooutputfilter.h" #include "moousertools-enums.h" diff --git a/moo/plugins/usertools/moocommanddisplay.h b/moo/plugins/usertools/moocommanddisplay.h index 39d356fb..abb00a67 100644 --- a/moo/plugins/usertools/moocommanddisplay.h +++ b/moo/plugins/usertools/moocommanddisplay.h @@ -18,8 +18,7 @@ #include #include "moocommand.h" -#include -#include +#include G_BEGIN_DECLS diff --git a/moo/plugins/usertools/moooutputfilterregex.c b/moo/plugins/usertools/moooutputfilterregex.c index 6aeab9ab..36b8e26e 100644 --- a/moo/plugins/usertools/moooutputfilterregex.c +++ b/moo/plugins/usertools/moooutputfilterregex.c @@ -23,7 +23,7 @@ #include "mooutils/mooutils-misc.h" #include "mooutils/moomarkup.h" #include "mooutils/mooi18n.h" -#include +#include #include #define FILTERS_VERSION "1.0" diff --git a/moo/plugins/usertools/moousertools-prefs.h b/moo/plugins/usertools/moousertools-prefs.h index 151499f9..9cac9600 100644 --- a/moo/plugins/usertools/moousertools-prefs.h +++ b/moo/plugins/usertools/moousertools-prefs.h @@ -16,7 +16,7 @@ #ifndef MOO_USER_TOOLS_PREFS_H #define MOO_USER_TOOLS_PREFS_H -#include +#include G_BEGIN_DECLS