4efcbab332
This is a mega-commit - because most of it had to be done in one go otherwise some commits would fail to compile - that attempts to fix a few problems with Geany's includes as well as various other related cleanups. After this change it's easier to use includes and there's little worry about which order things are included in or who includes what. Overview of changes: * Include config.h at the start of each source file if HAVE_CONFIG_H is defined (and never in headers). * Go through each source file and make the includes section generally like this: - Always config.h first as above - Then if the file has a header with the same name, include that - Then include in alphabetical order each other internal/geany header. - Then include standard headers - Then include non-standard system headers - Then include GLib/GTK+ related stuff * Doing as above makes it easier to find implicit header include dependencies and it exposed quite a few weird problems with includes or forward declarations, fix those. * Make geany.h contain not much besides some defines. - Add a little header file "app.h" for GeanyApp and move it there - Move "app" global to new "app.h" file - Move "ignore_callback" global to "callbacks.h" - Move "geany_object" global to "geanyobject.h" * Add an include in "geany.h" for "app.h" since GeanyApp used to be defined there and some plugins included this header to access GeanyApp. * Include "gtkcompat.h" everywhere instead of gtk/gtk.h so that everywhere sees the same definitions (not a problem in practice AFAIK so this could be changed back if better that way. * Remove forward declarations from previous commits as some people apparently consider this bad style, despite that it reduces inter- header dependencies. TODO: * As always, to test on win32 * As always, to test with not Autotools * Test plugins better, both builtin and geany-plugins, likely API/ABI bump * Test with various defines/flags that may change what is included * win32.[ch] not really touched since I couldn't test
62 lines
2.0 KiB
C
62 lines
2.0 KiB
C
/*
|
|
* filetypesprivate.h - this file is part of Geany, a fast and lightweight IDE
|
|
*
|
|
* Copyright 2008-2012 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de>
|
|
* Copyright 2008-2012 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com>
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License as published by
|
|
* the Free Software Foundation; either version 2 of the License, or
|
|
* (at your option) any later version.
|
|
*
|
|
* This program is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License along
|
|
* with this program; if not, write to the Free Software Foundation, Inc.,
|
|
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
|
*/
|
|
|
|
|
|
#ifndef GEANY_FILETYPES_PRIVATE_H
|
|
#define GEANY_FILETYPES_PRIVATE_H 1
|
|
|
|
#include "build.h"
|
|
|
|
#include "gtkcompat.h"
|
|
|
|
G_BEGIN_DECLS
|
|
|
|
/* Private GeanyFiletype fields */
|
|
typedef struct GeanyFiletypePrivate
|
|
{
|
|
GtkWidget *menu_item; /* holds a pointer to the menu item for this filetype */
|
|
gboolean keyfile_loaded;
|
|
GRegex *error_regex;
|
|
gchar *last_error_pattern;
|
|
gboolean custom;
|
|
gint symbol_list_sort_mode;
|
|
gboolean xml_indent_tags; /* XML tag autoindentation, for HTML and XML filetypes */
|
|
GSList *tag_files;
|
|
gboolean warn_color_scheme;
|
|
|
|
/* TODO: move to structure in build.h and only put a pointer here */
|
|
GeanyBuildCommand *filecmds;
|
|
GeanyBuildCommand *ftdefcmds;
|
|
GeanyBuildCommand *execcmds;
|
|
GeanyBuildCommand *homefilecmds;
|
|
GeanyBuildCommand *homeexeccmds;
|
|
GeanyBuildCommand *projfilecmds;
|
|
GeanyBuildCommand *projexeccmds;
|
|
gint project_list_entry;
|
|
gchar *projerror_regex_string;
|
|
gchar *homeerror_regex_string;
|
|
}
|
|
GeanyFiletypePrivate;
|
|
|
|
G_END_DECLS
|
|
|
|
#endif /* GEANY_FILETYPES_PRIVATE_H */
|