Mercurial > irccd
changeset 603:986ed3a7575d
Misc: fix includes style, closes #732
line wrap: on
line diff
--- a/irccdctl/alias.hpp Thu Dec 07 20:07:10 2017 +0100 +++ b/irccdctl/alias.hpp Fri Dec 08 08:41:29 2017 +0100 @@ -16,20 +16,20 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#ifndef IRCCD_ALIAS_HPP -#define IRCCD_ALIAS_HPP +#ifndef IRCCD_CTL_ALIAS_HPP +#define IRCCD_CTL_ALIAS_HPP /** * \file alias.hpp * \brief Create irccdctl aliases. */ +#include <irccd/sysconfig.hpp> + #include <ostream> #include <string> #include <vector> -#include "sysconfig.hpp" - namespace irccd { namespace ctl { @@ -173,4 +173,4 @@ } // !irccd -#endif // !IRCCD_ALIAS_HPP +#endif // !IRCCD_CTL_ALIAS_HPP
--- a/irccdctl/cli.hpp Thu Dec 07 20:07:10 2017 +0100 +++ b/irccdctl/cli.hpp Fri Dec 08 08:41:29 2017 +0100 @@ -16,8 +16,8 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#ifndef IRCCD_CLI_HPP -#define IRCCD_CLI_HPP +#ifndef IRCCD_CTL_CLI_HPP +#define IRCCD_CTL_CLI_HPP #include <stdexcept> #include <string> @@ -95,4 +95,4 @@ } // !irccd -#endif // !IRCCD_CLI_HPP +#endif // !IRCCD_CTL_CLI_HPP
--- a/irccdctl/plugin_config_cli.hpp Thu Dec 07 20:07:10 2017 +0100 +++ b/irccdctl/plugin_config_cli.hpp Fri Dec 08 08:41:29 2017 +0100 @@ -16,8 +16,8 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#ifndef IRCCD_PLUGIN_CONFIG_CLI_HPP -#define IRCCD_PLUGIN_CONFIG_CLI_HPP +#ifndef IRCCD_CTL_PLUGIN_CONFIG_CLI_HPP +#define IRCCD_CTL_PLUGIN_CONFIG_CLI_HPP /** * \file plugin_config_cli.hpp @@ -55,4 +55,4 @@ } // !irccd -#endif // !IRCCD_PLUGIN_CONFIG_CLI_HPP +#endif // !IRCCD_CTL_PLUGIN_CONFIG_CLI_HPP
--- a/irccdctl/plugin_info_cli.hpp Thu Dec 07 20:07:10 2017 +0100 +++ b/irccdctl/plugin_info_cli.hpp Fri Dec 08 08:41:29 2017 +0100 @@ -16,8 +16,8 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#ifndef IRCCD_PLUGIN_INFO_CLI_HPP -#define IRCCD_PLUGIN_INFO_CLI_HPP +#ifndef IRCCD_CTL_PLUGIN_INFO_CLI_HPP +#define IRCCD_CTL_PLUGIN_INFO_CLI_HPP /** * \file plugin_info_cli.hpp @@ -50,4 +50,4 @@ } // !irccd -#endif // !IRCCD_PLUGIN_INFO_CLI_HPP +#endif // !IRCCD_CTL_PLUGIN_INFO_CLI_HPP
--- a/irccdctl/plugin_list_cli.hpp Thu Dec 07 20:07:10 2017 +0100 +++ b/irccdctl/plugin_list_cli.hpp Fri Dec 08 08:41:29 2017 +0100 @@ -16,8 +16,8 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#ifndef IRCCD_PLUGIN_LIST_CLI_HPP -#define IRCCD_PLUGIN_LIST_CLI_HPP +#ifndef IRCCD_CTL_PLUGIN_LIST_CLI_HPP +#define IRCCD_CTL_PLUGIN_LIST_CLI_HPP /** * \file plugin_list_cli.hpp @@ -50,4 +50,4 @@ } // !irccd -#endif // !IRCCD_PLUGIN_LIST_CLI_HPP +#endif // !IRCCD_CTL_PLUGIN_LIST_CLI_HPP
--- a/irccdctl/plugin_load_cli.hpp Thu Dec 07 20:07:10 2017 +0100 +++ b/irccdctl/plugin_load_cli.hpp Fri Dec 08 08:41:29 2017 +0100 @@ -16,8 +16,8 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#ifndef IRCCD_PLUGIN_LOAD_CLI_HPP -#define IRCCD_PLUGIN_LOAD_CLI_HPP +#ifndef IRCCD_CTL_PLUGIN_LOAD_CLI_HPP +#define IRCCD_CTL_PLUGIN_LOAD_CLI_HPP /** * \file plugin_load_cli.hpp @@ -50,4 +50,4 @@ } // !irccd -#endif // !IRCCD_PLUGIN_LOAD_CLI_HPP +#endif // !IRCCD_CTL_PLUGIN_LOAD_CLI_HPP
--- a/irccdctl/plugin_reload_cli.hpp Thu Dec 07 20:07:10 2017 +0100 +++ b/irccdctl/plugin_reload_cli.hpp Fri Dec 08 08:41:29 2017 +0100 @@ -16,8 +16,8 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#ifndef IRCCD_PLUGIN_RELOAD_CLI_HPP -#define IRCCD_PLUGIN_RELOAD_CLI_HPP +#ifndef IRCCD_CTL_PLUGIN_RELOAD_CLI_HPP +#define IRCCD_CTL_PLUGIN_RELOAD_CLI_HPP /** * \file plugin_reload_cli.hpp @@ -50,4 +50,4 @@ } // !irccd -#endif // !IRCCD_PLUGIN_RELOAD_CLI_HPP +#endif // !IRCCD_CTL_PLUGIN_RELOAD_CLI_HPP
--- a/irccdctl/plugin_unload_cli.hpp Thu Dec 07 20:07:10 2017 +0100 +++ b/irccdctl/plugin_unload_cli.hpp Fri Dec 08 08:41:29 2017 +0100 @@ -16,8 +16,8 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#ifndef IRCCD_PLUGIN_UNLOAD_CLI_HPP -#define IRCCD_PLUGIN_UNLOAD_CLI_HPP +#ifndef IRCCD_CTL_PLUGIN_UNLOAD_CLI_HPP +#define IRCCD_CTL_PLUGIN_UNLOAD_CLI_HPP /** * \file plugin_unload_cli.hpp @@ -50,4 +50,4 @@ } // !irccd -#endif // !IRCCD_PLUGIN_UNLOAD_CLI_HPP +#endif // !IRCCD_CTL_PLUGIN_UNLOAD_CLI_HPP
--- a/irccdctl/rule_add_cli.hpp Thu Dec 07 20:07:10 2017 +0100 +++ b/irccdctl/rule_add_cli.hpp Fri Dec 08 08:41:29 2017 +0100 @@ -16,8 +16,8 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#ifndef IRCCD_RULE_ADD_CLI_HPP -#define IRCCD_RULE_ADD_CLI_HPP +#ifndef IRCCD_CTL_RULE_ADD_CLI_HPP +#define IRCCD_CTL_RULE_ADD_CLI_HPP /** * \file rule_add_cli.hpp @@ -50,4 +50,4 @@ } // !irccd -#endif // !IRCCD_RULE_ADD_CLI_HPP +#endif // !IRCCD_CTL_RULE_ADD_CLI_HPP
--- a/irccdctl/rule_edit_cli.hpp Thu Dec 07 20:07:10 2017 +0100 +++ b/irccdctl/rule_edit_cli.hpp Fri Dec 08 08:41:29 2017 +0100 @@ -16,8 +16,8 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#ifndef IRCCD_RULE_EDIT_CLI_HPP -#define IRCCD_RULE_EDIT_CLI_HPP +#ifndef IRCCD_CTL_RULE_EDIT_CLI_HPP +#define IRCCD_CTL_RULE_EDIT_CLI_HPP /** * \file rule_edit_cli.hpp @@ -50,4 +50,4 @@ } // !irccd -#endif // !IRCCD_RULE_EDIT_CLI_HPP +#endif // !IRCCD_CTL_RULE_EDIT_CLI_HPP
--- a/irccdctl/rule_info_cli.hpp Thu Dec 07 20:07:10 2017 +0100 +++ b/irccdctl/rule_info_cli.hpp Fri Dec 08 08:41:29 2017 +0100 @@ -16,8 +16,8 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#ifndef IRCCD_RULE_INFO_CLI_HPP -#define IRCCD_RULE_INFO_CLI_HPP +#ifndef IRCCD_CTL_RULE_INFO_CLI_HPP +#define IRCCD_CTL_RULE_INFO_CLI_HPP /** * \file rule_info_cli.hpp @@ -58,4 +58,4 @@ } // !irccd -#endif // !IRCCD_RULE_INFO_CLI_HPP +#endif // !IRCCD_CTL_RULE_INFO_CLI_HPP
--- a/irccdctl/rule_list_cli.hpp Thu Dec 07 20:07:10 2017 +0100 +++ b/irccdctl/rule_list_cli.hpp Fri Dec 08 08:41:29 2017 +0100 @@ -16,8 +16,8 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#ifndef IRCCD_RULE_LIST_CLI_HPP -#define IRCCD_RULE_LIST_CLI_HPP +#ifndef IRCCD_CTL_RULE_LIST_CLI_HPP +#define IRCCD_CTL_RULE_LIST_CLI_HPP /** * \file rule_list_cli.hpp @@ -50,4 +50,4 @@ } // !irccd -#endif // !IRCCD_RULE_LIST_CLI_HPP +#endif // !IRCCD_CTL_RULE_LIST_CLI_HPP
--- a/irccdctl/rule_move_cli.hpp Thu Dec 07 20:07:10 2017 +0100 +++ b/irccdctl/rule_move_cli.hpp Fri Dec 08 08:41:29 2017 +0100 @@ -16,8 +16,8 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#ifndef IRCCD_RULE_MOVE_CLI_HPP -#define IRCCD_RULE_MOVE_CLI_HPP +#ifndef IRCCD_CTL_RULE_MOVE_CLI_HPP +#define IRCCD_CTL_RULE_MOVE_CLI_HPP /** * \file rule_move_cli.hpp @@ -50,4 +50,4 @@ } // !irccd -#endif // !IRCCD_RULE_MOVE_CLI_HPP +#endif // !IRCCD_CTL_RULE_MOVE_CLI_HPP
--- a/irccdctl/rule_remove_cli.hpp Thu Dec 07 20:07:10 2017 +0100 +++ b/irccdctl/rule_remove_cli.hpp Fri Dec 08 08:41:29 2017 +0100 @@ -16,8 +16,8 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#ifndef IRCCD_RULE_REMOVE_CLI_HPP -#define IRCCD_RULE_REMOVE_CLI_HPP +#ifndef IRCCD_CTL_RULE_REMOVE_CLI_HPP +#define IRCCD_CTL_RULE_REMOVE_CLI_HPP /** * \file rule_remove_cli.hpp @@ -50,4 +50,4 @@ } // !irccd -#endif // !IRCCD_RULE_REMOVE_CLI_HPP +#endif // !IRCCD_CTL_RULE_REMOVE_CLI_HPP
--- a/irccdctl/server_channel_mode_cli.hpp Thu Dec 07 20:07:10 2017 +0100 +++ b/irccdctl/server_channel_mode_cli.hpp Fri Dec 08 08:41:29 2017 +0100 @@ -16,8 +16,8 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#ifndef IRCCD_SERVER_CHANNEL_MODE_CLI_HPP -#define IRCCD_SERVER_CHANNEL_MODE_CLI_HPP +#ifndef IRCCD_CTL_SERVER_CHANNEL_MODE_CLI_HPP +#define IRCCD_CTL_SERVER_CHANNEL_MODE_CLI_HPP /** * \file server_channel_mode_cli.hpp @@ -50,4 +50,4 @@ } // !irccd -#endif // !IRCCD_SERVER_CHANNEL_MODE_CLI_HPP +#endif // !IRCCD_CTL_SERVER_CHANNEL_MODE_CLI_HPP
--- a/irccdctl/server_channel_notice_cli.hpp Thu Dec 07 20:07:10 2017 +0100 +++ b/irccdctl/server_channel_notice_cli.hpp Fri Dec 08 08:41:29 2017 +0100 @@ -16,8 +16,8 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#ifndef IRCCD_SERVER_CHANNEL_NOTICE_CLI_HPP -#define IRCCD_SERVER_CHANNEL_NOTICE_CLI_HPP +#ifndef IRCCD_CTL_SERVER_CHANNEL_NOTICE_CLI_HPP +#define IRCCD_CTL_SERVER_CHANNEL_NOTICE_CLI_HPP /** * \file server_channel_notice_cli.hpp @@ -50,4 +50,4 @@ } // !irccd -#endif // !IRCCD_SERVER_CHANNEL_NOTICE_CLI_HPP +#endif // !IRCCD_CTL_SERVER_CHANNEL_NOTICE_CLI_HPP
--- a/irccdctl/server_connect_cli.hpp Thu Dec 07 20:07:10 2017 +0100 +++ b/irccdctl/server_connect_cli.hpp Fri Dec 08 08:41:29 2017 +0100 @@ -16,8 +16,8 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#ifndef IRCCD_SERVER_CONNECT_CLI_HPP -#define IRCCD_SERVER_CONNECT_CLI_HPP +#ifndef IRCCD_CTL_SERVER_CONNECT_CLI_HPP +#define IRCCD_CTL_SERVER_CONNECT_CLI_HPP /** * \file server_connect_cli.hpp @@ -50,4 +50,4 @@ } // !irccd -#endif // !IRCCD_SERVER_CONNECT_CLI_HPP +#endif // !IRCCD_CTL_SERVER_CONNECT_CLI_HPP
--- a/irccdctl/server_disconnect_cli.hpp Thu Dec 07 20:07:10 2017 +0100 +++ b/irccdctl/server_disconnect_cli.hpp Fri Dec 08 08:41:29 2017 +0100 @@ -16,8 +16,8 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#ifndef IRCCD_SERVER_DISCONNECT_CLI_HPP -#define IRCCD_SERVER_DISCONNECT_CLI_HPP +#ifndef IRCCD_CTL_SERVER_DISCONNECT_CLI_HPP +#define IRCCD_CTL_SERVER_DISCONNECT_CLI_HPP /** * \file server_disconnect_cli.hpp @@ -50,4 +50,4 @@ } // !irccd -#endif // !IRCCD_SERVER_DISCONNECT_CLI_HPP +#endif // !IRCCD_CTL_SERVER_DISCONNECT_CLI_HPP
--- a/irccdctl/server_info_cli.hpp Thu Dec 07 20:07:10 2017 +0100 +++ b/irccdctl/server_info_cli.hpp Fri Dec 08 08:41:29 2017 +0100 @@ -16,8 +16,8 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#ifndef IRCCD_SERVER_INFO_CLI_HPP -#define IRCCD_SERVER_INFO_CLI_HPP +#ifndef IRCCD_CTL_SERVER_INFO_CLI_HPP +#define IRCCD_CTL_SERVER_INFO_CLI_HPP /** * \file server_info_cli.hpp @@ -50,4 +50,4 @@ } // !irccd -#endif // !IRCCD_SERVER_INFO_CLI_HPP +#endif // !IRCCD_CTL_SERVER_INFO_CLI_HPP
--- a/irccdctl/server_invite_cli.hpp Thu Dec 07 20:07:10 2017 +0100 +++ b/irccdctl/server_invite_cli.hpp Fri Dec 08 08:41:29 2017 +0100 @@ -16,8 +16,8 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#ifndef IRCCD_SERVER_INVITE_CLI_HPP -#define IRCCD_SERVER_INVITE_CLI_HPP +#ifndef IRCCD_CTL_SERVER_INVITE_CLI_HPP +#define IRCCD_CTL_SERVER_INVITE_CLI_HPP /** * \file server_invite_cli.hpp @@ -50,4 +50,4 @@ } // !irccd -#endif // !IRCCD_SERVER_INVITE_CLI_HPP +#endif // !IRCCD_CTL_SERVER_INVITE_CLI_HPP
--- a/irccdctl/server_join_cli.hpp Thu Dec 07 20:07:10 2017 +0100 +++ b/irccdctl/server_join_cli.hpp Fri Dec 08 08:41:29 2017 +0100 @@ -16,8 +16,8 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#ifndef IRCCD_SERVER_JOIN_CLI_HPP -#define IRCCD_SERVER_JOIN_CLI_HPP +#ifndef IRCCD_CTL_SERVER_JOIN_CLI_HPP +#define IRCCD_CTL_SERVER_JOIN_CLI_HPP /** * \file server_join_cli.hpp @@ -50,4 +50,4 @@ } // !irccd -#endif // !IRCCD_SERVER_JOIN_CLI_HPP +#endif // !IRCCD_CTL_SERVER_JOIN_CLI_HPP
--- a/irccdctl/server_kick_cli.hpp Thu Dec 07 20:07:10 2017 +0100 +++ b/irccdctl/server_kick_cli.hpp Fri Dec 08 08:41:29 2017 +0100 @@ -16,8 +16,8 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#ifndef IRCCD_SERVER_KICK_CLI_HPP -#define IRCCD_SERVER_KICK_CLI_HPP +#ifndef IRCCD_CTL_SERVER_KICK_CLI_HPP +#define IRCCD_CTL_SERVER_KICK_CLI_HPP /** * \file server_kick_cli.hpp @@ -50,4 +50,4 @@ } // !irccd -#endif // !IRCCD_SERVER_KICK_CLI_HPP +#endif // !IRCCD_CTL_SERVER_KICK_CLI_HPP
--- a/irccdctl/server_list_cli.hpp Thu Dec 07 20:07:10 2017 +0100 +++ b/irccdctl/server_list_cli.hpp Fri Dec 08 08:41:29 2017 +0100 @@ -16,8 +16,8 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#ifndef IRCCD_SERVER_LIST_CLI_HPP -#define IRCCD_SERVER_LIST_CLI_HPP +#ifndef IRCCD_CTL_SERVER_LIST_CLI_HPP +#define IRCCD_CTL_SERVER_LIST_CLI_HPP /** * \file server_list_cli.hpp @@ -50,4 +50,4 @@ } // !irccd -#endif // !IRCCD_SERVER_LIST_CLI_HPP +#endif // !IRCCD_CTL_SERVER_LIST_CLI_HPP
--- a/irccdctl/server_me_cli.hpp Thu Dec 07 20:07:10 2017 +0100 +++ b/irccdctl/server_me_cli.hpp Fri Dec 08 08:41:29 2017 +0100 @@ -16,8 +16,8 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#ifndef IRCCD_SERVER_ME_CLI_HPP -#define IRCCD_SERVER_ME_CLI_HPP +#ifndef IRCCD_CTL_SERVER_ME_CLI_HPP +#define IRCCD_CTL_SERVER_ME_CLI_HPP /** * \file server_me_cli.hpp @@ -50,4 +50,4 @@ } // !irccd -#endif // !IRCCD_SERVER_ME_CLI_HPP +#endif // !IRCCD_CTL_SERVER_ME_CLI_HPP
--- a/irccdctl/server_message_cli.hpp Thu Dec 07 20:07:10 2017 +0100 +++ b/irccdctl/server_message_cli.hpp Fri Dec 08 08:41:29 2017 +0100 @@ -16,8 +16,8 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#ifndef IRCCD_SERVER_MESSAGE_CLI_HPP -#define IRCCD_SERVER_MESSAGE_CLI_HPP +#ifndef IRCCD_CTL_SERVER_MESSAGE_CLI_HPP +#define IRCCD_CTL_SERVER_MESSAGE_CLI_HPP /** * \file server_message_cli.hpp @@ -50,4 +50,4 @@ } // !irccd -#endif // !IRCCD_SERVER_MESSAGE_CLI_HPP +#endif // !IRCCD_CTL_SERVER_MESSAGE_CLI_HPP
--- a/irccdctl/server_mode_cli.hpp Thu Dec 07 20:07:10 2017 +0100 +++ b/irccdctl/server_mode_cli.hpp Fri Dec 08 08:41:29 2017 +0100 @@ -16,8 +16,8 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#ifndef IRCCD_SERVER_MODE_CLI_HPP -#define IRCCD_SERVER_MODE_CLI_HPP +#ifndef IRCCD_CTL_SERVER_MODE_CLI_HPP +#define IRCCD_CTL_SERVER_MODE_CLI_HPP /** * \file server_mode_cli.hpp @@ -50,4 +50,4 @@ } // !irccd -#endif // !IRCCD_SERVER_MODE_CLI_HPP +#endif // !IRCCD_CTL_SERVER_MODE_CLI_HPP
--- a/irccdctl/server_nick_cli.hpp Thu Dec 07 20:07:10 2017 +0100 +++ b/irccdctl/server_nick_cli.hpp Fri Dec 08 08:41:29 2017 +0100 @@ -16,8 +16,8 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#ifndef IRCCD_SERVER_NICK_CLI_HPP -#define IRCCD_SERVER_NICK_CLI_HPP +#ifndef IRCCD_CTL_SERVER_NICK_CLI_HPP +#define IRCCD_CTL_SERVER_NICK_CLI_HPP /** * \file server_nick_cli.hpp @@ -50,4 +50,4 @@ } // !irccd -#endif // !IRCCD_SERVER_NICK_CLI_HPP +#endif // !IRCCD_CTL_SERVER_NICK_CLI_HPP
--- a/irccdctl/server_notice_cli.hpp Thu Dec 07 20:07:10 2017 +0100 +++ b/irccdctl/server_notice_cli.hpp Fri Dec 08 08:41:29 2017 +0100 @@ -16,8 +16,8 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#ifndef IRCCD_SERVER_NOTICE_CLI_HPP -#define IRCCD_SERVER_NOTICE_CLI_HPP +#ifndef IRCCD_CTL_SERVER_NOTICE_CLI_HPP +#define IRCCD_CTL_SERVER_NOTICE_CLI_HPP /** * \file server_notice_cli.hpp @@ -50,4 +50,4 @@ } // !irccd -#endif // !IRCCD_SERVER_NOTICE_CLI_HPP +#endif // !IRCCD_CTL_SERVER_NOTICE_CLI_HPP
--- a/irccdctl/server_part_cli.hpp Thu Dec 07 20:07:10 2017 +0100 +++ b/irccdctl/server_part_cli.hpp Fri Dec 08 08:41:29 2017 +0100 @@ -16,8 +16,8 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#ifndef IRCCD_SERVER_PART_CLI_HPP -#define IRCCD_SERVER_PART_CLI_HPP +#ifndef IRCCD_CTL_SERVER_PART_CLI_HPP +#define IRCCD_CTL_SERVER_PART_CLI_HPP /** * \file server_part_cli.hpp @@ -50,4 +50,4 @@ } // !irccd -#endif // !IRCCD_SERVER_PART_CLI_HPP +#endif // !IRCCD_CTL_SERVER_PART_CLI_HPP
--- a/irccdctl/server_reconnect_cli.hpp Thu Dec 07 20:07:10 2017 +0100 +++ b/irccdctl/server_reconnect_cli.hpp Fri Dec 08 08:41:29 2017 +0100 @@ -16,8 +16,8 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#ifndef IRCCD_SERVER_RECONNECT_CLI_HPP -#define IRCCD_SERVER_RECONNECT_CLI_HPP +#ifndef IRCCD_CTL_SERVER_RECONNECT_CLI_HPP +#define IRCCD_CTL_SERVER_RECONNECT_CLI_HPP /** * \file server_reconnect_cli.hpp @@ -50,4 +50,4 @@ } // !irccd -#endif // !IRCCD_SERVER_RECONNECT_CLI_HPP +#endif // !IRCCD_CTL_SERVER_RECONNECT_CLI_HPP
--- a/irccdctl/server_topic_cli.hpp Thu Dec 07 20:07:10 2017 +0100 +++ b/irccdctl/server_topic_cli.hpp Fri Dec 08 08:41:29 2017 +0100 @@ -16,8 +16,8 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#ifndef IRCCD_SERVER_TOPIC_CLI_HPP -#define IRCCD_SERVER_TOPIC_CLI_HPP +#ifndef IRCCD_CTL_SERVER_TOPIC_CLI_HPP +#define IRCCD_CTL_SERVER_TOPIC_CLI_HPP /** * \file server_topic_cli.hpp @@ -50,4 +50,4 @@ } // !irccd -#endif // !IRCCD_SERVER_TOPIC_CLI_HPP +#endif // !IRCCD_CTL_SERVER_TOPIC_CLI_HPP
--- a/irccdctl/watch_cli.hpp Thu Dec 07 20:07:10 2017 +0100 +++ b/irccdctl/watch_cli.hpp Fri Dec 08 08:41:29 2017 +0100 @@ -16,8 +16,8 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#ifndef IRCCD_WATCH_CLI_HPP -#define IRCCD_WATCH_CLI_HPP +#ifndef IRCCD_CTL_WATCH_CLI_HPP +#define IRCCD_CTL_WATCH_CLI_HPP /** * \file watch_cli.hpp @@ -50,4 +50,4 @@ } // !irccd -#endif // !IRCCD_WATCH_CLI_HPP +#endif // !IRCCD_CTL_WATCH_CLI_HPP
--- a/libcommon/CMakeLists.txt Thu Dec 07 20:07:10 2017 +0100 +++ b/libcommon/CMakeLists.txt Fri Dec 08 08:41:29 2017 +0100 @@ -65,6 +65,5 @@ PUBLIC_INCLUDES ${Boost_INCLUDE_DIRS} $<BUILD_INTERFACE:${CMAKE_BINARY_DIR}> - $<BUILD_INTERFACE:${libcommon_SOURCE_DIR}/irccd> $<BUILD_INTERFACE:${libcommon_SOURCE_DIR}> )
--- a/libcommon/irccd/config.hpp Thu Dec 07 20:07:10 2017 +0100 +++ b/libcommon/irccd/config.hpp Fri Dec 08 08:41:29 2017 +0100 @@ -16,8 +16,8 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#ifndef IRCCD_CONFIG_HPP -#define IRCCD_CONFIG_HPP +#ifndef IRCCD_COMMON_CONFIG_HPP +#define IRCCD_COMMON_CONFIG_HPP /** * \file config.hpp @@ -105,4 +105,4 @@ } // !irccd -#endif // !IRCCD_CONFIG_HPP +#endif // !IRCCD_COMMON_CONFIG_HPP
--- a/libcommon/irccd/ini.hpp Thu Dec 07 20:07:10 2017 +0100 +++ b/libcommon/irccd/ini.hpp Fri Dec 08 08:41:29 2017 +0100 @@ -16,8 +16,8 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#ifndef IRCCD_INI_HPP -#define IRCCD_INI_HPP +#ifndef IRCCD_COMMON_INI_HPP +#define IRCCD_COMMON_INI_HPP /** * \file ini.hpp @@ -644,4 +644,4 @@ } // !irccd -#endif // !INI_HPP +#endif // !IRCCD_COMMON_INI_HPP
--- a/libcommon/irccd/options.hpp Thu Dec 07 20:07:10 2017 +0100 +++ b/libcommon/irccd/options.hpp Fri Dec 08 08:41:29 2017 +0100 @@ -16,8 +16,8 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#ifndef IRCCD_OPTIONS_HPP -#define IRCCD_OPTIONS_HPP +#ifndef IRCCD_COMMON_OPTIONS_HPP +#define IRCCD_COMMON_OPTIONS_HPP /** * \file options.hpp @@ -158,4 +158,4 @@ } // !irccd -#endif // !OPTIONS_HPP +#endif // !IRCCD_COMMON_OPTIONS_HPP
--- a/libcommon/irccd/system.cpp Thu Dec 07 20:07:10 2017 +0100 +++ b/libcommon/irccd/system.cpp Fri Dec 08 08:41:29 2017 +0100 @@ -84,14 +84,14 @@ # include <ctime> #endif -// For sys::setGid. +// For sys::set_gid. #if defined(HAVE_SETGID) # include <sys/types.h> # include <unistd.h> # include <grp.h> #endif -// For sys::setUid. +// For sys::set_uid. #if defined(HAVE_SETGID) # include <sys/types.h> # include <unistd.h>
--- a/libcommon/irccd/system.hpp Thu Dec 07 20:07:10 2017 +0100 +++ b/libcommon/irccd/system.hpp Fri Dec 08 08:41:29 2017 +0100 @@ -16,8 +16,8 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#ifndef IRCCD_SYSTEM_HPP -#define IRCCD_SYSTEM_HPP +#ifndef IRCCD_COMMON_SYSTEM_HPP +#define IRCCD_COMMON_SYSTEM_HPP /** * \file system.hpp @@ -176,4 +176,4 @@ } // !irccd -#endif // !IRCCD_SYSTEM_HPP +#endif // !IRCCD_COMMON_SYSTEM_HPP
--- a/libcommon/irccd/util.hpp Thu Dec 07 20:07:10 2017 +0100 +++ b/libcommon/irccd/util.hpp Fri Dec 08 08:41:29 2017 +0100 @@ -16,8 +16,8 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#ifndef IRCCD_UTIL_HPP -#define IRCCD_UTIL_HPP +#ifndef IRCCD_COMMON_UTIL_HPP +#define IRCCD_COMMON_UTIL_HPP /** * \file util.hpp
--- a/libirccd-js/irccd/js/js_plugin.cpp Thu Dec 07 20:07:10 2017 +0100 +++ b/libirccd-js/irccd/js/js_plugin.cpp Fri Dec 08 08:41:29 2017 +0100 @@ -22,9 +22,10 @@ #include <iterator> #include <stdexcept> +#include <irccd/daemon/irccd.hpp> +#include <irccd/daemon/logger.hpp> + #include "duktape_vector.hpp" -#include "irccd.hpp" -#include "logger.hpp" #include "js_plugin.hpp" #include "server_jsapi.hpp"
--- a/libirccd-js/irccd/js/server_jsapi.hpp Thu Dec 07 20:07:10 2017 +0100 +++ b/libirccd-js/irccd/js/server_jsapi.hpp Fri Dec 08 08:41:29 2017 +0100 @@ -24,8 +24,9 @@ * \brief irccd.Server Javascript API. */ +#include <irccd/daemon/server.hpp> + #include "jsapi.hpp" -#include "server.hpp" namespace irccd {
--- a/libirccd-js/irccd/js/unicode.hpp Thu Dec 07 20:07:10 2017 +0100 +++ b/libirccd-js/irccd/js/unicode.hpp Fri Dec 08 08:41:29 2017 +0100 @@ -16,8 +16,8 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#ifndef IRCCD_UNICODE_HPP -#define IRCCD_UNICODE_HPP +#ifndef IRCCD_JS_UNICODE_HPP +#define IRCCD_JS_UNICODE_HPP /** * \file unicode.hpp @@ -270,4 +270,4 @@ } // !irccd -#endif // !IRCCD_UNICODE_HPP +#endif // !IRCCD_JS_UNICODE_HPP
--- a/libirccd-test/irccd/journal_server.hpp Thu Dec 07 20:07:10 2017 +0100 +++ b/libirccd-test/irccd/journal_server.hpp Fri Dec 08 08:41:29 2017 +0100 @@ -16,8 +16,8 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#ifndef IRCCD_JOURNAL_SERVER_HPP -#define IRCCD_JOURNAL_SERVER_HPP +#ifndef IRCCD_TEST_JOURNAL_SERVER_HPP +#define IRCCD_TEST_JOURNAL_SERVER_HPP #include <deque> @@ -172,4 +172,4 @@ } // !irccd -#endif // !IRCCD_JOURNAL_SERVER_HPP +#endif // !IRCCD_TEST_JOURNAL_SERVER_HPP
--- a/libirccd-test/irccd/js_test.hpp Thu Dec 07 20:07:10 2017 +0100 +++ b/libirccd-test/irccd/js_test.hpp Fri Dec 08 08:41:29 2017 +0100 @@ -16,8 +16,8 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#ifndef IRCCD_JS_TEST_HPP -#define IRCCD_JS_TEST_HPP +#ifndef IRCCD_TEST_JS_TEST_HPP +#define IRCCD_TEST_JS_TEST_HPP /** * \file js_test.hpp @@ -90,4 +90,4 @@ } // !irccd -#endif // !IRCCD_JS_TEST_HPP +#endif // !IRCCD_TEST_JS_TEST_HPP
--- a/libirccd-test/irccd/plugin_test.hpp Thu Dec 07 20:07:10 2017 +0100 +++ b/libirccd-test/irccd/plugin_test.hpp Fri Dec 08 08:41:29 2017 +0100 @@ -16,8 +16,8 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#ifndef IRCCD_PLUGIN_TEST_HPP -#define IRCCD_PLUGIN_TEST_HPP +#ifndef IRCCD_TEST_PLUGIN_TEST_HPP +#define IRCCD_TEST_PLUGIN_TEST_HPP /** * \file plugin_test.hpp @@ -57,4 +57,4 @@ } // !irccd -#endif // !IRCCD_PLUGIN_TESTER_HPP +#endif // !IRCCD_TEST_PLUGIN_TESTER_HPP
--- a/libirccd/irccd/daemon/basic_transport_server.hpp Thu Dec 07 20:07:10 2017 +0100 +++ b/libirccd/irccd/daemon/basic_transport_server.hpp Fri Dec 08 08:41:29 2017 +0100 @@ -16,8 +16,8 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#ifndef IRCCD_BASIC_TRANSPORT_SERVER_HPP -#define IRCCD_BASIC_TRANSPORT_SERVER_HPP +#ifndef IRCCD_DAEMON_BASIC_TRANSPORT_SERVER_HPP +#define IRCCD_DAEMON_BASIC_TRANSPORT_SERVER_HPP /** * \file basic_transport_server.hpp @@ -94,4 +94,4 @@ } // !irccd -#endif // !IRCCD_BASIC_TRANSPORT_SERVER_HPP +#endif // !IRCCD_DAEMON_BASIC_TRANSPORT_SERVER_HPP
--- a/libirccd/irccd/daemon/command.cpp Thu Dec 07 20:07:10 2017 +0100 +++ b/libirccd/irccd/daemon/command.cpp Fri Dec 08 08:41:29 2017 +0100 @@ -16,15 +16,16 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ +#include <irccd/json_util.hpp> +#include <irccd/string_util.hpp> +#include <irccd/util.hpp> + #include "command.hpp" #include "irccd.hpp" -#include "json_util.hpp" #include "rule_service.hpp" #include "plugin_service.hpp" #include "server_service.hpp" #include "transport_client.hpp" -#include "string_util.hpp" -#include "util.hpp" using namespace std::string_literals;
--- a/libirccd/irccd/daemon/command.hpp Thu Dec 07 20:07:10 2017 +0100 +++ b/libirccd/irccd/daemon/command.hpp Fri Dec 08 08:41:29 2017 +0100 @@ -16,20 +16,21 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#ifndef IRCCD_COMMAND_HPP -#define IRCCD_COMMAND_HPP +#ifndef IRCCD_DAEMON_COMMAND_HPP +#define IRCCD_DAEMON_COMMAND_HPP /** * \file command.hpp * \brief Remote commands. */ +#include <irccd/sysconfig.hpp> + #include <cassert> #include <map> #include <vector> #include "json.hpp" -#include "sysconfig.hpp" namespace irccd { @@ -653,4 +654,4 @@ } // !irccd -#endif // !IRCCD_COMMAND_HPP +#endif // !IRCCD_DAEMON_COMMAND_HPP
--- a/libirccd/irccd/daemon/command_service.hpp Thu Dec 07 20:07:10 2017 +0100 +++ b/libirccd/irccd/daemon/command_service.hpp Fri Dec 08 08:41:29 2017 +0100 @@ -16,8 +16,8 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#ifndef IRCCD_COMMAND_SERVICE_HPP -#define IRCCD_COMMAND_SERVICE_HPP +#ifndef IRCCD_DAEMON_COMMAND_SERVICE_HPP +#define IRCCD_DAEMON_COMMAND_SERVICE_HPP /** * \file command_service.hpp @@ -77,4 +77,4 @@ } // !irccd -#endif // !IRCCD_COMMAND_SERVICE_HPP +#endif // !IRCCD_DAEMON_COMMAND_SERVICE_HPP
--- a/libirccd/irccd/daemon/dynlib_plugin.cpp Thu Dec 07 20:07:10 2017 +0100 +++ b/libirccd/irccd/daemon/dynlib_plugin.cpp Fri Dec 08 08:41:29 2017 +0100 @@ -21,8 +21,9 @@ #include <boost/filesystem.hpp> +#include <irccd/string_util.hpp> + #include "dynlib_plugin.hpp" -#include "string_util.hpp" #if defined(IRCCD_SYSTEM_WINDOWS) # define DYNLIB_EXTENSION ".dll"
--- a/libirccd/irccd/daemon/dynlib_plugin.hpp Thu Dec 07 20:07:10 2017 +0100 +++ b/libirccd/irccd/daemon/dynlib_plugin.hpp Fri Dec 08 08:41:29 2017 +0100 @@ -16,8 +16,8 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#ifndef IRCCD_PLUGIN_DYNLIB_HPP -#define IRCCD_PLUGIN_DYNLIB_HPP +#ifndef IRCCD_DAEMON_DYNLIB_PLUGIN_HPP +#define IRCCD_DAEMON_DYNLIB_PLUGIN_HPP /** * \file plugin-dynlib.hpp @@ -156,4 +156,4 @@ } // !irccd -#endif // !IRCCD_PLUGIN_DYNLIB_HPP +#endif // !IRCCD_DAEMON_DYNLIB_PLUGIN_HPP
--- a/libirccd/irccd/daemon/ip_transport_server.hpp Thu Dec 07 20:07:10 2017 +0100 +++ b/libirccd/irccd/daemon/ip_transport_server.hpp Fri Dec 08 08:41:29 2017 +0100 @@ -16,8 +16,8 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#ifndef IRCCD_IP_TRANSPORT_SERVER_HPP -#define IRCCD_IP_TRANSPORT_SERVER_HPP +#ifndef IRCCD_DAEMON_IP_TRANSPORT_SERVER_HPP +#define IRCCD_DAEMON_IP_TRANSPORT_SERVER_HPP /** * \file ip_transport_server.hpp @@ -35,4 +35,4 @@ } // !irccd -#endif // !IRCCD_IP_TRANSPORT_SERVER_HPP +#endif // !IRCCD_DAEMON_IP_TRANSPORT_SERVER_HPP
--- a/libirccd/irccd/daemon/irc.hpp Thu Dec 07 20:07:10 2017 +0100 +++ b/libirccd/irccd/daemon/irc.hpp Fri Dec 08 08:41:29 2017 +0100 @@ -24,7 +24,7 @@ * \brief Low level IRC functions. */ -#include "sysconfig.hpp" +#include <irccd/sysconfig.hpp> #include <deque> #include <functional>
--- a/libirccd/irccd/daemon/irccd.hpp Thu Dec 07 20:07:10 2017 +0100 +++ b/libirccd/irccd/daemon/irccd.hpp Fri Dec 08 08:41:29 2017 +0100 @@ -16,21 +16,21 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#ifndef IRCCD_HPP -#define IRCCD_HPP +#ifndef IRCCD_DAEMON_IRCCD_HPP +#define IRCCD_DAEMON_IRCCD_HPP /** * \file irccd.hpp * \brief Base class for irccd front end. */ -#include "sysconfig.hpp" +#include <irccd/sysconfig.hpp> #include <memory> #include <boost/asio.hpp> -#include "config.hpp" +#include <irccd/config.hpp> /** * \brief Main irccd namespace @@ -290,4 +290,4 @@ } // !boost -#endif // !IRCCD_HPP +#endif // !IRCCD_DAEMON_IRCCD_HPP
--- a/libirccd/irccd/daemon/local_transport_server.hpp Thu Dec 07 20:07:10 2017 +0100 +++ b/libirccd/irccd/daemon/local_transport_server.hpp Fri Dec 08 08:41:29 2017 +0100 @@ -16,8 +16,8 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#ifndef IRCCD_LOCAL_TRANSPORT_SERVER_HPP -#define IRCCD_LOCAL_TRANSPORT_SERVER_HPP +#ifndef IRCCD_DAEMON_LOCAL_TRANSPORT_SERVER_HPP +#define IRCCD_DAEMON_LOCAL_TRANSPORT_SERVER_HPP /** * \file local_transport_server.hpp @@ -41,4 +41,4 @@ } // !irccd -#endif // !IRCCD_LOCAL_TRANSPORT_SERVER_HPP +#endif // !IRCCD_DAEMON_LOCAL_TRANSPORT_SERVER_HPP
--- a/libirccd/irccd/daemon/logger.cpp Thu Dec 07 20:07:10 2017 +0100 +++ b/libirccd/irccd/daemon/logger.cpp Fri Dec 08 08:41:29 2017 +0100 @@ -26,7 +26,6 @@ #include <streambuf> #include "logger.hpp" -#include "system.hpp" #if defined(HAVE_SYSLOG) # include <syslog.h>
--- a/libirccd/irccd/daemon/logger.hpp Thu Dec 07 20:07:10 2017 +0100 +++ b/libirccd/irccd/daemon/logger.hpp Fri Dec 08 08:41:29 2017 +0100 @@ -24,12 +24,12 @@ * \brief Logging facilities. */ +#include <irccd/sysconfig.hpp> + #include <memory> #include <sstream> #include <utility> -#include "sysconfig.hpp" - namespace irccd { class logger_filter;
--- a/libirccd/irccd/daemon/plugin.cpp Thu Dec 07 20:07:10 2017 +0100 +++ b/libirccd/irccd/daemon/plugin.cpp Fri Dec 08 08:41:29 2017 +0100 @@ -20,8 +20,9 @@ #include <sstream> +#include <irccd/system.hpp> + #include "plugin.hpp" -#include "system.hpp" namespace fs = boost::filesystem;
--- a/libirccd/irccd/daemon/plugin.hpp Thu Dec 07 20:07:10 2017 +0100 +++ b/libirccd/irccd/daemon/plugin.hpp Fri Dec 08 08:41:29 2017 +0100 @@ -16,8 +16,8 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#ifndef IRCCD_PLUGIN_HPP -#define IRCCD_PLUGIN_HPP +#ifndef IRCCD_DAEMON_PLUGIN_HPP +#define IRCCD_DAEMON_PLUGIN_HPP /** * \file plugin.hpp @@ -29,7 +29,7 @@ * \brief Plugin management. */ -#include "sysconfig.hpp" +#include <irccd/sysconfig.hpp> #include <cassert> #include <memory> @@ -37,8 +37,9 @@ #include <unordered_map> #include <vector> +#include <irccd/util.hpp> + #include "server.hpp" -#include "util.hpp" namespace irccd { @@ -617,4 +618,4 @@ } // !boost -#endif // !IRCCD_PLUGIN_HPP +#endif // !IRCCD_DAEMON_PLUGIN_HPP
--- a/libirccd/irccd/daemon/plugin_service.cpp Thu Dec 07 20:07:10 2017 +0100 +++ b/libirccd/irccd/daemon/plugin_service.cpp Fri Dec 08 08:41:29 2017 +0100 @@ -16,14 +16,13 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ +#include <irccd/config.hpp> #include <irccd/string_util.hpp> +#include <irccd/system.hpp> +#include "irccd.hpp" #include "logger.hpp" -#include "config.hpp" -#include "irccd.hpp" #include "plugin_service.hpp" -#include "string_util.hpp" -#include "system.hpp" namespace irccd {
--- a/libirccd/irccd/daemon/plugin_service.hpp Thu Dec 07 20:07:10 2017 +0100 +++ b/libirccd/irccd/daemon/plugin_service.hpp Fri Dec 08 08:41:29 2017 +0100 @@ -16,8 +16,8 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#ifndef IRCCD_PLUGIN_SERVICE_HPP -#define IRCCD_PLUGIN_SERVICE_HPP +#ifndef IRCCD_DAEMON_PLUGIN_SERVICE_HPP +#define IRCCD_DAEMON_PLUGIN_SERVICE_HPP /** * \file plugin_service.hpp @@ -234,4 +234,4 @@ } // !irccd -#endif // !IRCCD_PLUGIN_SERVICE_HPP +#endif // !IRCCD_DAEMON_PLUGIN_SERVICE_HPP
--- a/libirccd/irccd/daemon/rule.hpp Thu Dec 07 20:07:10 2017 +0100 +++ b/libirccd/irccd/daemon/rule.hpp Fri Dec 08 08:41:29 2017 +0100 @@ -16,15 +16,15 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#ifndef IRCCD_RULE_HPP -#define IRCCD_RULE_HPP +#ifndef IRCCD_DAEMON_RULE_HPP +#define IRCCD_DAEMON_RULE_HPP /** * \file rule.hpp * \brief Rule description */ -#include "sysconfig.hpp" +#include <irccd/sysconfig.hpp> #include <cassert> #include <string> @@ -267,4 +267,4 @@ } // !boost -#endif // !IRCCD_RULE_HPP +#endif // !IRCCD_DAEMON_RULE_HPP
--- a/libirccd/irccd/daemon/rule_service.cpp Thu Dec 07 20:07:10 2017 +0100 +++ b/libirccd/irccd/daemon/rule_service.cpp Fri Dec 08 08:41:29 2017 +0100 @@ -18,13 +18,12 @@ #include <stdexcept> +#include <irccd/config.hpp> #include <irccd/string_util.hpp> -#include "config.hpp" #include "irccd.hpp" #include "logger.hpp" #include "rule_service.hpp" -#include "string_util.hpp" namespace irccd {
--- a/libirccd/irccd/daemon/rule_service.hpp Thu Dec 07 20:07:10 2017 +0100 +++ b/libirccd/irccd/daemon/rule_service.hpp Fri Dec 08 08:41:29 2017 +0100 @@ -16,8 +16,8 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#ifndef IRCCD_RULE_SERVICE_HPP -#define IRCCD_RULE_SERVICE_HPP +#ifndef IRCCD_DAEMON_RULE_SERVICE_HPP +#define IRCCD_DAEMON_RULE_SERVICE_HPP /** * \file rule_service.hpp @@ -133,4 +133,4 @@ } // !irccd -#endif // !IRCCD_RULE_SERVICE_HPP +#endif // !IRCCD_DAEMON_RULE_SERVICE_HPP
--- a/libirccd/irccd/daemon/server.cpp Thu Dec 07 20:07:10 2017 +0100 +++ b/libirccd/irccd/daemon/server.cpp Fri Dec 08 08:41:29 2017 +0100 @@ -16,7 +16,7 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#include "sysconfig.hpp" +#include <irccd/sysconfig.hpp> #include <algorithm> #include <cerrno> @@ -30,10 +30,11 @@ # include <resolv.h> #endif -#include "json_util.hpp" +#include <irccd/json_util.hpp> +#include <irccd/string_util.hpp> +#include <irccd/system.hpp> + #include "server.hpp" -#include "string_util.hpp" -#include "system.hpp" namespace irccd {
--- a/libirccd/irccd/daemon/server.hpp Thu Dec 07 20:07:10 2017 +0100 +++ b/libirccd/irccd/daemon/server.hpp Fri Dec 08 08:41:29 2017 +0100 @@ -16,15 +16,15 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#ifndef IRCCD_SERVER_HPP -#define IRCCD_SERVER_HPP +#ifndef IRCCD_DAEMON_SERVER_HPP +#define IRCCD_DAEMON_SERVER_HPP /** * \file server.hpp * \brief IRC Server. */ -#include "sysconfig.hpp" +#include <irccd/sysconfig.hpp> #include <cstdint> #include <map> @@ -994,4 +994,4 @@ } // !boost -#endif // !IRCCD_SERVER_HPP +#endif // !IRCCD_DAEMON_SERVER_HPP
--- a/libirccd/irccd/daemon/server_service.cpp Thu Dec 07 20:07:10 2017 +0100 +++ b/libirccd/irccd/daemon/server_service.cpp Fri Dec 08 08:41:29 2017 +0100 @@ -17,13 +17,13 @@ */ #include <irccd/json_util.hpp> +#include <irccd/string_util.hpp> #include "irccd.hpp" #include "logger.hpp" #include "plugin_service.hpp" #include "rule_service.hpp" #include "server_service.hpp" -#include "string_util.hpp" #include "transport_service.hpp" namespace irccd {
--- a/libirccd/irccd/daemon/server_service.hpp Thu Dec 07 20:07:10 2017 +0100 +++ b/libirccd/irccd/daemon/server_service.hpp Fri Dec 08 08:41:29 2017 +0100 @@ -16,8 +16,8 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#ifndef IRCCD_SERVER_SERVICE_HPP -#define IRCCD_SERVER_SERVICE_HPP +#ifndef IRCCD_DAEMON_SERVER_SERVICE_HPP +#define IRCCD_DAEMON_SERVER_SERVICE_HPP /** * \file server_service.hpp @@ -145,4 +145,4 @@ } // !irccd -#endif // !IRCCD_SERVER_SERVICE_HPP +#endif // !IRCCD_DAEMON_SERVER_SERVICE_HPP
--- a/libirccd/irccd/daemon/tls_transport_server.hpp Thu Dec 07 20:07:10 2017 +0100 +++ b/libirccd/irccd/daemon/tls_transport_server.hpp Fri Dec 08 08:41:29 2017 +0100 @@ -16,8 +16,8 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#ifndef IRCCD_TLS_TRANSPORT_SERVER_HPP -#define IRCCD_TLS_TRANSPORT_SERVER_HPP +#ifndef IRCCD_DAEMON_TLS_TRANSPORT_SERVER_HPP +#define IRCCD_DAEMON_TLS_TRANSPORT_SERVER_HPP /** * \file tls_transport_server.hpp @@ -69,4 +69,4 @@ #endif // !HAVE_SSL -#endif // !IRCCD_TLS_TRANSPORT_SERVER_HPP +#endif // !IRCCD_DAEMON_TLS_TRANSPORT_SERVER_HPP
--- a/libirccd/irccd/daemon/transport_client.hpp Thu Dec 07 20:07:10 2017 +0100 +++ b/libirccd/irccd/daemon/transport_client.hpp Fri Dec 08 08:41:29 2017 +0100 @@ -16,10 +16,10 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#ifndef IRCCD_TRANSPORT_CLIENT_HPP -#define IRCCD_TRANSPORT_CLIENT_HPP +#ifndef IRCCD_DAEMON_TRANSPORT_CLIENT_HPP +#define IRCCD_DAEMON_TRANSPORT_CLIENT_HPP -#include "network_stream.hpp" +#include <irccd/network_stream.hpp> namespace irccd { @@ -179,4 +179,4 @@ } // !irccd -#endif // !IRCCD_TRANSPORT_CLIENT_HPP +#endif // !IRCCD_DAEMON_TRANSPORT_CLIENT_HPP
--- a/libirccd/irccd/daemon/transport_server.cpp Thu Dec 07 20:07:10 2017 +0100 +++ b/libirccd/irccd/daemon/transport_server.cpp Fri Dec 08 08:41:29 2017 +0100 @@ -16,12 +16,13 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#include "sysconfig.hpp" +#include <irccd/sysconfig.hpp> #include <cassert> +#include <irccd/json_util.hpp> + #include "irccd.hpp" -#include "json_util.hpp" #include "transport_server.hpp" namespace irccd {
--- a/libirccd/irccd/daemon/transport_server.hpp Thu Dec 07 20:07:10 2017 +0100 +++ b/libirccd/irccd/daemon/transport_server.hpp Fri Dec 08 08:41:29 2017 +0100 @@ -16,10 +16,10 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#ifndef IRCCD_TRANSPORT_SERVER_HPP -#define IRCCD_TRANSPORT_SERVER_HPP +#ifndef IRCCD_DAEMON_TRANSPORT_SERVER_HPP +#define IRCCD_DAEMON_TRANSPORT_SERVER_HPP -#include "sysconfig.hpp" +#include <irccd/sysconfig.hpp> #include <cassert> #include <functional> @@ -131,4 +131,4 @@ } // !irccd -#endif // !IRCCD_TRANSPORT_SERVER_HPP +#endif // !IRCCD_DAEMON_TRANSPORT_SERVER_HPP
--- a/libirccd/irccd/daemon/transport_service.cpp Thu Dec 07 20:07:10 2017 +0100 +++ b/libirccd/irccd/daemon/transport_service.cpp Fri Dec 08 08:41:29 2017 +0100 @@ -23,8 +23,8 @@ #include <irccd/string_util.hpp> #include "command_service.hpp" +#include "ip_transport_server.hpp" #include "irccd.hpp" -#include "ip_transport_server.hpp" #include "logger.hpp" #include "transport_client.hpp" #include "transport_service.hpp"
--- a/libirccd/irccd/daemon/transport_service.hpp Thu Dec 07 20:07:10 2017 +0100 +++ b/libirccd/irccd/daemon/transport_service.hpp Fri Dec 08 08:41:29 2017 +0100 @@ -16,8 +16,8 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#ifndef IRCCD_TRANSPORT_SERVICE_HPP -#define IRCCD_TRANSPORT_SERVICE_HPP +#ifndef IRCCD_DAEMON_TRANSPORT_SERVICE_HPP +#define IRCCD_DAEMON_TRANSPORT_SERVICE_HPP #include <memory> #include <vector> @@ -85,4 +85,4 @@ } // !irccd -#endif // !IRCCD_TRANSPORT_SERVICE_HPP +#endif // !IRCCD_DAEMON_TRANSPORT_SERVICE_HPP