~singpolyma/biboumi

81f8f45b371d1a0ef72c2768fbd1f9188fe83616 — louiz’ 6 years ago 5321d29
Replace all include guards by #pragma once

It’s $CURRENT_YEAR
M louloulibs/config/config.hpp => louloulibs/config/config.hpp +3 -3
@@ 13,8 13,8 @@
 * save the config into the file.
 */

#ifndef CONFIG_INCLUDED
# define CONFIG_INCLUDED
#pragma once


#include <functional>
#include <fstream>


@@ 91,4 91,4 @@ private:

};

#endif // CONFIG_INCLUDED


M louloulibs/logger/logger.hpp => louloulibs/logger/logger.hpp +3 -3
@@ 1,5 1,5 @@
#ifndef LOGGER_INCLUDED
# define LOGGER_INCLUDED
#pragma once


/**
 * Singleton used in logger macros to write into files or stdout, with


@@ 123,4 123,4 @@ namespace logging_details
#define log_debug(...) logging_details::log_debug(WHERE, __VA_ARGS__)


#endif // LOGGER_INCLUDED


M louloulibs/network/credentials_manager.hpp => louloulibs/network/credentials_manager.hpp +2 -3
@@ 1,5 1,4 @@
#ifndef BIBOUMI_CREDENTIALS_MANAGER_HPP
#define BIBOUMI_CREDENTIALS_MANAGER_HPP
#pragma once

#include "louloulibs.h"



@@ 37,4 36,4 @@ private:
};

#endif //BOTAN_FOUND
#endif //BIBOUMI_CREDENTIALS_MANAGER_HPP


M louloulibs/network/dns_handler.hpp => louloulibs/network/dns_handler.hpp +1 -3
@@ 1,5 1,4 @@
#ifndef DNS_HANDLER_HPP_INCLUDED
#define DNS_HANDLER_HPP_INCLUDED
#pragma once

#include <louloulibs.h>
#ifdef CARES_FOUND


@@ 56,4 55,3 @@ private:
};

#endif /* CARES_FOUND */
#endif /* DNS_HANDLER_HPP_INCLUDED */

M louloulibs/network/dns_socket_handler.hpp => louloulibs/network/dns_socket_handler.hpp +1 -3
@@ 1,5 1,4 @@
#ifndef DNS_SOCKET_HANDLER_HPP
# define DNS_SOCKET_HANDLER_HPP
#pragma once

#include <louloulibs.h>
#ifdef CARES_FOUND


@@ 44,4 43,3 @@ private:
};

#endif // CARES_FOUND
#endif // DNS_SOCKET_HANDLER_HPP

M louloulibs/network/poller.hpp => louloulibs/network/poller.hpp +3 -3
@@ 1,5 1,5 @@
#ifndef POLLER_INCLUDED
# define POLLER_INCLUDED
#pragma once


#include <network/socket_handler.hpp>



@@ 91,4 91,4 @@ private:
#endif
};

#endif // POLLER_INCLUDED


M louloulibs/network/resolver.hpp => louloulibs/network/resolver.hpp +3 -3
@@ 1,5 1,5 @@
#ifndef RESOLVER_HPP_INCLUDED
#define RESOLVER_HPP_INCLUDED
#pragma once


#include "louloulibs.h"



@@ 125,4 125,4 @@ private:

std::string addr_to_string(const struct addrinfo* rp);

#endif /* RESOLVER_HPP_INCLUDED */


M louloulibs/network/socket_handler.hpp => louloulibs/network/socket_handler.hpp +1 -3
@@ 1,5 1,4 @@
#ifndef SOCKET_HANDLER_HPP
# define SOCKET_HANDLER_HPP
#pragma once

#include <louloulibs.h>
#include <memory>


@@ 41,4 40,3 @@ protected:
  socket_t socket;
};

#endif // SOCKET_HANDLER_HPP

M louloulibs/network/tcp_socket_handler.hpp => louloulibs/network/tcp_socket_handler.hpp +3 -3
@@ 1,5 1,5 @@
#ifndef SOCKET_HANDLER_INCLUDED
# define SOCKET_HANDLER_INCLUDED
#pragma once


#include "louloulibs.h"



@@ 270,5 270,5 @@ private:
#endif // BOTAN_FOUND
};

#endif // SOCKET_HANDLER_INCLUDED



M louloulibs/utils/encoding.hpp => louloulibs/utils/encoding.hpp +3 -3
@@ 1,5 1,5 @@
#ifndef ENCODING_INCLUDED
# define ENCODING_INCLUDED
#pragma once


#include <string>



@@ 40,4 40,4 @@ namespace xep0106
  void encode(std::string&);
}

#endif // ENCODING_INCLUDED


