Mercurial > irccd

changeset 99:9a636d4ab8a2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Misc: get rid of old include style, #469
author David Demelier <markand@malikania.fr>
date Fri, 22 Apr 2016 18:43:12 +0200
parents cfcafe36bda4
children a3814665a60d
files lib/CMakeLists.txt lib/irccd/cmd-help.cpp lib/irccd/cmd-plugin-info.cpp lib/irccd/cmd-plugin-list.cpp lib/irccd/cmd-plugin-load.cpp lib/irccd/cmd-plugin-reload.cpp lib/irccd/cmd-plugin-unload.cpp lib/irccd/command.cpp lib/irccd/command.hpp lib/irccd/config.cpp lib/irccd/config.hpp lib/irccd/connection.cpp lib/irccd/connection.hpp lib/irccd/irccd.cpp lib/irccd/irccd.hpp lib/irccd/irccdctl.cpp lib/irccd/js-directory.cpp lib/irccd/js-file.cpp lib/irccd/js-irccd.cpp lib/irccd/js-server.hpp lib/irccd/js-system.cpp lib/irccd/logger.cpp lib/irccd/logger.hpp lib/irccd/path.cpp lib/irccd/plugin.cpp lib/irccd/server-state.cpp lib/irccd/server-state.hpp lib/irccd/server.hpp lib/irccd/system.cpp lib/irccd/system.hpp lib/irccd/transport-server.cpp lib/irccd/transport-server.hpp lib/irccd/util.cpp
diffstat 33 files changed, 43 insertions(+), 61 deletions(-) [+]
line wrap: on
line diff
--- a/lib/CMakeLists.txt	Fri Apr 22 13:06:56 2016 +0200
+++ b/lib/CMakeLists.txt	Fri Apr 22 18:43:12 2016 +0200
@@ -27,6 +27,7 @@
 	PUBLIC
 		$<BUILD_INTERFACE:${duktape_SOURCE_DIR}>
 		$<BUILD_INTERFACE:${extern-libircclient_SOURCE_DIR}/include>
+		$<BUILD_INTERFACE:${irccd_BINARY_DIR}/irccd>
 		$<BUILD_INTERFACE:${irccd_BINARY_DIR}>
 		$<BUILD_INTERFACE:${lib_SOURCE_DIR}>
 		$<INSTALL_INTERFACE:include>
--- a/lib/irccd/cmd-help.cpp	Fri Apr 22 13:06:56 2016 +0200
+++ b/lib/irccd/cmd-help.cpp	Fri Apr 22 18:43:12 2016 +0200
@@ -16,10 +16,9 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#include <irccd/irccdctl.hpp>
-#include <irccd/logger.hpp>
-
 #include "cmd-help.hpp"
