projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Revert "Work around MOC ignoring -D options by having dummy stubs"
[quassel.git]
/
src
/
core
/
userinputhandler.cpp
diff --git
a/src/core/userinputhandler.cpp
b/src/core/userinputhandler.cpp
index
e9b0139
..
deddc92
100644
(file)
--- a/
src/core/userinputhandler.cpp
+++ b/
src/core/userinputhandler.cpp
@@
-146,13
+146,6
@@
void UserInputHandler::handleInvite(const BufferInfo &bufferInfo, const QString
emit putCmd("INVITE", serverEncode(params));
}
emit putCmd("INVITE", serverEncode(params));
}
-void UserInputHandler::handleJ(const BufferInfo &bufferInfo, const QString &msg) {
- QString trimmed = msg.trimmed();
- if(trimmed.length() == 0) return;
- if(trimmed[0].isLetter()) trimmed.prepend("#");
- handleJoin(bufferInfo, trimmed);
-}
-
void UserInputHandler::handleJoin(const BufferInfo &bufferInfo, const QString &msg) {
Q_UNUSED(bufferInfo)
QStringList params = msg.trimmed().split(" ");
void UserInputHandler::handleJoin(const BufferInfo &bufferInfo, const QString &msg) {
Q_UNUSED(bufferInfo)
QStringList params = msg.trimmed().split(" ");
@@
-367,6
+360,8
@@
void UserInputHandler::expand(const QString &alias, const BufferInfo &bufferInfo
command = command.replace(QString("$%1").arg(j), params[j - 1]);
}
command = command.replace("$0", msg);
command = command.replace(QString("$%1").arg(j), params[j - 1]);
}
command = command.replace("$0", msg);
+ command = command.replace("$channelname", bufferInfo.bufferName());
+ command = command.replace("$currentnick", network()->myNick());
handleUserInput(bufferInfo, command);
}
}
handleUserInput(bufferInfo, command);
}
}