3 files changed, 18 insertions, 16 deletions
diff --git a/Swift/Controllers/HighlightAction.cpp b/Swift/Controllers/HighlightAction.cpp
index 80d9d85..4603408 100644
--- a/Swift/Controllers/HighlightAction.cpp
+++ b/Swift/Controllers/HighlightAction.cpp
@@ -11,16 +11,16 @@
  */
 
 #include <Swift/Controllers/HighlightAction.h>
 
 namespace Swift {
 
-void HighlightAction::setHighlightAllText(bool highlightText)
+void HighlightAction::setHighlightWholeMessage(bool highlightText)
 {
-	highlightText_ = highlightText;
-	if (!highlightText_) {
+	highlightWholeMessage_ = highlightText;
+	if (!highlightWholeMessage_) {
 		textColor_.clear();
 		textBackground_.clear();
 	}
 }
 
 void HighlightAction::setPlaySound(bool playSound)
@@ -29,13 +29,13 @@ void HighlightAction::setPlaySound(bool playSound)
 	if (!playSound_) {
 		soundFile_.clear();
 	}
 }
 
 bool operator ==(HighlightAction const& a, HighlightAction const& b) {
-	if (a.highlightAllText() != b.highlightAllText()) {
+	if (a.highlightWholeMessage() != b.highlightWholeMessage()) {
 		return false;
 	}
 
 	if (a.getTextColor() != b.getTextColor()) {
 		return false;
 	}
diff --git a/Swift/Controllers/HighlightAction.h b/Swift/Controllers/HighlightAction.h
index a9e0cee..3930eee 100644
--- a/Swift/Controllers/HighlightAction.h
+++ b/Swift/Controllers/HighlightAction.h
@@ -11,28 +11,28 @@
  */
 
 #pragma once
 
 #include <string>
 
-#include <boost/archive/text_oarchive.hpp>
 #include <boost/archive/text_iarchive.hpp>
+#include <boost/archive/text_oarchive.hpp>
 
 namespace Swift {
 
 	class HighlightRule;
 
 	class HighlightAction {
 		public:
-			HighlightAction() : highlightText_(false), playSound_(false) {}
+			HighlightAction() : highlightWholeMessage_(false), playSound_(false) {}
 
 			/**
 			* Gets the flag that indicates the entire message should be highlighted.
 			*/
-			bool highlightAllText() const { return highlightText_; }
-			void setHighlightAllText(bool highlightText);
+			bool highlightWholeMessage() const { return highlightWholeMessage_; }
+			void setHighlightWholeMessage(bool highlightText);
 
 			/**
 			* Gets the foreground highlight color.
 			*/
 			const std::string& getTextColor() const { return textColor_; }
 			void setTextColor(const std::string& textColor) { textColor_ = textColor; }
@@ -49,19 +49,19 @@ namespace Swift {
 			/**
 			* Gets the sound filename. If the string is empty, assume a default sound file.
 			*/
 			const std::string& getSoundFile() const { return soundFile_; }
 			void setSoundFile(const std::string& soundFile) { soundFile_ = soundFile; }
 
-			bool isEmpty() const { return !highlightText_ && !playSound_; }
+			bool isEmpty() const { return !highlightWholeMessage_ && !playSound_; }
 
 		private:
 			friend class boost::serialization::access;
 			template<class Archive> void serialize(Archive & ar, const unsigned int version);
 
-			bool highlightText_;
+			bool highlightWholeMessage_;
 			std::string textColor_;
 			std::string textBackground_;
 
 			bool playSound_;
 			std::string soundFile_;
 	};
@@ -69,13 +69,13 @@ namespace Swift {
 	bool operator ==(HighlightAction const& a, HighlightAction const& b);
 	bool operator !=(HighlightAction const& a, HighlightAction const& b);
 
 	template<class Archive>
 	void HighlightAction::serialize(Archive& ar, const unsigned int /*version*/)
 	{
-		ar & highlightText_;
+		ar & highlightWholeMessage_;
 		ar & textColor_;
 		ar & textBackground_;
 		ar & playSound_;
 		ar & soundFile_;
 	}
 
diff --git a/Swift/Controllers/HighlightManager.cpp b/Swift/Controllers/HighlightManager.cpp
index ed49e72..e5c8cef 100644
--- a/Swift/Controllers/HighlightManager.cpp
+++ b/Swift/Controllers/HighlightManager.cpp
@@ -7,27 +7,29 @@
 /*
  * Copyright (c) 2014-2015 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
+#include <Swift/Controllers/HighlightManager.h>
+
 #include <cassert>
 
 #include <boost/algorithm/string.hpp>
-#include <boost/regex.hpp>
+#include <boost/archive/text_iarchive.hpp>
+#include <boost/archive/text_oarchive.hpp>
 #include <boost/bind.hpp>
 #include <boost/numeric/conversion/cast.hpp>
+#include <boost/regex.hpp>
 #include <boost/serialization/vector.hpp>
-#include <boost/archive/text_oarchive.hpp>
-#include <boost/archive/text_iarchive.hpp>
 
 #include <Swiften/Base/foreach.h>
-#include <Swift/Controllers/HighlightManager.h>
+
 #include <Swift/Controllers/Highlighter.h>
-#include <Swift/Controllers/Settings/SettingsProvider.h>
 #include <Swift/Controllers/SettingConstants.h>
+#include <Swift/Controllers/Settings/SettingsProvider.h>
 
 /* How does highlighting work?
  *
  * HighlightManager manages a list of if-then rules used to highlight messages.
  * Rule is represented by HighlightRule. Action ("then" part) is HighlightAction.
  *