summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTobias Markmann <tm@ayena.de>2015-11-03 14:56:45 (GMT)
committerKevin Smith <kevin.smith@isode.com>2015-11-06 10:53:47 (GMT)
commitd3d767ba12d88fcb8d16b9a70f95781bacb19bfc (patch)
tree1831b894f43dfccd46458297f8f33bf66b715a4f /Swift/Controllers
parent7302ee18a137f6810ef1cc40a395f99d2f46a644 (diff)
downloadswift-d3d767ba12d88fcb8d16b9a70f95781bacb19bfc.zip
swift-d3d767ba12d88fcb8d16b9a70f95781bacb19bfc.tar.bz2
Make methods non-virtual that are not overridden by subclass
These cases have been uncovered by Clang Analyzer as they were called during some constructor. However, there is no reason for them being virtual. They are never overridden in a derived class. Test-Information: Unit tests still pass on OS X 10.10.5. Change-Id: I90b5396a0dba971d9150c35f9107733f7f4637cd
Diffstat (limited to 'Swift/Controllers')
-rw-r--r--Swift/Controllers/Chat/ChatControllerBase.h2
1 files changed, 1 insertions, 1 deletions
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;