M louloulibs/utils/reload.hpp => louloulibs/utils/reload.hpp +3 -3
@@ 1,5 1,5 @@
#ifndef RELOAD_HPP_INCLUDED
#define RELOAD_HPP_INCLUDED
#pragma once


/**
 * Reload the server's configuration, and close the logger (so that it


@@ 7,4 7,4 @@
 */
void reload_process();

#endif /* RELOAD_HPP_INCLUDED */


M louloulibs/utils/revstr.hpp => louloulibs/utils/revstr.hpp +3 -3
@@ 1,5 1,5 @@
#ifndef REVSTR_HPP_INCLUDED
# define REVSTR_HPP_INCLUDED
#pragma once


#include <string>



@@ 8,4 8,4 @@ namespace utils
  std::string revstr(const std::string& original);
}

#endif // REVSTR_HPP_INCLUDED


M louloulibs/utils/scopeguard.hpp => louloulibs/utils/scopeguard.hpp +1 -3
@@ 1,5 1,4 @@
#ifndef SCOPEGUARD_HPP
#define SCOPEGUARD_HPP
#pragma once

#include <functional>
#include <vector>


@@ 88,4 87,3 @@ private:

}

#endif

M louloulibs/utils/split.hpp => louloulibs/utils/split.hpp +3 -3
@@ 1,5 1,5 @@
#ifndef SPLIT_INCLUDED
# define SPLIT_INCLUDED
#pragma once


#include <string>
#include <vector>


@@ 9,4 9,4 @@ namespace utils
  std::vector<std::string> split(const std::string &s, const char delim, const bool allow_empty=true);
}

#endif // SPLIT_INCLUDED


M louloulibs/utils/string.hpp => louloulibs/utils/string.hpp +3 -3
@@ 1,5 1,5 @@
#ifndef STRING_UTILS_HPP_INCLUDED
#define STRING_UTILS_HPP_INCLUDED
#pragma once


#include <vector>
#include <string>


@@ 7,4 7,4 @@
bool to_bool(const std::string& val);
std::vector<std::string> cut(const std::string& val, const std::size_t size);

#endif /* STRING_UTILS_HPP_INCLUDED */


M louloulibs/utils/timed_events.hpp => louloulibs/utils/timed_events.hpp +1 -4
@@ 1,5 1,4 @@
#ifndef TIMED_EVENTS_HPP
# define TIMED_EVENTS_HPP
#pragma once

#include <functional>
#include <string>


@@ 131,5 130,3 @@ private:
  std::vector<TimedEvent> events;
  explicit TimedEventsManager() = default;
};

#endif // TIMED_EVENTS_HPP

M louloulibs/utils/tolower.hpp => louloulibs/utils/tolower.hpp +3 -3
@@ 1,5 1,5 @@
#ifndef TOLOWER_INCLUDED
# define TOLOWER_INCLUDED
#pragma once


#include <string>



@@ 8,4 8,4 @@ namespace utils
  std::string tolower(const std::string& original);
}

#endif // SPLIT_INCLUDED


M louloulibs/utils/xdg.hpp => louloulibs/utils/xdg.hpp +3 -3
@@ 1,5 1,5 @@
#ifndef XDG_HPP_INCLUDED
#define XDG_HPP_INCLUDED
#pragma once


#include <string>



@@ 11,4 11,4 @@
std::string xdg_config_path(const std::string& filename);
std::string xdg_data_path(const std::string& filename);

#endif /* XDG_HPP_INCLUDED */


M louloulibs/xmpp/adhoc_command.hpp => louloulibs/xmpp/adhoc_command.hpp +1 -4
@@ 1,5 1,4 @@
#ifndef ADHOC_COMMAND_HPP
# define ADHOC_COMMAND_HPP
#pragma once

/**
 * Describe an ad-hoc command.


@@ 43,5 42,3 @@ void PingStep1(XmppComponent&, AdhocSession& session, XmlNode& command_node);
void HelloStep1(XmppComponent&, AdhocSession& session, XmlNode& command_node);
void HelloStep2(XmppComponent&, AdhocSession& session, XmlNode& command_node);
void Reload(XmppComponent&, AdhocSession& session, XmlNode& command_node);

#endif // ADHOC_COMMAND_HPP

M louloulibs/xmpp/adhoc_commands_handler.hpp => louloulibs/xmpp/adhoc_commands_handler.hpp +1 -4
@@ 1,5 1,4 @@
#ifndef ADHOC_COMMANDS_HANDLER_HPP
# define ADHOC_COMMANDS_HANDLER_HPP
#pragma once

/**
 * Manage a list of available AdhocCommands and the list of ongoing


@@ 70,5 69,3 @@ private:
   */
  std::map<std::pair<const std::string, const std::string>, AdhocSession> sessions;
};

#endif // ADHOC_COMMANDS_HANDLER_HPP

