From 97f298452e01638b899993dd971069b09a9d3154 Mon Sep 17 00:00:00 2001
From: Zach H <Zoosorbs@gmail.com>
Date: Sun, 12 Jul 2015 11:00:11 -0400
Subject: [PATCH] first fixes

---
 cockatrice/src/chatview.cpp      | 5 -----
 cockatrice/src/dlg_settings.cpp  | 2 +-
 cockatrice/src/settingscache.cpp | 2 +-
 cockatrice/src/settingscache.h   | 2 +-
 4 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/cockatrice/src/chatview.cpp b/cockatrice/src/chatview.cpp
index cb84df83..4863b2c1 100644
--- a/cockatrice/src/chatview.cpp
+++ b/cockatrice/src/chatview.cpp
@@ -427,11 +427,6 @@ void ChatView::appendMessage(QString message, QString sender, UserLevelFlags use
             cursor.setCharFormat(defaultFormat);
             message = message.mid(firstSpace);
             QApplication::alert(this);
-            if (settingsCache->getShowMentionPopup() && shouldShowSystemPopup())
-            {
-                QString ref = sender.left(sender.length() - 2);
-                showSystemPopup(ref);
-            }
         }
         else
         {
diff --git a/cockatrice/src/dlg_settings.cpp b/cockatrice/src/dlg_settings.cpp
index 3159f88d..1a86be51 100644
--- a/cockatrice/src/dlg_settings.cpp
+++ b/cockatrice/src/dlg_settings.cpp
@@ -710,7 +710,7 @@ void MessagesSettingsPage::retranslateUi()
     messagePopups.setText(tr("Enable desktop notifications for private messages."));
     mentionPopups.setText(tr("Enable desktop notification for mentions."));
     hexLabel.setText(tr("(Color is hexadecimal)"));
-    customAlertStringLabel.setText(tr("(Seperate each word with a comma; Words are case insensitive)"));
+    customAlertStringLabel.setText(tr("(Seperate each word with a comma, words are case insensitive)"));
 }
 
 
diff --git a/cockatrice/src/settingscache.cpp b/cockatrice/src/settingscache.cpp
index ab6a8b38..01f1b960 100644
--- a/cockatrice/src/settingscache.cpp
+++ b/cockatrice/src/settingscache.cpp
@@ -91,7 +91,7 @@ void SettingsCache::setCardInfoViewMode(const int _viewMode) {
     settings->setValue("cards/cardinfoviewmode", cardInfoViewMode);
 }
 
-void SettingsCache::setHighlightWords(const QString _highlightWords) {
+void SettingsCache::setHighlightWords(const QString &_highlightWords) {
     // Words are seperated by a comma and you can not use spaces in words
     highlightWords = _highlightWords.simplified().replace(" ", "").split(",");
     settings->setValue("personal/highlightWords", highlightWords);
diff --git a/cockatrice/src/settingscache.h b/cockatrice/src/settingscache.h
index 5e7b2a85..12916805 100644
--- a/cockatrice/src/settingscache.h
+++ b/cockatrice/src/settingscache.h
@@ -196,7 +196,7 @@ public slots:
     void setLeftJustified( const int _leftJustified);
     void setMasterVolume(const int _masterVolume);
     void setCardInfoViewMode(const int _viewMode);
-    void setHighlightWords(const QString _highlightWords);
+    void setHighlightWords(const QString &_highlightWords);
 };
 
 extern SettingsCache *settingsCache;