Swiftdiff options
| -rw-r--r-- | Swiften/History/HistoryManager.h | 6 | ||||
| -rw-r--r-- | Swiften/History/HistoryMessage.h | 1 | ||||
| -rw-r--r-- | Swiften/SConscript | 2 |
3 files changed, 5 insertions, 4 deletions
diff --git a/Swiften/History/HistoryManager.h b/Swiften/History/HistoryManager.h index c918cbc..7a4324b 100644 --- a/Swiften/History/HistoryManager.h +++ b/Swiften/History/HistoryManager.h @@ -1,20 +1,20 @@ /* * Copyright (c) 2010 Remko Tronçon * Licensed under the GNU General Public License v3. * See Documentation/Licenses/GPLv3.txt for more information. */ #pragma once -#include <string> -#include "Swiften/JID/JID.h" -#include "Swiften/History/HistoryMessage.h" +#include <vector> +#include <Swiften/JID/JID.h> +#include <Swiften/History/HistoryMessage.h> namespace Swift { class HistoryManager { public: virtual ~HistoryManager(); virtual void addMessage(const HistoryMessage& message) = 0; virtual std::vector<HistoryMessage> getMessages() const = 0; diff --git a/Swiften/History/HistoryMessage.h b/Swiften/History/HistoryMessage.h index 5e4782d..461f5de 100644 --- a/Swiften/History/HistoryMessage.h +++ b/Swiften/History/HistoryMessage.h @@ -1,17 +1,18 @@ /* * Copyright (c) 2010 Remko Tronçon * Licensed under the GNU General Public License v3. * See Documentation/Licenses/GPLv3.txt for more information. */ #pragma once +#include <Swiften/JID/JID.h> #include <boost/date_time/posix_time/posix_time_types.hpp> namespace Swift { class HistoryMessage { public: HistoryMessage(const std::string& message, const JID& from, const JID& to, const boost::posix_time::ptime time) : message_(message), from_(from), to_(to), time_(time) { } const std::string& getMessage() const { diff --git a/Swiften/SConscript b/Swiften/SConscript index 9de71fb..110f202 100644 --- a/Swiften/SConscript +++ b/Swiften/SConscript @@ -348,19 +348,19 @@ if env["SCONS_STAGE"] == "build" : # Private modules if root.endswith("Config") or root.endswith("Compress") : continue # Library-specfifc private modules if root.endswith("OpenSSL") or root.endswith("Cocoa") or root.endswith("Qt") or root.endswith("IDN") or root.endswith("Avahi") or root.endswith("Bonjour") : continue # Library-specific files - if file.startswith("CAres") or file.startswith("LibXML") or file.startswith("Expat") : + if file.startswith("CAres") or file.startswith("LibXML") or file.startswith("Expat") or file.startswith("SQLite") : continue # Specific headers we don't want to globally include if file == "Swiften.h" or file == "foreach.h" or file == "Log.h" or file == "format.h" : continue swiften_header += "#include <" + include + ">\n" swiften_includes.append(include) swiften_env.WriteVal("Swiften.h", swiften_env.Value(swiften_header)) swiften_includes.append("Swiften/Swiften.h") |