M louloulibs/xmpp/adhoc_session.hpp => louloulibs/xmpp/adhoc_session.hpp +1 -4
@@ 1,5 1,4 @@
#ifndef ADHOC_SESSION_HPP
# define ADHOC_SESSION_HPP
#pragma once

#include <xmpp/xmpp_stanza.hpp>



@@ 87,5 86,3 @@ public:
   */
  std::map<std::string, std::string> vars;
};

#endif // ADHOC_SESSION_HPP

M louloulibs/xmpp/body.hpp => louloulibs/xmpp/body.hpp +3 -3
@@ 1,5 1,5 @@
#ifndef XMPP_BODY_HPP_INCLUDED
#define XMPP_BODY_HPP_INCLUDED
#pragma once


namespace Xmpp
{


@@ 9,4 9,4 @@ namespace Xmpp
  using body = std::tuple<const std::string, std::unique_ptr<XmlNode>>;
}

#endif /* XMPP_BODY_HPP_INCLUDED */


M louloulibs/xmpp/jid.hpp => louloulibs/xmpp/jid.hpp +3 -3
@@ 1,5 1,5 @@
#ifndef JID_INCLUDED
# define JID_INCLUDED
#pragma once


#include <string>



@@ 41,4 41,4 @@ public:
 */
std::string jidprep(const std::string& original);

#endif // JID_INCLUDED


M louloulibs/xmpp/roster.hpp => louloulibs/xmpp/roster.hpp +3 -3
@@ 1,5 1,5 @@
#ifndef ROSTER_HPP_INCLUDED
#define ROSTER_HPP_INCLUDED
#pragma once


#include <algorithm>
#include <string>


@@ 68,4 68,4 @@ private:
  Roster& operator=(Roster&&) = delete;
};

#endif /* ROSTER_HPP_INCLUDED */


M louloulibs/xmpp/xmpp_component.hpp => louloulibs/xmpp/xmpp_component.hpp +3 -3
@@ 1,5 1,5 @@
#ifndef XMPP_COMPONENT_INCLUDED
# define XMPP_COMPONENT_INCLUDED
#pragma once


#include <xmpp/adhoc_commands_handler.hpp>
#include <network/tcp_socket_handler.hpp>


@@ 240,4 240,4 @@ protected:
  AdhocCommandsHandler adhoc_commands_handler;
};

#endif // XMPP_COMPONENT_INCLUDED


M louloulibs/xmpp/xmpp_parser.hpp => louloulibs/xmpp/xmpp_parser.hpp +3 -3
@@ 1,5 1,5 @@
#ifndef XMPP_PARSER_INCLUDED
# define XMPP_PARSER_INCLUDED
#pragma once


#include <xmpp/xmpp_stanza.hpp>



@@ 130,4 130,4 @@ private:
  std::vector<std::function<void(const XmlNode&)>> stream_close_callbacks;
};

#endif // XMPP_PARSER_INCLUDED


M louloulibs/xmpp/xmpp_stanza.hpp => louloulibs/xmpp/xmpp_stanza.hpp +3 -3
@@ 1,5 1,5 @@
#ifndef XMPP_STANZA_INCLUDED
# define XMPP_STANZA_INCLUDED
#pragma once


#include <map>
#include <string>


@@ 143,4 143,4 @@ std::ostream& operator<<(std::ostream& os, const XmlNode& node);
 */
using Stanza = XmlNode;

#endif // XMPP_STANZA_INCLUDED


M src/bridge/bridge.hpp => src/bridge/bridge.hpp +3 -3
@@ 1,5 1,5 @@
#ifndef BRIDGE_INCLUDED
# define BRIDGE_INCLUDED
#pragma once


#include <irc/irc_message.hpp>
#include <irc/irc_client.hpp>


@@ 290,4 290,4 @@ struct IRCNotConnected: public std::exception
  const std::string hostname;
};

#endif // BRIDGE_INCLUDED


M src/bridge/colors.hpp => src/bridge/colors.hpp +3 -3
@@ 1,5 1,5 @@
#ifndef COLORS_INCLUDED
# define COLORS_INCLUDED
#pragma once


/**
 * A module handling the conversion between IRC colors and XHTML-IM, and


@@ 53,4 53,4 @@ static const char irc_format_char[] = {
 */
Xmpp::body irc_format_to_xhtmlim(const std::string& str);

#endif // COLORS_INCLUDED


M src/bridge/list_element.hpp => src/bridge/list_element.hpp +3 -3
@@ 1,5 1,5 @@
#ifndef LIST_ELEMENT_HPP_INCLUDED
#define LIST_ELEMENT_HPP_INCLUDED
#pragma once


#include <string>



@@ 16,4 16,4 @@ struct ListElement
  std::string topic;
};

#endif /* LIST_ELEMENT_HPP_INCLUDED */


