first fixes

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
         {

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)"));
 }
 
 

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);

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;