diff --git a/Makefile.am b/Makefile.am index ba45d8ac..8bfa362e 100644 --- a/Makefile.am +++ b/Makefile.am @@ -21,6 +21,8 @@ SUBDIRS = src tests docs scripts themes utils confdir = $(sysconfdir) conf_DATA = irssi.conf +pkgconfig_DATA = irssi-1.pc + pkginclude_HEADERS = irssi-config.h irssi-version.h EXTRA_DIST = \ @@ -28,5 +30,4 @@ EXTRA_DIST = \ autogen.sh \ README.md \ $(conf_DATA) \ - irssi-config.in \ irssi-icon.png diff --git a/configure.ac b/configure.ac index 066f7a07..9c0243f7 100644 --- a/configure.ac +++ b/configure.ac @@ -18,6 +18,8 @@ AM_PROG_LIBTOOL AC_PATH_PROG(sedpath, sed) AC_PATH_PROG(perlpath, perl) +PKG_INSTALLDIR + AC_CHECK_HEADERS(unistd.h dirent.h sys/ioctl.h sys/resource.h) # check posix headers.. @@ -762,10 +764,15 @@ docs/help/Makefile docs/help/in/Makefile utils/Makefile themes/Makefile -irssi-config +irssi-1.pc ]) +dnl ** make the paths like include headers later +AC_CONFIG_LINKS([irssi/irssi-config.h:irssi-config.h]) +AC_LINK_FILES([$srcdir/src],[irssi/src]) + AC_OUTPUT +$LN_S ../irssi-version.h irssi/irssi-version.h dnl ** for building from objdir old_dir=`pwd` && cd $srcdir && whole_dir=`pwd` && cd $old_dir diff --git a/irssi-1.pc.in b/irssi-1.pc.in new file mode 100644 index 00000000..a1c00f5c --- /dev/null +++ b/irssi-1.pc.in @@ -0,0 +1,20 @@ +prefix=@prefix@ +exec_prefix=@exec_prefix@ +libdir=@libdir@ +includedir=@includedir@ + +prog_libs="@PROG_LIBS@" +common_libs="@COMMON_LIBS@" + +perl_link_libs="@PERL_LINK_LIBS@" +perl_fe_link_libs="@PERL_FE_LINK_LIBS@" +perl_link_flags="@PERL_LINK_FLAGS@" + +chat_modules="@CHAT_MODULES@" +irc_modules="@irc_MODULES@" + +Name: Irssi +Description: Irssi chat client +Version: @PACKAGE_VERSION@ +Cflags: -I${includedir} @OPENSSL_CFLAGS@ +Requires: glib-2.0 \ No newline at end of file diff --git a/irssi-config.in b/irssi-config.in deleted file mode 100644 index cd529ed0..00000000 --- a/irssi-config.in +++ /dev/null @@ -1,9 +0,0 @@ -PROG_LIBS="@PROG_LIBS@" -COMMON_LIBS="@COMMON_LIBS@" - -PERL_LINK_LIBS="@PERL_LINK_LIBS@" -PERL_FE_LINK_LIBS="@PERL_FE_LINK_LIBS@" -PERL_LINK_FLAGS="@PERL_LINK_FLAGS@" - -CHAT_MODULES="@CHAT_MODULES@" -irc_MODULES="@irc_MODULES@" diff --git a/m4/pkg.m4 b/m4/pkg.m4 new file mode 100644 index 00000000..13a88901 --- /dev/null +++ b/m4/pkg.m4 @@ -0,0 +1,275 @@ +# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- +# serial 12 (pkg-config-0.29.2) + +dnl Copyright © 2004 Scott James Remnant . +dnl Copyright © 2012-2015 Dan Nicholson +dnl +dnl This program is free software; you can redistribute it and/or modify +dnl it under the terms of the GNU General Public License as published by +dnl the Free Software Foundation; either version 2 of the License, or +dnl (at your option) any later version. +dnl +dnl This program is distributed in the hope that it will be useful, but +dnl WITHOUT ANY WARRANTY; without even the implied warranty of +dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +dnl General Public License for more details. +dnl +dnl You should have received a copy of the GNU General Public License +dnl along with this program; if not, write to the Free Software +dnl Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +dnl 02111-1307, USA. +dnl +dnl As a special exception to the GNU General Public License, if you +dnl distribute this file as part of a program that contains a +dnl configuration script generated by Autoconf, you may include it under +dnl the same distribution terms that you use for the rest of that +dnl program. + +dnl PKG_PREREQ(MIN-VERSION) +dnl ----------------------- +dnl Since: 0.29 +dnl +dnl Verify that the version of the pkg-config macros are at least +dnl MIN-VERSION. Unlike PKG_PROG_PKG_CONFIG, which checks the user's +dnl installed version of pkg-config, this checks the developer's version +dnl of pkg.m4 when generating configure. +dnl +dnl To ensure that this macro is defined, also add: +dnl m4_ifndef([PKG_PREREQ], +dnl [m4_fatal([must install pkg-config 0.29 or later before running autoconf/autogen])]) +dnl +dnl See the "Since" comment for each macro you use to see what version +dnl of the macros you require. +m4_defun([PKG_PREREQ], +[m4_define([PKG_MACROS_VERSION], [0.29.2]) +m4_if(m4_version_compare(PKG_MACROS_VERSION, [$1]), -1, + [m4_fatal([pkg.m4 version $1 or higher is required but ]PKG_MACROS_VERSION[ found])]) +])dnl PKG_PREREQ + +dnl PKG_PROG_PKG_CONFIG([MIN-VERSION]) +dnl ---------------------------------- +dnl Since: 0.16 +dnl +dnl Search for the pkg-config tool and set the PKG_CONFIG variable to +dnl first found in the path. Checks that the version of pkg-config found +dnl is at least MIN-VERSION. If MIN-VERSION is not specified, 0.9.0 is +dnl used since that's the first version where most current features of +dnl pkg-config existed. +AC_DEFUN([PKG_PROG_PKG_CONFIG], +[m4_pattern_forbid([^_?PKG_[A-Z_]+$]) +m4_pattern_allow([^PKG_CONFIG(_(PATH|LIBDIR|SYSROOT_DIR|ALLOW_SYSTEM_(CFLAGS|LIBS)))?$]) +m4_pattern_allow([^PKG_CONFIG_(DISABLE_UNINSTALLED|TOP_BUILD_DIR|DEBUG_SPEW)$]) +AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility]) +AC_ARG_VAR([PKG_CONFIG_PATH], [directories to add to pkg-config's search path]) +AC_ARG_VAR([PKG_CONFIG_LIBDIR], [path overriding pkg-config's built-in search path]) + +if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then + AC_PATH_TOOL([PKG_CONFIG], [pkg-config]) +fi +if test -n "$PKG_CONFIG"; then + _pkg_min_version=m4_default([$1], [0.9.0]) + AC_MSG_CHECKING([pkg-config is at least version $_pkg_min_version]) + if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then + AC_MSG_RESULT([yes]) + else + AC_MSG_RESULT([no]) + PKG_CONFIG="" + fi +fi[]dnl +])dnl PKG_PROG_PKG_CONFIG + +dnl PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) +dnl ------------------------------------------------------------------- +dnl Since: 0.18 +dnl +dnl Check to see whether a particular set of modules exists. Similar to +dnl PKG_CHECK_MODULES(), but does not set variables or print errors. +dnl +dnl Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG]) +dnl only at the first occurence in configure.ac, so if the first place +dnl it's called might be skipped (such as if it is within an "if", you +dnl have to call PKG_CHECK_EXISTS manually +AC_DEFUN([PKG_CHECK_EXISTS], +[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl +if test -n "$PKG_CONFIG" && \ + AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then + m4_default([$2], [:]) +m4_ifvaln([$3], [else + $3])dnl +fi]) + +dnl _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES]) +dnl --------------------------------------------- +dnl Internal wrapper calling pkg-config via PKG_CONFIG and setting +dnl pkg_failed based on the result. +m4_define([_PKG_CONFIG], +[if test -n "$$1"; then + pkg_cv_[]$1="$$1" + elif test -n "$PKG_CONFIG"; then + PKG_CHECK_EXISTS([$3], + [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes ], + [pkg_failed=yes]) + else + pkg_failed=untried +fi[]dnl +])dnl _PKG_CONFIG + +dnl _PKG_SHORT_ERRORS_SUPPORTED +dnl --------------------------- +dnl Internal check to see if pkg-config supports short errors. +AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED], +[AC_REQUIRE([PKG_PROG_PKG_CONFIG]) +if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then + _pkg_short_errors_supported=yes +else + _pkg_short_errors_supported=no +fi[]dnl +])dnl _PKG_SHORT_ERRORS_SUPPORTED + + +dnl PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND], +dnl [ACTION-IF-NOT-FOUND]) +dnl -------------------------------------------------------------- +dnl Since: 0.4.0 +dnl +dnl Note that if there is a possibility the first call to +dnl PKG_CHECK_MODULES might not happen, you should be sure to include an +dnl explicit call to PKG_PROG_PKG_CONFIG in your configure.ac +AC_DEFUN([PKG_CHECK_MODULES], +[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl +AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl +AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl + +pkg_failed=no +AC_MSG_CHECKING([for $2]) + +_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2]) +_PKG_CONFIG([$1][_LIBS], [libs], [$2]) + +m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS +and $1[]_LIBS to avoid the need to call pkg-config. +See the pkg-config man page for more details.]) + +if test $pkg_failed = yes; then + AC_MSG_RESULT([no]) + _PKG_SHORT_ERRORS_SUPPORTED + if test $_pkg_short_errors_supported = yes; then + $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$2" 2>&1` + else + $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$2" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD + + m4_default([$4], [AC_MSG_ERROR( +[Package requirements ($2) were not met: + +$$1_PKG_ERRORS + +Consider adjusting the PKG_CONFIG_PATH environment variable if you +installed software in a non-standard prefix. + +_PKG_TEXT])[]dnl + ]) +elif test $pkg_failed = untried; then + AC_MSG_RESULT([no]) + m4_default([$4], [AC_MSG_FAILURE( +[The pkg-config script could not be found or is too old. Make sure it +is in your PATH or set the PKG_CONFIG environment variable to the full +path to pkg-config. + +_PKG_TEXT + +To get pkg-config, see .])[]dnl + ]) +else + $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS + $1[]_LIBS=$pkg_cv_[]$1[]_LIBS + AC_MSG_RESULT([yes]) + $3 +fi[]dnl +])dnl PKG_CHECK_MODULES + + +dnl PKG_CHECK_MODULES_STATIC(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND], +dnl [ACTION-IF-NOT-FOUND]) +dnl --------------------------------------------------------------------- +dnl Since: 0.29 +dnl +dnl Checks for existence of MODULES and gathers its build flags with +dnl static libraries enabled. Sets VARIABLE-PREFIX_CFLAGS from --cflags +dnl and VARIABLE-PREFIX_LIBS from --libs. +dnl +dnl Note that if there is a possibility the first call to +dnl PKG_CHECK_MODULES_STATIC might not happen, you should be sure to +dnl include an explicit call to PKG_PROG_PKG_CONFIG in your +dnl configure.ac. +AC_DEFUN([PKG_CHECK_MODULES_STATIC], +[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl +_save_PKG_CONFIG=$PKG_CONFIG +PKG_CONFIG="$PKG_CONFIG --static" +PKG_CHECK_MODULES($@) +PKG_CONFIG=$_save_PKG_CONFIG[]dnl +])dnl PKG_CHECK_MODULES_STATIC + + +dnl PKG_INSTALLDIR([DIRECTORY]) +dnl ------------------------- +dnl Since: 0.27 +dnl +dnl Substitutes the variable pkgconfigdir as the location where a module +dnl should install pkg-config .pc files. By default the directory is +dnl $libdir/pkgconfig, but the default can be changed by passing +dnl DIRECTORY. The user can override through the --with-pkgconfigdir +dnl parameter. +AC_DEFUN([PKG_INSTALLDIR], +[m4_pushdef([pkg_default], [m4_default([$1], ['${libdir}/pkgconfig'])]) +m4_pushdef([pkg_description], + [pkg-config installation directory @<:@]pkg_default[@:>@]) +AC_ARG_WITH([pkgconfigdir], + [AS_HELP_STRING([--with-pkgconfigdir], pkg_description)],, + [with_pkgconfigdir=]pkg_default) +AC_SUBST([pkgconfigdir], [$with_pkgconfigdir]) +m4_popdef([pkg_default]) +m4_popdef([pkg_description]) +])dnl PKG_INSTALLDIR + + +dnl PKG_NOARCH_INSTALLDIR([DIRECTORY]) +dnl -------------------------------- +dnl Since: 0.27 +dnl +dnl Substitutes the variable noarch_pkgconfigdir as the location where a +dnl module should install arch-independent pkg-config .pc files. By +dnl default the directory is $datadir/pkgconfig, but the default can be +dnl changed by passing DIRECTORY. The user can override through the +dnl --with-noarch-pkgconfigdir parameter. +AC_DEFUN([PKG_NOARCH_INSTALLDIR], +[m4_pushdef([pkg_default], [m4_default([$1], ['${datadir}/pkgconfig'])]) +m4_pushdef([pkg_description], + [pkg-config arch-independent installation directory @<:@]pkg_default[@:>@]) +AC_ARG_WITH([noarch-pkgconfigdir], + [AS_HELP_STRING([--with-noarch-pkgconfigdir], pkg_description)],, + [with_noarch_pkgconfigdir=]pkg_default) +AC_SUBST([noarch_pkgconfigdir], [$with_noarch_pkgconfigdir]) +m4_popdef([pkg_default]) +m4_popdef([pkg_description]) +])dnl PKG_NOARCH_INSTALLDIR + + +dnl PKG_CHECK_VAR(VARIABLE, MODULE, CONFIG-VARIABLE, +dnl [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) +dnl ------------------------------------------- +dnl Since: 0.28 +dnl +dnl Retrieves the value of the pkg-config variable for the given module. +AC_DEFUN([PKG_CHECK_VAR], +[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl +AC_ARG_VAR([$1], [value of $3 for $2, overriding pkg-config])dnl + +_PKG_CONFIG([$1], [variable="][$3]["], [$2]) +AS_VAR_COPY([$1], [pkg_cv_][$1]) + +AS_VAR_IF([$1], [""], [$5], [$4])dnl +])dnl PKG_CHECK_VAR diff --git a/src/common.h b/src/common.h index 41dc192f..ef4b0c15 100644 --- a/src/common.h +++ b/src/common.h @@ -1,5 +1,5 @@ -#ifndef __COMMON_H -#define __COMMON_H +#ifndef IRSSI_COMMON_H +#define IRSSI_COMMON_H #define IRSSI_DIR_FULL "%s/.irssi" /* %s == g_get_home_dir() */ @@ -11,9 +11,7 @@ #define DEFAULT_SERVER_ADD_PORT 6667 #define DEFAULT_SERVER_ADD_TLS_PORT 6697 -#ifdef HAVE_CONFIG_H -#include "irssi-config.h" -#endif +#include #include #include diff --git a/src/core/Makefile.am b/src/core/Makefile.am index 4cc2226c..c01b8f10 100644 --- a/src/core/Makefile.am +++ b/src/core/Makefile.am @@ -1,8 +1,6 @@ noinst_LIBRARIES = libcore.a AM_CPPFLAGS = \ - -I$(top_srcdir)/src \ - -I$(top_srcdir)/src/core \ $(GLIB_CFLAGS) \ -DSYSCONFDIR=\""$(sysconfdir)"\" \ -DMODULEDIR=\""$(libdir)/irssi/modules"\" diff --git a/src/core/args.c b/src/core/args.c index 9894b6c8..5e2b1412 100644 --- a/src/core/args.c +++ b/src/core/args.c @@ -19,7 +19,7 @@ */ #include "module.h" -#include "args.h" +#include static GOptionContext *context = NULL; diff --git a/src/core/args.h b/src/core/args.h index bbe16b5f..aeaf5714 100644 --- a/src/core/args.h +++ b/src/core/args.h @@ -1,5 +1,5 @@ -#ifndef __ARGS_H -#define __ARGS_H +#ifndef IRSSI_CORE_ARGS_H +#define IRSSI_CORE_ARGS_H void args_register(GOptionEntry *options); void args_execute(int argc, char *argv[]); diff --git a/src/core/capsicum.c b/src/core/capsicum.c index 568b5542..d73d15fb 100644 --- a/src/core/capsicum.c +++ b/src/core/capsicum.c @@ -23,14 +23,14 @@ */ #include "module.h" -#include "capsicum.h" -#include "commands.h" -#include "log.h" -#include "misc.h" -#include "network.h" -#include "network-openssl.h" -#include "settings.h" -#include "signals.h" +#include +#include +#include +#include +#include +#include +#include +#include #include #include diff --git a/src/core/capsicum.h b/src/core/capsicum.h index 7d89f2aa..ab980a43 100644 --- a/src/core/capsicum.h +++ b/src/core/capsicum.h @@ -1,5 +1,5 @@ -#ifndef __CAPSICUM_H -#define __CAPSICUM_H +#ifndef IRSSI_CORE_CAPSICUM_H +#define IRSSI_CORE_CAPSICUM_H gboolean capsicum_enabled(void); int capsicum_net_connect_ip(IPADDR *ip, int port, IPADDR *my_ip); @@ -12,4 +12,4 @@ void capsicum_mkdir_with_parents_wrapper(const char *path, int mode); void capsicum_init(void); void capsicum_deinit(void); -#endif /* !__CAPSICUM_H */ +#endif /* !IRSSI_CORE_CAPSICUM_H */ diff --git a/src/core/channel-rec.h b/src/core/channel-rec.h index f3ec5f8d..f1e30fa0 100644 --- a/src/core/channel-rec.h +++ b/src/core/channel-rec.h @@ -1,6 +1,6 @@ /* CHANNEL_REC definition, used for inheritance */ -#include "window-item-rec.h" +#include char *topic; char *topic_by; diff --git a/src/core/channels-setup.c b/src/core/channels-setup.c index 8002646d..55b4533e 100644 --- a/src/core/channels-setup.c +++ b/src/core/channels-setup.c @@ -19,14 +19,14 @@ */ #include "module.h" -#include "signals.h" -#include "lib-config/iconfig.h" -#include "settings.h" +#include +#include +#include -#include "chat-protocols.h" -#include "chatnets.h" -#include "servers-setup.h" -#include "channels-setup.h" +#include +#include +#include +#include GSList *setupchannels; diff --git a/src/core/channels-setup.h b/src/core/channels-setup.h index 3bb7da7f..c0297aec 100644 --- a/src/core/channels-setup.h +++ b/src/core/channels-setup.h @@ -1,7 +1,7 @@ -#ifndef __CHANNELS_SETUP_H -#define __CHANNELS_SETUP_H +#ifndef IRSSI_CORE_CHANNELS_SETUP_H +#define IRSSI_CORE_CHANNELS_SETUP_H -#include "modules.h" +#include #define CHANNEL_SETUP(server) \ MODULE_CHECK_CAST(server, CHANNEL_SETUP_REC, type, "CHANNEL SETUP") @@ -10,7 +10,7 @@ (CHANNEL_SETUP(server) ? TRUE : FALSE) struct _CHANNEL_SETUP_REC { -#include "channel-setup-rec.h" +#include }; extern GSList *setupchannels; diff --git a/src/core/channels.c b/src/core/channels.c index 9c3b92ba..edc30544 100644 --- a/src/core/channels.c +++ b/src/core/channels.c @@ -19,14 +19,14 @@ */ #include "module.h" -#include "signals.h" -#include "misc.h" -#include "special-vars.h" +#include +#include +#include -#include "servers.h" -#include "channels.h" -#include "channels-setup.h" -#include "nicklist.h" +#include +#include +#include +#include GSList *channels; /* List of all channels */ diff --git a/src/core/channels.h b/src/core/channels.h index bd136fe2..197d2254 100644 --- a/src/core/channels.h +++ b/src/core/channels.h @@ -1,7 +1,7 @@ -#ifndef __CHANNELS_H -#define __CHANNELS_H +#ifndef IRSSI_CORE_CHANNELS_H +#define IRSSI_CORE_CHANNELS_H -#include "modules.h" +#include /* Returns CHANNEL_REC if it's channel, NULL if it isn't. */ #define CHANNEL(channel) \ @@ -13,7 +13,7 @@ #define STRUCT_SERVER_REC SERVER_REC struct _CHANNEL_REC { -#include "channel-rec.h" +#include }; extern GSList *channels; diff --git a/src/core/chat-commands.c b/src/core/chat-commands.c index d5a133f8..0b4b6591 100644 --- a/src/core/chat-commands.c +++ b/src/core/chat-commands.c @@ -19,20 +19,20 @@ */ #include "module.h" -#include "network.h" -#include "signals.h" -#include "commands.h" -#include "special-vars.h" -#include "settings.h" +#include +#include +#include +#include +#include -#include "chat-protocols.h" -#include "servers.h" -#include "servers-setup.h" -#include "servers-reconnect.h" -#include "channels.h" -#include "queries.h" -#include "window-item-def.h" -#include "rawlog.h" +#include +#include +#include +#include +#include +#include +#include +#include static SERVER_CONNECT_REC *get_server_connect(const char *data, int *plus_addr, char **rawlog_file) diff --git a/src/core/chat-protocols.c b/src/core/chat-protocols.c index ee15c087..c53b01b3 100644 --- a/src/core/chat-protocols.c +++ b/src/core/chat-protocols.c @@ -19,14 +19,14 @@ */ #include "module.h" -#include "modules.h" -#include "signals.h" -#include "chat-protocols.h" +#include +#include +#include -#include "chatnets.h" -#include "servers.h" -#include "servers-setup.h" -#include "channels-setup.h" +#include +#include +#include +#include GSList *chat_protocols; diff --git a/src/core/chat-protocols.h b/src/core/chat-protocols.h index 8b7dc170..ab7327bd 100644 --- a/src/core/chat-protocols.h +++ b/src/core/chat-protocols.h @@ -1,5 +1,5 @@ -#ifndef __CHAT_PROTOCOLS_H -#define __CHAT_PROTOCOLS_H +#ifndef IRSSI_CORE_CHAT_PROTOCOLS_H +#define IRSSI_CORE_CHAT_PROTOCOLS_H struct _CHAT_PROTOCOL_REC { int id; diff --git a/src/core/chatnets.c b/src/core/chatnets.c index e0a7a8d9..2d49a6df 100644 --- a/src/core/chatnets.c +++ b/src/core/chatnets.c @@ -19,15 +19,15 @@ */ #include "module.h" -#include "network.h" -#include "signals.h" -#include "special-vars.h" -#include "lib-config/iconfig.h" -#include "settings.h" +#include +#include +#include +#include +#include -#include "chat-protocols.h" -#include "chatnets.h" -#include "servers.h" +#include +#include +#include GSList *chatnets; /* list of available chat networks */ diff --git a/src/core/chatnets.h b/src/core/chatnets.h index 2b78f64a..6f36fe33 100644 --- a/src/core/chatnets.h +++ b/src/core/chatnets.h @@ -1,7 +1,7 @@ -#ifndef __CHATNETS_H -#define __CHATNETS_H +#ifndef IRSSI_CORE_CHATNETS_H +#define IRSSI_CORE_CHATNETS_H -#include "modules.h" +#include /* Returns CHATNET_REC if it's chatnet, NULL if it isn't. */ #define CHATNET(chatnet) \ @@ -11,7 +11,7 @@ (CHATNET(chatnet) ? TRUE : FALSE) struct _CHATNET_REC { -#include "chatnet-rec.h" +#include }; extern GSList *chatnets; /* list of available chat networks */ diff --git a/src/core/commands.c b/src/core/commands.c index 2eebf0a3..4ba1ea1c 100644 --- a/src/core/commands.c +++ b/src/core/commands.c @@ -19,17 +19,17 @@ */ #include "module.h" -#include "signals.h" -#include "commands.h" -#include "misc.h" -#include "special-vars.h" -#include "window-item-def.h" +#include +#include +#include +#include +#include -#include "servers.h" -#include "channels.h" +#include +#include -#include "lib-config/iconfig.h" -#include "settings.h" +#include +#include GSList *commands; char *current_command; diff --git a/src/core/commands.h b/src/core/commands.h index 93d6276b..7c6bd87b 100644 --- a/src/core/commands.h +++ b/src/core/commands.h @@ -1,7 +1,7 @@ -#ifndef __COMMANDS_H -#define __COMMANDS_H +#ifndef IRSSI_CORE_COMMANDS_H +#define IRSSI_CORE_COMMANDS_H -#include "signals.h" +#include typedef struct { SIGNAL_FUNC func; diff --git a/src/core/core.c b/src/core/core.c index 3c335fd2..8562836a 100644 --- a/src/core/core.c +++ b/src/core/core.c @@ -21,33 +21,33 @@ #include "module.h" #include -#include "args.h" -#include "pidwait.h" -#include "misc.h" +#include +#include +#include -#include "net-disconnect.h" -#include "signals.h" -#include "settings.h" -#include "session.h" +#include +#include +#include +#include #ifdef HAVE_CAPSICUM -#include "capsicum.h" +#include #endif -#include "chat-protocols.h" -#include "servers.h" -#include "chatnets.h" -#include "commands.h" -#include "expandos.h" -#include "write-buffer.h" -#include "log.h" -#include "rawlog.h" -#include "ignore.h" -#include "recode.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include -#include "channels.h" -#include "queries.h" -#include "nicklist.h" -#include "nickmatch-cache.h" +#include +#include +#include +#include #ifdef HAVE_SYS_RESOURCE_H # include diff --git a/src/core/core.h b/src/core/core.h index 982dbaad..6c6c7b61 100644 --- a/src/core/core.h +++ b/src/core/core.h @@ -1,7 +1,7 @@ -#ifndef __IRSSI_CORE_H -#define __IRSSI_CORE_H +#ifndef IRSSI_CORE_CORE_H +#define IRSSI_CORE_CORE_H -#include "common.h" +#include /* for determining what GUI is currently in use: */ #define IRSSI_GUI_NONE 0 diff --git a/src/core/expandos.c b/src/core/expandos.c index 2e4265d5..96e2d9f3 100644 --- a/src/core/expandos.c +++ b/src/core/expandos.c @@ -18,20 +18,20 @@ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#include "core.h" +#include #include "module.h" -#include "modules.h" -#include "signals.h" -#include "expandos.h" -#include "settings.h" -#include "commands.h" -#include "misc.h" -#include "irssi-version.h" +#include +#include +#include +#include +#include +#include +#include -#include "servers.h" -#include "channels.h" -#include "queries.h" -#include "window-item-def.h" +#include +#include +#include +#include #ifdef HAVE_SYS_UTSNAME_H # include diff --git a/src/core/expandos.h b/src/core/expandos.h index 45608a26..05dfcf11 100644 --- a/src/core/expandos.h +++ b/src/core/expandos.h @@ -1,7 +1,7 @@ -#ifndef __EXPANDOS_H -#define __EXPANDOS_H +#ifndef IRSSI_CORE_EXPANDOS_H +#define IRSSI_CORE_EXPANDOS_H -#include "signals.h" +#include /* first argument of signal must match to active .. */ typedef enum { diff --git a/src/core/ignore.c b/src/core/ignore.c index 371da83b..14fa585e 100644 --- a/src/core/ignore.c +++ b/src/core/ignore.c @@ -19,20 +19,20 @@ */ #include "module.h" -#include "signals.h" -#include "misc.h" -#include "levels.h" -#include "lib-config/iconfig.h" -#include "settings.h" -#include "iregex.h" +#include +#include +#include +#include +#include +#include -#include "masks.h" -#include "servers.h" -#include "channels.h" -#include "nicklist.h" -#include "nickmatch-cache.h" +#include +#include +#include +#include +#include -#include "ignore.h" +#include GSList *ignores; diff --git a/src/core/ignore.h b/src/core/ignore.h index 20c5475e..bf55a76b 100644 --- a/src/core/ignore.h +++ b/src/core/ignore.h @@ -1,7 +1,7 @@ -#ifndef __IGNORE_H -#define __IGNORE_H +#ifndef IRSSI_CORE_IGNORE_H +#define IRSSI_CORE_IGNORE_H -#include "iregex.h" +#include typedef struct _IGNORE_REC IGNORE_REC; diff --git a/src/core/iregex-gregex.c b/src/core/iregex-gregex.c index 36b4faa4..60b4ec58 100644 --- a/src/core/iregex-gregex.c +++ b/src/core/iregex-gregex.c @@ -1,6 +1,6 @@ #include -#include "iregex.h" +#include struct _MatchInfo { const char *valid_string; diff --git a/src/core/iregex-regexh.c b/src/core/iregex-regexh.c index 897eb7e2..aae8ecdf 100644 --- a/src/core/iregex-regexh.c +++ b/src/core/iregex-regexh.c @@ -1,4 +1,4 @@ -#include "iregex.h" +#include Regex * i_regex_new (const gchar *pattern, diff --git a/src/core/iregex.h b/src/core/iregex.h index e67378d7..53263944 100644 --- a/src/core/iregex.h +++ b/src/core/iregex.h @@ -1,7 +1,7 @@ -#ifndef __REGEX_H -#define __REGEX_H +#ifndef IRSSI_CORE_IREGEX_H +#define IRSSI_CORE_IREGEX_H -#include "common.h" +#include #ifdef USE_GREGEX diff --git a/src/core/levels.c b/src/core/levels.c index eb7efcf7..9102696e 100644 --- a/src/core/levels.c +++ b/src/core/levels.c @@ -19,7 +19,7 @@ */ #include "module.h" -#include "levels.h" +#include /* the order of these levels must match the bits in levels.h */ static const char *levels[] = { diff --git a/src/core/levels.h b/src/core/levels.h index b0ebafba..385ecd0c 100644 --- a/src/core/levels.h +++ b/src/core/levels.h @@ -1,5 +1,5 @@ -#ifndef __LEVELS_H -#define __LEVELS_H +#ifndef IRSSI_CORE_LEVELS_H +#define IRSSI_CORE_LEVELS_H /* This is pretty much IRC specific, but I think it would be easier for other chats to try to use these same levels instead of implementing too diff --git a/src/core/line-split.c b/src/core/line-split.c index 0ee87d23..da84a334 100644 --- a/src/core/line-split.c +++ b/src/core/line-split.c @@ -19,7 +19,7 @@ */ #include "module.h" -#include "misc.h" +#include /* Maximum line length - split to two lines if it's longer than this. diff --git a/src/core/line-split.h b/src/core/line-split.h index 7c101ddd..cf957423 100644 --- a/src/core/line-split.h +++ b/src/core/line-split.h @@ -1,5 +1,5 @@ -#ifndef __LINE_SPLIT_H -#define __LINE_SPLIT_H +#ifndef IRSSI_CORE_LINE_SPLIT_H +#define IRSSI_CORE_LINE_SPLIT_H /* line-split `data'. Initially `*buffer' should contain NULL. */ int line_split(const char *data, int len, char **output, LINEBUF_REC **buffer); diff --git a/src/core/log-away.c b/src/core/log-away.c index e2a0120b..d6dac4d9 100644 --- a/src/core/log-away.c +++ b/src/core/log-away.c @@ -19,12 +19,12 @@ */ #include "module.h" -#include "signals.h" -#include "levels.h" -#include "log.h" -#include "servers.h" -#include "settings.h" -#include "write-buffer.h" +#include +#include +#include +#include +#include +#include static LOG_REC *awaylog; static int away_filepos; diff --git a/src/core/log.c b/src/core/log.c index f7741d3d..3e260fe7 100644 --- a/src/core/log.c +++ b/src/core/log.c @@ -19,19 +19,19 @@ */ #include "module.h" -#include "signals.h" -#include "commands.h" -#include "levels.h" -#include "misc.h" -#include "servers.h" -#include "log.h" -#include "write-buffer.h" +#include +#include +#include +#include +#include +#include +#include #ifdef HAVE_CAPSICUM -#include "capsicum.h" +#include #endif -#include "lib-config/iconfig.h" -#include "settings.h" +#include +#include #define DEFAULT_LOG_FILE_CREATE_MODE 600 diff --git a/src/core/log.h b/src/core/log.h index 5a07859b..1c529670 100644 --- a/src/core/log.h +++ b/src/core/log.h @@ -1,5 +1,5 @@ -#ifndef __LOG_H -#define __LOG_H +#ifndef IRSSI_CORE_LOG_H +#define IRSSI_CORE_LOG_H enum { LOG_ITEM_TARGET, /* channel, query, .. */ diff --git a/src/core/masks.c b/src/core/masks.c index dc0064a9..a84ac44d 100644 --- a/src/core/masks.c +++ b/src/core/masks.c @@ -19,10 +19,10 @@ */ #include "module.h" -#include "network.h" -#include "misc.h" +#include +#include -#include "servers.h" +#include /* Returns TRUE if mask contains '!' ie. address should be checked too. Also checks if mask contained any wildcards. */ diff --git a/src/core/masks.h b/src/core/masks.h index b6ce20d8..e3a0437a 100644 --- a/src/core/masks.h +++ b/src/core/masks.h @@ -1,5 +1,5 @@ -#ifndef __MASKS_H -#define __MASKS_H +#ifndef IRSSI_CORE_MASKS_H +#define IRSSI_CORE_MASKS_H int mask_match(SERVER_REC *server, const char *mask, const char *nick, const char *user, const char *host); diff --git a/src/core/misc.c b/src/core/misc.c index e1f199b2..d612f587 100644 --- a/src/core/misc.c +++ b/src/core/misc.c @@ -19,8 +19,8 @@ */ #include "module.h" -#include "misc.h" -#include "commands.h" +#include +#include typedef struct { int condition; diff --git a/src/core/misc.h b/src/core/misc.h index 1545f7a2..9e06c707 100644 --- a/src/core/misc.h +++ b/src/core/misc.h @@ -1,5 +1,5 @@ -#ifndef __MISC_H -#define __MISC_H +#ifndef IRSSI_CORE_MISC_H +#define IRSSI_CORE_MISC_H int g_input_add_poll(int fd, int priority, int condition, GInputFunction function, void *data); diff --git a/src/core/module.h b/src/core/module.h index 89784389..639e7e29 100644 --- a/src/core/module.h +++ b/src/core/module.h @@ -1,3 +1,3 @@ -#include "common.h" +#include #define MODULE_NAME "core" diff --git a/src/core/modules-load.c b/src/core/modules-load.c index 9baac1d7..a3598c65 100644 --- a/src/core/modules-load.c +++ b/src/core/modules-load.c @@ -19,13 +19,13 @@ */ #include "module.h" -#include "modules.h" -#include "modules-load.h" -#include "signals.h" +#include +#include +#include -#include "settings.h" -#include "commands.h" -#include "misc.h" +#include +#include +#include #ifdef HAVE_GMODULE diff --git a/src/core/modules-load.h b/src/core/modules-load.h index 42e14382..a99bcdfe 100644 --- a/src/core/modules-load.h +++ b/src/core/modules-load.h @@ -1,7 +1,7 @@ -#ifndef __MODULES_LOAD_H -#define __MODULES_LOAD_H +#ifndef IRSSI_CORE_MODULES_LOAD_H +#define IRSSI_CORE_MODULES_LOAD_H -#include "modules.h" +#include /* Load module - automatically tries to load also the related non-core modules given in `prefixes' (like irc, fe, fe_text, ..) */ diff --git a/src/core/modules.c b/src/core/modules.c index 9b531899..c625071a 100644 --- a/src/core/modules.c +++ b/src/core/modules.c @@ -19,8 +19,8 @@ */ #include "module.h" -#include "modules.h" -#include "signals.h" +#include +#include GSList *modules; diff --git a/src/core/modules.h b/src/core/modules.h index b2fa2fa4..e3deaee2 100644 --- a/src/core/modules.h +++ b/src/core/modules.h @@ -1,5 +1,5 @@ -#ifndef __MODULES_H -#define __MODULES_H +#ifndef IRSSI_CORE_MODULES_H +#define IRSSI_CORE_MODULES_H #define MODULE_DATA_INIT(rec) \ (rec)->module_data = g_hash_table_new(g_str_hash, g_str_equal) diff --git a/src/core/net-disconnect.c b/src/core/net-disconnect.c index 6476e776..889563c5 100644 --- a/src/core/net-disconnect.c +++ b/src/core/net-disconnect.c @@ -19,7 +19,7 @@ */ #include "module.h" -#include "network.h" +#include /* when quitting, wait for max. 5 seconds before forcing to close the socket */ #define MAX_QUIT_CLOSE_WAIT 5 diff --git a/src/core/net-disconnect.h b/src/core/net-disconnect.h index 37a46846..78b03c16 100644 --- a/src/core/net-disconnect.h +++ b/src/core/net-disconnect.h @@ -1,5 +1,5 @@ -#ifndef __NET_DISCONNECT_H -#define __NET_DISCONNECT_H +#ifndef IRSSI_CORE_NET_DISCONNECT_H +#define IRSSI_CORE_NET_DISCONNECT_H /* Try to let the other side close the connection, if it still isn't disconnected after certain amount of time, close it ourself */ diff --git a/src/core/net-nonblock.c b/src/core/net-nonblock.c index 2aca616b..31fbf985 100644 --- a/src/core/net-nonblock.c +++ b/src/core/net-nonblock.c @@ -22,8 +22,8 @@ #include -#include "pidwait.h" -#include "net-nonblock.h" +#include +#include /* nonblocking gethostbyname(), ip (IPADDR) + error (int, 0 = not error) is written to pipe when found PID of the resolver child is returned */ diff --git a/src/core/net-nonblock.h b/src/core/net-nonblock.h index 853fcaa6..086c9dab 100644 --- a/src/core/net-nonblock.h +++ b/src/core/net-nonblock.h @@ -1,7 +1,7 @@ -#ifndef __NET_NONBLOCK_H -#define __NET_NONBLOCK_H +#ifndef IRSSI_CORE_NET_NONBLOCK_H +#define IRSSI_CORE_NET_NONBLOCK_H -#include "network.h" +#include typedef struct { IPADDR ip4, ip6; /* resolved ip addresses */ diff --git a/src/core/net-sendbuffer.c b/src/core/net-sendbuffer.c index 97fb551f..2272de1d 100644 --- a/src/core/net-sendbuffer.c +++ b/src/core/net-sendbuffer.c @@ -20,9 +20,9 @@ #include "module.h" -#include "network.h" -#include "net-sendbuffer.h" -#include "line-split.h" +#include +#include +#include /* Create new buffer - if `bufsize' is zero or less, DEFAULT_BUFFER_SIZE is used */ diff --git a/src/core/net-sendbuffer.h b/src/core/net-sendbuffer.h index bdeb7156..7cf1ef6d 100644 --- a/src/core/net-sendbuffer.h +++ b/src/core/net-sendbuffer.h @@ -1,5 +1,5 @@ -#ifndef __NET_SENDBUFFER_H -#define __NET_SENDBUFFER_H +#ifndef IRSSI_CORE_NET_SENDBUFFER_H +#define IRSSI_CORE_NET_SENDBUFFER_H #define DEFAULT_BUFFER_SIZE 8192 #define MAX_BUFFER_SIZE 1048576 diff --git a/src/core/network-openssl.c b/src/core/network-openssl.c index eec725fa..92507e14 100644 --- a/src/core/network-openssl.c +++ b/src/core/network-openssl.c @@ -19,13 +19,13 @@ */ #include "module.h" -#include "network.h" -#include "network-openssl.h" -#include "net-sendbuffer.h" -#include "misc.h" -#include "servers.h" -#include "signals.h" -#include "tls.h" +#include +#include +#include +#include +#include +#include +#include #include #include diff --git a/src/core/network-openssl.h b/src/core/network-openssl.h index 4cd6d711..2c204fb8 100644 --- a/src/core/network-openssl.h +++ b/src/core/network-openssl.h @@ -1,6 +1,6 @@ -#ifndef __NETWORK_OPENSSL_H -#define __NETWORK_OPENSSL_H +#ifndef IRSSI_CORE_NETWORK_OPENSSL_H +#define IRSSI_CORE_NETWORK_OPENSSL_H gboolean irssi_ssl_init(void); -#endif /* !__NETWORK_OPENSSL_H */ +#endif /* !IRSSI_CORE_NETWORK_OPENSSL_H */ diff --git a/src/core/network.c b/src/core/network.c index 0e326e22..87b91698 100644 --- a/src/core/network.c +++ b/src/core/network.c @@ -19,9 +19,9 @@ */ #include "module.h" -#include "network.h" +#include #ifdef HAVE_CAPSICUM -#include "capsicum.h" +#include #endif #include diff --git a/src/core/network.h b/src/core/network.h index 30fd6aab..1776005d 100644 --- a/src/core/network.h +++ b/src/core/network.h @@ -1,5 +1,5 @@ -#ifndef __NETWORK_H -#define __NETWORK_H +#ifndef IRSSI_CORE_NETWORK_H +#define IRSSI_CORE_NETWORK_H #ifdef HAVE_SOCKS_H #include diff --git a/src/core/nicklist.c b/src/core/nicklist.c index 0bc88ab8..bf845c0d 100644 --- a/src/core/nicklist.c +++ b/src/core/nicklist.c @@ -19,13 +19,13 @@ */ #include "module.h" -#include "signals.h" -#include "misc.h" +#include +#include -#include "servers.h" -#include "channels.h" -#include "nicklist.h" -#include "masks.h" +#include +#include +#include +#include #define isalnumhigh(a) \ (i_isalnum(a) || (unsigned char) (a) >= 128) diff --git a/src/core/nicklist.h b/src/core/nicklist.h index 5e0f4f75..62afa5ff 100644 --- a/src/core/nicklist.h +++ b/src/core/nicklist.h @@ -1,5 +1,5 @@ -#ifndef __NICKLIST_H -#define __NICKLIST_H +#ifndef IRSSI_CORE_NICKLIST_H +#define IRSSI_CORE_NICKLIST_H /* Returns NICK_REC if it's nick, NULL if it isn't. */ #define NICK(server) \ @@ -11,7 +11,7 @@ #define MAX_USER_PREFIXES 7 /* Max prefixes kept for any user-in-chan. 7+1 is a memory unit */ struct _NICK_REC { -#include "nick-rec.h" +#include }; /* Add new nick to list */ diff --git a/src/core/nickmatch-cache.c b/src/core/nickmatch-cache.c index 36a6c241..cae6620d 100644 --- a/src/core/nickmatch-cache.c +++ b/src/core/nickmatch-cache.c @@ -19,12 +19,12 @@ */ #include "module.h" -#include "signals.h" +#include -#include "channels.h" -#include "nicklist.h" +#include +#include -#include "nickmatch-cache.h" +#include static GSList *lists; diff --git a/src/core/nickmatch-cache.h b/src/core/nickmatch-cache.h index c4140a49..ff58d853 100644 --- a/src/core/nickmatch-cache.h +++ b/src/core/nickmatch-cache.h @@ -1,5 +1,5 @@ -#ifndef __NICKMATCH_CACHE_H -#define __NICKMATCH_CACHE_H +#ifndef IRSSI_CORE_NICKMATCH_CACHE_H +#define IRSSI_CORE_NICKMATCH_CACHE_H typedef void (*NICKMATCH_REBUILD_FUNC) (GHashTable *list, CHANNEL_REC *channel, NICK_REC *nick); diff --git a/src/core/pidwait.c b/src/core/pidwait.c index 7fc06195..f421c1d6 100644 --- a/src/core/pidwait.c +++ b/src/core/pidwait.c @@ -19,8 +19,8 @@ */ #include "module.h" -#include "signals.h" -#include "modules.h" +#include +#include static GHashTable *child_pids; static GSList *pids; diff --git a/src/core/pidwait.h b/src/core/pidwait.h index ae1ba01e..148c65d7 100644 --- a/src/core/pidwait.h +++ b/src/core/pidwait.h @@ -1,5 +1,5 @@ -#ifndef __PIDWAIT_H -#define __PIDWAIT_H +#ifndef IRSSI_CORE_PIDWAIT_H +#define IRSSI_CORE_PIDWAIT_H void pidwait_init(void); void pidwait_deinit(void); diff --git a/src/core/queries.c b/src/core/queries.c index a2fd4b0a..fe86271f 100644 --- a/src/core/queries.c +++ b/src/core/queries.c @@ -19,11 +19,11 @@ */ #include "module.h" -#include "signals.h" -#include "misc.h" +#include +#include -#include "servers.h" -#include "queries.h" +#include +#include GSList *queries; diff --git a/src/core/queries.h b/src/core/queries.h index 77ef9c37..c6170361 100644 --- a/src/core/queries.h +++ b/src/core/queries.h @@ -1,7 +1,7 @@ -#ifndef __QUERIES_H -#define __QUERIES_H +#ifndef IRSSI_CORE_QUERIES_H +#define IRSSI_CORE_QUERIES_H -#include "modules.h" +#include /* Returns QUERY_REC if it's query, NULL if it isn't. */ #define QUERY(query) \ @@ -13,7 +13,7 @@ #define STRUCT_SERVER_REC SERVER_REC struct _QUERY_REC { -#include "query-rec.h" +#include }; extern GSList *queries; diff --git a/src/core/query-rec.h b/src/core/query-rec.h index 59519ad4..cc15c9ec 100644 --- a/src/core/query-rec.h +++ b/src/core/query-rec.h @@ -1,6 +1,6 @@ /* QUERY_REC definition, used for inheritance */ -#include "window-item-rec.h" +#include char *address; char *server_tag; diff --git a/src/core/rawlog.c b/src/core/rawlog.c index e0c4dd3d..f1938ea6 100644 --- a/src/core/rawlog.c +++ b/src/core/rawlog.c @@ -19,19 +19,19 @@ */ #include "module.h" -#include "rawlog.h" -#include "log.h" -#include "modules.h" -#include "signals.h" -#include "commands.h" -#include "misc.h" -#include "write-buffer.h" -#include "settings.h" +#include +#include +#include +#include +#include +#include +#include +#include #ifdef HAVE_CAPSICUM -#include "capsicum.h" +#include #endif -#include "servers.h" +#include static int rawlog_lines; static int signal_rawlog; diff --git a/src/core/rawlog.h b/src/core/rawlog.h index 01175e67..53c0d3c3 100644 --- a/src/core/rawlog.h +++ b/src/core/rawlog.h @@ -1,5 +1,5 @@ -#ifndef __RAWLOG_H -#define __RAWLOG_H +#ifndef IRSSI_CORE_RAWLOG_H +#define IRSSI_CORE_RAWLOG_H struct _RAWLOG_REC { int logging; diff --git a/src/core/recode.c b/src/core/recode.c index d3fc91e7..7185dd99 100644 --- a/src/core/recode.c +++ b/src/core/recode.c @@ -19,11 +19,11 @@ */ #include "module.h" -#include "settings.h" -#include "servers.h" -#include "signals.h" -#include "lib-config/iconfig.h" -#include "misc.h" +#include +#include +#include +#include +#include static char *translit_charset; static gboolean term_is_utf8; diff --git a/src/core/recode.h b/src/core/recode.h index 719e8f54..ce1b9daf 100644 --- a/src/core/recode.h +++ b/src/core/recode.h @@ -1,5 +1,5 @@ -#ifndef __RECODE_H -#define __RECODE_H +#ifndef IRSSI_CORE_RECODE_H +#define IRSSI_CORE_RECODE_H char *recode_in (const SERVER_REC *server, const char *str, const char *target); char *recode_out (const SERVER_REC *server, const char *str, const char *target); @@ -12,4 +12,4 @@ void recode_update_charset(void); void recode_init (void); void recode_deinit (void); -#endif /* __RECODE_H */ +#endif /* IRSSI_CORE_RECODE_H */ diff --git a/src/core/servers-reconnect.c b/src/core/servers-reconnect.c index 5f609cf5..97175f78 100644 --- a/src/core/servers-reconnect.c +++ b/src/core/servers-reconnect.c @@ -19,16 +19,16 @@ */ #include "module.h" -#include "commands.h" -#include "network.h" -#include "signals.h" +#include +#include +#include -#include "chat-protocols.h" -#include "servers.h" -#include "servers-setup.h" -#include "servers-reconnect.h" +#include +#include +#include +#include -#include "settings.h" +#include GSList *reconnects; static int last_reconnect_tag; diff --git a/src/core/servers-reconnect.h b/src/core/servers-reconnect.h index 835d58d5..b98f5176 100644 --- a/src/core/servers-reconnect.h +++ b/src/core/servers-reconnect.h @@ -1,5 +1,5 @@ -#ifndef __SERVER_RECONNECT_H -#define __SERVER_RECONNECT_H +#ifndef IRSSI_CORE_SERVERS_RECONNECT_H +#define IRSSI_CORE_SERVERS_RECONNECT_H /* wait for half an hour before trying to reconnect to host where last connection failed */ diff --git a/src/core/servers-setup.c b/src/core/servers-setup.c index 2a92a367..a505df5b 100644 --- a/src/core/servers-setup.c +++ b/src/core/servers-setup.c @@ -19,15 +19,15 @@ */ #include "module.h" -#include "signals.h" -#include "network.h" -#include "lib-config/iconfig.h" -#include "settings.h" +#include +#include +#include +#include -#include "chat-protocols.h" -#include "chatnets.h" -#include "servers.h" -#include "servers-setup.h" +#include +#include +#include +#include GSList *setupservers; diff --git a/src/core/servers-setup.h b/src/core/servers-setup.h index e7ff7abf..296a94fa 100644 --- a/src/core/servers-setup.h +++ b/src/core/servers-setup.h @@ -1,7 +1,7 @@ -#ifndef __SERVERS_SETUP_H -#define __SERVERS_SETUP_H +#ifndef IRSSI_CORE_SERVERS_SETUP_H +#define IRSSI_CORE_SERVERS_SETUP_H -#include "modules.h" +#include #define SERVER_SETUP(server) \ MODULE_CHECK_CAST(server, SERVER_SETUP_REC, type, "SERVER SETUP") @@ -11,7 +11,7 @@ /* servers */ struct _SERVER_SETUP_REC { -#include "server-setup-rec.h" +#include }; extern GSList *setupservers; diff --git a/src/core/servers.c b/src/core/servers.c index 81bdb89e..20452f8c 100644 --- a/src/core/servers.c +++ b/src/core/servers.c @@ -19,21 +19,21 @@ */ #include "module.h" -#include "signals.h" -#include "commands.h" -#include "net-disconnect.h" -#include "net-nonblock.h" -#include "net-sendbuffer.h" -#include "misc.h" -#include "rawlog.h" -#include "settings.h" +#include +#include +#include +#include +#include +#include +#include +#include -#include "chat-protocols.h" -#include "servers.h" -#include "servers-reconnect.h" -#include "servers-setup.h" -#include "channels.h" -#include "queries.h" +#include +#include +#include +#include +#include +#include GSList *servers, *lookup_servers; diff --git a/src/core/servers.h b/src/core/servers.h index f39c650b..7b998c8d 100644 --- a/src/core/servers.h +++ b/src/core/servers.h @@ -1,7 +1,7 @@ -#ifndef __SERVERS_H -#define __SERVERS_H +#ifndef IRSSI_CORE_SERVERS_H +#define IRSSI_CORE_SERVERS_H -#include "modules.h" +#include /* Returns SERVER_REC if it's server, NULL if it isn't. */ #define SERVER(server) \ @@ -23,12 +23,12 @@ /* all strings should be either NULL or dynamically allocated */ /* address and nick are mandatory, rest are optional */ struct _SERVER_CONNECT_REC { -#include "server-connect-rec.h" +#include }; #define STRUCT_SERVER_CONNECT_REC SERVER_CONNECT_REC struct _SERVER_REC { -#include "server-rec.h" +#include }; #define SEND_TARGET_CHANNEL 0 diff --git a/src/core/session.c b/src/core/session.c index 34190c52..0dc36fef 100644 --- a/src/core/session.c +++ b/src/core/session.c @@ -19,19 +19,19 @@ */ #include "module.h" -#include "signals.h" -#include "commands.h" -#include "args.h" -#include "network.h" -#include "net-sendbuffer.h" -#include "pidwait.h" -#include "lib-config/iconfig.h" +#include +#include +#include +#include +#include +#include +#include -#include "chat-protocols.h" -#include "servers.h" -#include "servers-setup.h" -#include "channels.h" -#include "nicklist.h" +#include +#include +#include +#include +#include static char *session_file; char *irssi_binary = NULL; diff --git a/src/core/session.h b/src/core/session.h index a3c8d67c..28c5cec8 100644 --- a/src/core/session.h +++ b/src/core/session.h @@ -1,5 +1,5 @@ -#ifndef __SESSION_H -#define __SESSION_H +#ifndef IRSSI_CORE_SESSION_H +#define IRSSI_CORE_SESSION_H extern char *irssi_binary; diff --git a/src/core/settings.c b/src/core/settings.c index 5fc37ded..2bd6c06a 100644 --- a/src/core/settings.c +++ b/src/core/settings.c @@ -19,14 +19,14 @@ */ #include "module.h" -#include "signals.h" -#include "commands.h" -#include "levels.h" -#include "misc.h" +#include +#include +#include +#include -#include "lib-config/iconfig.h" -#include "recode.h" -#include "settings.h" +#include +#include +#include #include "default-config.h" #include diff --git a/src/core/settings.h b/src/core/settings.h index b67a9e44..3a8a4646 100644 --- a/src/core/settings.h +++ b/src/core/settings.h @@ -1,5 +1,5 @@ -#ifndef __SETTINGS_H -#define __SETTINGS_H +#ifndef IRSSI_CORE_SETTINGS_H +#define IRSSI_CORE_SETTINGS_H typedef enum { SETTING_TYPE_STRING, diff --git a/src/core/signals.c b/src/core/signals.c index 1f425ba4..e52e6907 100644 --- a/src/core/signals.c +++ b/src/core/signals.c @@ -19,8 +19,8 @@ */ #include "module.h" -#include "signals.h" -#include "modules.h" +#include +#include typedef struct _SignalHook { struct _SignalHook *next; diff --git a/src/core/signals.h b/src/core/signals.h index 384af66f..0fa005a1 100644 --- a/src/core/signals.h +++ b/src/core/signals.h @@ -1,5 +1,5 @@ -#ifndef __SIGNAL_H -#define __SIGNAL_H +#ifndef IRSSI_CORE_SIGNALS_H +#define IRSSI_CORE_SIGNALS_H #define SIGNAL_PRIORITY_LOW 100 #define SIGNAL_PRIORITY_DEFAULT 0 diff --git a/src/core/special-vars.c b/src/core/special-vars.c index 7081b602..d84912d2 100644 --- a/src/core/special-vars.c +++ b/src/core/special-vars.c @@ -19,13 +19,13 @@ */ #include "module.h" -#include "signals.h" -#include "special-vars.h" -#include "expandos.h" -#include "settings.h" -#include "servers.h" -#include "misc.h" -#include "utf8.h" +#include +#include +#include +#include +#include +#include +#include #define isvarchar(c) \ (i_isalnum(c) || (c) == '_') diff --git a/src/core/special-vars.h b/src/core/special-vars.h index 300dae0e..f4bd926d 100644 --- a/src/core/special-vars.h +++ b/src/core/special-vars.h @@ -1,7 +1,7 @@ -#ifndef __SPECIAL_VARS_H -#define __SPECIAL_VARS_H +#ifndef IRSSI_CORE_SPECIAL_VARS_H +#define IRSSI_CORE_SPECIAL_VARS_H -#include "signals.h" +#include #define PARSE_FLAG_GETNAME 0x01 /* return argument name instead of it's value */ #define PARSE_FLAG_ISSET_ANY 0x02 /* arg_used field specifies that at least one of the $variables was non-empty */ diff --git a/src/core/tls.c b/src/core/tls.c index 3bddd773..bd5c8329 100644 --- a/src/core/tls.c +++ b/src/core/tls.c @@ -18,7 +18,7 @@ #include "module.h" -#include "tls.h" +#include TLS_REC *tls_create_rec() { diff --git a/src/core/tls.h b/src/core/tls.h index 9ba4ac47..791bde86 100644 --- a/src/core/tls.h +++ b/src/core/tls.h @@ -16,8 +16,8 @@ * Franklin Street, Fifth Floor, Boston, MA 02110-1301,USA */ -#ifndef __TLS_H -#define __TLS_H +#ifndef IRSSI_CORE_TLS_H +#define IRSSI_CORE_TLS_H #include diff --git a/src/core/utf8.c b/src/core/utf8.c index c44fdbd6..5ef030d3 100644 --- a/src/core/utf8.c +++ b/src/core/utf8.c @@ -22,11 +22,11 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#include "utf8.h" +#include #include "module.h" /* Provide is_utf8(): */ -#include "recode.h" +#include int string_advance(char const **str, int policy) { diff --git a/src/core/utf8.h b/src/core/utf8.h index 9f7d1aaa..372c5d27 100644 --- a/src/core/utf8.h +++ b/src/core/utf8.h @@ -1,5 +1,5 @@ -#ifndef __UTF8_H -#define __UTF8_H +#ifndef IRSSI_CORE_UTF8_H +#define IRSSI_CORE_UTF8_H /* XXX I didn't check the encoding range of big5+. This is standard big5. */ #define is_big5_los(lo) (0x40 <= (lo) && (lo) <= 0x7E) /* standard */ diff --git a/src/core/wcwidth-wrapper.c b/src/core/wcwidth-wrapper.c index 03d0dc0c..b3881d38 100644 --- a/src/core/wcwidth-wrapper.c +++ b/src/core/wcwidth-wrapper.c @@ -22,9 +22,9 @@ #include #include "module.h" -#include "signals.h" -#include "settings.h" -#include "utf8.h" +#include +#include +#include #ifdef HAVE_LIBUTF8PROC #include diff --git a/src/core/wcwidth.c b/src/core/wcwidth.c index 711c4646..5226d695 100644 --- a/src/core/wcwidth.c +++ b/src/core/wcwidth.c @@ -59,7 +59,7 @@ * Latest version: http://www.cl.cam.ac.uk/~mgk25/ucs/wcwidth.c */ -#include "utf8.h" +#include struct interval { int first; diff --git a/src/core/window-item-def.h b/src/core/window-item-def.h index 4364c66e..6944c921 100644 --- a/src/core/window-item-def.h +++ b/src/core/window-item-def.h @@ -1,9 +1,9 @@ -#ifndef __WINDOW_ITEM_DEF_H -#define __WINDOW_ITEM_DEF_H +#ifndef IRSSI_CORE_WINDOW_ITEM_DEF_H +#define IRSSI_CORE_WINDOW_ITEM_DEF_H #define STRUCT_SERVER_REC SERVER_REC struct _WI_ITEM_REC { -#include "window-item-rec.h" +#include }; #endif diff --git a/src/core/write-buffer.c b/src/core/write-buffer.c index ffc3ae63..475e41b8 100644 --- a/src/core/write-buffer.c +++ b/src/core/write-buffer.c @@ -19,10 +19,10 @@ */ #include "module.h" -#include "signals.h" -#include "commands.h" -#include "settings.h" -#include "write-buffer.h" +#include +#include +#include +#include #define BUFFER_BLOCK_SIZE 2048 diff --git a/src/core/write-buffer.h b/src/core/write-buffer.h index ef527440..8c60dc77 100644 --- a/src/core/write-buffer.h +++ b/src/core/write-buffer.h @@ -1,5 +1,5 @@ -#ifndef __WRITE_BUFFER_H -#define __WRITE_BUFFER_H +#ifndef IRSSI_CORE_WRITE_BUFFER_H +#define IRSSI_CORE_WRITE_BUFFER_H int write_buffer(int handle, const void *data, int size); void write_buffer_flush(void); diff --git a/src/fe-common/core/Makefile.am b/src/fe-common/core/Makefile.am index cf4e8ee3..4e8fdcb2 100644 --- a/src/fe-common/core/Makefile.am +++ b/src/fe-common/core/Makefile.am @@ -1,7 +1,6 @@ noinst_LIBRARIES = libfe_common_core.a AM_CPPFLAGS = \ - -I$(top_srcdir)/src -I$(top_srcdir)/src/core/ \ $(GLIB_CFLAGS) \ -DHELPDIR=\""$(datadir)/irssi/help"\" \ -DTHEMESDIR=\""$(datadir)/irssi/themes"\" diff --git a/src/fe-common/core/chat-completion.c b/src/fe-common/core/chat-completion.c index d610008f..144ed0f4 100644 --- a/src/fe-common/core/chat-completion.c +++ b/src/fe-common/core/chat-completion.c @@ -19,24 +19,24 @@ */ #include "module.h" -#include "signals.h" -#include "commands.h" -#include "misc.h" -#include "levels.h" -#include "lib-config/iconfig.h" -#include "settings.h" +#include +#include +#include +#include +#include +#include -#include "chatnets.h" -#include "servers.h" -#include "servers-setup.h" -#include "channels.h" -#include "channels-setup.h" -#include "queries.h" -#include "nicklist.h" +#include +#include +#include +#include +#include +#include +#include -#include "completion.h" -#include "chat-completion.h" -#include "window-items.h" +#include +#include +#include enum { COMPLETE_MCASE_NEVER = 0, diff --git a/src/fe-common/core/chat-completion.h b/src/fe-common/core/chat-completion.h index 17c1408d..2976b962 100644 --- a/src/fe-common/core/chat-completion.h +++ b/src/fe-common/core/chat-completion.h @@ -1,5 +1,5 @@ -#ifndef __CHAT_COMPLETION_H -#define __CHAT_COMPLETION_H +#ifndef IRSSI_FE_COMMON_CORE_CHAT_COMPLETION_H +#define IRSSI_FE_COMMON_CORE_CHAT_COMPLETION_H GList *completion_get_chatnets(const char *word); GList *completion_get_servers(const char *word); diff --git a/src/fe-common/core/command-history.c b/src/fe-common/core/command-history.c index 32d7adaa..43d86354 100644 --- a/src/fe-common/core/command-history.c +++ b/src/fe-common/core/command-history.c @@ -19,15 +19,15 @@ */ #include "module.h" -#include "signals.h" -#include "misc.h" -#include "special-vars.h" -#include "settings.h" +#include +#include +#include +#include -#include "fe-windows.h" -#include "window-items.h" +#include +#include -#include "command-history.h" +#include /* command history */ static GList *history_entries; diff --git a/src/fe-common/core/command-history.h b/src/fe-common/core/command-history.h index ed093415..04922d2d 100644 --- a/src/fe-common/core/command-history.h +++ b/src/fe-common/core/command-history.h @@ -1,7 +1,7 @@ -#ifndef __COMMAND_HISTORY_H -#define __COMMAND_HISTORY_H +#ifndef IRSSI_FE_COMMON_CORE_COMMAND_HISTORY_H +#define IRSSI_FE_COMMON_CORE_COMMAND_HISTORY_H -#include "common.h" +#include typedef struct { char *name; diff --git a/src/fe-common/core/completion.c b/src/fe-common/core/completion.c index a6513d58..7778d8a4 100644 --- a/src/fe-common/core/completion.c +++ b/src/fe-common/core/completion.c @@ -19,16 +19,16 @@ */ #include "module.h" -#include "module-formats.h" -#include "signals.h" -#include "commands.h" -#include "levels.h" -#include "misc.h" -#include "lib-config/iconfig.h" -#include "settings.h" +#include +#include +#include +#include +#include +#include +#include -#include "completion.h" -#include "printtext.h" +#include +#include static GList *complist; /* list of commands we're currently completing */ static char *last_line; diff --git a/src/fe-common/core/completion.h b/src/fe-common/core/completion.h index 5c1e6958..d505aa84 100644 --- a/src/fe-common/core/completion.h +++ b/src/fe-common/core/completion.h @@ -1,7 +1,7 @@ -#ifndef __COMPLETION_H -#define __COMPLETION_H +#ifndef IRSSI_FE_COMMON_CORE_COMPLETION_H +#define IRSSI_FE_COMMON_CORE_COMPLETION_H -#include "window-items.h" +#include /* automatic word completion - called when space/enter is pressed */ char *auto_word_complete(const char *line, int *pos); diff --git a/src/fe-common/core/fe-capsicum.c b/src/fe-common/core/fe-capsicum.c index 54a43d27..d7ea95ee 100644 --- a/src/fe-common/core/fe-capsicum.c +++ b/src/fe-common/core/fe-capsicum.c @@ -23,11 +23,11 @@ */ #include "module.h" -#include "fe-capsicum.h" -#include "levels.h" -#include "module-formats.h" -#include "printtext.h" -#include "signals.h" +#include +#include +#include +#include +#include static void capability_mode_enabled(void) { diff --git a/src/fe-common/core/fe-capsicum.h b/src/fe-common/core/fe-capsicum.h index a7cb743b..c0471296 100644 --- a/src/fe-common/core/fe-capsicum.h +++ b/src/fe-common/core/fe-capsicum.h @@ -1,5 +1,5 @@ -#ifndef __FE_CAPSICUM_H -#define __FE_CAPSICUM_H +#ifndef IRSSI_FE_COMMON_CORE_FE_CAPSICUM_H +#define IRSSI_FE_COMMON_CORE_FE_CAPSICUM_H void fe_capsicum_init(void); void fe_capsicum_deinit(void); diff --git a/src/fe-common/core/fe-channels.c b/src/fe-common/core/fe-channels.c index 5cad51a7..8c914cb8 100644 --- a/src/fe-common/core/fe-channels.c +++ b/src/fe-common/core/fe-channels.c @@ -19,27 +19,27 @@ */ #include "module.h" -#include "module-formats.h" -#include "modules.h" -#include "signals.h" -#include "commands.h" -#include "levels.h" -#include "misc.h" -#include "settings.h" -#include "special-vars.h" -#include "utf8.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include -#include "chat-protocols.h" -#include "chatnets.h" -#include "servers.h" -#include "channels.h" -#include "channels-setup.h" -#include "nicklist.h" +#include +#include +#include +#include +#include +#include -#include "fe-windows.h" -#include "fe-channels.h" -#include "window-items.h" -#include "printtext.h" +#include +#include +#include +#include static void signal_channel_created(CHANNEL_REC *channel, void *automatic) { diff --git a/src/fe-common/core/fe-channels.h b/src/fe-common/core/fe-channels.h index e9a03a12..34b24ac6 100644 --- a/src/fe-common/core/fe-channels.h +++ b/src/fe-common/core/fe-channels.h @@ -1,5 +1,5 @@ -#ifndef __FE_CHANNELS_H -#define __FE_CHANNELS_H +#ifndef IRSSI_FE_COMMON_CORE_FE_CHANNELS_H +#define IRSSI_FE_COMMON_CORE_FE_CHANNELS_H #define CHANNEL_NICKLIST_FLAG_OPS 0x01 #define CHANNEL_NICKLIST_FLAG_HALFOPS 0x02 diff --git a/src/fe-common/core/fe-common-core.c b/src/fe-common/core/fe-common-core.c index e47eb446..c7cdd995 100644 --- a/src/fe-common/core/fe-common-core.c +++ b/src/fe-common/core/fe-common-core.c @@ -19,35 +19,35 @@ */ #include "module.h" -#include "module-formats.h" -#include "args.h" -#include "misc.h" -#include "levels.h" -#include "settings.h" +#include +#include +#include +#include +#include -#include "servers.h" -#include "channels.h" -#include "servers-setup.h" +#include +#include +#include -#include "special-vars.h" -#include "fe-core-commands.h" -#include "fe-queries.h" +#include +#include +#include #ifdef HAVE_CAPSICUM -#include "fe-capsicum.h" +#include #endif -#include "hilight-text.h" -#include "command-history.h" -#include "completion.h" -#include "keyboard.h" -#include "printtext.h" -#include "formats.h" -#include "themes.h" -#include "fe-channels.h" -#include "fe-windows.h" -#include "window-activity.h" -#include "window-items.h" -#include "windows-layout.h" -#include "fe-recode.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include diff --git a/src/fe-common/core/fe-common-core.h b/src/fe-common/core/fe-common-core.h index 88b2e94b..a9a74b0f 100644 --- a/src/fe-common/core/fe-common-core.h +++ b/src/fe-common/core/fe-common-core.h @@ -1,5 +1,5 @@ -#ifndef __FE_COMMON_CORE_H -#define __FE_COMMON_CORE_H +#ifndef IRSSI_FE_COMMON_CORE_FE_COMMON_CORE_H +#define IRSSI_FE_COMMON_CORE_FE_COMMON_CORE_H void fe_common_core_register_options(void); void fe_common_core_init(void); diff --git a/src/fe-common/core/fe-core-commands.c b/src/fe-common/core/fe-core-commands.c index 00c07af6..7e09cded 100644 --- a/src/fe-common/core/fe-core-commands.c +++ b/src/fe-common/core/fe-core-commands.c @@ -18,22 +18,22 @@ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#include "core.h" +#include #include "module.h" -#include "module-formats.h" -#include "signals.h" -#include "commands.h" -#include "levels.h" -#include "misc.h" -#include "settings.h" -#include "irssi-version.h" -#include "servers.h" +#include +#include +#include +#include +#include +#include +#include +#include #ifdef HAVE_CAPSICUM -#include "capsicum.h" +#include #endif -#include "fe-windows.h" -#include "printtext.h" +#include +#include #define PASTE_CHECK_SPEED 200 /* 0.2 sec */ diff --git a/src/fe-common/core/fe-core-commands.h b/src/fe-common/core/fe-core-commands.h index 261303de..d711b5d6 100644 --- a/src/fe-common/core/fe-core-commands.h +++ b/src/fe-common/core/fe-core-commands.h @@ -1,5 +1,5 @@ -#ifndef __FE_CORE_COMMANDS_H -#define __FE_CORE_COMMANDS_H +#ifndef IRSSI_FE_COMMON_CORE_FE_CORE_COMMANDS_H +#define IRSSI_FE_COMMON_CORE_FE_CORE_COMMANDS_H extern int command_hide_output; diff --git a/src/fe-common/core/fe-exec.c b/src/fe-common/core/fe-exec.c index c1739d39..0da4ac89 100644 --- a/src/fe-common/core/fe-exec.c +++ b/src/fe-common/core/fe-exec.c @@ -19,24 +19,24 @@ */ #include "module.h" -#include "modules.h" -#include "signals.h" -#include "commands.h" -#include "pidwait.h" -#include "line-split.h" -#include "network.h" -#include "net-sendbuffer.h" -#include "misc.h" -#include "levels.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include -#include "servers.h" -#include "channels.h" -#include "queries.h" +#include +#include +#include -#include "printtext.h" -#include "fe-exec.h" -#include "fe-windows.h" -#include "window-items.h" +#include +#include +#include +#include #include #include diff --git a/src/fe-common/core/fe-exec.h b/src/fe-common/core/fe-exec.h index 20219d5a..824d3d8a 100644 --- a/src/fe-common/core/fe-exec.h +++ b/src/fe-common/core/fe-exec.h @@ -1,7 +1,7 @@ -#ifndef __FE_EXEC_H -#define __FE_EXEC_H +#ifndef IRSSI_FE_COMMON_CORE_FE_EXEC_H +#define IRSSI_FE_COMMON_CORE_FE_EXEC_H -#include "fe-windows.h" +#include #define EXEC_WI(query) \ MODULE_CHECK_CAST_MODULE(query, EXEC_WI_REC, type, \ @@ -14,7 +14,7 @@ typedef struct PROCESS_REC PROCESS_REC; #define STRUCT_SERVER_REC void typedef struct { -#include "window-item-rec.h" +#include PROCESS_REC *process; unsigned int destroying:1; } EXEC_WI_REC; diff --git a/src/fe-common/core/fe-expandos.c b/src/fe-common/core/fe-expandos.c index d054a633..9a48b4b1 100644 --- a/src/fe-common/core/fe-expandos.c +++ b/src/fe-common/core/fe-expandos.c @@ -19,8 +19,8 @@ */ #include "module.h" -#include "expandos.h" -#include "fe-windows.h" +#include +#include /* Window ref# */ static char *expando_winref(SERVER_REC *server, void *item, int *free_ret) diff --git a/src/fe-common/core/fe-help.c b/src/fe-common/core/fe-help.c index c7566113..9c428062 100644 --- a/src/fe-common/core/fe-help.c +++ b/src/fe-common/core/fe-help.c @@ -19,14 +19,14 @@ */ #include "module.h" -#include "signals.h" -#include "commands.h" -#include "levels.h" -#include "misc.h" -#include "settings.h" +#include +#include +#include +#include +#include -#include "printtext.h" -#include "formats.h" +#include +#include static int commands_equal(COMMAND_REC *rec, COMMAND_REC *rec2) { diff --git a/src/fe-common/core/fe-ignore-messages.c b/src/fe-common/core/fe-ignore-messages.c index fd889783..73ebd01f 100644 --- a/src/fe-common/core/fe-ignore-messages.c +++ b/src/fe-common/core/fe-ignore-messages.c @@ -19,10 +19,10 @@ */ #include "module.h" -#include "signals.h" -#include "levels.h" -#include "ignore.h" -#include "servers.h" +#include +#include +#include +#include static void sig_message_public(SERVER_REC *server, const char *msg, const char *nick, const char *address, diff --git a/src/fe-common/core/fe-ignore.c b/src/fe-common/core/fe-ignore.c index 39c4dd9f..54ab6a55 100644 --- a/src/fe-common/core/fe-ignore.c +++ b/src/fe-common/core/fe-ignore.c @@ -19,15 +19,15 @@ */ #include "module.h" -#include "module-formats.h" -#include "signals.h" -#include "commands.h" -#include "levels.h" -#include "misc.h" +#include +#include +#include +#include +#include -#include "servers.h" -#include "ignore.h" -#include "printtext.h" +#include +#include +#include static char *ignore_get_key(IGNORE_REC *rec) { diff --git a/src/fe-common/core/fe-log.c b/src/fe-common/core/fe-log.c index d71c62a9..12b6b643 100644 --- a/src/fe-common/core/fe-log.c +++ b/src/fe-common/core/fe-log.c @@ -19,30 +19,30 @@ */ #include "module.h" -#include "module-formats.h" -#include "signals.h" -#include "commands.h" -#include "chat-protocols.h" -#include "servers.h" -#include "channels.h" -#include "levels.h" -#include "misc.h" -#include "log.h" -#include "special-vars.h" -#include "settings.h" -#include "lib-config/iconfig.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #ifdef HAVE_CAPSICUM -#include "capsicum.h" +#include #endif -#include "fe-windows.h" -#include "window-items.h" -#include "formats.h" -#include "themes.h" -#include "printtext.h" -#include "fe-common-core.h" +#include +#include +#include +#include +#include +#include -#include "channels-setup.h" +#include /* close autologs after 5 minutes of inactivity */ #define AUTOLOG_INACTIVITY_CLOSE (60*5) diff --git a/src/fe-common/core/fe-messages.c b/src/fe-common/core/fe-messages.c index 12cb1055..5edac26d 100644 --- a/src/fe-common/core/fe-messages.c +++ b/src/fe-common/core/fe-messages.c @@ -19,23 +19,23 @@ */ #include "module.h" -#include "module-formats.h" -#include "signals.h" -#include "commands.h" -#include "levels.h" -#include "misc.h" -#include "special-vars.h" -#include "settings.h" +#include +#include +#include +#include +#include +#include +#include -#include "servers.h" -#include "channels.h" -#include "nicklist.h" -#include "ignore.h" +#include +#include +#include +#include -#include "window-items.h" -#include "fe-queries.h" -#include "hilight-text.h" -#include "printtext.h" +#include +#include +#include +#include #define ishighalnum(c) ((unsigned char) (c) >= 128 || i_isalnum(c)) #define isnickchar(a) \ diff --git a/src/fe-common/core/fe-messages.h b/src/fe-common/core/fe-messages.h index 07ecef80..03f7da7b 100644 --- a/src/fe-common/core/fe-messages.h +++ b/src/fe-common/core/fe-messages.h @@ -1,5 +1,5 @@ -#ifndef __FE_MESSAGES_H -#define __FE_MESSAGES_H +#ifndef IRSSI_FE_COMMON_CORE_FE_MESSAGES_H +#define IRSSI_FE_COMMON_CORE_FE_MESSAGES_H /* convert _underlined_ and *bold* words (and phrases) to use real underlining or bolding */ diff --git a/src/fe-common/core/fe-modules.c b/src/fe-common/core/fe-modules.c index 27b6b4c1..9ad594cb 100644 --- a/src/fe-common/core/fe-modules.c +++ b/src/fe-common/core/fe-modules.c @@ -19,15 +19,15 @@ */ #include "module.h" -#include "modules.h" -#include "modules-load.h" -#include "module-formats.h" -#include "signals.h" -#include "commands.h" -#include "levels.h" -#include "chat-protocols.h" +#include +#include +#include +#include +#include +#include +#include -#include "printtext.h" +#include #ifdef HAVE_GMODULE diff --git a/src/fe-common/core/fe-queries.c b/src/fe-common/core/fe-queries.c index 121417e4..77f07474 100644 --- a/src/fe-common/core/fe-queries.c +++ b/src/fe-common/core/fe-queries.c @@ -19,21 +19,21 @@ */ #include "module.h" -#include "module-formats.h" -#include "modules.h" -#include "signals.h" -#include "commands.h" -#include "levels.h" -#include "settings.h" +#include +#include +#include +#include +#include +#include -#include "chat-protocols.h" -#include "servers.h" -#include "queries.h" +#include +#include +#include -#include "fe-core-commands.h" -#include "fe-windows.h" -#include "window-items.h" -#include "printtext.h" +#include +#include +#include +#include static int queryclose_tag, query_auto_close, querycreate_level; diff --git a/src/fe-common/core/fe-queries.h b/src/fe-common/core/fe-queries.h index 6db9cb44..30c45e4e 100644 --- a/src/fe-common/core/fe-queries.h +++ b/src/fe-common/core/fe-queries.h @@ -1,7 +1,7 @@ -#ifndef __FE_QUERIES_H -#define __FE_QUERIES_H +#ifndef IRSSI_FE_COMMON_CORE_FE_QUERIES_H +#define IRSSI_FE_COMMON_CORE_FE_QUERIES_H -#include "queries.h" +#include /* Return query where to put the private message. */ QUERY_REC *privmsg_get_query(SERVER_REC *server, const char *nick, diff --git a/src/fe-common/core/fe-recode.c b/src/fe-common/core/fe-recode.c index 829c89e7..5e7c1e47 100644 --- a/src/fe-common/core/fe-recode.c +++ b/src/fe-common/core/fe-recode.c @@ -19,15 +19,15 @@ */ #include "module.h" -#include "modules.h" -#include "module-formats.h" -#include "commands.h" -#include "levels.h" -#include "lib-config/iconfig.h" -#include "settings.h" -#include "printtext.h" -#include "formats.h" -#include "recode.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include static char *recode_fallback = NULL; static char *recode_out_default = NULL; diff --git a/src/fe-common/core/fe-recode.h b/src/fe-common/core/fe-recode.h index 9fc73289..50775f2c 100644 --- a/src/fe-common/core/fe-recode.h +++ b/src/fe-common/core/fe-recode.h @@ -1,7 +1,7 @@ -#ifndef __FE_RECODE_H -#define __FE_RECODE_H +#ifndef IRSSI_FE_COMMON_CORE_FE_RECODE_H +#define IRSSI_FE_COMMON_CORE_FE_RECODE_H void fe_recode_init (void); void fe_recode_deinit (void); -#endif /* __FE_RECODE_H */ +#endif /* IRSSI_FE_COMMON_CORE_FE_RECODE_H */ diff --git a/src/fe-common/core/fe-server.c b/src/fe-common/core/fe-server.c index 074a83f3..be5ea4ab 100644 --- a/src/fe-common/core/fe-server.c +++ b/src/fe-common/core/fe-server.c @@ -19,20 +19,20 @@ */ #include "module.h" -#include "signals.h" -#include "commands.h" -#include "network.h" -#include "levels.h" -#include "settings.h" +#include +#include +#include +#include +#include -#include "chat-protocols.h" -#include "chatnets.h" -#include "servers.h" -#include "servers-setup.h" -#include "servers-reconnect.h" +#include +#include +#include +#include +#include -#include "module-formats.h" -#include "printtext.h" +#include +#include static void print_servers(void) { diff --git a/src/fe-common/core/fe-settings.c b/src/fe-common/core/fe-settings.c index de9f67a1..ad4747e8 100644 --- a/src/fe-common/core/fe-settings.c +++ b/src/fe-common/core/fe-settings.c @@ -19,17 +19,17 @@ */ #include "module.h" -#include "module-formats.h" -#include "signals.h" -#include "commands.h" -#include "servers.h" -#include "misc.h" -#include "lib-config/iconfig.h" -#include "settings.h" -#include "fe-settings.h" -#include "levels.h" -#include "printtext.h" -#include "keyboard.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include static void set_print(SETTINGS_REC *rec) { diff --git a/src/fe-common/core/fe-settings.h b/src/fe-common/core/fe-settings.h index cc628790..61797bcd 100644 --- a/src/fe-common/core/fe-settings.h +++ b/src/fe-common/core/fe-settings.h @@ -1,5 +1,5 @@ -#ifndef __FE_SETTINGS_H -#define __FE_SETTINGS_H +#ifndef IRSSI_FE_COMMON_CORE_FE_SETTINGS_H +#define IRSSI_FE_COMMON_CORE_FE_SETTINGS_H void fe_settings_set_print(const char *key); diff --git a/src/fe-common/core/fe-tls.c b/src/fe-common/core/fe-tls.c index ed206d18..d72a13b0 100644 --- a/src/fe-common/core/fe-tls.c +++ b/src/fe-common/core/fe-tls.c @@ -17,15 +17,15 @@ */ #include "module.h" -#include "signals.h" -#include "settings.h" -#include "levels.h" -#include "tls.h" +#include +#include +#include +#include -#include "module-formats.h" -#include "printtext.h" +#include +#include -#include "fe-tls.h" +#include static void tls_handshake_finished(SERVER_REC *server, TLS_REC *tls) { diff --git a/src/fe-common/core/fe-tls.h b/src/fe-common/core/fe-tls.h index f0082477..b0a3ea99 100644 --- a/src/fe-common/core/fe-tls.h +++ b/src/fe-common/core/fe-tls.h @@ -16,8 +16,8 @@ * Franklin Street, Fifth Floor, Boston, MA 02110-1301,USA */ -#ifndef __FE_TLS_H -#define __FE_TLS_H +#ifndef IRSSI_FE_COMMON_CORE_FE_TLS_H +#define IRSSI_FE_COMMON_CORE_FE_TLS_H void fe_tls_init(void); void fe_tls_deinit(void); diff --git a/src/fe-common/core/fe-windows.c b/src/fe-common/core/fe-windows.c index 93f2e3f3..88fc0711 100644 --- a/src/fe-common/core/fe-windows.c +++ b/src/fe-common/core/fe-windows.c @@ -19,19 +19,19 @@ */ #include "module.h" -#include "module-formats.h" -#include "modules.h" -#include "signals.h" -#include "commands.h" -#include "servers.h" -#include "misc.h" -#include "settings.h" +#include +#include +#include +#include +#include +#include +#include -#include "levels.h" +#include -#include "printtext.h" -#include "fe-windows.h" -#include "window-items.h" +#include +#include +#include GSList *windows; /* first in the list is the active window, next is the last active, etc. */ diff --git a/src/fe-common/core/fe-windows.h b/src/fe-common/core/fe-windows.h index 061a999a..d5c60c81 100644 --- a/src/fe-common/core/fe-windows.h +++ b/src/fe-common/core/fe-windows.h @@ -1,8 +1,8 @@ -#ifndef __WINDOWS_H -#define __WINDOWS_H +#ifndef IRSSI_FE_COMMON_CORE_FE_WINDOWS_H +#define IRSSI_FE_COMMON_CORE_FE_WINDOWS_H -#include "window-item-def.h" -#include "command-history.h" +#include +#include enum { DATA_LEVEL_NONE = 0, diff --git a/src/fe-common/core/formats.c b/src/fe-common/core/formats.c index c8d56fd0..414c6582 100644 --- a/src/fe-common/core/formats.c +++ b/src/fe-common/core/formats.c @@ -19,21 +19,21 @@ */ #include "module.h" -#include "module-formats.h" -#include "signals.h" -#include "special-vars.h" -#include "settings.h" +#include +#include +#include +#include -#include "levels.h" -#include "servers.h" +#include +#include -#include "fe-windows.h" -#include "window-items.h" -#include "formats.h" -#include "themes.h" -#include "recode.h" -#include "utf8.h" -#include "misc.h" +#include +#include +#include +#include +#include +#include +#include static const char *format_backs = "04261537"; static const char *format_fores = "kbgcrmyw"; diff --git a/src/fe-common/core/formats.h b/src/fe-common/core/formats.h index 8efd204c..2e6133be 100644 --- a/src/fe-common/core/formats.h +++ b/src/fe-common/core/formats.h @@ -1,8 +1,8 @@ -#ifndef __FORMATS_H -#define __FORMATS_H +#ifndef IRSSI_FE_COMMON_CORE_FORMATS_H +#define IRSSI_FE_COMMON_CORE_FORMATS_H -#include "themes.h" -#include "fe-windows.h" +#include +#include #define GUI_PRINT_FLAG_BOLD 0x0001 #define GUI_PRINT_FLAG_REVERSE 0x0002 diff --git a/src/fe-common/core/hilight-text.c b/src/fe-common/core/hilight-text.c index 3d853a90..2fe6068b 100644 --- a/src/fe-common/core/hilight-text.c +++ b/src/fe-common/core/hilight-text.c @@ -19,23 +19,23 @@ */ #include "module.h" -#include "module-formats.h" -#include "signals.h" -#include "commands.h" -#include "levels.h" -#include "misc.h" -#include "lib-config/iconfig.h" -#include "settings.h" -#include "iregex.h" +#include +#include +#include +#include +#include +#include +#include +#include -#include "servers.h" -#include "channels.h" -#include "nicklist.h" +#include +#include +#include -#include "hilight-text.h" -#include "nickmatch-cache.h" -#include "printtext.h" -#include "formats.h" +#include +#include +#include +#include static NICKMATCH_REC *nickmatch; static int never_hilight_level, default_hilight_level; diff --git a/src/fe-common/core/hilight-text.h b/src/fe-common/core/hilight-text.h index 1d942f29..0dfe78f3 100644 --- a/src/fe-common/core/hilight-text.h +++ b/src/fe-common/core/hilight-text.h @@ -1,8 +1,8 @@ -#ifndef __HILIGHT_TEXT_H -#define __HILIGHT_TEXT_H +#ifndef IRSSI_FE_COMMON_CORE_HILIGHT_TEXT_H +#define IRSSI_FE_COMMON_CORE_HILIGHT_TEXT_H -#include "iregex.h" -#include "formats.h" +#include +#include struct _HILIGHT_REC { char *text; diff --git a/src/fe-common/core/keyboard.c b/src/fe-common/core/keyboard.c index c3df5ed7..8f90b1ad 100644 --- a/src/fe-common/core/keyboard.c +++ b/src/fe-common/core/keyboard.c @@ -19,17 +19,17 @@ */ #include "module.h" -#include "module-formats.h" -#include "signals.h" -#include "commands.h" -#include "levels.h" -#include "misc.h" -#include "lib-config/iconfig.h" -#include "settings.h" +#include +#include +#include +#include +#include +#include +#include -#include "keyboard.h" -#include "fe-windows.h" -#include "printtext.h" +#include +#include +#include #define MAX_EXPAND_RECURSION 100 diff --git a/src/fe-common/core/keyboard.h b/src/fe-common/core/keyboard.h index 970dc7b7..b19536a0 100644 --- a/src/fe-common/core/keyboard.h +++ b/src/fe-common/core/keyboard.h @@ -1,7 +1,7 @@ -#ifndef __KEYBOARD_H -#define __KEYBOARD_H +#ifndef IRSSI_FE_COMMON_CORE_KEYBOARD_H +#define IRSSI_FE_COMMON_CORE_KEYBOARD_H -#include "signals.h" +#include typedef struct _KEYBOARD_REC KEYBOARD_REC; typedef struct _KEYINFO_REC KEYINFO_REC; diff --git a/src/fe-common/core/module-formats.c b/src/fe-common/core/module-formats.c index d3c7251b..0c41e68b 100644 --- a/src/fe-common/core/module-formats.c +++ b/src/fe-common/core/module-formats.c @@ -19,7 +19,7 @@ */ #include "module.h" -#include "formats.h" +#include FORMAT_REC fecommon_core_formats[] = { { MODULE_NAME, "Core", 0 }, diff --git a/src/fe-common/core/module-formats.h b/src/fe-common/core/module-formats.h index 97ac60bb..181aa4c2 100644 --- a/src/fe-common/core/module-formats.h +++ b/src/fe-common/core/module-formats.h @@ -1,4 +1,4 @@ -#include "formats.h" +#include enum { TXT_MODULE_NAME, diff --git a/src/fe-common/core/module.h b/src/fe-common/core/module.h index db712ec7..e629dc51 100644 --- a/src/fe-common/core/module.h +++ b/src/fe-common/core/module.h @@ -1,8 +1,8 @@ -#include "common.h" +#include #define MODULE_NAME "fe-common/core" -#include "utf8.h" +#include typedef struct { time_t time; char *nick; diff --git a/src/fe-common/core/printtext.c b/src/fe-common/core/printtext.c index 01ef2dcd..3e215d72 100644 --- a/src/fe-common/core/printtext.c +++ b/src/fe-common/core/printtext.c @@ -19,18 +19,18 @@ */ #include "module.h" -#include "module-formats.h" -#include "modules.h" -#include "signals.h" -#include "commands.h" -#include "settings.h" +#include +#include +#include +#include +#include -#include "levels.h" -#include "servers.h" +#include +#include -#include "themes.h" -#include "fe-windows.h" -#include "printtext.h" +#include +#include +#include static int beep_msg_level, beep_when_away, beep_when_window_active; diff --git a/src/fe-common/core/printtext.h b/src/fe-common/core/printtext.h index db53c611..845bfc6c 100644 --- a/src/fe-common/core/printtext.h +++ b/src/fe-common/core/printtext.h @@ -1,8 +1,8 @@ -#ifndef __PRINTTEXT_H -#define __PRINTTEXT_H +#ifndef IRSSI_FE_COMMON_CORE_PRINTTEXT_H +#define IRSSI_FE_COMMON_CORE_PRINTTEXT_H -#include "fe-windows.h" -#include "formats.h" +#include +#include void printformat_module(const char *module, void *server, const char *target, int level, int formatnum, ...); void printformat_module_window(const char *module, WINDOW_REC *window, int level, int formatnum, ...); diff --git a/src/fe-common/core/themes.c b/src/fe-common/core/themes.c index a95f6180..ff737c41 100644 --- a/src/fe-common/core/themes.c +++ b/src/fe-common/core/themes.c @@ -19,17 +19,17 @@ */ #include "module.h" -#include "module-formats.h" -#include "signals.h" -#include "commands.h" -#include "levels.h" -#include "misc.h" -#include "special-vars.h" -#include "lib-config/iconfig.h" -#include "settings.h" +#include +#include +#include +#include +#include +#include +#include +#include -#include "themes.h" -#include "printtext.h" +#include +#include #include "default-theme.h" diff --git a/src/fe-common/core/themes.h b/src/fe-common/core/themes.h index 31cfe943..53426f3b 100644 --- a/src/fe-common/core/themes.h +++ b/src/fe-common/core/themes.h @@ -1,5 +1,5 @@ -#ifndef __THEMES_H -#define __THEMES_H +#ifndef IRSSI_FE_COMMON_CORE_THEMES_H +#define IRSSI_FE_COMMON_CORE_THEMES_H typedef struct { char *name; diff --git a/src/fe-common/core/window-activity.c b/src/fe-common/core/window-activity.c index 06c24a2f..7a2903fd 100644 --- a/src/fe-common/core/window-activity.c +++ b/src/fe-common/core/window-activity.c @@ -19,19 +19,19 @@ */ #include "module.h" -#include "signals.h" -#include "levels.h" -#include "servers.h" -#include "channels.h" -#include "misc.h" -#include "settings.h" +#include +#include +#include +#include +#include +#include -#include "fe-windows.h" -#include "window-items.h" -#include "nicklist.h" -#include "hilight-text.h" -#include "formats.h" -#include "fe-common-core.h" +#include +#include +#include +#include +#include +#include static char **hide_targets; static int hide_level, msg_level, hilight_level, signal_window_hilight_check; diff --git a/src/fe-common/core/window-activity.h b/src/fe-common/core/window-activity.h index b904872f..42a4cda5 100644 --- a/src/fe-common/core/window-activity.h +++ b/src/fe-common/core/window-activity.h @@ -1,5 +1,5 @@ -#ifndef __WINDOW_ACTIVITY_H -#define __WINDOW_ACTIVITY_H +#ifndef IRSSI_FE_COMMON_CORE_WINDOW_ACTIVITY_H +#define IRSSI_FE_COMMON_CORE_WINDOW_ACTIVITY_H void window_activity(WINDOW_REC *window, int data_level, const char *hilight_color); diff --git a/src/fe-common/core/window-commands.c b/src/fe-common/core/window-commands.c index d9956324..7c542d37 100644 --- a/src/fe-common/core/window-commands.c +++ b/src/fe-common/core/window-commands.c @@ -19,21 +19,21 @@ */ #include "module.h" -#include "module-formats.h" -#include "signals.h" -#include "commands.h" -#include "misc.h" -#include "servers.h" -#include "settings.h" +#include +#include +#include +#include +#include +#include -#include "levels.h" +#include -#include "themes.h" -#include "fe-windows.h" -#include "window-items.h" -#include "windows-layout.h" -#include "printtext.h" -#include "command-history.h" +#include +#include +#include +#include +#include +#include static void window_print_binds(WINDOW_REC *win) { diff --git a/src/fe-common/core/window-items.c b/src/fe-common/core/window-items.c index 8eab7124..c60c796c 100644 --- a/src/fe-common/core/window-items.c +++ b/src/fe-common/core/window-items.c @@ -19,18 +19,18 @@ */ #include "module.h" -#include "module-formats.h" -#include "modules.h" -#include "signals.h" -#include "servers.h" -#include "channels.h" -#include "settings.h" +#include +#include +#include +#include +#include +#include -#include "levels.h" +#include -#include "fe-windows.h" -#include "window-items.h" -#include "printtext.h" +#include +#include +#include static void window_item_add_signal(WINDOW_REC *window, WI_ITEM_REC *item, int automatic, int send_signal) { diff --git a/src/fe-common/core/window-items.h b/src/fe-common/core/window-items.h index f8db3c39..5bfa92fa 100644 --- a/src/fe-common/core/window-items.h +++ b/src/fe-common/core/window-items.h @@ -1,7 +1,7 @@ -#ifndef __WINDOW_ITEMS_H -#define __WINDOW_ITEMS_H +#ifndef IRSSI_FE_COMMON_CORE_WINDOW_ITEMS_H +#define IRSSI_FE_COMMON_CORE_WINDOW_ITEMS_H -#include "fe-windows.h" +#include /* Add/remove/destroy window item from `window' */ void window_item_add(WINDOW_REC *window, WI_ITEM_REC *item, int automatic); diff --git a/src/fe-common/core/windows-layout.c b/src/fe-common/core/windows-layout.c index 5aa60916..745453d5 100644 --- a/src/fe-common/core/windows-layout.c +++ b/src/fe-common/core/windows-layout.c @@ -19,22 +19,22 @@ */ #include "module.h" -#include "signals.h" -#include "misc.h" -#include "levels.h" -#include "lib-config/iconfig.h" -#include "settings.h" +#include +#include +#include +#include +#include -#include "chat-protocols.h" -#include "servers.h" -#include "channels.h" -#include "queries.h" +#include +#include +#include +#include -#include "module-formats.h" -#include "printtext.h" -#include "themes.h" -#include "fe-windows.h" -#include "window-items.h" +#include +#include +#include +#include +#include static WINDOW_REC *restore_win; diff --git a/src/fe-common/core/windows-layout.h b/src/fe-common/core/windows-layout.h index d33fda52..706fb781 100644 --- a/src/fe-common/core/windows-layout.h +++ b/src/fe-common/core/windows-layout.h @@ -1,5 +1,5 @@ -#ifndef __WINDOWS_LAYOUT_H -#define __WINDOWS_LAYOUT_H +#ifndef IRSSI_FE_COMMON_CORE_WINDOWS_LAYOUT_H +#define IRSSI_FE_COMMON_CORE_WINDOWS_LAYOUT_H void windows_layout_restore(void); void windows_layout_save(void); diff --git a/src/fe-common/irc/Makefile.am b/src/fe-common/irc/Makefile.am index a5e95885..704de297 100644 --- a/src/fe-common/irc/Makefile.am +++ b/src/fe-common/irc/Makefile.am @@ -3,10 +3,6 @@ SUBDIRS = dcc notifylist noinst_LIBRARIES = libfe_common_irc.a AM_CPPFLAGS = \ - -I$(top_srcdir)/src \ - -I$(top_srcdir)/src/core/ \ - -I$(top_srcdir)/src/irc/core/ \ - -I$(top_srcdir)/src/fe-common/core/ \ $(GLIB_CFLAGS) \ -DHELPDIR=\""$(datadir)/irssi/help"\" \ -DSYSCONFDIR=\""$(sysconfdir)"\" diff --git a/src/fe-common/irc/dcc/Makefile.am b/src/fe-common/irc/dcc/Makefile.am index e0ad6296..c6a5d79d 100644 --- a/src/fe-common/irc/dcc/Makefile.am +++ b/src/fe-common/irc/dcc/Makefile.am @@ -1,11 +1,6 @@ noinst_LIBRARIES = libfe_irc_dcc.a AM_CPPFLAGS = \ - -I$(top_srcdir)/src \ - -I$(top_srcdir)/src/core/ \ - -I$(top_srcdir)/src/irc/core/ \ - -I$(top_srcdir)/src/irc/dcc/ \ - -I$(top_srcdir)/src/fe-common/core/ \ $(GLIB_CFLAGS) \ -DHELPDIR=\""$(datadir)/irssi/help"\" \ -DSYSCONFDIR=\""$(sysconfdir)"\" diff --git a/src/fe-common/irc/dcc/fe-dcc-chat-messages.c b/src/fe-common/irc/dcc/fe-dcc-chat-messages.c index 41cea64c..8dd67f7b 100644 --- a/src/fe-common/irc/dcc/fe-dcc-chat-messages.c +++ b/src/fe-common/irc/dcc/fe-dcc-chat-messages.c @@ -19,16 +19,16 @@ */ #include "module.h" -#include "signals.h" -#include "levels.h" +#include +#include -#include "irc-servers.h" -#include "irc-queries.h" -#include "dcc-chat.h" -#include "ignore.h" +#include +#include +#include +#include -#include "module-formats.h" -#include "printtext.h" +#include +#include static void sig_message_dcc_own(CHAT_DCC_REC *dcc, const char *msg) { diff --git a/src/fe-common/irc/dcc/fe-dcc-chat.c b/src/fe-common/irc/dcc/fe-dcc-chat.c index 5bcb3475..4099e2f1 100644 --- a/src/fe-common/irc/dcc/fe-dcc-chat.c +++ b/src/fe-common/irc/dcc/fe-dcc-chat.c @@ -19,22 +19,22 @@ */ #include "module.h" -#include "signals.h" -#include "commands.h" -#include "levels.h" -#include "settings.h" -#include "misc.h" +#include +#include +#include +#include +#include -#include "irc.h" -#include "irc-servers.h" -#include "irc-queries.h" -#include "dcc-chat.h" +#include +#include +#include +#include -#include "module-formats.h" -#include "printtext.h" -#include "fe-messages.h" +#include +#include +#include -#include "chat-completion.h" +#include void fe_dcc_chat_messages_init(void); void fe_dcc_chat_messages_deinit(void); diff --git a/src/fe-common/irc/dcc/fe-dcc-get.c b/src/fe-common/irc/dcc/fe-dcc-get.c index 99b6b963..e75640bc 100644 --- a/src/fe-common/irc/dcc/fe-dcc-get.c +++ b/src/fe-common/irc/dcc/fe-dcc-get.c @@ -19,18 +19,18 @@ */ #include "module.h" -#include "signals.h" -#include "levels.h" -#include "servers.h" +#include +#include +#include -#include "irc.h" -#include "dcc-file.h" -#include "dcc-get.h" +#include +#include +#include -#include "module-formats.h" -#include "printtext.h" +#include +#include -#include "fe-dcc.h" +#include static void dcc_request(GET_DCC_REC *dcc) { diff --git a/src/fe-common/irc/dcc/fe-dcc-send.c b/src/fe-common/irc/dcc/fe-dcc-send.c index 7920bedc..cf9b634e 100644 --- a/src/fe-common/irc/dcc/fe-dcc-send.c +++ b/src/fe-common/irc/dcc/fe-dcc-send.c @@ -19,20 +19,20 @@ */ #include "module.h" -#include "signals.h" -#include "levels.h" -#include "misc.h" -#include "settings.h" +#include +#include +#include +#include -#include "dcc-file.h" -#include "dcc-send.h" -#include "dcc-queue.h" +#include +#include +#include -#include "module-formats.h" -#include "printtext.h" -#include "completion.h" +#include +#include +#include -#include "fe-dcc.h" +#include static void dcc_connected(SEND_DCC_REC *dcc) { diff --git a/src/fe-common/irc/dcc/fe-dcc-server.c b/src/fe-common/irc/dcc/fe-dcc-server.c index 919d8665..eaab9637 100644 --- a/src/fe-common/irc/dcc/fe-dcc-server.c +++ b/src/fe-common/irc/dcc/fe-dcc-server.c @@ -19,16 +19,16 @@ */ #include "module.h" -#include "signals.h" -#include "commands.h" -#include "network.h" -#include "levels.h" +#include +#include +#include +#include -#include "dcc-server.h" +#include -#include "module-formats.h" -#include "printtext.h" -#include "themes.h" +#include +#include +#include static void dcc_server_started(SERVER_DCC_REC *dcc) { diff --git a/src/fe-common/irc/dcc/fe-dcc.c b/src/fe-common/irc/dcc/fe-dcc.c index 0a46a595..51fb5eea 100644 --- a/src/fe-common/irc/dcc/fe-dcc.c +++ b/src/fe-common/irc/dcc/fe-dcc.c @@ -19,20 +19,20 @@ */ #include "module.h" -#include "signals.h" -#include "commands.h" -#include "network.h" -#include "levels.h" -#include "settings.h" +#include +#include +#include +#include +#include -#include "dcc-chat.h" -#include "dcc-file.h" -#include "dcc-get.h" -#include "dcc-send.h" +#include +#include +#include +#include -#include "module-formats.h" -#include "printtext.h" -#include "themes.h" +#include +#include +#include void fe_dcc_chat_init(void); void fe_dcc_chat_deinit(void); diff --git a/src/fe-common/irc/dcc/fe-dcc.h b/src/fe-common/irc/dcc/fe-dcc.h index f18b4a80..4d792966 100644 --- a/src/fe-common/irc/dcc/fe-dcc.h +++ b/src/fe-common/irc/dcc/fe-dcc.h @@ -1,5 +1,5 @@ -#ifndef __FE_DCC_H -#define __FE_DCC_H +#ifndef IRSSI_FE_COMMON_IRC_DCC_FE_DCC_H +#define IRSSI_FE_COMMON_IRC_DCC_FE_DCC_H char *dcc_get_size_str(uoff_t size); void dcc_list_print_file(FILE_DCC_REC *dcc); diff --git a/src/fe-common/irc/dcc/module-formats.c b/src/fe-common/irc/dcc/module-formats.c index 225c5429..f973cd9e 100644 --- a/src/fe-common/irc/dcc/module-formats.c +++ b/src/fe-common/irc/dcc/module-formats.c @@ -19,7 +19,7 @@ */ #include "module.h" -#include "formats.h" +#include FORMAT_REC fecommon_irc_dcc_formats[] = { { MODULE_NAME, "IRC", 0 }, diff --git a/src/fe-common/irc/dcc/module-formats.h b/src/fe-common/irc/dcc/module-formats.h index d1bcc3ba..204c7dd5 100644 --- a/src/fe-common/irc/dcc/module-formats.h +++ b/src/fe-common/irc/dcc/module-formats.h @@ -1,4 +1,4 @@ -#include "formats.h" +#include enum { IRCTXT_MODULE_NAME, diff --git a/src/fe-common/irc/dcc/module.h b/src/fe-common/irc/dcc/module.h index 58e65b25..54934469 100644 --- a/src/fe-common/irc/dcc/module.h +++ b/src/fe-common/irc/dcc/module.h @@ -1,4 +1,4 @@ -#include "common.h" -#include "irc.h" +#include +#include #define MODULE_NAME "fe-common/irc/dcc" diff --git a/src/fe-common/irc/fe-cap.c b/src/fe-common/irc/fe-cap.c index 4f9d8ea9..a75f2bb3 100644 --- a/src/fe-common/irc/fe-cap.c +++ b/src/fe-common/irc/fe-cap.c @@ -19,14 +19,14 @@ */ #include "module.h" -#include "module-formats.h" -#include "signals.h" -#include "levels.h" -#include "misc.h" +#include +#include +#include +#include -#include "irc-servers.h" +#include -#include "printtext.h" +#include static const struct { const char *command; diff --git a/src/fe-common/irc/fe-common-irc.c b/src/fe-common/irc/fe-common-irc.c index b1bfb525..0db2d98e 100644 --- a/src/fe-common/irc/fe-common-irc.c +++ b/src/fe-common/irc/fe-common-irc.c @@ -19,16 +19,16 @@ */ #include "module.h" -#include "modules.h" -#include "module-formats.h" -#include "signals.h" -#include "misc.h" -#include "lib-config/iconfig.h" -#include "settings.h" +#include +#include +#include +#include +#include +#include -#include "themes.h" -#include "fe-irc-server.h" -#include "fe-irc-channels.h" +#include +#include +#include void fe_irc_modules_init(void); void fe_irc_modules_deinit(void); diff --git a/src/fe-common/irc/fe-ctcp.c b/src/fe-common/irc/fe-ctcp.c index cbb591ba..63d7ecd3 100644 --- a/src/fe-common/irc/fe-ctcp.c +++ b/src/fe-common/irc/fe-ctcp.c @@ -19,19 +19,19 @@ */ #include "module.h" -#include "module-formats.h" -#include "misc.h" -#include "settings.h" +#include +#include +#include -#include "levels.h" -#include "servers.h" -#include "channels.h" -#include "queries.h" -#include "ignore.h" +#include +#include +#include +#include +#include -#include "fe-windows.h" -#include "window-items.h" -#include "printtext.h" +#include +#include +#include static void ctcp_default_msg(IRC_SERVER_REC *server, const char *data, const char *nick, const char *addr, diff --git a/src/fe-common/irc/fe-events-numeric.c b/src/fe-common/irc/fe-events-numeric.c index 3eb124fc..b4525db5 100644 --- a/src/fe-common/irc/fe-events-numeric.c +++ b/src/fe-common/irc/fe-events-numeric.c @@ -19,22 +19,22 @@ */ #include "module.h" -#include "module-formats.h" -#include "signals.h" -#include "misc.h" -#include "settings.h" -#include "levels.h" -#include "recode.h" +#include +#include +#include +#include +#include +#include -#include "irc-servers.h" -#include "irc-channels.h" -#include "nicklist.h" -#include "mode-lists.h" +#include +#include +#include +#include -#include "../core/module-formats.h" -#include "printtext.h" -#include "fe-channels.h" -#include "fe-irc-server.h" +#include +#include +#include +#include static void print_event_received(IRC_SERVER_REC *server, const char *data, const char *nick, int target_param); diff --git a/src/fe-common/irc/fe-events.c b/src/fe-common/irc/fe-events.c index 850174c5..30f00efc 100644 --- a/src/fe-common/irc/fe-events.c +++ b/src/fe-common/irc/fe-events.c @@ -19,29 +19,29 @@ */ #include "module.h" -#include "module-formats.h" -#include "signals.h" -#include "misc.h" -#include "settings.h" +#include +#include +#include +#include -#include "levels.h" -#include "servers.h" -#include "servers-redirect.h" -#include "servers-reconnect.h" -#include "queries.h" -#include "ignore.h" -#include "recode.h" +#include +#include +#include +#include +#include +#include +#include -#include "irc-servers.h" -#include "irc-channels.h" -#include "irc-nicklist.h" -#include "irc-masks.h" +#include +#include +#include +#include -#include "printtext.h" -#include "fe-queries.h" -#include "fe-windows.h" -#include "fe-irc-server.h" -#include "fe-irc-channels.h" +#include +#include +#include +#include +#include static void event_privmsg(IRC_SERVER_REC *server, const char *data, const char *nick, const char *addr) diff --git a/src/fe-common/irc/fe-irc-channels.c b/src/fe-common/irc/fe-irc-channels.c index 0ec30003..93ff3603 100644 --- a/src/fe-common/irc/fe-irc-channels.c +++ b/src/fe-common/irc/fe-irc-channels.c @@ -19,17 +19,17 @@ */ #include "module.h" -#include "module-formats.h" -#include "signals.h" -#include "levels.h" +#include +#include +#include -#include "irc-servers.h" -#include "irc-channels.h" -#include "channel-rejoin.h" +#include +#include +#include -#include "printtext.h" -#include "fe-windows.h" -#include "window-items.h" +#include +#include +#include int fe_channel_is_opchannel(IRC_SERVER_REC *server, const char *target) { diff --git a/src/fe-common/irc/fe-irc-channels.h b/src/fe-common/irc/fe-irc-channels.h index d05c91a5..a5770107 100644 --- a/src/fe-common/irc/fe-irc-channels.h +++ b/src/fe-common/irc/fe-irc-channels.h @@ -1,5 +1,5 @@ -#ifndef __FE_IRC_CHANNELS_H -#define __FE_IRC_CHANNELS_H +#ifndef IRSSI_FE_COMMON_IRC_FE_IRC_CHANNELS_H +#define IRSSI_FE_COMMON_IRC_FE_IRC_CHANNELS_H int fe_channel_is_opchannel(IRC_SERVER_REC *server, const char *target); const char *fe_channel_skip_prefix(IRC_SERVER_REC *server, const char *target); diff --git a/src/fe-common/irc/fe-irc-commands.c b/src/fe-common/irc/fe-irc-commands.c index 668367e4..40ad36e0 100644 --- a/src/fe-common/irc/fe-irc-commands.c +++ b/src/fe-common/irc/fe-irc-commands.c @@ -19,26 +19,26 @@ */ #include "module.h" -#include "module-formats.h" -#include "signals.h" -#include "misc.h" -#include "special-vars.h" -#include "settings.h" +#include +#include +#include +#include +#include -#include "levels.h" -#include "servers.h" -#include "mode-lists.h" -#include "nicklist.h" -#include "irc-commands.h" -#include "irc-servers.h" -#include "irc-channels.h" -#include "irc-queries.h" +#include +#include +#include +#include +#include +#include +#include +#include -#include "fe-queries.h" -#include "fe-windows.h" -#include "window-items.h" -#include "printtext.h" -#include "keyboard.h" +#include +#include +#include +#include +#include /* SYNTAX: ME */ static void cmd_me(const char *data, IRC_SERVER_REC *server, WI_ITEM_REC *item) diff --git a/src/fe-common/irc/fe-irc-messages.c b/src/fe-common/irc/fe-irc-messages.c index 27aee5e2..ddd4311e 100644 --- a/src/fe-common/irc/fe-irc-messages.c +++ b/src/fe-common/irc/fe-irc-messages.c @@ -19,25 +19,25 @@ */ #include "module.h" -#include "signals.h" -#include "levels.h" -#include "channels.h" -#include "ignore.h" -#include "settings.h" +#include +#include +#include +#include +#include -#include "irc-servers.h" -#include "irc-channels.h" -#include "irc-queries.h" +#include +#include +#include -#include "../core/module-formats.h" -#include "module-formats.h" -#include "printtext.h" -#include "fe-messages.h" +#include +#include +#include +#include -#include "fe-queries.h" -#include "window-items.h" -#include "fe-irc-channels.h" -#include "fe-irc-server.h" +#include +#include +#include +#include static void sig_message_own_public(SERVER_REC *server, const char *msg, const char *target, const char *origtarget) diff --git a/src/fe-common/irc/fe-irc-queries.c b/src/fe-common/irc/fe-irc-queries.c index c928a94a..7a13542a 100644 --- a/src/fe-common/irc/fe-irc-queries.c +++ b/src/fe-common/irc/fe-irc-queries.c @@ -19,11 +19,11 @@ */ #include "module.h" -#include "signals.h" -#include "settings.h" -#include "servers.h" -#include "queries.h" -#include "nicklist.h" +#include +#include +#include +#include +#include static QUERY_REC *query_find_address(SERVER_REC *server, const char *address) { diff --git a/src/fe-common/irc/fe-irc-server.c b/src/fe-common/irc/fe-irc-server.c index c2b9fc0f..7e3a6300 100644 --- a/src/fe-common/irc/fe-irc-server.c +++ b/src/fe-common/irc/fe-irc-server.c @@ -19,22 +19,22 @@ */ #include "module.h" -#include "module-formats.h" -#include "signals.h" -#include "commands.h" -#include "misc.h" +#include +#include +#include +#include -#include "servers-setup.h" +#include -#include "levels.h" -#include "irc-chatnets.h" -#include "irc-servers.h" -#include "irc-channels.h" -#include "servers-reconnect.h" -#include "irc-servers-setup.h" +#include +#include +#include +#include +#include +#include -#include "fe-windows.h" -#include "printtext.h" +#include +#include const char *get_visible_target(IRC_SERVER_REC *server, const char *target) { diff --git a/src/fe-common/irc/fe-irc-server.h b/src/fe-common/irc/fe-irc-server.h index 7d9425be..28a709e3 100644 --- a/src/fe-common/irc/fe-irc-server.h +++ b/src/fe-common/irc/fe-irc-server.h @@ -1,5 +1,5 @@ -#ifndef __FE_IRC_SERVER_H -#define __FE_IRC_SERVER_H +#ifndef IRSSI_FE_COMMON_IRC_FE_IRC_SERVER_H +#define IRSSI_FE_COMMON_IRC_FE_IRC_SERVER_H const char *get_visible_target(IRC_SERVER_REC *server, const char *target); diff --git a/src/fe-common/irc/fe-ircnet.c b/src/fe-common/irc/fe-ircnet.c index 5ae5ac05..3484d923 100644 --- a/src/fe-common/irc/fe-ircnet.c +++ b/src/fe-common/irc/fe-ircnet.c @@ -19,18 +19,18 @@ */ #include "module.h" -#include "module-formats.h" -#include "signals.h" -#include "commands.h" -#include "levels.h" -#include "misc.h" -#include "chatnets.h" +#include +#include +#include +#include +#include +#include -#include "irc-servers.h" -#include "irc-chatnets.h" -#include "printtext.h" -#include "servers-setup.h" -#include "channels-setup.h" +#include +#include +#include +#include +#include static void cmd_network_list(void) { diff --git a/src/fe-common/irc/fe-modes.c b/src/fe-common/irc/fe-modes.c index dfe65c2d..61ea6c38 100644 --- a/src/fe-common/irc/fe-modes.c +++ b/src/fe-common/irc/fe-modes.c @@ -19,18 +19,18 @@ */ #include "module.h" -#include "module-formats.h" -#include "signals.h" -#include "levels.h" -#include "misc.h" -#include "settings.h" +#include +#include +#include +#include +#include -#include "irc-servers.h" -#include "irc-channels.h" -#include "modes.h" -#include "ignore.h" +#include +#include +#include +#include -#include "printtext.h" +#include #define MODE_WAIT_TIME 3 /* how many seconds to wait for identical modes */ diff --git a/src/fe-common/irc/fe-netjoin.c b/src/fe-common/irc/fe-netjoin.c index 9ea633b4..602eaf20 100644 --- a/src/fe-common/irc/fe-netjoin.c +++ b/src/fe-common/irc/fe-netjoin.c @@ -19,18 +19,18 @@ */ #include "module.h" -#include "module-formats.h" -#include "signals.h" -#include "levels.h" -#include "misc.h" -#include "settings.h" +#include +#include +#include +#include +#include -#include "irc-servers.h" -#include "modes.h" -#include "ignore.h" -#include "netsplit.h" +#include +#include +#include +#include -#include "printtext.h" +#include #define NETJOIN_WAIT_TIME 5 /* how many seconds to wait for the netsplitted JOIN messages to stop */ #define NETJOIN_MAX_WAIT 30 /* how many seconds to wait for nick to join to the rest of the channels she was before the netsplit */ diff --git a/src/fe-common/irc/fe-netsplit.c b/src/fe-common/irc/fe-netsplit.c index 258d0d57..4b7850da 100644 --- a/src/fe-common/irc/fe-netsplit.c +++ b/src/fe-common/irc/fe-netsplit.c @@ -19,17 +19,17 @@ */ #include "module.h" -#include "module-formats.h" -#include "signals.h" -#include "levels.h" -#include "settings.h" +#include +#include +#include +#include -#include "irc-servers.h" -#include "irc-commands.h" -#include "ignore.h" -#include "netsplit.h" +#include +#include +#include +#include -#include "printtext.h" +#include #define SPLIT_WAIT_TIME 5 /* how many seconds to wait for the QUIT split messages to stop */ diff --git a/src/fe-common/irc/fe-sasl.c b/src/fe-common/irc/fe-sasl.c index ed11f047..72fec58e 100644 --- a/src/fe-common/irc/fe-sasl.c +++ b/src/fe-common/irc/fe-sasl.c @@ -19,16 +19,16 @@ */ #include "module.h" -#include "module-formats.h" -#include "signals.h" -#include "levels.h" -#include "misc.h" -#include "sasl.h" +#include +#include +#include +#include +#include -#include "irc-servers.h" -#include "settings.h" +#include +#include -#include "printtext.h" +#include static void sig_sasl_success(IRC_SERVER_REC *server) { diff --git a/src/fe-common/irc/fe-whois.c b/src/fe-common/irc/fe-whois.c index 117df120..9a31cd9e 100644 --- a/src/fe-common/irc/fe-whois.c +++ b/src/fe-common/irc/fe-whois.c @@ -1,16 +1,16 @@ /* Copyright (C) 1999-2004 Timo Sirainen */ #include "module.h" -#include "module-formats.h" -#include "signals.h" -#include "levels.h" -#include "misc.h" -#include "settings.h" -#include "recode.h" +#include +#include +#include +#include +#include +#include -#include "irc-servers.h" +#include -#include "printtext.h" +#include static void event_whois(IRC_SERVER_REC *server, const char *data) { diff --git a/src/fe-common/irc/irc-completion.c b/src/fe-common/irc/irc-completion.c index 1593ff3d..71e2e0c8 100644 --- a/src/fe-common/irc/irc-completion.c +++ b/src/fe-common/irc/irc-completion.c @@ -19,8 +19,8 @@ */ #include "module.h" -#include "signals.h" -#include "chat-completion.h" +#include +#include static void sig_complete_stats(GList **list, WINDOW_REC *window, const char *word, const char *line, diff --git a/src/fe-common/irc/module-formats.c b/src/fe-common/irc/module-formats.c index 722aed73..a0f6bd29 100644 --- a/src/fe-common/irc/module-formats.c +++ b/src/fe-common/irc/module-formats.c @@ -19,7 +19,7 @@ */ #include "module.h" -#include "formats.h" +#include FORMAT_REC fecommon_irc_formats[] = { { MODULE_NAME, "IRC", 0 }, diff --git a/src/fe-common/irc/module-formats.h b/src/fe-common/irc/module-formats.h index 7969b5ac..66a9804f 100644 --- a/src/fe-common/irc/module-formats.h +++ b/src/fe-common/irc/module-formats.h @@ -1,4 +1,4 @@ -#include "formats.h" +#include enum { IRCTXT_MODULE_NAME, diff --git a/src/fe-common/irc/module.h b/src/fe-common/irc/module.h index 9583b81b..ad63c95e 100644 --- a/src/fe-common/irc/module.h +++ b/src/fe-common/irc/module.h @@ -1,4 +1,4 @@ -#include "common.h" -#include "irc.h" +#include +#include #define MODULE_NAME "fe-common/irc" diff --git a/src/fe-common/irc/notifylist/Makefile.am b/src/fe-common/irc/notifylist/Makefile.am index b990dcd2..b0f35fdf 100644 --- a/src/fe-common/irc/notifylist/Makefile.am +++ b/src/fe-common/irc/notifylist/Makefile.am @@ -1,10 +1,6 @@ noinst_LIBRARIES = libfe_irc_notifylist.a AM_CPPFLAGS = \ - -I$(top_srcdir)/src \ - -I$(top_srcdir)/src/core/ \ - -I$(top_srcdir)/src/irc/core/ \ - -I$(top_srcdir)/src/fe-common/core/ \ $(GLIB_CFLAGS) \ -DHELPDIR=\""$(datadir)/irssi/help"\" \ -DSYSCONFDIR=\""$(sysconfdir)"\" diff --git a/src/fe-common/irc/notifylist/fe-notifylist.c b/src/fe-common/irc/notifylist/fe-notifylist.c index 1cfe9ed4..1f136a97 100644 --- a/src/fe-common/irc/notifylist/fe-notifylist.c +++ b/src/fe-common/irc/notifylist/fe-notifylist.c @@ -19,21 +19,21 @@ */ #include "module.h" -#include "module-formats.h" -#include "signals.h" -#include "commands.h" -#include "misc.h" -#include "chatnets.h" -#include "lib-config/iconfig.h" -#include "settings.h" +#include +#include +#include +#include +#include +#include +#include -#include "levels.h" -#include "irc-servers.h" -#include "irc-chatnets.h" -#include "irc/notifylist/notifylist.h" +#include +#include +#include +#include -#include "themes.h" -#include "printtext.h" +#include +#include /* add the nick of a hostmask to list if it isn't there already */ static GSList *mask_add_once(GSList *list, const char *mask) diff --git a/src/fe-common/irc/notifylist/module-formats.c b/src/fe-common/irc/notifylist/module-formats.c index 700a846f..12f41fb5 100644 --- a/src/fe-common/irc/notifylist/module-formats.c +++ b/src/fe-common/irc/notifylist/module-formats.c @@ -19,7 +19,7 @@ */ #include "module.h" -#include "formats.h" +#include FORMAT_REC fecommon_irc_notifylist_formats[] = { diff --git a/src/fe-common/irc/notifylist/module-formats.h b/src/fe-common/irc/notifylist/module-formats.h index 042b54ae..ff3085e1 100644 --- a/src/fe-common/irc/notifylist/module-formats.h +++ b/src/fe-common/irc/notifylist/module-formats.h @@ -1,4 +1,4 @@ -#include "formats.h" +#include enum { IRCTXT_MODULE_NAME, diff --git a/src/fe-common/irc/notifylist/module.h b/src/fe-common/irc/notifylist/module.h index 3c74a998..0e5ca451 100644 --- a/src/fe-common/irc/notifylist/module.h +++ b/src/fe-common/irc/notifylist/module.h @@ -1,4 +1,4 @@ -#include "common.h" -#include "irc.h" +#include +#include #define MODULE_NAME "fe-common/irc/notifylist" diff --git a/src/fe-fuzz/Makefile.am b/src/fe-fuzz/Makefile.am index f52d9c47..e72b8723 100644 --- a/src/fe-fuzz/Makefile.am +++ b/src/fe-fuzz/Makefile.am @@ -6,10 +6,6 @@ bin_PROGRAMS = irssi-fuzz server-fuzz CCLD=$(CXX) $(CXXFLAGS) AM_CPPFLAGS = \ - -I$(top_srcdir)/src \ - -I$(top_srcdir)/src/core/ \ - -I$(top_srcdir)/src/irc/core/ \ - -I$(top_srcdir)/src/fe-common/core/ \ $(GLIB_CFLAGS) irssi_fuzz_DEPENDENCIES = @COMMON_LIBS@ diff --git a/src/fe-fuzz/fe-common/core/Makefile.am b/src/fe-fuzz/fe-common/core/Makefile.am index 9aa39a84..692e95cf 100644 --- a/src/fe-fuzz/fe-common/core/Makefile.am +++ b/src/fe-fuzz/fe-common/core/Makefile.am @@ -4,10 +4,6 @@ bin_PROGRAMS = theme-load-fuzz CCLD=$(CXX) $(CXXFLAGS) AM_CPPFLAGS = \ - -I$(top_srcdir)/src \ - -I$(top_srcdir)/src/core/ \ - -I$(top_srcdir)/src/irc/core/ \ - -I$(top_srcdir)/src/fe-common/core/ \ $(GLIB_CFLAGS) LDADD = \ diff --git a/src/fe-fuzz/fe-common/core/theme-load.c b/src/fe-fuzz/fe-common/core/theme-load.c index 14df74c6..87429ac4 100644 --- a/src/fe-fuzz/fe-common/core/theme-load.c +++ b/src/fe-fuzz/fe-common/core/theme-load.c @@ -18,17 +18,17 @@ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#include "module.h" -#include "modules-load.h" -#include "levels.h" -#include "../fe-text/module-formats.h" // need to explicitly grab from fe-text -#include "themes.h" -#include "core.h" -#include "fe-common-core.h" -#include "args.h" -#include "printtext.h" -#include "irc.h" -#include "themes.h" +#include +#include +#include +#include // need to explicitly grab from fe-text +#include +#include +#include +#include +#include +#include +#include #include #include diff --git a/src/fe-fuzz/irc/core/Makefile.am b/src/fe-fuzz/irc/core/Makefile.am index cb8b7e31..b2e1ea97 100644 --- a/src/fe-fuzz/irc/core/Makefile.am +++ b/src/fe-fuzz/irc/core/Makefile.am @@ -4,10 +4,6 @@ bin_PROGRAMS = event-get-params-fuzz CCLD=$(CXX) $(CXXFLAGS) AM_CPPFLAGS = \ - -I$(top_srcdir)/src \ - -I$(top_srcdir)/src/core/ \ - -I$(top_srcdir)/src/irc/core/ \ - -I$(top_srcdir)/src/fe-common/core/ \ $(GLIB_CFLAGS) LDADD = \ diff --git a/src/fe-fuzz/irc/core/event-get-params.c b/src/fe-fuzz/irc/core/event-get-params.c index c50b6205..36aeacf7 100644 --- a/src/fe-fuzz/irc/core/event-get-params.c +++ b/src/fe-fuzz/irc/core/event-get-params.c @@ -18,16 +18,16 @@ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#include "module.h" -#include "modules-load.h" -#include "levels.h" -#include "../fe-text/module-formats.h" // need to explicitly grab from fe-text -#include "themes.h" -#include "core.h" -#include "fe-common-core.h" -#include "args.h" -#include "printtext.h" -#include "irc.h" +#include +#include +#include +#include // need to explicitly grab from fe-text +#include +#include +#include +#include +#include +#include #include #include diff --git a/src/fe-fuzz/irssi.c b/src/fe-fuzz/irssi.c index c1b2ca9b..1c9f6c5f 100644 --- a/src/fe-fuzz/irssi.c +++ b/src/fe-fuzz/irssi.c @@ -18,15 +18,15 @@ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#include "module.h" -#include "modules-load.h" -#include "levels.h" -#include "../fe-text/module-formats.h" /* need to explicitly grab from fe-text */ -#include "themes.h" -#include "core.h" -#include "fe-common-core.h" -#include "args.h" -#include "printtext.h" +#include +#include +#include +#include /* need to explicitly grab from fe-text */ +#include +#include +#include +#include +#include #include #include diff --git a/src/fe-fuzz/server.c b/src/fe-fuzz/server.c index 76eeb17e..2e8cd3d2 100644 --- a/src/fe-fuzz/server.c +++ b/src/fe-fuzz/server.c @@ -18,17 +18,17 @@ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#include "module.h" -#include "modules-load.h" -#include "module-formats.h" -#include "levels.h" -#include "themes.h" -#include "core.h" -#include "fe-common-core.h" -#include "args.h" -#include "printtext.h" -#include "misc.h" -#include "servers-setup.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include @@ -36,9 +36,9 @@ #include #include -#include "irc.h" -#include "irc-servers.h" -#include "irc-channels.h" +#include +#include +#include /* irc.c */ void irc_init(void); diff --git a/src/fe-none/Makefile.am b/src/fe-none/Makefile.am index 1233fc91..570d6261 100644 --- a/src/fe-none/Makefile.am +++ b/src/fe-none/Makefile.am @@ -1,9 +1,6 @@ bin_PROGRAMS = botti AM_CPPFLAGS = \ - -I$(top_srcdir)/src \ - -I$(top_srcdir)/src/core/ \ - -I$(top_srcdir)/src/irc/core/ \ $(GLIB_CFLAGS) botti_DEPENDENCIES = @COMMON_NOUI_LIBS@ diff --git a/src/fe-none/irssi.c b/src/fe-none/irssi.c index 6c601627..c61d74f7 100644 --- a/src/fe-none/irssi.c +++ b/src/fe-none/irssi.c @@ -19,11 +19,11 @@ */ #include "module.h" -#include "modules.h" -#include "modules-load.h" -#include "args.h" -#include "signals.h" -#include "core.h" +#include +#include +#include +#include +#include #ifdef HAVE_STATIC_PERL void perl_core_init(void); diff --git a/src/fe-none/module.h b/src/fe-none/module.h index 1bb9e252..cf956eaa 100644 --- a/src/fe-none/module.h +++ b/src/fe-none/module.h @@ -1,3 +1,3 @@ -#include "common.h" +#include #define MODULE_NAME "fe-none" diff --git a/src/fe-text/Makefile.am b/src/fe-text/Makefile.am index 448a9389..94ce1a3c 100644 --- a/src/fe-text/Makefile.am +++ b/src/fe-text/Makefile.am @@ -1,9 +1,6 @@ bin_PROGRAMS = irssi AM_CPPFLAGS = \ - -I$(top_srcdir)/src \ - -I$(top_srcdir)/src/core/ \ - -I$(top_srcdir)/src/fe-common/core/ \ $(GLIB_CFLAGS) irssi_DEPENDENCIES = \ diff --git a/src/fe-text/gui-entry.c b/src/fe-text/gui-entry.c index ee3de77d..1a721397 100644 --- a/src/fe-text/gui-entry.c +++ b/src/fe-text/gui-entry.c @@ -19,14 +19,14 @@ */ #include "module.h" -#include "misc.h" -#include "utf8.h" -#include "formats.h" +#include +#include +#include -#include "gui-entry.h" -#include "gui-printtext.h" -#include "term.h" -#include "recode.h" +#include +#include +#include +#include #undef i_toupper #undef i_tolower diff --git a/src/fe-text/gui-entry.h b/src/fe-text/gui-entry.h index dff860d3..97dcee22 100644 --- a/src/fe-text/gui-entry.h +++ b/src/fe-text/gui-entry.h @@ -1,5 +1,5 @@ -#ifndef __GUI_ENTRY_H -#define __GUI_ENTRY_H +#ifndef IRSSI_FE_TEXT_GUI_ENTRY_H +#define IRSSI_FE_TEXT_GUI_ENTRY_H typedef struct { int cutbuffer_len; diff --git a/src/fe-text/gui-expandos.c b/src/fe-text/gui-expandos.c index 064a0955..a6b11418 100644 --- a/src/fe-text/gui-expandos.c +++ b/src/fe-text/gui-expandos.c @@ -19,10 +19,10 @@ */ #include "module.h" -#include "expandos.h" +#include -#include "gui-entry.h" -#include "gui-readline.h" +#include +#include /* idle time */ static char *expando_idletime(SERVER_REC *server, void *item, int *free_ret) diff --git a/src/fe-text/gui-printtext.c b/src/fe-text/gui-printtext.c index e47e4594..9b472bff 100644 --- a/src/fe-text/gui-printtext.c +++ b/src/fe-text/gui-printtext.c @@ -19,16 +19,16 @@ */ #include "module.h" -#include "signals.h" -#include "settings.h" +#include +#include -#include "formats.h" -#include "printtext.h" -#include "themes.h" +#include +#include +#include -#include "term.h" -#include "gui-printtext.h" -#include "gui-windows.h" +#include +#include +#include int mirc_colors[] = { 15, 0, 1, 2, 12, 4, 5, 6, 14, 10, 3, 11, 9, 13, 8, 7, /* 16-27 */ 52, 94, 100, 58, 22, 29, 23, 24, 17, 54, 53, 89, diff --git a/src/fe-text/gui-printtext.h b/src/fe-text/gui-printtext.h index 64595bbe..ba5d6f8f 100644 --- a/src/fe-text/gui-printtext.h +++ b/src/fe-text/gui-printtext.h @@ -1,9 +1,9 @@ -#ifndef __GUI_PRINTTEXT_H -#define __GUI_PRINTTEXT_H +#ifndef IRSSI_FE_TEXT_GUI_PRINTTEXT_H +#define IRSSI_FE_TEXT_GUI_PRINTTEXT_H -#include "gui-windows.h" -#include "textbuffer-view.h" -#include "formats.h" +#include +#include +#include extern int mirc_colors[]; diff --git a/src/fe-text/gui-readline.c b/src/fe-text/gui-readline.c index 1033339e..8f5594cb 100644 --- a/src/fe-text/gui-readline.c +++ b/src/fe-text/gui-readline.c @@ -19,23 +19,23 @@ */ #include "module.h" -#include "module-formats.h" -#include "signals.h" -#include "misc.h" -#include "settings.h" -#include "special-vars.h" -#include "levels.h" -#include "servers.h" +#include +#include +#include +#include +#include +#include +#include -#include "completion.h" -#include "command-history.h" -#include "keyboard.h" -#include "printtext.h" +#include +#include +#include +#include -#include "term.h" -#include "gui-entry.h" -#include "gui-windows.h" -#include "utf8.h" +#include +#include +#include +#include #include #include diff --git a/src/fe-text/gui-readline.h b/src/fe-text/gui-readline.h index 9ce3a742..dc497b8f 100644 --- a/src/fe-text/gui-readline.h +++ b/src/fe-text/gui-readline.h @@ -1,5 +1,5 @@ -#ifndef __GUI_READLINE_H -#define __GUI_READLINE_H +#ifndef IRSSI_FE_TEXT_GUI_READLINE_H +#define IRSSI_FE_TEXT_GUI_READLINE_H extern char *cutbuffer; diff --git a/src/fe-text/gui-windows.c b/src/fe-text/gui-windows.c index 0890fe6f..9ca2dfdb 100644 --- a/src/fe-text/gui-windows.c +++ b/src/fe-text/gui-windows.c @@ -19,16 +19,16 @@ */ #include "module.h" -#include "signals.h" -#include "misc.h" -#include "settings.h" -#include "special-vars.h" -#include "levels.h" +#include +#include +#include +#include +#include -#include "term.h" -#include "gui-entry.h" -#include "gui-windows.h" -#include "gui-printtext.h" +#include +#include +#include +#include static int window_create_override; static int wcwidth_impl; diff --git a/src/fe-text/gui-windows.h b/src/fe-text/gui-windows.h index 94c0d28b..52a64cea 100644 --- a/src/fe-text/gui-windows.h +++ b/src/fe-text/gui-windows.h @@ -1,8 +1,8 @@ -#ifndef __GUI_WINDOWS_H -#define __GUI_WINDOWS_H +#ifndef IRSSI_FE_TEXT_GUI_WINDOWS_H +#define IRSSI_FE_TEXT_GUI_WINDOWS_H -#include "mainwindows.h" -#include "textbuffer-view.h" +#include +#include #define WINDOW_GUI(a) ((GUI_WINDOW_REC *) ((a)->gui_data)) #define WINDOW_MAIN(a) (WINDOW_GUI(a)->parent) diff --git a/src/fe-text/irssi.c b/src/fe-text/irssi.c index c979e917..8b466905 100644 --- a/src/fe-text/irssi.c +++ b/src/fe-text/irssi.c @@ -19,29 +19,29 @@ */ #include "module.h" -#include "module-formats.h" -#include "modules-load.h" -#include "args.h" -#include "signals.h" -#include "levels.h" -#include "core.h" -#include "settings.h" -#include "session.h" -#include "servers.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include -#include "printtext.h" -#include "fe-common-core.h" -#include "fe-settings.h" -#include "themes.h" +#include +#include +#include +#include -#include "term.h" -#include "gui-entry.h" -#include "mainwindows.h" -#include "gui-printtext.h" -#include "gui-readline.h" -#include "statusbar.h" -#include "gui-windows.h" -#include "irssi-version.h" +#include +#include +#include +#include +#include +#include +#include +#include #include #include diff --git a/src/fe-text/lastlog.c b/src/fe-text/lastlog.c index c0b1dde8..d5aa298a 100644 --- a/src/fe-text/lastlog.c +++ b/src/fe-text/lastlog.c @@ -19,17 +19,17 @@ */ #include "module.h" -#include "signals.h" -#include "commands.h" -#include "misc.h" -#include "levels.h" -#include "settings.h" +#include +#include +#include +#include +#include -#include "module-formats.h" -#include "printtext.h" +#include +#include -#include "gui-windows.h" -#include "gui-printtext.h" +#include +#include #define DEFAULT_LASTLOG_BEFORE 3 #define DEFAULT_LASTLOG_AFTER 3 diff --git a/src/fe-text/mainwindow-activity.c b/src/fe-text/mainwindow-activity.c index 7f7a0528..d3759ace 100644 --- a/src/fe-text/mainwindow-activity.c +++ b/src/fe-text/mainwindow-activity.c @@ -19,10 +19,10 @@ */ #include "module.h" -#include "signals.h" -#include "settings.h" +#include +#include -#include "gui-windows.h" +#include /* Don't send window activity if window is already visible in another mainwindow */ diff --git a/src/fe-text/mainwindows-layout.c b/src/fe-text/mainwindows-layout.c index bb53fdab..ef13892f 100644 --- a/src/fe-text/mainwindows-layout.c +++ b/src/fe-text/mainwindows-layout.c @@ -19,15 +19,15 @@ */ #include "module.h" -#include "signals.h" -#include "misc.h" -#include "lib-config/iconfig.h" -#include "settings.h" -#include "levels.h" +#include +#include +#include +#include +#include -#include "mainwindows.h" -#include "gui-windows.h" -#include "textbuffer-view.h" +#include +#include +#include static void sig_layout_window_save(WINDOW_REC *window, CONFIG_NODE *node) { diff --git a/src/fe-text/mainwindows.c b/src/fe-text/mainwindows.c index 997cdd22..677e0e14 100644 --- a/src/fe-text/mainwindows.c +++ b/src/fe-text/mainwindows.c @@ -19,16 +19,16 @@ */ #include "module.h" -#include "module-formats.h" -#include "signals.h" -#include "commands.h" -#include "levels.h" -#include "misc.h" -#include "settings.h" -#include "printtext.h" +#include +#include +#include +#include +#include +#include +#include -#include "term.h" -#include "gui-windows.h" +#include +#include #define NEW_WINDOW_SIZE (WINDOW_MIN_SIZE + 1) diff --git a/src/fe-text/mainwindows.h b/src/fe-text/mainwindows.h index 4810c1e3..52cf2df3 100644 --- a/src/fe-text/mainwindows.h +++ b/src/fe-text/mainwindows.h @@ -1,8 +1,8 @@ -#ifndef __MAINWINDOWS_H -#define __MAINWINDOWS_H +#ifndef IRSSI_FE_TEXT_MAINWINDOWS_H +#define IRSSI_FE_TEXT_MAINWINDOWS_H -#include "fe-windows.h" -#include "term.h" +#include +#include #define WINDOW_MIN_SIZE 2 #define NEW_WINDOW_WIDTH 20 /* must be >= MIN_SCREEN_WIDTH defined in term.c */ diff --git a/src/fe-text/module-formats.c b/src/fe-text/module-formats.c index 277872c6..7cdc5654 100644 --- a/src/fe-text/module-formats.c +++ b/src/fe-text/module-formats.c @@ -19,7 +19,7 @@ */ #include "module.h" -#include "formats.h" +#include FORMAT_REC gui_text_formats[] = { diff --git a/src/fe-text/module-formats.h b/src/fe-text/module-formats.h index ac60fdb7..59c877b8 100644 --- a/src/fe-text/module-formats.h +++ b/src/fe-text/module-formats.h @@ -1,4 +1,4 @@ -#include "formats.h" +#include enum { TXT_MODULE_NAME, diff --git a/src/fe-text/module.h b/src/fe-text/module.h index 0ca9f703..b1eeeb0e 100644 --- a/src/fe-text/module.h +++ b/src/fe-text/module.h @@ -1,5 +1,5 @@ -#include "common.h" -#include "term.h" +#include +#include #define MODULE_NAME "fe-text" diff --git a/src/fe-text/statusbar-config.c b/src/fe-text/statusbar-config.c index 38372725..3cfa5379 100644 --- a/src/fe-text/statusbar-config.c +++ b/src/fe-text/statusbar-config.c @@ -19,16 +19,16 @@ */ #include "module.h" -#include "module-formats.h" -#include "signals.h" -#include "commands.h" -#include "settings.h" -#include "levels.h" -#include "lib-config/iconfig.h" -#include "misc.h" +#include +#include +#include +#include +#include +#include +#include -#include "statusbar.h" -#include "printtext.h" +#include +#include static void read_statusbar_config_from_node(CONFIG_NODE *node); diff --git a/src/fe-text/statusbar-config.h b/src/fe-text/statusbar-config.h index a2a0b049..239918db 100644 --- a/src/fe-text/statusbar-config.h +++ b/src/fe-text/statusbar-config.h @@ -1,7 +1,7 @@ -#ifndef __STATUSBAR_CONFIG_H -#define __STATUSBAR_CONFIG_H +#ifndef IRSSI_FE_TEXT_STATUSBAR_CONFIG_H +#define IRSSI_FE_TEXT_STATUSBAR_CONFIG_H -#include "statusbar.h" +#include void statusbar_config_destroy(STATUSBAR_GROUP_REC *group, STATUSBAR_CONFIG_REC *config); diff --git a/src/fe-text/statusbar-items.c b/src/fe-text/statusbar-items.c index 27efcbd1..c6770e32 100644 --- a/src/fe-text/statusbar-items.c +++ b/src/fe-text/statusbar-items.c @@ -19,14 +19,14 @@ */ #include "module.h" -#include "signals.h" -#include "settings.h" -#include "servers.h" +#include +#include +#include -#include "themes.h" -#include "statusbar.h" -#include "gui-entry.h" -#include "gui-windows.h" +#include +#include +#include +#include /* how often to redraw lagging time (seconds) */ #define LAG_REFRESH_TIME 10 diff --git a/src/fe-text/statusbar.c b/src/fe-text/statusbar.c index 40837eea..2439d101 100644 --- a/src/fe-text/statusbar.c +++ b/src/fe-text/statusbar.c @@ -19,16 +19,16 @@ */ #include "module.h" -#include "signals.h" -#include "expandos.h" -#include "special-vars.h" +#include +#include +#include -#include "themes.h" +#include -#include "statusbar.h" -#include "statusbar-config.h" -#include "gui-windows.h" -#include "gui-printtext.h" +#include +#include +#include +#include void statusbar_items_init(void); void statusbar_items_deinit(void); diff --git a/src/fe-text/statusbar.h b/src/fe-text/statusbar.h index b0048cc4..140d355d 100644 --- a/src/fe-text/statusbar.h +++ b/src/fe-text/statusbar.h @@ -1,8 +1,8 @@ -#ifndef __STATUSBAR_H -#define __STATUSBAR_H +#ifndef IRSSI_FE_TEXT_STATUSBAR_H +#define IRSSI_FE_TEXT_STATUSBAR_H -#include "mainwindows.h" -#include "statusbar-item.h" +#include +#include #define STATUSBAR_PRIORITY_HIGH 100 #define STATUSBAR_PRIORITY_NORMAL 0 diff --git a/src/fe-text/term-terminfo.c b/src/fe-text/term-terminfo.c index 6e031ebf..5235f72d 100644 --- a/src/fe-text/term-terminfo.c +++ b/src/fe-text/term-terminfo.c @@ -19,12 +19,12 @@ */ #include "module.h" -#include "signals.h" -#include "term.h" -#include "terminfo-core.h" -#include "fe-windows.h" -#include "gui-printtext.h" -#include "utf8.h" +#include +#include +#include +#include +#include +#include #include #include diff --git a/src/fe-text/term.c b/src/fe-text/term.c index 408dc7ef..1d5c2bef 100644 --- a/src/fe-text/term.c +++ b/src/fe-text/term.c @@ -19,12 +19,12 @@ */ #include "module.h" -#include "signals.h" -#include "commands.h" -#include "settings.h" +#include +#include +#include -#include "term.h" -#include "mainwindows.h" +#include +#include #ifdef HAVE_SYS_IOCTL_H # include diff --git a/src/fe-text/term.h b/src/fe-text/term.h index f25154c2..7758fea3 100644 --- a/src/fe-text/term.h +++ b/src/fe-text/term.h @@ -1,5 +1,5 @@ -#ifndef __TERM_H -#define __TERM_H +#ifndef IRSSI_FE_TEXT_TERM_H +#define IRSSI_FE_TEXT_TERM_H typedef struct _TERM_WINDOW TERM_WINDOW; @@ -27,7 +27,7 @@ typedef struct _TERM_WINDOW TERM_WINDOW; #define TERM_TYPE_UTF8 1 #define TERM_TYPE_BIG5 2 -#include "utf8.h" +#include extern TERM_WINDOW *root_window; extern int term_width, term_height; diff --git a/src/fe-text/terminfo-core.c b/src/fe-text/terminfo-core.c index 9c9179a5..d2273d71 100644 --- a/src/fe-text/terminfo-core.c +++ b/src/fe-text/terminfo-core.c @@ -1,6 +1,6 @@ #include "module.h" -#include "signals.h" -#include "terminfo-core.h" +#include +#include #ifndef _POSIX_VDISABLE # define _POSIX_VDISABLE 0 diff --git a/src/fe-text/terminfo-core.h b/src/fe-text/terminfo-core.h index 1253fd9d..a077d0bf 100644 --- a/src/fe-text/terminfo-core.h +++ b/src/fe-text/terminfo-core.h @@ -1,5 +1,5 @@ -#ifndef __TERMINFO_CORE_H -#define __TERMINFO_CORE_H +#ifndef IRSSI_FE_TEXT_TERMINFO_CORE_H +#define IRSSI_FE_TEXT_TERMINFO_CORE_H #include diff --git a/src/fe-text/textbuffer-commands.c b/src/fe-text/textbuffer-commands.c index 7278772c..318ee077 100644 --- a/src/fe-text/textbuffer-commands.c +++ b/src/fe-text/textbuffer-commands.c @@ -19,16 +19,16 @@ */ #include "module.h" -#include "module-formats.h" -#include "signals.h" -#include "commands.h" -#include "misc.h" -#include "levels.h" -#include "settings.h" -#include "servers.h" +#include +#include +#include +#include +#include +#include +#include -#include "printtext.h" -#include "gui-windows.h" +#include +#include static int activity_hide_window_hidelevel; diff --git a/src/fe-text/textbuffer-view.c b/src/fe-text/textbuffer-view.c index e5141430..ec518cbf 100644 --- a/src/fe-text/textbuffer-view.c +++ b/src/fe-text/textbuffer-view.c @@ -21,9 +21,9 @@ #define G_LOG_DOMAIN "TextBufferView" #include "module.h" -#include "textbuffer-view.h" -#include "signals.h" -#include "utf8.h" +#include +#include +#include typedef struct { char *name; diff --git a/src/fe-text/textbuffer-view.h b/src/fe-text/textbuffer-view.h index 1ae7c163..607016ac 100644 --- a/src/fe-text/textbuffer-view.h +++ b/src/fe-text/textbuffer-view.h @@ -1,8 +1,8 @@ -#ifndef __TEXTBUFFER_VIEW_H -#define __TEXTBUFFER_VIEW_H +#ifndef IRSSI_FE_TEXT_TEXTBUFFER_VIEW_H +#define IRSSI_FE_TEXT_TEXTBUFFER_VIEW_H -#include "textbuffer.h" -#include "term.h" +#include +#include typedef struct _TEXT_BUFFER_VIEW_REC TEXT_BUFFER_VIEW_REC; diff --git a/src/fe-text/textbuffer.c b/src/fe-text/textbuffer.c index 5f9e68ad..470c0b00 100644 --- a/src/fe-text/textbuffer.c +++ b/src/fe-text/textbuffer.c @@ -21,12 +21,12 @@ #define G_LOG_DOMAIN "TextBuffer" #include "module.h" -#include "misc.h" -#include "formats.h" -#include "utf8.h" -#include "iregex.h" +#include +#include +#include +#include -#include "textbuffer.h" +#include #define TEXT_CHUNK_USABLE_SIZE (LINE_TEXT_CHUNK_SIZE-2-(int)sizeof(char*)) diff --git a/src/fe-text/textbuffer.h b/src/fe-text/textbuffer.h index 2aa22f1a..cbe4fbf0 100644 --- a/src/fe-text/textbuffer.h +++ b/src/fe-text/textbuffer.h @@ -1,5 +1,5 @@ -#ifndef __TEXTBUFFER_H -#define __TEXTBUFFER_H +#ifndef IRSSI_FE_TEXT_TEXTBUFFER_H +#define IRSSI_FE_TEXT_TEXTBUFFER_H /* Make sure TEXT_CHUNK_REC is not slightly more than a page, as that wastes a lot of memory. */ diff --git a/src/irc/core/Makefile.am b/src/irc/core/Makefile.am index c668faea..63b41113 100644 --- a/src/irc/core/Makefile.am +++ b/src/irc/core/Makefile.am @@ -1,8 +1,6 @@ noinst_LIBRARIES = libirc_core.a AM_CPPFLAGS = \ - -I$(top_srcdir)/src \ - -I$(top_srcdir)/src/core \ -DSYSCONFDIR=\""$(sysconfdir)"\" \ $(GLIB_CFLAGS) diff --git a/src/irc/core/bans.c b/src/irc/core/bans.c index 198fdc4a..a61742f3 100644 --- a/src/irc/core/bans.c +++ b/src/irc/core/bans.c @@ -19,17 +19,17 @@ */ #include "module.h" -#include "signals.h" -#include "misc.h" -#include "settings.h" +#include +#include +#include -#include "irc-servers.h" -#include "irc-channels.h" -#include "irc-masks.h" -#include "irc-commands.h" -#include "modes.h" -#include "mode-lists.h" -#include "nicklist.h" +#include +#include +#include +#include +#include +#include +#include #define BAN_TYPE_NORMAL (IRC_MASK_USER | IRC_MASK_DOMAIN) #define BAN_TYPE_USER (IRC_MASK_USER) diff --git a/src/irc/core/bans.h b/src/irc/core/bans.h index 0b00f19d..5f052667 100644 --- a/src/irc/core/bans.h +++ b/src/irc/core/bans.h @@ -1,5 +1,5 @@ -#ifndef __BANS_H -#define __BANS_H +#ifndef IRSSI_IRC_CORE_BANS_H +#define IRSSI_IRC_CORE_BANS_H void bans_init(void); void bans_deinit(void); diff --git a/src/irc/core/channel-events.c b/src/irc/core/channel-events.c index 6ffe7364..7603a14f 100644 --- a/src/irc/core/channel-events.c +++ b/src/irc/core/channel-events.c @@ -19,15 +19,15 @@ */ #include "module.h" -#include "signals.h" -#include "misc.h" -#include "channel-events.h" -#include "channels-setup.h" -#include "settings.h" -#include "recode.h" +#include +#include +#include +#include +#include +#include -#include "irc-servers.h" -#include "irc-channels.h" +#include +#include static void check_join_failure(IRC_SERVER_REC *server, const char *channel) { diff --git a/src/irc/core/channel-events.h b/src/irc/core/channel-events.h index 6d01c48e..ada3e3a1 100644 --- a/src/irc/core/channel-events.h +++ b/src/irc/core/channel-events.h @@ -1,7 +1,7 @@ -#ifndef __CHANNEL_EVENTS_H -#define __CHANNEL_EVENTS_H +#ifndef IRSSI_IRC_CORE_CHANNEL_EVENTS_H +#define IRSSI_IRC_CORE_CHANNEL_EVENTS_H -#include "irc.h" +#include void channel_events_init(void); void channel_events_deinit(void); diff --git a/src/irc/core/channel-rejoin.c b/src/irc/core/channel-rejoin.c index 154035ae..f49c69b6 100644 --- a/src/irc/core/channel-rejoin.c +++ b/src/irc/core/channel-rejoin.c @@ -20,14 +20,14 @@ */ #include "module.h" -#include "signals.h" -#include "settings.h" -#include "misc.h" +#include +#include +#include -#include "irc-servers.h" -#include "irc-channels.h" -#include "irc-commands.h" -#include "channel-rejoin.h" +#include +#include +#include +#include #define REJOIN_TIMEOUT (1000*60*5) /* try to rejoin every 5 minutes */ diff --git a/src/irc/core/channel-rejoin.h b/src/irc/core/channel-rejoin.h index 0b9cd151..3c465799 100644 --- a/src/irc/core/channel-rejoin.h +++ b/src/irc/core/channel-rejoin.h @@ -1,5 +1,5 @@ -#ifndef __CHANNEL_REJOIN_H -#define __CHANNEL_REJOIN_H +#ifndef IRSSI_IRC_CORE_CHANNEL_REJOIN_H +#define IRSSI_IRC_CORE_CHANNEL_REJOIN_H typedef struct { char *channel; diff --git a/src/irc/core/channels-query.c b/src/irc/core/channels-query.c index d7dadf04..8f90af64 100644 --- a/src/irc/core/channels-query.c +++ b/src/irc/core/channels-query.c @@ -39,16 +39,16 @@ loop: */ #include "module.h" -#include "misc.h" -#include "signals.h" -#include "settings.h" +#include +#include +#include -#include "modes.h" -#include "mode-lists.h" -#include "nicklist.h" -#include "irc-servers.h" -#include "irc-channels.h" -#include "servers-redirect.h" +#include +#include +#include +#include +#include +#include enum { CHANNEL_QUERY_MODE, diff --git a/src/irc/core/ctcp.c b/src/irc/core/ctcp.c index accbb57f..42b93411 100644 --- a/src/irc/core/ctcp.c +++ b/src/irc/core/ctcp.c @@ -19,16 +19,16 @@ */ #include "module.h" -#include "signals.h" -#include "levels.h" -#include "misc.h" -#include "special-vars.h" -#include "settings.h" +#include +#include +#include +#include +#include -#include "irc-servers.h" -#include "servers-idle.h" -#include "ignore.h" -#include "ctcp.h" +#include +#include +#include +#include typedef struct { char *name; diff --git a/src/irc/core/ctcp.h b/src/irc/core/ctcp.h index a146b15f..c8a8a84e 100644 --- a/src/irc/core/ctcp.h +++ b/src/irc/core/ctcp.h @@ -1,5 +1,5 @@ -#ifndef __CTCP_H -#define __CTCP_H +#ifndef IRSSI_IRC_CORE_CTCP_H +#define IRSSI_IRC_CORE_CTCP_H /* Register/unregister CTCP command, so it shows in CTCP CLIENTINFO */ void ctcp_register(const char *name); diff --git a/src/irc/core/irc-cap.c b/src/irc/core/irc-cap.c index 2d740c59..21a27324 100644 --- a/src/irc/core/irc-cap.c +++ b/src/irc/core/irc-cap.c @@ -18,11 +18,11 @@ */ #include "module.h" -#include "signals.h" -#include "misc.h" +#include +#include -#include "irc-cap.h" -#include "irc-servers.h" +#include +#include int irc_cap_toggle (IRC_SERVER_REC *server, char *cap, int enable) { diff --git a/src/irc/core/irc-cap.h b/src/irc/core/irc-cap.h index 96efbbee..aa13023a 100644 --- a/src/irc/core/irc-cap.h +++ b/src/irc/core/irc-cap.h @@ -1,5 +1,5 @@ -#ifndef __IRC_CAP_H -#define __IRC_CAP_H +#ifndef IRSSI_IRC_CORE_IRC_CAP_H +#define IRSSI_IRC_CORE_IRC_CAP_H void irc_cap_init(void); void irc_cap_deinit(void); diff --git a/src/irc/core/irc-channels-setup.c b/src/irc/core/irc-channels-setup.c index bbbc095c..93874d35 100644 --- a/src/irc/core/irc-channels-setup.c +++ b/src/irc/core/irc-channels-setup.c @@ -19,8 +19,8 @@ */ #include "module.h" -#include "signals.h" -#include "channels.h" +#include +#include void irc_channels_setup_init(void) { diff --git a/src/irc/core/irc-channels.c b/src/irc/core/irc-channels.c index e775f530..b2ee3772 100644 --- a/src/irc/core/irc-channels.c +++ b/src/irc/core/irc-channels.c @@ -19,18 +19,18 @@ */ #include "module.h" -#include "signals.h" -#include "misc.h" -#include "levels.h" -#include "channels-setup.h" +#include +#include +#include +#include -#include "bans.h" -#include "modes.h" -#include "mode-lists.h" -#include "irc-servers.h" -#include "irc-channels.h" -#include "irc-nicklist.h" -#include "channel-rejoin.h" +#include +#include +#include +#include +#include +#include +#include void channels_query_init(void); void channels_query_deinit(void); diff --git a/src/irc/core/irc-channels.h b/src/irc/core/irc-channels.h index 8cfc4992..4ed7fd73 100644 --- a/src/irc/core/irc-channels.h +++ b/src/irc/core/irc-channels.h @@ -1,8 +1,8 @@ -#ifndef __IRC_CHANNELS_H -#define __IRC_CHANNELS_H +#ifndef IRSSI_IRC_CORE_IRC_CHANNELS_H +#define IRSSI_IRC_CORE_IRC_CHANNELS_H -#include "chat-protocols.h" -#include "channels.h" +#include +#include /* Returns IRC_CHANNEL_REC if it's IRC channel, NULL if it isn't. */ #define IRC_CHANNEL(channel) \ @@ -13,7 +13,7 @@ #define STRUCT_SERVER_REC IRC_SERVER_REC struct _IRC_CHANNEL_REC { -#include "channel-rec.h" +#include GSList *banlist; /* list of bans */ diff --git a/src/irc/core/irc-chatnets.c b/src/irc/core/irc-chatnets.c index 98ce89c3..c3b24a11 100644 --- a/src/irc/core/irc-chatnets.c +++ b/src/irc/core/irc-chatnets.c @@ -19,11 +19,11 @@ */ #include "module.h" -#include "signals.h" -#include "lib-config/iconfig.h" -#include "settings.h" +#include +#include +#include -#include "irc-chatnets.h" +#include void ircnet_create(IRC_CHATNET_REC *rec) { diff --git a/src/irc/core/irc-chatnets.h b/src/irc/core/irc-chatnets.h index 3fd44472..10e98921 100644 --- a/src/irc/core/irc-chatnets.h +++ b/src/irc/core/irc-chatnets.h @@ -1,8 +1,8 @@ -#ifndef __IRC_CHATNETS_H -#define __IRC_CHATNETS_H +#ifndef IRSSI_IRC_CORE_IRC_CHATNETS_H +#define IRSSI_IRC_CORE_IRC_CHATNETS_H -#include "chat-protocols.h" -#include "chatnets.h" +#include +#include /* returns IRC_CHATNET_REC if it's IRC network, NULL if it isn't */ #define IRC_CHATNET(chatnet) \ @@ -15,7 +15,7 @@ #define IRCNET(ircnet) IRC_CHATNET(ircnet) struct _IRC_CHATNET_REC { -#include "chatnet-rec.h" +#include char *usermode; char *alternate_nick; diff --git a/src/irc/core/irc-commands.c b/src/irc/core/irc-commands.c index 32ee8845..4062b1da 100644 --- a/src/irc/core/irc-commands.c +++ b/src/irc/core/irc-commands.c @@ -19,22 +19,22 @@ */ #include "module.h" -#include "misc.h" -#include "recode.h" -#include "special-vars.h" -#include "settings.h" -#include "window-item-def.h" +#include +#include +#include +#include +#include -#include "servers-reconnect.h" -#include "servers-redirect.h" -#include "servers-setup.h" -#include "nicklist.h" +#include +#include +#include +#include -#include "bans.h" -#include "irc-commands.h" -#include "irc-servers.h" -#include "irc-channels.h" -#include "irc-queries.h" +#include +#include +#include +#include +#include /* How often to check if there's anyone to be unbanned in knockout list */ #define KNOCKOUT_TIMECHECK 10000 diff --git a/src/irc/core/irc-commands.h b/src/irc/core/irc-commands.h index 739bd443..6f689313 100644 --- a/src/irc/core/irc-commands.h +++ b/src/irc/core/irc-commands.h @@ -1,7 +1,7 @@ -#ifndef __IRC_COMMANDS_H -#define __IRC_COMMANDS_H +#ifndef IRSSI_IRC_CORE_IRC_COMMANDS_H +#define IRSSI_IRC_CORE_IRC_COMMANDS_H -#include "commands.h" +#include #define command_bind_irc(cmd, section, signal) \ command_bind_proto(cmd, IRC_PROTOCOL, section, signal) diff --git a/src/irc/core/irc-core.c b/src/irc/core/irc-core.c index 950e5029..e65abe25 100644 --- a/src/irc/core/irc-core.c +++ b/src/irc/core/irc-core.c @@ -19,22 +19,22 @@ */ #include "module.h" -#include "chat-protocols.h" -#include "settings.h" +#include +#include -#include "irc-servers.h" -#include "irc-chatnets.h" -#include "irc-channels.h" -#include "irc-queries.h" -#include "irc-cap.h" -#include "sasl.h" +#include +#include +#include +#include +#include +#include -#include "irc-servers-setup.h" -#include "channels-setup.h" +#include +#include -#include "ctcp.h" -#include "irc-commands.h" -#include "netsplit.h" +#include +#include +#include void irc_expandos_init(void); void irc_expandos_deinit(void); diff --git a/src/irc/core/irc-expandos.c b/src/irc/core/irc-expandos.c index 62ef577a..625e6e8b 100644 --- a/src/irc/core/irc-expandos.c +++ b/src/irc/core/irc-expandos.c @@ -19,13 +19,13 @@ */ #include "module.h" -#include "misc.h" -#include "expandos.h" -#include "settings.h" +#include +#include +#include -#include "irc-servers.h" -#include "irc-channels.h" -#include "nicklist.h" +#include +#include +#include #ifndef HOST_NAME_MAX #define HOST_NAME_MAX 255 diff --git a/src/irc/core/irc-masks.c b/src/irc/core/irc-masks.c index d93a083d..e2c5aea6 100644 --- a/src/irc/core/irc-masks.c +++ b/src/irc/core/irc-masks.c @@ -19,9 +19,9 @@ */ #include "module.h" -#include "network.h" +#include -#include "irc-masks.h" +#include static char *get_domain_mask(char *host) { diff --git a/src/irc/core/irc-masks.h b/src/irc/core/irc-masks.h index 680877c9..5696bbb5 100644 --- a/src/irc/core/irc-masks.h +++ b/src/irc/core/irc-masks.h @@ -1,7 +1,7 @@ -#ifndef __IRC_MASKS_H -#define __IRC_MASKS_H +#ifndef IRSSI_IRC_CORE_IRC_MASKS_H +#define IRSSI_IRC_CORE_IRC_MASKS_H -#include "masks.h" +#include #define IRC_MASK_NICK 0x01 #define IRC_MASK_USER 0x02 diff --git a/src/irc/core/irc-nicklist.c b/src/irc/core/irc-nicklist.c index 3e16db80..54a9bd3b 100644 --- a/src/irc/core/irc-nicklist.c +++ b/src/irc/core/irc-nicklist.c @@ -19,15 +19,15 @@ */ #include "module.h" -#include "signals.h" -#include "misc.h" +#include +#include -#include "irc-servers.h" -#include "irc-channels.h" -#include "irc-masks.h" -#include "irc-nicklist.h" -#include "modes.h" -#include "servers.h" +#include +#include +#include +#include +#include +#include /* Add new nick to list */ NICK_REC *irc_nicklist_insert(IRC_CHANNEL_REC *channel, const char *nick, diff --git a/src/irc/core/irc-nicklist.h b/src/irc/core/irc-nicklist.h index 2ae17d2c..7ac3176d 100644 --- a/src/irc/core/irc-nicklist.h +++ b/src/irc/core/irc-nicklist.h @@ -1,7 +1,7 @@ -#ifndef __IRC_NICKLIST_H -#define __IRC_NICKLIST_H +#ifndef IRSSI_IRC_CORE_IRC_NICKLIST_H +#define IRSSI_IRC_CORE_IRC_NICKLIST_H -#include "nicklist.h" +#include /* Add new nick to list */ NICK_REC *irc_nicklist_insert(IRC_CHANNEL_REC *channel, const char *nick, diff --git a/src/irc/core/irc-queries.c b/src/irc/core/irc-queries.c index 64995ead..9c7eb6a9 100644 --- a/src/irc/core/irc-queries.c +++ b/src/irc/core/irc-queries.c @@ -19,12 +19,12 @@ */ #include "module.h" -#include "signals.h" -#include "misc.h" +#include +#include -#include "irc-nicklist.h" -#include "irc-servers.h" -#include "irc-queries.h" +#include +#include +#include QUERY_REC *irc_query_create(const char *server_tag, const char *nick, int automatic) diff --git a/src/irc/core/irc-queries.h b/src/irc/core/irc-queries.h index 0a3cc7a5..f6680ed2 100644 --- a/src/irc/core/irc-queries.h +++ b/src/irc/core/irc-queries.h @@ -1,8 +1,8 @@ -#ifndef __IRC_QUERIES_H -#define __IRC_QUERIES_H +#ifndef IRSSI_IRC_CORE_IRC_QUERIES_H +#define IRSSI_IRC_CORE_IRC_QUERIES_H -#include "chat-protocols.h" -#include "queries.h" +#include +#include /* Returns IRC_QUERY_REC if it's IRC query, NULL if it isn't. */ #define IRC_QUERY(query) \ diff --git a/src/irc/core/irc-servers-reconnect.c b/src/irc/core/irc-servers-reconnect.c index ca61492d..3d2933f4 100644 --- a/src/irc/core/irc-servers-reconnect.c +++ b/src/irc/core/irc-servers-reconnect.c @@ -19,14 +19,14 @@ */ #include "module.h" -#include "commands.h" -#include "network.h" -#include "signals.h" +#include +#include +#include -#include "modes.h" -#include "irc-servers.h" +#include +#include -#include "settings.h" +#include static void sig_server_connect_copy(SERVER_CONNECT_REC **dest, IRC_SERVER_CONNECT_REC *src) diff --git a/src/irc/core/irc-servers-setup.c b/src/irc/core/irc-servers-setup.c index 0af93902..56e52edd 100644 --- a/src/irc/core/irc-servers-setup.c +++ b/src/irc/core/irc-servers-setup.c @@ -19,16 +19,16 @@ */ #include "module.h" -#include "signals.h" -#include "network.h" -#include "servers-setup.h" -#include "lib-config/iconfig.h" -#include "settings.h" +#include +#include +#include +#include +#include -#include "irc-chatnets.h" -#include "irc-servers-setup.h" -#include "irc-servers.h" -#include "sasl.h" +#include +#include +#include +#include /* Fill information to connection from server setup record */ static void sig_server_setup_fill_reconn(IRC_SERVER_CONNECT_REC *conn, diff --git a/src/irc/core/irc-servers-setup.h b/src/irc/core/irc-servers-setup.h index 92629c2b..d3bafdef 100644 --- a/src/irc/core/irc-servers-setup.h +++ b/src/irc/core/irc-servers-setup.h @@ -1,8 +1,8 @@ -#ifndef __IRC_SERVERS_SETUP_H -#define __IRC_SERVERS_SETUP_H +#ifndef IRSSI_IRC_CORE_IRC_SERVERS_SETUP_H +#define IRSSI_IRC_CORE_IRC_SERVERS_SETUP_H -#include "chat-protocols.h" -#include "servers-setup.h" +#include +#include #define IRC_SERVER_SETUP(server) \ PROTO_CHECK_CAST(SERVER_SETUP(server), IRC_SERVER_SETUP_REC, \ @@ -12,7 +12,7 @@ (IRC_SERVER_SETUP(server) ? TRUE : FALSE) typedef struct { -#include "server-setup-rec.h" +#include /* override the default if > 0 */ int max_cmds_at_once; diff --git a/src/irc/core/irc-servers.c b/src/irc/core/irc-servers.c index 03c73312..7057c02a 100644 --- a/src/irc/core/irc-servers.c +++ b/src/irc/core/irc-servers.c @@ -20,30 +20,30 @@ #include "module.h" -#include "net-sendbuffer.h" -#include "signals.h" -#include "rawlog.h" -#include "misc.h" +#include +#include +#include +#include -#include "channels.h" -#include "queries.h" +#include +#include -#include "irc-nicklist.h" -#include "irc-queries.h" -#include "irc-servers-setup.h" -#include "irc-servers.h" -#include "irc-cap.h" -#include "sasl.h" +#include +#include +#include +#include +#include +#include -#include "channels-setup.h" -#include "channel-rejoin.h" -#include "servers-idle.h" -#include "servers-reconnect.h" -#include "servers-redirect.h" -#include "modes.h" +#include +#include +#include +#include +#include +#include -#include "settings.h" -#include "recode.h" +#include +#include #define DEFAULT_MAX_KICKS 1 #define DEFAULT_MAX_MODES 3 diff --git a/src/irc/core/irc-servers.h b/src/irc/core/irc-servers.h index 1374e846..57b65527 100644 --- a/src/irc/core/irc-servers.h +++ b/src/irc/core/irc-servers.h @@ -1,9 +1,9 @@ -#ifndef __IRC_SERVERS_H -#define __IRC_SERVERS_H +#ifndef IRSSI_IRC_CORE_IRC_SERVERS_H +#define IRSSI_IRC_CORE_IRC_SERVERS_H -#include "chat-protocols.h" -#include "servers.h" -#include "modes.h" +#include +#include +#include /* returns IRC_SERVER_REC if it's IRC server, NULL if it isn't */ #define IRC_SERVER(server) \ @@ -22,7 +22,7 @@ /* all strings should be either NULL or dynamically allocated */ /* address and nick are mandatory, rest are optional */ struct _IRC_SERVER_CONNECT_REC { -#include "server-connect-rec.h" +#include char *usermode; char *alternate_nick; @@ -40,7 +40,7 @@ struct _IRC_SERVER_CONNECT_REC { #define STRUCT_SERVER_CONNECT_REC IRC_SERVER_CONNECT_REC struct _IRC_SERVER_REC { -#include "server-rec.h" +#include /* For deciding if event should be redirected */ GSList *redirects; diff --git a/src/irc/core/irc-session.c b/src/irc/core/irc-session.c index 18e8e5c7..ec2c86ee 100644 --- a/src/irc/core/irc-session.c +++ b/src/irc/core/irc-session.c @@ -19,16 +19,16 @@ */ #include "module.h" -#include "signals.h" -#include "net-sendbuffer.h" -#include "lib-config/iconfig.h" -#include "misc.h" +#include +#include +#include +#include -#include "irc-servers.h" -#include "irc-channels.h" -#include "irc-nicklist.h" +#include +#include +#include -#include "sasl.h" +#include struct _isupport_data { CONFIG_REC *config; CONFIG_NODE *node; }; diff --git a/src/irc/core/irc.c b/src/irc/core/irc.c index a740b0da..4940fcb4 100644 --- a/src/irc/core/irc.c +++ b/src/irc/core/irc.c @@ -19,15 +19,15 @@ */ #include "module.h" -#include "modules.h" -#include "network.h" -#include "net-sendbuffer.h" -#include "rawlog.h" -#include "misc.h" +#include +#include +#include +#include +#include -#include "irc-servers.h" -#include "irc-channels.h" -#include "servers-redirect.h" +#include +#include +#include char *current_server_event; static int signal_default_event; diff --git a/src/irc/core/irc.h b/src/irc/core/irc.h index b5bd833a..3f1a9887 100644 --- a/src/irc/core/irc.h +++ b/src/irc/core/irc.h @@ -1,5 +1,5 @@ -#ifndef __IRC_H -#define __IRC_H +#ifndef IRSSI_IRC_CORE_IRC_H +#define IRSSI_IRC_CORE_IRC_H typedef struct _IRC_CHATNET_REC IRC_CHATNET_REC; typedef struct _IRC_SERVER_CONNECT_REC IRC_SERVER_CONNECT_REC; @@ -49,7 +49,7 @@ void irc_send_cmd_full(IRC_SERVER_REC *server, const char *cmd, int send_now, int immediate, int raw); /* Get count parameters from data */ -#include "commands.h" +#include char *event_get_param(char **data); char *event_get_params(const char *data, int count, ...); diff --git a/src/irc/core/lag.c b/src/irc/core/lag.c index 787505f0..d3d6118d 100644 --- a/src/irc/core/lag.c +++ b/src/irc/core/lag.c @@ -19,12 +19,12 @@ */ #include "module.h" -#include "signals.h" -#include "misc.h" -#include "settings.h" +#include +#include +#include -#include "irc-servers.h" -#include "servers-redirect.h" +#include +#include static int timeout_tag; diff --git a/src/irc/core/massjoin.c b/src/irc/core/massjoin.c index 6cc2b7c7..ec63a0b3 100644 --- a/src/irc/core/massjoin.c +++ b/src/irc/core/massjoin.c @@ -19,12 +19,12 @@ */ #include "module.h" -#include "signals.h" -#include "settings.h" +#include +#include -#include "irc-servers.h" -#include "irc-channels.h" -#include "irc-nicklist.h" +#include +#include +#include static int massjoin_tag; static int massjoin_max_joins; diff --git a/src/irc/core/mode-lists.c b/src/irc/core/mode-lists.c index 73b7a6b2..d2d7234f 100644 --- a/src/irc/core/mode-lists.c +++ b/src/irc/core/mode-lists.c @@ -19,12 +19,12 @@ */ #include "module.h" -#include "misc.h" -#include "signals.h" +#include +#include -#include "irc-servers.h" -#include "irc-channels.h" -#include "mode-lists.h" +#include +#include +#include static void ban_free(GSList **list, BAN_REC *rec) { diff --git a/src/irc/core/mode-lists.h b/src/irc/core/mode-lists.h index cd3bc0bf..2c9f20b1 100644 --- a/src/irc/core/mode-lists.h +++ b/src/irc/core/mode-lists.h @@ -1,5 +1,5 @@ -#ifndef __MODE_LISTS_H -#define __MODE_LISTS_H +#ifndef IRSSI_IRC_CORE_MODE_LISTS_H +#define IRSSI_IRC_CORE_MODE_LISTS_H typedef struct { char *ban; diff --git a/src/irc/core/modes.c b/src/irc/core/modes.c index cc3d0faf..b0de2f18 100644 --- a/src/irc/core/modes.c +++ b/src/irc/core/modes.c @@ -19,16 +19,16 @@ */ #include "module.h" -#include "signals.h" -#include "settings.h" +#include +#include -#include "irc-commands.h" -#include "irc-servers.h" -#include "irc-channels.h" -#include "servers-redirect.h" -#include "modes.h" -#include "mode-lists.h" -#include "nicklist.h" +#include +#include +#include +#include +#include +#include +#include /* Change nick's mode in channel */ static void nick_mode_change(IRC_CHANNEL_REC *channel, const char *nick, diff --git a/src/irc/core/modes.h b/src/irc/core/modes.h index bef017ba..f899a06d 100644 --- a/src/irc/core/modes.h +++ b/src/irc/core/modes.h @@ -1,8 +1,8 @@ -#ifndef __MODES_H -#define __MODES_H +#ifndef IRSSI_IRC_CORE_MODES_H +#define IRSSI_IRC_CORE_MODES_H -#include "irc-channels.h" -#include "nicklist.h" /* MAX_USER_PREFIXES */ +#include +#include /* MAX_USER_PREFIXES */ typedef void mode_func_t(IRC_CHANNEL_REC *, const char *, char, char, char *, GString *); diff --git a/src/irc/core/module.h b/src/irc/core/module.h index 19c0b3cc..41800038 100644 --- a/src/irc/core/module.h +++ b/src/irc/core/module.h @@ -1,4 +1,4 @@ -#include "common.h" -#include "irc.h" +#include +#include #define MODULE_NAME "irc/core" diff --git a/src/irc/core/netsplit.c b/src/irc/core/netsplit.c index 0642846f..1463f962 100644 --- a/src/irc/core/netsplit.c +++ b/src/irc/core/netsplit.c @@ -19,13 +19,13 @@ */ #include "module.h" -#include "signals.h" -#include "commands.h" -#include "misc.h" +#include +#include +#include -#include "irc-servers.h" -#include "irc-channels.h" -#include "netsplit.h" +#include +#include +#include /* How long to keep netsplits in memory (seconds) */ #define NETSPLIT_MAX_REMEMBER (60*60) diff --git a/src/irc/core/netsplit.h b/src/irc/core/netsplit.h index cbe3f26f..50edf63b 100644 --- a/src/irc/core/netsplit.h +++ b/src/irc/core/netsplit.h @@ -1,7 +1,7 @@ -#ifndef __NETSPLIT_H -#define __NETSPLIT_H +#ifndef IRSSI_IRC_CORE_NETSPLIT_H +#define IRSSI_IRC_CORE_NETSPLIT_H -#include "nicklist.h" +#include typedef struct { char *server; diff --git a/src/irc/core/sasl.c b/src/irc/core/sasl.c index 92eb6244..22a10ec7 100644 --- a/src/irc/core/sasl.c +++ b/src/irc/core/sasl.c @@ -19,12 +19,12 @@ */ #include "module.h" -#include "misc.h" -#include "settings.h" +#include +#include -#include "irc-cap.h" -#include "irc-servers.h" -#include "sasl.h" +#include +#include +#include /* * Based on IRCv3 SASL Extension Specification: diff --git a/src/irc/core/sasl.h b/src/irc/core/sasl.h index 0693989d..04d0cd9d 100644 --- a/src/irc/core/sasl.h +++ b/src/irc/core/sasl.h @@ -18,8 +18,8 @@ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifndef __SASL_H -#define __SASL_H +#ifndef IRSSI_IRC_CORE_SASL_H +#define IRSSI_IRC_CORE_SASL_H enum { SASL_MECHANISM_NONE = 0, diff --git a/src/irc/core/servers-idle.c b/src/irc/core/servers-idle.c index 2b1851af..93c8f05a 100644 --- a/src/irc/core/servers-idle.c +++ b/src/irc/core/servers-idle.c @@ -19,11 +19,11 @@ */ #include "module.h" -#include "signals.h" +#include -#include "irc-servers.h" -#include "servers-idle.h" -#include "servers-redirect.h" +#include +#include +#include typedef struct { char *cmd; diff --git a/src/irc/core/servers-idle.h b/src/irc/core/servers-idle.h index 9d2eacec..b0aed721 100644 --- a/src/irc/core/servers-idle.h +++ b/src/irc/core/servers-idle.h @@ -1,5 +1,5 @@ -#ifndef __SERVERS_IDLE_H -#define __SERVERS_IDLE_H +#ifndef IRSSI_IRC_CORE_SERVERS_IDLE_H +#define IRSSI_IRC_CORE_SERVERS_IDLE_H /* Add new idle command to queue */ int server_idle_add_redir(IRC_SERVER_REC *server, const char *cmd, diff --git a/src/irc/core/servers-redirect.c b/src/irc/core/servers-redirect.c index aeb9c010..770aa4c2 100644 --- a/src/irc/core/servers-redirect.c +++ b/src/irc/core/servers-redirect.c @@ -19,12 +19,12 @@ */ #include "module.h" -#include "signals.h" -#include "misc.h" -#include "rawlog.h" +#include +#include +#include -#include "irc-servers.h" -#include "servers-redirect.h" +#include +#include #define DEFAULT_REDIRECT_TIMEOUT 60 diff --git a/src/irc/core/servers-redirect.h b/src/irc/core/servers-redirect.h index 6182e3ab..f8ca605f 100644 --- a/src/irc/core/servers-redirect.h +++ b/src/irc/core/servers-redirect.h @@ -1,5 +1,5 @@ -#ifndef __SERVERS_REDIRECT_H -#define __SERVERS_REDIRECT_H +#ifndef IRSSI_IRC_CORE_SERVERS_REDIRECT_H +#define IRSSI_IRC_CORE_SERVERS_REDIRECT_H /* Register new redirection command. diff --git a/src/irc/dcc/Makefile.am b/src/irc/dcc/Makefile.am index cf1e2ff5..a81bf84d 100644 --- a/src/irc/dcc/Makefile.am +++ b/src/irc/dcc/Makefile.am @@ -1,9 +1,6 @@ noinst_LIBRARIES = libirc_dcc.a AM_CPPFLAGS = \ - -I$(top_srcdir)/src \ - -I$(top_srcdir)/src/core/ \ - -I$(top_srcdir)/src/irc/core/ \ $(GLIB_CFLAGS) libirc_dcc_a_SOURCES = \ diff --git a/src/irc/dcc/dcc-autoget.c b/src/irc/dcc/dcc-autoget.c index dd12f438..ba0bed0b 100644 --- a/src/irc/dcc/dcc-autoget.c +++ b/src/irc/dcc/dcc-autoget.c @@ -19,13 +19,13 @@ */ #include "module.h" -#include "signals.h" -#include "masks.h" -#include "settings.h" -#include "servers.h" -#include "misc.h" +#include +#include +#include +#include +#include -#include "dcc-get.h" +#include static void sig_dcc_request(GET_DCC_REC *dcc, const char *nickaddr) { diff --git a/src/irc/dcc/dcc-chat.c b/src/irc/dcc/dcc-chat.c index 5e03042f..987a5ba9 100644 --- a/src/irc/dcc/dcc-chat.c +++ b/src/irc/dcc/dcc-chat.c @@ -19,19 +19,19 @@ */ #include "module.h" -#include "signals.h" -#include "commands.h" -#include "recode.h" -#include "network.h" -#include "net-sendbuffer.h" -#include "misc.h" -#include "settings.h" +#include +#include +#include +#include +#include +#include +#include -#include "irc-servers.h" -#include "irc-queries.h" -#include "masks.h" +#include +#include +#include -#include "dcc-chat.h" +#include static char *dcc_chat_get_new_id(const char *nick) { diff --git a/src/irc/dcc/dcc-chat.h b/src/irc/dcc/dcc-chat.h index c8f2cea9..ef992bb8 100644 --- a/src/irc/dcc/dcc-chat.h +++ b/src/irc/dcc/dcc-chat.h @@ -1,7 +1,7 @@ -#ifndef __DCC_CHAT_H -#define __DCC_CHAT_H +#ifndef IRSSI_IRC_DCC_DCC_CHAT_H +#define IRSSI_IRC_DCC_DCC_CHAT_H -#include "dcc.h" +#include #define DCC_CHAT(dcc) \ MODULE_CHECK_CAST_MODULE(dcc, CHAT_DCC_REC, type, "DCC", "CHAT") @@ -10,7 +10,7 @@ (DCC_CHAT(dcc) ? TRUE : FALSE) struct CHAT_DCC_REC { -#include "dcc-rec.h" +#include char *id; /* unique identifier - usually same as nick. */ NET_SENDBUF_REC *sendbuf; diff --git a/src/irc/dcc/dcc-file-rec.h b/src/irc/dcc/dcc-file-rec.h index fe66a985..28a488e4 100644 --- a/src/irc/dcc/dcc-file-rec.h +++ b/src/irc/dcc/dcc-file-rec.h @@ -1,4 +1,4 @@ -#include "dcc-rec.h" +#include uoff_t size, skipped; /* file size / skipped at start */ int fhandle; /* file handle */ diff --git a/src/irc/dcc/dcc-file.h b/src/irc/dcc/dcc-file.h index 4ff4a2e9..38986354 100644 --- a/src/irc/dcc/dcc-file.h +++ b/src/irc/dcc/dcc-file.h @@ -1,10 +1,10 @@ -#ifndef __DCC_FILE_H -#define __DCC_FILE_H +#ifndef IRSSI_IRC_DCC_DCC_FILE_H +#define IRSSI_IRC_DCC_DCC_FILE_H -#include "dcc.h" +#include typedef struct { -#include "dcc-file-rec.h" +#include } FILE_DCC_REC; #endif diff --git a/src/irc/dcc/dcc-get.c b/src/irc/dcc/dcc-get.c index ee8b9a49..0191c679 100644 --- a/src/irc/dcc/dcc-get.c +++ b/src/irc/dcc/dcc-get.c @@ -19,16 +19,16 @@ */ #include "module.h" -#include "signals.h" -#include "commands.h" -#include "network.h" -#include "misc.h" -#include "settings.h" -#include "net-sendbuffer.h" -#include "irc-servers.h" +#include +#include +#include +#include +#include +#include +#include -#include "dcc-get.h" -#include "dcc-send.h" +#include +#include static char *dcc_get_recv_buffer; diff --git a/src/irc/dcc/dcc-get.h b/src/irc/dcc/dcc-get.h index 7ac7b3c1..3624f2c8 100644 --- a/src/irc/dcc/dcc-get.h +++ b/src/irc/dcc/dcc-get.h @@ -1,7 +1,7 @@ -#ifndef __DCC_GET_H -#define __DCC_GET_H +#ifndef IRSSI_IRC_DCC_DCC_GET_H +#define IRSSI_IRC_DCC_DCC_GET_H -#include "dcc.h" +#include #define DCC_GET(dcc) \ MODULE_CHECK_CAST_MODULE(dcc, GET_DCC_REC, type, "DCC", "GET") @@ -18,7 +18,7 @@ enum { }; typedef struct { -#include "dcc-file-rec.h" +#include int get_type; /* what to do if file exists? */ char *file; /* file name we're really moving, arg is just the reference */ diff --git a/src/irc/dcc/dcc-queue.c b/src/irc/dcc/dcc-queue.c index 895f9e44..0253be4f 100644 --- a/src/irc/dcc/dcc-queue.c +++ b/src/irc/dcc/dcc-queue.c @@ -21,15 +21,15 @@ */ #include "module.h" -#include "signals.h" -#include "commands.h" -#include "network.h" -#include "net-sendbuffer.h" -#include "misc.h" -#include "settings.h" -#include "irc-servers.h" +#include +#include +#include +#include +#include +#include +#include -#include "dcc-queue.h" +#include static GPtrArray *queuelist; diff --git a/src/irc/dcc/dcc-queue.h b/src/irc/dcc/dcc-queue.h index b05beb47..1ab4ecbf 100644 --- a/src/irc/dcc/dcc-queue.h +++ b/src/irc/dcc/dcc-queue.h @@ -1,7 +1,7 @@ -#ifndef __DCC_QUEUE_H_ -#define __DCC_QUEUE_H_ +#ifndef IRSSI_IRC_DCC_DCC_QUEUE_H_ +#define IRSSI_IRC_DCC_DCC_QUEUE_H_ -#include "dcc-chat.h" +#include enum { DCC_QUEUE_NORMAL, diff --git a/src/irc/dcc/dcc-resume.c b/src/irc/dcc/dcc-resume.c index ce0ac925..b0438e79 100644 --- a/src/irc/dcc/dcc-resume.c +++ b/src/irc/dcc/dcc-resume.c @@ -19,15 +19,15 @@ */ #include "module.h" -#include "signals.h" -#include "commands.h" -#include "network.h" -#include "misc.h" +#include +#include +#include +#include -#include "dcc-file.h" -#include "dcc-get.h" -#include "dcc-send.h" -#include "dcc-chat.h" +#include +#include +#include +#include static FILE_DCC_REC *dcc_resume_find(int type, const char *nick, int port) { diff --git a/src/irc/dcc/dcc-send.c b/src/irc/dcc/dcc-send.c index 50009287..6eabd25f 100644 --- a/src/irc/dcc/dcc-send.c +++ b/src/irc/dcc/dcc-send.c @@ -19,18 +19,18 @@ */ #include "module.h" -#include "signals.h" -#include "commands.h" -#include "network.h" -#include "net-sendbuffer.h" -#include "misc.h" -#include "settings.h" +#include +#include +#include +#include +#include +#include -#include "irc-servers.h" +#include -#include "dcc-send.h" -#include "dcc-chat.h" -#include "dcc-queue.h" +#include +#include +#include #include diff --git a/src/irc/dcc/dcc-send.h b/src/irc/dcc/dcc-send.h index 378f1c54..881ef64e 100644 --- a/src/irc/dcc/dcc-send.h +++ b/src/irc/dcc/dcc-send.h @@ -1,7 +1,7 @@ -#ifndef __DCC_SEND_H -#define __DCC_SEND_H +#ifndef IRSSI_IRC_DCC_DCC_SEND_H +#define IRSSI_IRC_DCC_DCC_SEND_H -#include "dcc.h" +#include #define DCC_SEND(dcc) \ MODULE_CHECK_CAST_MODULE(dcc, SEND_DCC_REC, type, "DCC", "SEND") @@ -10,7 +10,7 @@ (DCC_SEND(dcc) ? TRUE : FALSE) typedef struct { -#include "dcc-file-rec.h" +#include unsigned int file_quoted:1; /* file name was received quoted ("file name") */ diff --git a/src/irc/dcc/dcc-server.c b/src/irc/dcc/dcc-server.c index 7ae572cd..0a6c0acf 100644 --- a/src/irc/dcc/dcc-server.c +++ b/src/irc/dcc/dcc-server.c @@ -19,17 +19,17 @@ */ #include "module.h" -#include "signals.h" -#include "commands.h" -#include "network.h" -#include "net-sendbuffer.h" -#include "misc.h" +#include +#include +#include +#include +#include -#include "irc-servers.h" +#include -#include "dcc-chat.h" -#include "dcc-get.h" -#include "dcc-server.h" +#include +#include +#include void sig_dccget_connected(GET_DCC_REC *dcc); GET_DCC_REC *dcc_get_create(IRC_SERVER_REC *server, CHAT_DCC_REC *chat, diff --git a/src/irc/dcc/dcc-server.h b/src/irc/dcc/dcc-server.h index 72435cbf..1a4449d4 100644 --- a/src/irc/dcc/dcc-server.h +++ b/src/irc/dcc/dcc-server.h @@ -1,7 +1,7 @@ -#ifndef __DCC_SERVER_H -#define __DCC_SERVER_H +#ifndef IRSSI_IRC_DCC_DCC_SERVER_H +#define IRSSI_IRC_DCC_DCC_SERVER_H -#include "dcc.h" +#include #define DCC_SERVER(dcc) \ MODULE_CHECK_CAST_MODULE(dcc, SERVER_DCC_REC, type, "DCC", "SERVER") @@ -10,7 +10,7 @@ (DCC_SERVER(dcc) ? TRUE : FALSE) struct SERVER_DCC_REC { -#include "dcc-rec.h" +#include NET_SENDBUF_REC *sendbuf; unsigned int accept_send:1; /* Accept SEND connections */ diff --git a/src/irc/dcc/dcc.c b/src/irc/dcc/dcc.c index 01ab0e59..006a2b77 100644 --- a/src/irc/dcc/dcc.c +++ b/src/irc/dcc/dcc.c @@ -19,21 +19,21 @@ */ #include "module.h" -#include "signals.h" -#include "commands.h" -#include "network.h" -#include "misc.h" -#include "settings.h" -#include "ignore.h" -#include "levels.h" +#include +#include +#include +#include +#include +#include +#include -#include "irc-servers.h" -#include "servers-setup.h" +#include +#include -#include "dcc-chat.h" -#include "dcc-get.h" -#include "dcc-send.h" -#include "dcc-server.h" +#include +#include +#include +#include void dcc_resume_init(void); void dcc_resume_deinit(void); diff --git a/src/irc/dcc/dcc.h b/src/irc/dcc/dcc.h index 144cc89b..258d3395 100644 --- a/src/irc/dcc/dcc.h +++ b/src/irc/dcc/dcc.h @@ -1,15 +1,15 @@ -#ifndef __DCC_H -#define __DCC_H +#ifndef IRSSI_IRC_DCC_DCC_H +#define IRSSI_IRC_DCC_DCC_H -#include "modules.h" -#include "network.h" +#include +#include #define DCC(dcc) ((DCC_REC *) (dcc)) typedef struct CHAT_DCC_REC CHAT_DCC_REC; typedef struct { -#include "dcc-rec.h" +#include } DCC_REC; /* fully connected? */ diff --git a/src/irc/dcc/module.h b/src/irc/dcc/module.h index 8436945d..4330d0a3 100644 --- a/src/irc/dcc/module.h +++ b/src/irc/dcc/module.h @@ -1,4 +1,4 @@ -#include "common.h" -#include "irc.h" +#include +#include #define MODULE_NAME "irc/dcc" diff --git a/src/irc/flood/Makefile.am b/src/irc/flood/Makefile.am index 1c4d786a..b582ffe4 100644 --- a/src/irc/flood/Makefile.am +++ b/src/irc/flood/Makefile.am @@ -1,9 +1,6 @@ noinst_LIBRARIES = libirc_flood.a AM_CPPFLAGS = \ - -I$(top_srcdir)/src \ - -I$(top_srcdir)/src/core/ \ - -I$(top_srcdir)/src/irc/core/ \ $(GLIB_CFLAGS) libirc_flood_a_SOURCES = \ diff --git a/src/irc/flood/autoignore.c b/src/irc/flood/autoignore.c index 86ff3ec5..33bd91f4 100644 --- a/src/irc/flood/autoignore.c +++ b/src/irc/flood/autoignore.c @@ -19,15 +19,15 @@ */ #include "module.h" -#include "modules.h" -#include "signals.h" -#include "commands.h" -#include "levels.h" -#include "misc.h" -#include "settings.h" +#include +#include +#include +#include +#include +#include -#include "irc-servers.h" -#include "ignore.h" +#include +#include void autoignore_update(IGNORE_REC *rec, int level) { diff --git a/src/irc/flood/autoignore.h b/src/irc/flood/autoignore.h index b00829a1..6c7a86e8 100644 --- a/src/irc/flood/autoignore.h +++ b/src/irc/flood/autoignore.h @@ -1,5 +1,5 @@ -#ifndef __AUTOIGNORE_H -#define __AUTOIGNORE_H +#ifndef IRSSI_IRC_FLOOD_AUTOIGNORE_H +#define IRSSI_IRC_FLOOD_AUTOIGNORE_H void autoignore_add(IRC_SERVER_REC *server, char *nick, int level); diff --git a/src/irc/flood/flood.c b/src/irc/flood/flood.c index b528f707..886a266c 100644 --- a/src/irc/flood/flood.c +++ b/src/irc/flood/flood.c @@ -19,15 +19,15 @@ */ #include "module.h" -#include "modules.h" -#include "signals.h" -#include "levels.h" -#include "misc.h" -#include "settings.h" +#include +#include +#include +#include +#include -#include "irc.h" -#include "irc-servers.h" -#include "ignore.h" +#include +#include +#include void autoignore_init(void); void autoignore_deinit(void); diff --git a/src/irc/flood/flood.h b/src/irc/flood/flood.h index e6454729..6bfc7850 100644 --- a/src/irc/flood/flood.h +++ b/src/irc/flood/flood.h @@ -1,5 +1,5 @@ -#ifndef __FLOOD_H -#define __FLOOD_H +#ifndef IRSSI_IRC_FLOOD_FLOOD_H +#define IRSSI_IRC_FLOOD_FLOOD_H void flood_init(void); void flood_deinit(void); diff --git a/src/irc/flood/module.h b/src/irc/flood/module.h index fc7eceeb..a80c46f7 100644 --- a/src/irc/flood/module.h +++ b/src/irc/flood/module.h @@ -1,5 +1,5 @@ -#include "common.h" -#include "irc.h" +#include +#include typedef struct { /* Flood protection */ diff --git a/src/irc/notifylist/Makefile.am b/src/irc/notifylist/Makefile.am index abd9d18d..421bc7d4 100644 --- a/src/irc/notifylist/Makefile.am +++ b/src/irc/notifylist/Makefile.am @@ -1,9 +1,6 @@ noinst_LIBRARIES = libirc_notifylist.a AM_CPPFLAGS = \ - -I$(top_srcdir)/src \ - -I$(top_srcdir)/src/core/ \ - -I$(top_srcdir)/src/irc/core/ \ $(GLIB_CFLAGS) libirc_notifylist_a_SOURCES = \ diff --git a/src/irc/notifylist/module.h b/src/irc/notifylist/module.h index c7239a88..f109afff 100644 --- a/src/irc/notifylist/module.h +++ b/src/irc/notifylist/module.h @@ -1,5 +1,5 @@ -#include "common.h" -#include "irc.h" +#include +#include #define MODULE_NAME "irc/notifylist" @@ -23,7 +23,7 @@ typedef struct { GSList *ison_tempusers; /* Temporary list for saving /ISON events.. */ } MODULE_SERVER_REC; -#include "irc-servers.h" +#include NOTIFY_NICK_REC *notify_nick_create(IRC_SERVER_REC *server, const char *nick); void notify_nick_destroy(NOTIFY_NICK_REC *rec); diff --git a/src/irc/notifylist/notify-commands.c b/src/irc/notifylist/notify-commands.c index 0d4fd4f2..e7bceaac 100644 --- a/src/irc/notifylist/notify-commands.c +++ b/src/irc/notifylist/notify-commands.c @@ -19,12 +19,12 @@ */ #include "module.h" -#include "signals.h" -#include "commands.h" -#include "misc.h" -#include "settings.h" +#include +#include +#include +#include -#include "notifylist.h" +#include /* SYNTAX: NOTIFY [-away] [] */ static void cmd_notify(gchar *data) diff --git a/src/irc/notifylist/notify-ison.c b/src/irc/notifylist/notify-ison.c index 8a8865cc..39292896 100644 --- a/src/irc/notifylist/notify-ison.c +++ b/src/irc/notifylist/notify-ison.c @@ -19,15 +19,15 @@ */ #include "module.h" -#include "signals.h" -#include "misc.h" -#include "settings.h" +#include +#include +#include -#include "irc.h" -#include "irc-servers.h" -#include "servers-redirect.h" +#include +#include +#include -#include "notifylist.h" +#include #define DEFAULT_NOTIFY_CHECK_TIME "1min" #define DEFAULT_NOTIFY_WHOIS_TIME "5min" diff --git a/src/irc/notifylist/notify-setup.c b/src/irc/notifylist/notify-setup.c index 9ea481ca..62f983e2 100644 --- a/src/irc/notifylist/notify-setup.c +++ b/src/irc/notifylist/notify-setup.c @@ -19,11 +19,11 @@ */ #include "module.h" -#include "lib-config/iconfig.h" -#include "settings.h" +#include +#include -#include "irc-servers.h" -#include "notifylist.h" +#include +#include void notifylist_add_config(NOTIFYLIST_REC *rec) { diff --git a/src/irc/notifylist/notify-setup.h b/src/irc/notifylist/notify-setup.h index bfaef0c8..8540d1c2 100644 --- a/src/irc/notifylist/notify-setup.h +++ b/src/irc/notifylist/notify-setup.h @@ -1,5 +1,5 @@ -#ifndef __NOTIFY_SETUP_H -#define __NOTIFY_SETUP_H +#ifndef IRSSI_IRC_NOTIFYLIST_NOTIFY_SETUP_H +#define IRSSI_IRC_NOTIFYLIST_NOTIFY_SETUP_H void notifylist_add_config(NOTIFYLIST_REC *rec); void notifylist_remove_config(NOTIFYLIST_REC *rec); diff --git a/src/irc/notifylist/notify-whois.c b/src/irc/notifylist/notify-whois.c index 2d0736b5..bdfd72b4 100644 --- a/src/irc/notifylist/notify-whois.c +++ b/src/irc/notifylist/notify-whois.c @@ -19,14 +19,14 @@ */ #include "module.h" -#include "signals.h" -#include "expandos.h" +#include +#include -#include "irc.h" -#include "irc-servers.h" -#include "masks.h" +#include +#include +#include -#include "notifylist.h" +#include static char *last_notify_nick; diff --git a/src/irc/notifylist/notifylist.c b/src/irc/notifylist/notifylist.c index 4fd5ef1a..475e92c8 100644 --- a/src/irc/notifylist/notifylist.c +++ b/src/irc/notifylist/notifylist.c @@ -19,18 +19,18 @@ */ #include "module.h" -#include "modules.h" -#include "signals.h" -#include "settings.h" +#include +#include +#include -#include "irc.h" -#include "irc-channels.h" -#include "servers-redirect.h" -#include "masks.h" -#include "nicklist.h" +#include +#include +#include +#include +#include -#include "notifylist.h" -#include "notify-setup.h" +#include +#include GSList *notifies; diff --git a/src/irc/notifylist/notifylist.h b/src/irc/notifylist/notifylist.h index 1094a105..fe2a1aac 100644 --- a/src/irc/notifylist/notifylist.h +++ b/src/irc/notifylist/notifylist.h @@ -1,5 +1,5 @@ -#ifndef __NOTIFYLIST_H -#define __NOTIFYLIST_H +#ifndef IRSSI_IRC_NOTIFYLIST_NOTIFYLIST_H +#define IRSSI_IRC_NOTIFYLIST_NOTIFYLIST_H typedef struct { char *mask; /* nick part must not contain wildcards */ diff --git a/src/irc/proxy/Makefile.am b/src/irc/proxy/Makefile.am index 4eb73bb8..6411f49d 100644 --- a/src/irc/proxy/Makefile.am +++ b/src/irc/proxy/Makefile.am @@ -2,9 +2,6 @@ moduledir = $(libdir)/irssi/modules module_LTLIBRARIES = libirc_proxy.la AM_CPPFLAGS = \ - -I$(top_srcdir)/src \ - -I$(top_srcdir)/src/core/ \ - -I$(top_srcdir)/src/irc/core/ \ $(GLIB_CFLAGS) libirc_proxy.a: diff --git a/src/irc/proxy/dump.c b/src/irc/proxy/dump.c index e39c21a6..82dc1fe5 100644 --- a/src/irc/proxy/dump.c +++ b/src/irc/proxy/dump.c @@ -19,16 +19,16 @@ */ #include "module.h" -#include "network.h" -#include "net-sendbuffer.h" -#include "settings.h" -#include "irssi-version.h" -#include "recode.h" +#include +#include +#include +#include +#include -#include "irc-servers.h" -#include "irc-channels.h" -#include "irc-nicklist.h" -#include "modes.h" +#include +#include +#include +#include void proxy_outdata(CLIENT_REC *client, const char *data, ...) { diff --git a/src/irc/proxy/listen.c b/src/irc/proxy/listen.c index cde4c0be..37e2a939 100644 --- a/src/irc/proxy/listen.c +++ b/src/irc/proxy/listen.c @@ -19,17 +19,17 @@ */ #include "module.h" -#include "signals.h" -#include "net-sendbuffer.h" -#include "servers-redirect.h" -#include "levels.h" -#include "settings.h" -#include "misc.h" +#include +#include +#include +#include +#include +#include -#include "irc.h" -#include "irc-channels.h" +#include +#include -#include "fe-common/core/printtext.h" /* FIXME: evil. need to do fe-proxy */ +#include /* FIXME: evil. need to do fe-proxy */ #include diff --git a/src/irc/proxy/module.h b/src/irc/proxy/module.h index ff95227f..b6ad3a4c 100644 --- a/src/irc/proxy/module.h +++ b/src/irc/proxy/module.h @@ -1,12 +1,12 @@ -#include "common.h" +#include #define MODULE_NAME "proxy" -#include "network.h" -#include "irc.h" -#include "irc-servers.h" +#include +#include +#include -#include "proxy.h" +#include extern GSList *proxy_listens; extern GSList *proxy_clients; diff --git a/src/irc/proxy/proxy.c b/src/irc/proxy/proxy.c index 2875d2c2..d32b6009 100644 --- a/src/irc/proxy/proxy.c +++ b/src/irc/proxy/proxy.c @@ -19,11 +19,11 @@ */ #include "module.h" -#include "signals.h" -#include "settings.h" -#include "levels.h" +#include +#include +#include -#include "fe-common/core/printtext.h" +#include /* SYNTAX: IRSSIPROXY STATUS */ static void cmd_irssiproxy_status(const char *data, IRC_SERVER_REC *server) diff --git a/src/irc/proxy/proxy.h b/src/irc/proxy/proxy.h index 620ea605..5b3d25f5 100644 --- a/src/irc/proxy/proxy.h +++ b/src/irc/proxy/proxy.h @@ -1,11 +1,11 @@ -#ifndef PROXY_H -#define PROXY_H +#ifndef IRSSI_IRC_PROXY_PROXY_H +#define IRSSI_IRC_PROXY_PROXY_H -#include "common.h" +#include -#include "network.h" -#include "irc.h" -#include "irc-servers.h" +#include +#include +#include typedef struct { int port; diff --git a/src/lib-config/Makefile.am b/src/lib-config/Makefile.am index 06c7787c..d644eae5 100644 --- a/src/lib-config/Makefile.am +++ b/src/lib-config/Makefile.am @@ -1,7 +1,6 @@ noinst_LIBRARIES = libirssi_config.a AM_CPPFLAGS = \ - -I$(top_srcdir)/src \ $(GLIB_CFLAGS) libirssi_config_a_SOURCES = \ diff --git a/src/lib-config/iconfig.h b/src/lib-config/iconfig.h index 91583e40..92662d8d 100644 --- a/src/lib-config/iconfig.h +++ b/src/lib-config/iconfig.h @@ -1,5 +1,5 @@ -#ifndef __ICONFIG_H -#define __ICONFIG_H +#ifndef IRSSI_LIB_CONFIG_ICONFIG_H +#define IRSSI_LIB_CONFIG_ICONFIG_H enum { NODE_TYPE_KEY, diff --git a/src/lib-config/module.h b/src/lib-config/module.h index 22e0e7c7..eb09d70e 100644 --- a/src/lib-config/module.h +++ b/src/lib-config/module.h @@ -1,5 +1,5 @@ -#include "common.h" -#include "iconfig.h" +#include +#include /* private */ int config_error(CONFIG_REC *rec, const char *msg); diff --git a/src/otr/Makefile.am b/src/otr/Makefile.am index 7cc02d6d..ac40cbac 100644 --- a/src/otr/Makefile.am +++ b/src/otr/Makefile.am @@ -8,11 +8,6 @@ EXTRA_LTLIBRARIES = \ libotr_core_static.la AM_CPPFLAGS = \ - -I$(top_srcdir)/src \ - -I$(top_srcdir)/src/core/ \ - -I$(top_srcdir)/src/irc/core/ \ - -I$(top_srcdir)/src/fe-common/core/ \ - -I$(top_srcdir)/src/fe-text/ \ $(GLIB_CFLAGS) \ $(OTR_CFLAGS) diff --git a/src/otr/key.c b/src/otr/key.c index 7fee4084..27de0226 100644 --- a/src/otr/key.c +++ b/src/otr/key.c @@ -28,15 +28,15 @@ #include #include -#include "key.h" +#include -#include "levels.h" -#include "network.h" -#include "pidwait.h" -#include "printtext.h" +#include +#include +#include +#include -#include "irssi-otr.h" -#include "otr-formats.h" +#include +#include /* * Status of key generation. diff --git a/src/otr/key.h b/src/otr/key.h index 259a8e67..e9476953 100644 --- a/src/otr/key.h +++ b/src/otr/key.h @@ -21,10 +21,10 @@ #ifndef IRSSI_OTR_KEY_H #define IRSSI_OTR_KEY_H -#include "common.h" -#include "servers.h" +#include +#include -#include "otr.h" +#include void key_gen_run(struct otr_user_state *ustate, const char *account_name); void key_load(struct otr_user_state *ustate); diff --git a/src/otr/module.h b/src/otr/module.h index 513ee03b..dab26345 100644 --- a/src/otr/module.h +++ b/src/otr/module.h @@ -21,8 +21,8 @@ #ifndef IRSSI_OTR_MODULE #define IRSSI_OTR_MODULE -#include "common.h" -#include "servers.h" +#include +#include void sig_message_private(SERVER_REC *server, const char *msg, const char *nick, const char *address, const char *target); diff --git a/src/otr/otr-fe.c b/src/otr/otr-fe.c index 13e37576..80b50ae5 100644 --- a/src/otr/otr-fe.c +++ b/src/otr/otr-fe.c @@ -20,18 +20,18 @@ * Franklin Street, Fifth Floor, Boston, MA 02110-1301,USA */ -#include "common.h" -#include "levels.h" -#include "printtext.h" -#include "commands.h" -#include "irc.h" -#include "irc-servers.h" -#include "irc-queries.h" -#include "statusbar-item.h" +#include +#include +#include +#include +#include +#include +#include +#include -#include "otr.h" -#include "otr-formats.h" -#include "key.h" +#include +#include +#include static void cmd_otr(const char *data, SERVER_REC *server, void *item) { diff --git a/src/otr/otr-formats.c b/src/otr/otr-formats.c index e430b6b5..d26edbba 100644 --- a/src/otr/otr-formats.c +++ b/src/otr/otr-formats.c @@ -19,8 +19,8 @@ * Franklin Street, Fifth Floor, Boston, MA 02110-1301,USA */ -#include "otr.h" -#include "otr-formats.h" +#include +#include FORMAT_REC fe_otr_formats[] = { { MODULE_NAME, "Core", 0 }, diff --git a/src/otr/otr-formats.h b/src/otr/otr-formats.h index 454b2f6c..cf895dcb 100644 --- a/src/otr/otr-formats.h +++ b/src/otr/otr-formats.h @@ -22,7 +22,7 @@ #ifndef IRSSI_OTR_FORMATS_H #define IRSSI_OTR_FORMATS_H -#include "formats.h" +#include /* * Must be in sync with the fe_otr_formats array. diff --git a/src/otr/otr-module.c b/src/otr/otr-module.c index f561b91c..6fe4c9f2 100644 --- a/src/otr/otr-module.c +++ b/src/otr/otr-module.c @@ -24,21 +24,21 @@ #include "module.h" -#include "common.h" -#include "signals.h" -#include "queries.h" -#include "commands.h" +#include +#include +#include +#include -#include "irc.h" -#include "irc-servers.h" -#include "irc-queries.h" -#include "irc-commands.h" +#include +#include +#include +#include -#include "key.h" -#include "otr.h" -#include "otr-formats.h" -#include "otr-fe.h" -#include "misc.h" +#include +#include +#include +#include +#include /* * Global state for the user. Init when the module loads. diff --git a/src/otr/otr-ops.c b/src/otr/otr-ops.c index 4e8c4e81..f87e6e94 100644 --- a/src/otr/otr-ops.c +++ b/src/otr/otr-ops.c @@ -17,17 +17,17 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,USA */ -#include "common.h" +#include -#include "signals.h" -#include "levels.h" -#include "printtext.h" -#include "fe-windows.h" +#include +#include +#include +#include -#include "key.h" +#include #include "module.h" -#include "otr-formats.h" -#include "irssi-otr.h" +#include +#include static OtrlPolicy OTR_DEFAULT_POLICY = OTRL_POLICY_MANUAL | OTRL_POLICY_WHITESPACE_START_AKE; diff --git a/src/otr/otr.c b/src/otr/otr.c index 9f0192e1..80604513 100644 --- a/src/otr/otr.c +++ b/src/otr/otr.c @@ -24,15 +24,15 @@ #include #include -#include "common.h" -#include "levels.h" -#include "signals.h" -#include "printtext.h" -#include "statusbar-item.h" +#include +#include +#include +#include +#include -#include "irssi-otr.h" -#include "otr-formats.h" -#include "key.h" +#include +#include +#include static int otr_debug = 0; diff --git a/src/otr/otr.h b/src/otr/otr.h index 60a08184..e0324a13 100644 --- a/src/otr/otr.h +++ b/src/otr/otr.h @@ -28,8 +28,8 @@ #include #include -#include "common.h" -#include "servers.h" +#include +#include /* irssi module name */ #define MODULE_NAME "otr/core" diff --git a/src/perl/Makefile.am b/src/perl/Makefile.am index db52744e..0e56d7a3 100644 --- a/src/perl/Makefile.am +++ b/src/perl/Makefile.am @@ -15,9 +15,6 @@ perl-core.lo: irssi-core.pl.h perl-signals.lo: perl-signals-list.h AM_CPPFLAGS = \ - -I$(top_srcdir)/src \ - -I$(top_srcdir)/src/core \ - -I$(top_srcdir)/src/fe-common/core \ $(GLIB_CFLAGS) \ -DSCRIPTDIR=\""$(datadir)/irssi/scripts"\" \ -DPERL_USE_LIB=\""$(PERL_USE_LIB)"\" \ diff --git a/src/perl/common/Core.xs b/src/perl/common/Core.xs index 7c72f646..75b851d6 100644 --- a/src/perl/common/Core.xs +++ b/src/perl/common/Core.xs @@ -1,12 +1,12 @@ #define PERL_NO_GET_CONTEXT #include "module.h" -#include "irssi-version.h" -#include "core.h" -#include "utf8.h" -#include "recode.h" +#include +#include +#include +#include -#include "pidwait.h" -#include "session.h" +#include +#include #define DEFAULT_COMMAND_CATEGORY "Perl scripts' commands" diff --git a/src/perl/common/Expando.xs b/src/perl/common/Expando.xs index 84853a02..1dc36d27 100644 --- a/src/perl/common/Expando.xs +++ b/src/perl/common/Expando.xs @@ -1,6 +1,6 @@ #define PERL_NO_GET_CONTEXT #include "module.h" -#include "expandos.h" +#include typedef struct { PERL_SCRIPT_REC *script; diff --git a/src/perl/common/Makefile.PL.in b/src/perl/common/Makefile.PL.in index 70b1d258..2b087d08 100644 --- a/src/perl/common/Makefile.PL.in +++ b/src/perl/common/Makefile.PL.in @@ -3,5 +3,5 @@ use ExtUtils::MakeMaker;our $AM_DEFAULT_VERBOSITY='@AM_DEFAULT_VERBOSITY@';requi WriteMakefile('NAME' => 'Irssi', 'LIBS' => '', 'OBJECT' => '$(O_FILES)', - 'INC' => '-I../../.. -I@top_srcdir@ -I@top_srcdir@/src -I@top_srcdir@/src/core @GLIB_CFLAGS@', + 'INC' => '-I../../.. @GLIB_CFLAGS@', 'VERSION_FROM' => '@srcdir@/Irssi.pm'); diff --git a/src/perl/common/Settings.xs b/src/perl/common/Settings.xs index eb81b627..d1bce856 100644 --- a/src/perl/common/Settings.xs +++ b/src/perl/common/Settings.xs @@ -1,6 +1,6 @@ #define PERL_NO_GET_CONTEXT #include "module.h" -#include "misc.h" +#include static GHashTable *perl_settings; diff --git a/src/perl/common/module.h b/src/perl/common/module.h index 07ecc56f..92a712f8 100644 --- a/src/perl/common/module.h +++ b/src/perl/common/module.h @@ -1,32 +1,32 @@ #define NEED_PERL_H #define HAVE_CONFIG_H -#include "../module.h" +#include #include -#include "network.h" -#include "levels.h" -#include "commands.h" -#include "log.h" -#include "rawlog.h" -#include "ignore.h" -#include "settings.h" -#include "masks.h" -#include "special-vars.h" -#include "window-item-def.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include -#include "chat-protocols.h" -#include "chatnets.h" -#include "servers.h" -#include "servers-reconnect.h" -#include "servers-setup.h" -#include "channels.h" -#include "queries.h" -#include "nicklist.h" +#include +#include +#include +#include +#include +#include +#include +#include -#include "perl/perl-core.h" -#include "perl/perl-common.h" -#include "perl/perl-signals.h" -#include "perl/perl-sources.h" +#include +#include +#include +#include typedef COMMAND_REC *Irssi__Command; typedef LOG_REC *Irssi__Log; diff --git a/src/perl/irc/Ctcp.xs b/src/perl/irc/Ctcp.xs index d1bf8ba4..34978870 100644 --- a/src/perl/irc/Ctcp.xs +++ b/src/perl/irc/Ctcp.xs @@ -1,6 +1,6 @@ #define PERL_NO_GET_CONTEXT #include "module.h" -#include "ctcp.h" +#include MODULE = Irssi::Irc::Ctcp PACKAGE = Irssi PROTOTYPES: ENABLE diff --git a/src/perl/irc/Makefile.PL.in b/src/perl/irc/Makefile.PL.in index 582160a0..561308c7 100644 --- a/src/perl/irc/Makefile.PL.in +++ b/src/perl/irc/Makefile.PL.in @@ -4,5 +4,5 @@ WriteMakefile('NAME' => 'Irssi::Irc', 'LIBS' => '', 'OBJECT' => '$(O_FILES)', 'TYPEMAPS' => ['../common/typemap'], - 'INC' => '-I../../.. -I@top_srcdir@/src -I@top_srcdir@/src/core -I@top_srcdir@/src/irc/core -I@top_srcdir@/src/irc @GLIB_CFLAGS@', + 'INC' => '-I../../.. @GLIB_CFLAGS@', 'VERSION_FROM' => '@srcdir@/Irc.pm'); diff --git a/src/perl/irc/module.h b/src/perl/irc/module.h index a2454545..71801419 100644 --- a/src/perl/irc/module.h +++ b/src/perl/irc/module.h @@ -1,27 +1,27 @@ -#include "../common/module.h" +#include -#include "irc.h" -#include "irc-servers.h" -#include "irc-channels.h" -#include "irc-queries.h" -#include "irc-nicklist.h" -#include "irc-masks.h" -#include "irc-cap.h" +#include +#include +#include +#include +#include +#include +#include -#include "bans.h" -#include "modes.h" -#include "mode-lists.h" -#include "netsplit.h" -#include "servers-redirect.h" +#include +#include +#include +#include +#include -#include "dcc/dcc.h" -#include "dcc/dcc-file.h" -#include "dcc/dcc-chat.h" -#include "dcc/dcc-get.h" -#include "dcc/dcc-send.h" -#include "notifylist/notifylist.h" +#include +#include +#include +#include +#include +#include -#include "proxy/proxy.h" +#include typedef IRC_SERVER_REC *Irssi__Irc__Server; typedef IRC_SERVER_CONNECT_REC *Irssi__Irc__Connect; diff --git a/src/perl/module-formats.c b/src/perl/module-formats.c index e1a7aa74..0b8b7b4c 100644 --- a/src/perl/module-formats.c +++ b/src/perl/module-formats.c @@ -19,7 +19,7 @@ */ #include "module.h" -#include "formats.h" +#include FORMAT_REC feperl_formats[] = { { MODULE_NAME, "Core", 0 }, diff --git a/src/perl/module-formats.h b/src/perl/module-formats.h index 74d2e13b..43b2f4ae 100644 --- a/src/perl/module-formats.h +++ b/src/perl/module-formats.h @@ -1,4 +1,4 @@ -#include "formats.h" +#include enum { IRCTXT_MODULE_NAME, diff --git a/src/perl/module.h b/src/perl/module.h index 3cbdf3d5..0a4d78f6 100644 --- a/src/perl/module.h +++ b/src/perl/module.h @@ -1,4 +1,4 @@ -#include "common.h" +#include #ifdef NEED_PERL_H # include diff --git a/src/perl/perl-common.c b/src/perl/perl-common.c index 802a771e..6fd1705b 100644 --- a/src/perl/perl-common.c +++ b/src/perl/perl-common.c @@ -21,28 +21,28 @@ #define NEED_PERL_H #define PERL_NO_GET_CONTEXT #include "module.h" -#include "modules.h" -#include "signals.h" -#include "core.h" -#include "misc.h" -#include "settings.h" +#include +#include +#include +#include +#include -#include "commands.h" -#include "ignore.h" -#include "log.h" -#include "rawlog.h" -#include "servers-reconnect.h" +#include +#include +#include +#include +#include -#include "window-item-def.h" -#include "chat-protocols.h" -#include "chatnets.h" -#include "servers.h" -#include "channels.h" -#include "queries.h" -#include "nicklist.h" +#include +#include +#include +#include +#include +#include +#include -#include "perl-core.h" -#include "perl-common.h" +#include +#include typedef struct { char *stash; diff --git a/src/perl/perl-common.h b/src/perl/perl-common.h index e2992ee9..88adaa7e 100644 --- a/src/perl/perl-common.h +++ b/src/perl/perl-common.h @@ -1,5 +1,5 @@ -#ifndef __PERL_COMMON_H -#define __PERL_COMMON_H +#ifndef IRSSI_PERL_PERL_COMMON_H +#define IRSSI_PERL_PERL_COMMON_H /* helper defines */ #define new_pv(a) \ diff --git a/src/perl/perl-core.c b/src/perl/perl-core.c index 39389157..866b86e8 100644 --- a/src/perl/perl-core.c +++ b/src/perl/perl-core.c @@ -21,16 +21,16 @@ #define NEED_PERL_H #define PERL_NO_GET_CONTEXT #include "module.h" -#include "modules.h" -#include "core.h" -#include "signals.h" -#include "misc.h" -#include "settings.h" +#include +#include +#include +#include +#include -#include "perl-core.h" -#include "perl-common.h" -#include "perl-signals.h" -#include "perl-sources.h" +#include +#include +#include +#include #include "XSUB.h" #include "irssi-core.pl.h" diff --git a/src/perl/perl-core.h b/src/perl/perl-core.h index 7390a6fd..0d3a1a2f 100644 --- a/src/perl/perl-core.h +++ b/src/perl/perl-core.h @@ -1,5 +1,5 @@ -#ifndef __PERL_CORE_H -#define __PERL_CORE_H +#ifndef IRSSI_PERL_PERL_CORE_H +#define IRSSI_PERL_PERL_CORE_H typedef struct { char *name; /* unique name */ diff --git a/src/perl/perl-fe.c b/src/perl/perl-fe.c index 396c80b7..ac84d67a 100644 --- a/src/perl/perl-fe.c +++ b/src/perl/perl-fe.c @@ -18,17 +18,17 @@ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#include "module-fe.h" -#include "modules.h" -#include "module-formats.h" -#include "signals.h" -#include "commands.h" -#include "levels.h" +#include +#include +#include +#include +#include +#include -#include "printtext.h" -#include "completion.h" +#include +#include -#include "perl-core.h" +#include static void cmd_script(const char *data, SERVER_REC *server, void *item) { diff --git a/src/perl/perl-signals.c b/src/perl/perl-signals.c index 8f993660..59289588 100644 --- a/src/perl/perl-signals.c +++ b/src/perl/perl-signals.c @@ -21,14 +21,14 @@ #define NEED_PERL_H #define PERL_NO_GET_CONTEXT #include "module.h" -#include "modules.h" -#include "signals.h" -#include "commands.h" -#include "servers.h" +#include +#include +#include +#include -#include "perl-core.h" -#include "perl-common.h" -#include "perl-signals.h" +#include +#include +#include typedef struct { PERL_SCRIPT_REC *script; diff --git a/src/perl/perl-signals.h b/src/perl/perl-signals.h index 78a95bed..8191a917 100644 --- a/src/perl/perl-signals.h +++ b/src/perl/perl-signals.h @@ -1,5 +1,5 @@ -#ifndef __PERL_SIGNALS_H -#define __PERL_SIGNALS_H +#ifndef IRSSI_PERL_PERL_SIGNALS_H +#define IRSSI_PERL_PERL_SIGNALS_H void perl_signal_args_to_c(void (*callback)(void *, void **), void *cb_arg, int signal_id, SV **args, size_t n_args); diff --git a/src/perl/perl-sources.c b/src/perl/perl-sources.c index 0b49a608..3c72be22 100644 --- a/src/perl/perl-sources.c +++ b/src/perl/perl-sources.c @@ -21,12 +21,12 @@ #define NEED_PERL_H #define PERL_NO_GET_CONTEXT #include "module.h" -#include "signals.h" +#include -#include "perl-core.h" -#include "perl-common.h" -#include "perl-sources.h" -#include "misc.h" +#include +#include +#include +#include typedef struct { PERL_SCRIPT_REC *script; diff --git a/src/perl/perl-sources.h b/src/perl/perl-sources.h index a83a65a6..0addb35d 100644 --- a/src/perl/perl-sources.h +++ b/src/perl/perl-sources.h @@ -1,5 +1,5 @@ -#ifndef __PERL_SOURCES_H -#define __PERL_SOURCES_H +#ifndef IRSSI_PERL_PERL_SOURCES_H +#define IRSSI_PERL_PERL_SOURCES_H int perl_timeout_add(int msecs, SV *func, SV *data, int once); int perl_input_add(int source, int condition, SV *func, SV *data, int once); diff --git a/src/perl/textui/Makefile.PL.in b/src/perl/textui/Makefile.PL.in index ffdda21a..2b0a148a 100644 --- a/src/perl/textui/Makefile.PL.in +++ b/src/perl/textui/Makefile.PL.in @@ -4,5 +4,5 @@ WriteMakefile('NAME' => 'Irssi::TextUI', 'LIBS' => '', 'OBJECT' => '$(O_FILES)', 'TYPEMAPS' => ['../common/typemap', '../ui/typemap'], - 'INC' => '-I../../.. -I@top_srcdir@/src -I@top_srcdir@/src/core -I@top_srcdir@/src/fe-common/core -I@top_srcdir@/src/fe-text @GLIB_CFLAGS@', + 'INC' => '-I../../.. @GLIB_CFLAGS@', 'VERSION_FROM' => '@srcdir@/TextUI.pm'); diff --git a/src/perl/textui/module.h b/src/perl/textui/module.h index d8af5b48..394c2839 100644 --- a/src/perl/textui/module.h +++ b/src/perl/textui/module.h @@ -1,12 +1,12 @@ -#include "../ui/module.h" +#include -#include "mainwindows.h" -#include "gui-windows.h" -#include "gui-printtext.h" -#include "statusbar.h" -#include "textbuffer.h" -#include "textbuffer-view.h" -#include "gui-entry.h" +#include +#include +#include +#include +#include +#include +#include typedef MAIN_WINDOW_REC *Irssi__TextUI__MainWindow; typedef TEXT_BUFFER_REC *Irssi__TextUI__TextBuffer; diff --git a/src/perl/ui/Makefile.PL.in b/src/perl/ui/Makefile.PL.in index ceed51c3..9507e74d 100644 --- a/src/perl/ui/Makefile.PL.in +++ b/src/perl/ui/Makefile.PL.in @@ -4,5 +4,5 @@ WriteMakefile('NAME' => 'Irssi::UI', 'LIBS' => '', 'OBJECT' => '$(O_FILES)', 'TYPEMAPS' => ['../common/typemap'], - 'INC' => '-I../../.. -I@top_srcdir@/src -I@top_srcdir@/src/core -I@top_srcdir@/src/fe-common/core @GLIB_CFLAGS@', + 'INC' => '-I../../.. @GLIB_CFLAGS@', 'VERSION_FROM' => '@srcdir@/UI.pm'); diff --git a/src/perl/ui/Window.xs b/src/perl/ui/Window.xs index 85e284bb..d001f382 100644 --- a/src/perl/ui/Window.xs +++ b/src/perl/ui/Window.xs @@ -1,7 +1,7 @@ #define PERL_NO_GET_CONTEXT #include "module.h" -#include "window-activity.h" +#include MODULE = Irssi::UI::Window PACKAGE = Irssi PROTOTYPES: ENABLE diff --git a/src/perl/ui/module.h b/src/perl/ui/module.h index 31775039..4e19d4c0 100644 --- a/src/perl/ui/module.h +++ b/src/perl/ui/module.h @@ -1,12 +1,12 @@ -#include "../common/module.h" +#include -#include "fe-windows.h" -#include "fe-exec.h" -#include "formats.h" -#include "printtext.h" -#include "window-items.h" -#include "themes.h" -#include "keyboard.h" +#include +#include +#include +#include +#include +#include +#include typedef WINDOW_REC *Irssi__UI__Window; typedef TEXT_DEST_REC *Irssi__UI__TextDest; diff --git a/tests/fe-common/core/Makefile.am b/tests/fe-common/core/Makefile.am index f048e95c..ddd619a0 100644 --- a/tests/fe-common/core/Makefile.am +++ b/tests/fe-common/core/Makefile.am @@ -3,14 +3,11 @@ include $(top_srcdir)/utils/glib-tap.mk PACKAGE_STRING=fe-common/core AM_CPPFLAGS = \ - -I$(top_srcdir)/src \ - -I$(top_srcdir)/src/core \ $(GLIB_CFLAGS) test_programs = test-formats test_formats_CPPFLAGS = \ - -I$(top_srcdir)/src/fe-common/core \ $(AM_CPPFLAGS) test_formats_DEPENDENCIES = \ diff --git a/tests/fe-common/core/test-formats.c b/tests/fe-common/core/test-formats.c index aee5a219..d1164f91 100644 --- a/tests/fe-common/core/test-formats.c +++ b/tests/fe-common/core/test-formats.c @@ -1,5 +1,5 @@ -#include "common.h" -#include "formats.h" +#include +#include #define MAX_LENGTH 5 diff --git a/tests/fe-text/Makefile.am b/tests/fe-text/Makefile.am index 38979e14..b1762c7d 100644 --- a/tests/fe-text/Makefile.am +++ b/tests/fe-text/Makefile.am @@ -3,10 +3,6 @@ include $(top_srcdir)/utils/glib-tap.mk PACKAGE_STRING=fe-text AM_CPPFLAGS = \ - -I$(top_srcdir)/src \ - -I$(top_srcdir)/src/core \ - -I$(top_srcdir)/src/fe-common/core \ - -I$(top_srcdir)/src/fe-text \ $(GLIB_CFLAGS) test_programs = test-paste-join-multiline diff --git a/tests/fe-text/test-paste-join-multiline.c b/tests/fe-text/test-paste-join-multiline.c index 8a81a9fb..87669598 100644 --- a/tests/fe-text/test-paste-join-multiline.c +++ b/tests/fe-text/test-paste-join-multiline.c @@ -1,5 +1,5 @@ -#include "common.h" -#include "gui-readline.c" +#include +#include typedef struct { char const *const description; diff --git a/tests/irc/core/Makefile.am b/tests/irc/core/Makefile.am index f60da03f..23c1ef2c 100644 --- a/tests/irc/core/Makefile.am +++ b/tests/irc/core/Makefile.am @@ -3,15 +3,12 @@ include $(top_srcdir)/utils/glib-tap.mk PACKAGE_STRING=irc/core AM_CPPFLAGS = \ - -I$(top_srcdir)/src \ - -I$(top_srcdir)/src/core \ -DSYSCONFDIR=\""$(sysconfdir)"\" \ $(GLIB_CFLAGS) test_programs = test-channel-events test-irc CPPFLAGS = \ - -I$(top_srcdir)/src/irc/core \ $(AM_CPPFLAGS) DEPENDENCIES = \ diff --git a/tests/irc/core/test-channel-events.c b/tests/irc/core/test-channel-events.c index 9f52c98d..c6490e6b 100644 --- a/tests/irc/core/test-channel-events.c +++ b/tests/irc/core/test-channel-events.c @@ -20,18 +20,18 @@ #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include -#include +#include #define MODULE_NAME "test-channel-events" diff --git a/tests/irc/core/test-irc.c b/tests/irc/core/test-irc.c index 3eaf7020..4845d54c 100644 --- a/tests/irc/core/test-irc.c +++ b/tests/irc/core/test-irc.c @@ -19,7 +19,7 @@ */ #include -#include +#include #include typedef struct { diff --git a/tests/irc/flood/Makefile.am b/tests/irc/flood/Makefile.am index 58c0d98d..17885d53 100644 --- a/tests/irc/flood/Makefile.am +++ b/tests/irc/flood/Makefile.am @@ -3,8 +3,6 @@ include $(top_srcdir)/utils/glib-tap.mk PACKAGE_STRING=irc/flood AM_CPPFLAGS = \ - -I$(top_srcdir)/src \ - -I$(top_srcdir)/src/core \ -DSYSCONFDIR=\""$(sysconfdir)"\" \ $(GLIB_CFLAGS) @@ -12,9 +10,6 @@ test_programs = \ test-796 test_796_CPPFLAGS = \ - -I$(top_srcdir)/src/fe-common/core \ - -I$(top_srcdir)/src/irc/core \ - -I$(top_srcdir)/src/irc/flood \ $(AM_CPPFLAGS) test_796_DEPENDENCIES = \ diff --git a/tests/irc/flood/test-796.c b/tests/irc/flood/test-796.c index 0c98509b..6f0f3ac8 100644 --- a/tests/irc/flood/test-796.c +++ b/tests/irc/flood/test-796.c @@ -18,18 +18,18 @@ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#include "common.h" -#include "args.h" -#include "core.h" -#include "misc.h" -#include "servers-setup.h" +#include +#include +#include +#include +#include -#include "formats.h" -#include "fe-common-core.h" +#include +#include -#include "irc.h" -#include "irc-servers.h" -#include "irc-channels.h" +#include +#include +#include /* irc.c */ void irc_init(void);