M src/database/database.hpp => src/database/database.hpp +3 -3
@@ 1,5 1,5 @@
#ifndef DATABASE_HPP_INCLUDED
#define DATABASE_HPP_INCLUDED
#pragma once


#include <biboumi.h>
#ifdef USE_DATABASE


@@ 50,4 50,4 @@ private:
};
#endif /* USE_DATABASE */

#endif /* DATABASE_HPP_INCLUDED */


M src/irc/iid.hpp => src/irc/iid.hpp +3 -3
@@ 1,5 1,5 @@
#ifndef IID_INCLUDED
# define IID_INCLUDED
#pragma once


#include <string>



@@ 76,4 76,4 @@ namespace std {
  const std::string to_string(const Iid& iid);
}

#endif // IID_INCLUDED


M src/irc/irc_channel.hpp => src/irc/irc_channel.hpp +3 -3
@@ 1,5 1,5 @@
#ifndef IRC_CHANNEL_INCLUDED
# define IRC_CHANNEL_INCLUDED
#pragma once


#include <irc/irc_user.hpp>
#include <memory>


@@ 67,4 67,4 @@ public:
  bool joining;
};

#endif // IRC_CHANNEL_INCLUDED


M src/irc/irc_client.hpp => src/irc/irc_client.hpp +3 -3
@@ 1,5 1,5 @@
#ifndef IRC_CLIENT_INCLUDED
# define IRC_CLIENT_INCLUDED
#pragma once


#include <irc/irc_message.hpp>
#include <irc/irc_channel.hpp>


@@ 380,4 380,4 @@ private:
  Resolver dns_resolver;
};

#endif // IRC_CLIENT_INCLUDED


M src/irc/irc_message.hpp => src/irc/irc_message.hpp +3 -3
@@ 1,5 1,5 @@
#ifndef IRC_MESSAGE_INCLUDED
# define IRC_MESSAGE_INCLUDED
#pragma once


#include <vector>
#include <string>


@@ 25,4 25,4 @@ public:

std::ostream& operator<<(std::ostream& os, const IrcMessage& message);

#endif // IRC_MESSAGE_INCLUDED


M src/irc/irc_user.hpp => src/irc/irc_user.hpp +3 -3
@@ 1,5 1,5 @@
#ifndef IRC_USER_INCLUDED
# define IRC_USER_INCLUDED
#pragma once


#include <vector>
#include <string>


@@ 30,4 30,4 @@ public:
  std::set<char> modes;
};

#endif // IRC_USER_INCLUDED


M src/utils/empty_if_fixed_server.hpp => src/utils/empty_if_fixed_server.hpp +3 -3
@@ 1,5 1,5 @@
#ifndef EMPTY_IF_FIXED_SERVER_HPP_INCLUDED
#define EMPTY_IF_FIXED_SERVER_HPP_INCLUDED
#pragma once


#include <string>



@@ 23,4 23,4 @@ namespace utils

}

#endif /* EMPTY_IF_FIXED_SERVER_HPP_INCLUDED */


M src/xmpp/biboumi_adhoc_commands.hpp => src/xmpp/biboumi_adhoc_commands.hpp +3 -3
@@ 1,5 1,5 @@
#ifndef BIBOUMI_ADHOC_COMMANDS_HPP_INCLUDED
#define BIBOUMI_ADHOC_COMMANDS_HPP_INCLUDED
#pragma once


#include <xmpp/adhoc_command.hpp>
#include <xmpp/adhoc_session.hpp>


@@ 20,4 20,4 @@ void DisconnectUserFromServerStep1(XmppComponent&, AdhocSession& session, XmlNod
void DisconnectUserFromServerStep2(XmppComponent&, AdhocSession& session, XmlNode& command_node);
void DisconnectUserFromServerStep3(XmppComponent&, AdhocSession& session, XmlNode& command_node);

#endif /* BIBOUMI_ADHOC_COMMANDS_HPP_INCLUDED */


M src/xmpp/biboumi_component.hpp => src/xmpp/biboumi_component.hpp +3 -3
@@ 1,5 1,5 @@
#ifndef BIBOUMI_COMPONENT_INCLUDED
# define BIBOUMI_COMPONENT_INCLUDED
#pragma once


#include <xmpp/xmpp_component.hpp>



@@ 106,4 106,4 @@ private:
  AdhocCommandsHandler irc_channel_adhoc_commands_handler;
};

#endif // BIBOUMI_COMPONENT_INCLUDED


M tests/io_tester.hpp => tests/io_tester.hpp +1 -3
@@ 1,5 1,4 @@
#ifndef BIBOUMI_IO_TESTER_HPP
#define BIBOUMI_IO_TESTER_HPP
#pragma once

#include <ostream>
#include <sstream>


@@ 44,4 43,3 @@ private:
  std::streambuf* const old_buf;
};

#endif //BIBOUMI_IO_TESTER_HPP