Support $i:account in aliases

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

diff --git a/src/qtui/settingspages/aliasesmodel.cpp b/src/qtui/settingspages/aliasesmodel.cpp
index a63ad06..3fab383 100644 (file)
--- a/src/qtui/settingspages/aliasesmodel.cpp
+++ b/src/qtui/settingspages/aliasesmodel.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-2013 by the Quassel Project                        *
+ *   Copyright (C) 2005-2016 by the Quassel Project                        *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -64,6 +64,8 @@ QVariant AliasesModel::data(const QModelIndex &index, int role) const
                       " - <b>$i..j</b> represents the i'th to j'th parameter separated by spaces.<br />"
                       " - <b>$i..</b> represents all parameters from i on separated by spaces.<br />"
                       " - <b>$i:hostname</b> represents the hostname of the user identified by the i'th parameter or a * if unknown.<br />"
+                      " - <b>$i:ident</b> represents the ident of the user identified by the i'th parameter or a * if unknown.<br />"
+                      " - <b>$i:account</b> represents the account of the user identified by the i'th parameter or a * if logged out or unknown.<br />"
                       " - <b>$0</b> the whole string.<br />"
                       " - <b>$nick</b> your current nickname<br />"
                       " - <b>$channel</b> the name of the selected channel<br /><br />"
@@ -238,7 +240,8 @@ void AliasesModel::revert()
 
     _configChanged = false;
     emit configChanged(false);
-    reset();
+    beginResetModel();
+    endResetModel();
 }
 
 
@@ -255,7 +258,8 @@ void AliasesModel::commit()
 void AliasesModel::initDone()
 {
     _modelReady = true;
-    reset();
+    beginResetModel();
+    endResetModel();
     emit modelReady(true);
 }
 
@@ -275,6 +279,7 @@ void AliasesModel::clientDisconnected()
     // clear
     _clonedAliasManager = ClientAliasManager();
     _modelReady = false;
-    reset();
+    beginResetModel();
+    endResetModel();
     emit modelReady(false);
 }