diff options
| author | louiz <louiz@louiz.org> | 2017-06-14 11:11:17 +0200 |
|---|---|---|
| committer | louiz <louiz@louiz.org> | 2017-06-14 11:11:17 +0200 |
| commit | 5ba66c33519567f9f4e806a9ab41c3c94d93237f (patch) | |
| tree | 4b51bece4f4dec660e0c48297404a5da51aee4ec /src/xmpp/biboumi_component.hpp | |
| parent | ceb496369f834ffa055eb5b7ffc273b2a21f9b9a (diff) | |
| parent | 2677ac42e8d2e1cf162fec773a9acb453bef8b9b (diff) | |
| download | biboumi-5ba66c33519567f9f4e806a9ab41c3c94d93237f.tar.gz biboumi-5ba66c33519567f9f4e806a9ab41c3c94d93237f.tar.bz2 biboumi-5ba66c33519567f9f4e806a9ab41c3c94d93237f.tar.xz biboumi-5ba66c33519567f9f4e806a9ab41c3c94d93237f.zip | |
Merge branch 'orm' into 'master'
Pure c++ sqlite3 ORM
Closes #3271
See merge request !11
Diffstat (limited to 'src/xmpp/biboumi_component.hpp')
| -rw-r--r-- | src/xmpp/biboumi_component.hpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/xmpp/biboumi_component.hpp b/src/xmpp/biboumi_component.hpp index ac9bde4..87311f9 100644 --- a/src/xmpp/biboumi_component.hpp +++ b/src/xmpp/biboumi_component.hpp @@ -1,6 +1,6 @@ #pragma once - +#include <database/database.hpp> #include <xmpp/xmpp_component.hpp> #include <xmpp/jid.hpp> @@ -96,7 +96,7 @@ public: #ifdef USE_DATABASE bool handle_mam_request(const Stanza& stanza); - void send_archived_message(const db::MucLogLine& log_line, const std::string& from, const std::string& to, + void send_archived_message(const Database::MucLogLine& log_line, const std::string& from, const std::string& to, const std::string& queryid); bool handle_room_configuration_form_request(const std::string& from, const Jid& to, const std::string& id); bool handle_room_configuration_form(const XmlNode& query, const std::string& from, const Jid& to, const std::string& id); |