diff options
| -rw-r--r-- | SwifTools/Application/ApplicationPathProvider.h | 9 | ||||
| -rw-r--r-- | Swift/Controllers/Chat/ChatControllerBase.h | 2 | 
2 files changed, 6 insertions, 5 deletions
| diff --git a/SwifTools/Application/ApplicationPathProvider.h b/SwifTools/Application/ApplicationPathProvider.h index 17c39dd..aba9687 100644 --- a/SwifTools/Application/ApplicationPathProvider.h +++ b/SwifTools/Application/ApplicationPathProvider.h @@ -1,14 +1,15 @@  /* - * Copyright (c) 2010 Isode Limited. + * Copyright (c) 2010-2015 Isode Limited.   * All rights reserved.   * See the COPYING file for more information.   */  #pragma once -#include <boost/filesystem.hpp> -#include <vector>  #include <string> +#include <vector> + +#include <boost/filesystem.hpp>  namespace Swift {  	class ApplicationPathProvider { @@ -18,7 +19,7 @@ namespace Swift {  			virtual boost::filesystem::path getHomeDir() const = 0;  			virtual boost::filesystem::path getDataDir() const = 0; -			virtual boost::filesystem::path getExecutableDir() const; +			boost::filesystem::path getExecutableDir() const;  			boost::filesystem::path getProfileDir(const std::string& profile) const;  			boost::filesystem::path getResourcePath(const std::string& resource) const; diff --git a/Swift/Controllers/Chat/ChatControllerBase.h b/Swift/Controllers/Chat/ChatControllerBase.h index 49e24e8..6c67985 100644 --- a/Swift/Controllers/Chat/ChatControllerBase.h +++ b/Swift/Controllers/Chat/ChatControllerBase.h @@ -58,7 +58,7 @@ namespace Swift {  			std::string addMessage(const std::string& message, const std::string& senderName, bool senderIsSelf, boost::shared_ptr<SecurityLabel> label, const boost::filesystem::path& avatarPath, const boost::posix_time::ptime& time, const HighlightAction& highlight);  			void replaceMessage(const std::string& message, const std::string& id, bool senderIsSelf, const boost::posix_time::ptime& time, const HighlightAction& highlight);  			virtual void setOnline(bool online); -			virtual void setEnabled(bool enabled); +			void setEnabled(bool enabled);  			virtual void setToJID(const JID& jid) {toJID_ = jid;}  			/** Used for determining when something is recent.*/  			boost::signal<void (const std::string& /*activity*/)> onActivity; | 
 Swift
 Swift