+#include "irccdctl.hpp"
+#include "logger.hpp"
 
 namespace irccd {
 
--- a/lib/irccd/cmd-plugin-info.cpp	Fri Apr 22 13:06:56 2016 +0200
+++ b/lib/irccd/cmd-plugin-info.cpp	Fri Apr 22 18:43:12 2016 +0200
@@ -18,10 +18,9 @@
 
 #include <iostream>
 
-#include <irccd/sysconfig.hpp>
-
 #include "cmd-plugin-info.hpp"
 #include "irccd.hpp"
+#include "sysconfig.hpp"
 
 namespace irccd {
 
--- a/lib/irccd/cmd-plugin-list.cpp	Fri Apr 22 13:06:56 2016 +0200
+++ b/lib/irccd/cmd-plugin-list.cpp	Fri Apr 22 18:43:12 2016 +0200
@@ -18,10 +18,9 @@
 
 #include <iostream>
 
-#include <irccd/sysconfig.hpp>
-
 #include "cmd-plugin-list.hpp"
 #include "irccd.hpp"
+#include "sysconfig.hpp"
 
 namespace irccd {
 
--- a/lib/irccd/cmd-plugin-load.cpp	Fri Apr 22 13:06:56 2016 +0200
+++ b/lib/irccd/cmd-plugin-load.cpp	Fri Apr 22 18:43:12 2016 +0200
@@ -16,10 +16,9 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#include <irccd/sysconfig.hpp>
-
 #include "cmd-plugin-load.hpp"
 #include "irccd.hpp"
+#include "sysconfig.hpp"
 
 namespace irccd {
 
--- a/lib/irccd/cmd-plugin-reload.cpp	Fri Apr 22 13:06:56 2016 +0200
+++ b/lib/irccd/cmd-plugin-reload.cpp	Fri Apr 22 18:43:12 2016 +0200
@@ -16,10 +16,9 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#include <irccd/sysconfig.hpp>
-
 #include "cmd-plugin-reload.hpp"
 #include "irccd.hpp"
+#include "sysconfig.hpp"
 
 namespace irccd {
 
--- a/lib/irccd/cmd-plugin-unload.cpp	Fri Apr 22 13:06:56 2016 +0200
+++ b/lib/irccd/cmd-plugin-unload.cpp	Fri Apr 22 18:43:12 2016 +0200
@@ -16,10 +16,9 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#include <irccd/sysconfig.hpp>
-
 #include "cmd-plugin-unload.hpp"
 #include "irccd.hpp"
+#include "sysconfig.hpp"
 
 namespace irccd {
 
--- a/lib/irccd/command.cpp	Fri Apr 22 13:06:56 2016 +0200
+++ b/lib/irccd/command.cpp	Fri Apr 22 18:43:12 2016 +0200
@@ -20,10 +20,9 @@
 #include <numeric>
 #include <sstream>
 
-#include <irccd/logger.hpp>
-#include <irccd/system.hpp>
-
 #include "command.hpp"
+#include "logger.hpp"
+#include "system.hpp"
 
 using namespace std::string_literals;
 
--- a/lib/irccd/command.hpp	Fri Apr 22 13:06:56 2016 +0200
+++ b/lib/irccd/command.hpp	Fri Apr 22 18:43:12 2016 +0200
@@ -28,7 +28,7 @@
 #include <map>
 #include <vector>
 
-#include <irccd/json.hpp>
+#include "json.hpp"
 
 namespace irccd {
 
--- a/lib/irccd/config.cpp	Fri Apr 22 13:06:56 2016 +0200
+++ b/lib/irccd/config.cpp	Fri Apr 22 18:43:12 2016 +0200
@@ -16,7 +16,7 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#include <irccd/sysconfig.hpp>
+#include "sysconfig.hpp"
 
 #if defined(HAVE_GETPID)
 #  include <sys/types.h>
--- a/lib/irccd/config.hpp	Fri Apr 22 13:06:56 2016 +0200
+++ b/lib/irccd/config.hpp	Fri Apr 22 18:43:12 2016 +0200
@@ -24,7 +24,7 @@
  * \brief Read .ini configuration file for irccd
  */
 
-#include <irccd/options.hpp>
+#include "options.hpp"
 
 namespace irccd {
 
--- a/lib/irccd/connection.cpp	Fri Apr 22 13:06:56 2016 +0200
+++ b/lib/irccd/connection.cpp	Fri Apr 22 18:43:12 2016 +0200
@@ -16,9 +16,8 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#include <irccd/logger.hpp>
-
 #include "connection.hpp"
+#include "logger.hpp"
 
 namespace irccd {
 
--- a/lib/irccd/connection.hpp	Fri Apr 22 13:06:56 2016 +0200
+++ b/lib/irccd/connection.hpp	Fri Apr 22 18:43:12 2016 +0200
@@ -27,12 +27,11 @@
 #include <cassert>
 #include <stdexcept>
 
-#include <irccd/json.hpp>
-#include <irccd/system.hpp>
-#include <irccd/util.hpp>
-
 #include "elapsed-timer.hpp"
+#include "json.hpp"
 #include "sockets.hpp"
+#include "system.hpp"
+#include "util.hpp"
 
 namespace irccd {
 
--- a/lib/irccd/irccd.cpp	Fri Apr 22 13:06:56 2016 +0200
+++ b/lib/irccd/irccd.cpp	Fri Apr 22 18:43:12 2016 +0200
@@ -19,8 +19,8 @@
 #include <algorithm>
 #include <stdexcept>
 
+#include "fs.hpp"
 #include "irccd.hpp"
-#include "fs.hpp"
 #include "logger.hpp"
 #include "path.hpp"
 #include "util.hpp"
--- a/lib/irccd/irccd.hpp	Fri Apr 22 13:06:56 2016 +0200
+++ b/lib/irccd/irccd.hpp	Fri Apr 22 18:43:12 2016 +0200
@@ -32,9 +32,8 @@
 #include <mutex>
 #include <vector>
 
-#include <irccd/sysconfig.hpp>
-
 #include "sockets.hpp"
+#include "sysconfig.hpp"
 
 #if defined(WITH_JS)
 #  include "plugin.hpp"
--- a/lib/irccd/irccdctl.cpp	Fri Apr 22 13:06:56 2016 +0200
+++ b/lib/irccd/irccdctl.cpp	Fri Apr 22 18:43:12 2016 +0200
@@ -23,8 +23,6 @@
 #include <string>
 #include <unordered_map>
 
-#include <irccd/sysconfig.hpp>
-
 #include "elapsed-timer.hpp"
 #include "fs.hpp"
 #include "ini.hpp"
@@ -34,6 +32,7 @@
 #include "options.hpp"
 #include "path.hpp"
 #include "sockets.hpp"
+#include "sysconfig.hpp"
 #include "system.hpp"
 #include "util.hpp"
 
--- a/lib/irccd/js-directory.cpp	Fri Apr 22 13:06:56 2016 +0200
+++ b/lib/irccd/js-directory.cpp	Fri Apr 22 18:43:12 2016 +0200
@@ -24,12 +24,11 @@
 #include <stdexcept>
 #include <string>
 
-#include <irccd/sysconfig.hpp>
-
 #include "fs.hpp"
 #include "js.hpp"
 #include "js-irccd.hpp"
 #include "path.hpp"
+#include "sysconfig.hpp"
 
 namespace irccd {
 
--- a/lib/irccd/js-file.cpp	Fri Apr 22 13:06:56 2016 +0200
+++ b/lib/irccd/js-file.cpp	Fri Apr 22 18:43:12 2016 +0200
@@ -21,7 +21,7 @@
 #include <iterator>
 #include <vector>
 
-#include <irccd/sysconfig.hpp>
+#include "sysconfig.hpp"
 
 #if defined(HAVE_STAT)
 #  include <sys/types.h>
--- a/lib/irccd/js-irccd.cpp	Fri Apr 22 13:06:56 2016 +0200
+++ b/lib/irccd/js-irccd.cpp	Fri Apr 22 18:43:12 2016 +0200
@@ -16,9 +16,8 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#include <irccd/sysconfig.hpp>
-
 #include "js-irccd.hpp"
+#include "sysconfig.hpp"
 
 namespace irccd {
 
--- a/lib/irccd/js-server.hpp	Fri Apr 22 13:06:56 2016 +0200
+++ b/lib/irccd/js-server.hpp	Fri Apr 22 18:43:12 2016 +0200
@@ -24,9 +24,8 @@
  * \brief Irccd.Server JavaScript API.
  */
 
-#include <irccd/server.hpp>
-
 #include "js.hpp"
+#include "server.hpp"
 
 namespace irccd {
 
--- a/lib/irccd/js-system.cpp	Fri Apr 22 13:06:56 2016 +0200
+++ b/lib/irccd/js-system.cpp	Fri Apr 22 18:43:12 2016 +0200
@@ -16,17 +16,16 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#include <irccd/sysconfig.hpp>
+#include <chrono>
+#include <cstdlib>
+#include <thread>
 
-#include <chrono>
+#include "sysconfig.hpp"
 
 #if defined(HAVE_POPEN)
 #  include <cstdio>
 #endif
 
-#include <cstdlib>
-#include <thread>
-
 #include "js-file.hpp"
 #include "js-irccd.hpp"
 #include "js-system.hpp"
--- a/lib/irccd/logger.cpp	Fri Apr 22 13:06:56 2016 +0200
+++ b/lib/irccd/logger.cpp	Fri Apr 22 18:43:12 2016 +0200
@@ -23,15 +23,13 @@
 #include <stdexcept>
 #include <streambuf>
 
-#include <irccd/sysconfig.hpp>
+#include "logger.hpp"
+#include "system.hpp"
 
 #if defined(HAVE_SYSLOG)
 #  include <syslog.h>
 #endif // !HAVE_SYSLOG
 
-#include "logger.hpp"
-#include "system.hpp"
-
 namespace irccd {
 
 namespace log {
--- a/lib/irccd/logger.hpp	Fri Apr 22 13:06:56 2016 +0200
+++ b/lib/irccd/logger.hpp	Fri Apr 22 18:43:12 2016 +0200
@@ -24,7 +24,7 @@
  * \brief Logging facilities.
  */
 
-#include <irccd/sysconfig.hpp>
+#include "sysconfig.hpp"
 
 #include <memory>
 #include <sstream>
--- a/lib/irccd/path.cpp	Fri Apr 22 13:06:56 2016 +0200
+++ b/lib/irccd/path.cpp	Fri Apr 22 18:43:12 2016 +0200
@@ -21,7 +21,7 @@
 #include <sstream>
 #include <stdexcept>
 
-#include <irccd/sysconfig.hpp>
+#include "sysconfig.hpp"
 
 #if defined(IRCCD_SYSTEM_WINDOWS)
 #  include <Windows.h>
--- a/lib/irccd/plugin.cpp	Fri Apr 22 13:06:56 2016 +0200
+++ b/lib/irccd/plugin.cpp	Fri Apr 22 18:43:12 2016 +0200
@@ -18,7 +18,7 @@
 
 #include <stdexcept>
 
-#include <irccd/sysconfig.hpp>
+#include "sysconfig.hpp"
 
 #if defined(HAVE_STAT)
 #  include <sys/stat.h>
--- a/lib/irccd/server-state.cpp	Fri Apr 22 13:06:56 2016 +0200
+++ b/lib/irccd/server-state.cpp	Fri Apr 22 18:43:12 2016 +0200
@@ -18,7 +18,7 @@
 
 #include <cassert>
 
-#include <irccd/sysconfig.hpp>
+#include "sysconfig.hpp"
 
 #if !defined(_WIN32)
 #  include <sys/types.h>
--- a/lib/irccd/server-state.hpp	Fri Apr 22 13:06:56 2016 +0200
+++ b/lib/irccd/server-state.hpp	Fri Apr 22 18:43:12 2016 +0200
@@ -24,10 +24,9 @@
  * \brief Server state.
  */
 
-#include <irccd/sysconfig.hpp>
-
 #include "elapsed-timer.hpp"
 #include "sockets.hpp"
+#include "sysconfig.hpp"
 
 namespace irccd {
 
--- a/lib/irccd/server.hpp	Fri Apr 22 13:06:56 2016 +0200
+++ b/lib/irccd/server.hpp	Fri Apr 22 18:43:12 2016 +0200
@@ -35,11 +35,10 @@
 #include <utility>
 #include <vector>
 
-#include <irccd/sysconfig.hpp>
-
 #include "logger.hpp"
 #include "server-state.hpp"
 #include "signals.hpp"
+#include "sysconfig.hpp"
 
 namespace irccd {
 
--- a/lib/irccd/system.cpp	Fri Apr 22 13:06:56 2016 +0200
+++ b/lib/irccd/system.cpp	Fri Apr 22 18:43:12 2016 +0200
@@ -20,7 +20,7 @@
 #include <ctime>
 #include <stdexcept>
 
-#include <irccd/sysconfig.hpp>
+#include "sysconfig.hpp"
 
 #if defined(HAVE_SETPROGNAME)
 #  include <cstdlib>
--- a/lib/irccd/system.hpp	Fri Apr 22 13:06:56 2016 +0200
+++ b/lib/irccd/system.hpp	Fri Apr 22 18:43:12 2016 +0200
@@ -24,11 +24,11 @@
  * \brief System dependant functions
  */
 
-#include <irccd/sysconfig.hpp>
-
 #include <cstdint>
 #include <string>
 
+#include "sysconfig.hpp"
+
 namespace irccd {
 
 namespace sys {
--- a/lib/irccd/transport-server.cpp	Fri Apr 22 13:06:56 2016 +0200
+++ b/lib/irccd/transport-server.cpp	Fri Apr 22 18:43:12 2016 +0200
@@ -16,6 +16,8 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
+#include "sysconfig.h"
+
 #if !defined(IRCCD_SYSTEM_WINDOWS)
 #  include <cstdio>
 #endif
--- a/lib/irccd/transport-server.hpp	Fri Apr 22 13:06:56 2016 +0200
+++ b/lib/irccd/transport-server.hpp	Fri Apr 22 18:43:12 2016 +0200
@@ -27,9 +27,8 @@
 #include <memory>
 #include <string>
 
-#include <irccd/sysconfig.hpp>
-
 #include "sockets.hpp"
+#include "sysconfig.hpp"
 #include "transport-client.hpp"
 
 namespace irccd {
--- a/lib/irccd/util.cpp	Fri Apr 22 13:06:56 2016 +0200
+++ b/lib/irccd/util.cpp	Fri Apr 22 18:43:12 2016 +0200
@@ -24,8 +24,7 @@
 #include <sstream>
 #include <stdexcept>
 
-#include <irccd/sysconfig.hpp>
-
+#include "sysconfig.hpp"
 #include "util.hpp"
 #include "unicode.hpp"