Use QString::isEmpty() instead of size() comparsion

[quassel.git] / src / qtui / settingspages / highlightsettingspage.cpp

diff --git a/src/qtui/settingspages/highlightsettingspage.cpp b/src/qtui/settingspages/highlightsettingspage.cpp
index 4d169f2..22b4afe 100644 (file)
--- a/src/qtui/settingspages/highlightsettingspage.cpp
+++ b/src/qtui/settingspages/highlightsettingspage.cpp
@@ -73,7 +73,7 @@ void HighlightSettingsPage::defaults() {
   widgetHasChanged();
 }
 
-void HighlightSettingsPage::addNewRow(QString name, bool regex, bool cs, bool enable, QString chanName) {
+void HighlightSettingsPage::addNewRow(QString name, bool regex, bool cs, bool enable, QString chanName, bool self) {
   ui.highlightTable->setRowCount(ui.highlightTable->rowCount()+1);
 
   QTableWidgetItem *nameItem = new QTableWidgetItem(name);
@@ -108,6 +108,9 @@ void HighlightSettingsPage::addNewRow(QString name, bool regex, bool cs, bool en
   ui.highlightTable->setItem(lastRow, HighlightSettingsPage::EnableColumn, enableItem);
   ui.highlightTable->setItem(lastRow, HighlightSettingsPage::ChanColumn, chanNameItem);
 
+  if(!self)
+    ui.highlightTable->setCurrentItem(nameItem);
+
   QVariantMap highlightRule;
   highlightRule["Name"] = name;
   highlightRule["RegEx"] = regex;
@@ -177,7 +180,7 @@ void HighlightSettingsPage::tableChanged(QTableWidgetItem *item) {
       highlightRule["Enable"] = (item->checkState() == Qt::Checked);
       break;
     case HighlightSettingsPage::ChanColumn:
-      if(item->text().size() > 0 && item->text().trimmed().size() == 0)
+      if(!item->text().isEmpty() && item->text().trimmed().isEmpty())
         item->setText("");
       highlightRule["Chan"] = item->text();
       break;
@@ -199,7 +202,7 @@ void HighlightSettingsPage::load() {
     bool enable = highlightRule["Enable"].toBool();
     QString chanName = highlightRule["Chan"].toString();
 
-    addNewRow(name, regex, cs, enable, chanName);
+    addNewRow(name, regex, cs, enable, chanName, true);
   }
 
   switch(notificationSettings.highlightNick())