Reworking highlighting a bit

[quassel.git] / src / client / clientsettings.cpp

diff --git a/src/client/clientsettings.cpp b/src/client/clientsettings.cpp
index 1c3c5cf..3120078 100644 (file)
--- a/src/client/clientsettings.cpp
+++ b/src/client/clientsettings.cpp
@@ -18,13 +18,13 @@
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
 
+#include <QStringList>
+
 #include "client.h"
 #include "clientsettings.h"
-#include "global.h"
-
-#include <QStringList>
+#include "quassel.h"
 
-ClientSettings::ClientSettings(QString g) : Settings(g, Global::clientApplicationName) {
+ClientSettings::ClientSettings(QString g) : Settings(g, Quassel::buildInfo().clientApplicationName) {
 }
 
 ClientSettings::~ClientSettings() {
@@ -39,7 +39,8 @@ CoreAccountSettings::CoreAccountSettings(const QString &subgroup) : ClientSettin
 QList<AccountId> CoreAccountSettings::knownAccounts() {
   QList<AccountId> ids;
   foreach(QString key, localChildGroups()) {
-    ids << key.toInt();
+    AccountId acc = key.toInt();
+    if(acc.isValid()) ids << acc;
   }
   return ids;
 }
@@ -118,10 +119,18 @@ QVariantList NotificationSettings::highlightList() {
   return localValue("highlightList").toList();
 }
 
-void NotificationSettings::setHighlightCurrentNick(const bool &highlightCurrentNick) {
-  setLocalValue("highlightCurrentNick", highlightCurrentNick);
+void NotificationSettings::setHighlightNick(NotificationSettings::HighlightNickType highlightNickType) {
+  setLocalValue("highlightNick", highlightNickType);
+}
+
+NotificationSettings::HighlightNickType NotificationSettings::highlightNick() {
+  return (NotificationSettings::HighlightNickType) localValue("highlightNick", CurrentNick).toInt();
+}
+
+void NotificationSettings::setNicksCaseSensitive(bool cs) {
+  setLocalValue("Highlights/NicksCaseSensitive", cs);
 }
 
-bool NotificationSettings::highlightCurrentNick() {
-  return localValue("highlightCurrentNick", true).toBool();
+bool NotificationSettings::nicksCaseSensitive() {
+  return localValue("Highlights/NicksCaseSensitive", true).toBool();
 }