X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fsettingspages%2Faliasesmodel.cpp;h=d85feedf979feee4473d628edd2ff6e84a39d32c;hp=3896eb8f55d3b7c5714431b27b1265971ea6c5f8;hb=7a44d67d565fe4f627e64b158a91a5978591c743;hpb=8179670f13fbbdd5cbcd7fb4a3dc187913ee9ba3

diff --git a/src/qtui/settingspages/aliasesmodel.cpp b/src/qtui/settingspages/aliasesmodel.cpp
index 3896eb8f..d85feedf 100644
--- a/src/qtui/settingspages/aliasesmodel.cpp
+++ b/src/qtui/settingspages/aliasesmodel.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-08 by the Quassel Project                          *
+ *   Copyright (C) 2005-09 by the Quassel Project                          *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -53,13 +53,13 @@ QVariant AliasesModel::data(const QModelIndex &index, int role) const {
     case 1:
       return "<b>The string the shortcut will be expanded to</b><br />"
 	"<b>special variables:</b><br />"
-	" - <b>$i</b> represenents the i'th parameter.<br />"
-	" - <b>$i..j</b> represenents the i'th to j'th parameter separated by spaces.<br />"
-	" - <b>$i..</b> represenents all parameters from i on separated by spaces.<br />"
+	" - <b>$i</b> represents the i'th parameter.<br />"
+	" - <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>$0</b> the whole string.<br />"
-	" - <b>$currentnick</b> your current nickname<br />"
-	" - <b>$channelname</b> the name of the selected channel<br /><br />"
+	" - <b>$nick</b> your current nickname<br />"
+	" - <b>$channel</b> the name of the selected channel<br /><br />"
 	"Multiple commands can be separated with semicolons<br /><br />"
 	"<b>Example:</b> \"Test $1; Test $2; Test All $0\" will be expanded to three separate messages \"Test 1\", \"Test 2\" and \"Test All 1 2 3\" when called like /test 1 2 3";
     default:
@@ -87,7 +87,7 @@ bool AliasesModel::setData(const QModelIndex &index, const QVariant &value, int
   QString newValue = value.toString();
   if(newValue.isEmpty())
     return false;
-  
+
   switch(index.column()) {
   case 0:
     if(aliasManager().contains(newValue)) {
@@ -220,7 +220,7 @@ void AliasesModel::initDone() {
 }
 
 void AliasesModel::clientConnected() {
-  _aliasManager = AliasManager();
+  _aliasManager = ClientAliasManager();
   Client::signalProxy()->synchronize(&_aliasManager);
   connect(&_aliasManager, SIGNAL(initDone()), this, SLOT(initDone()));
   connect(&_aliasManager, SIGNAL(updated(const QVariantMap &)), this, SLOT(revert()));
@@ -228,8 +228,8 @@ void AliasesModel::clientConnected() {
 
 void AliasesModel::clientDisconnected() {
   // clear alias managers
-  _aliasManager = AliasManager();
-  _clonedAliasManager = AliasManager();
+  _aliasManager = ClientAliasManager();
+  _clonedAliasManager = ClientAliasManager();
   reset();
   emit modelReady(false);
 }