X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Fuisupport%2Finputline.cpp;h=60f34fb0b672dac872c8a9e7c3f490c4ed2ece32;hb=bd6d28b16df0b712fa30198c235dddf559d076ef;hp=b48c053d5e22bb695ef5c6b8959cd7c21e246137;hpb=ee9eb6726ae65a85fbb5e98e65d038d410580146;p=quassel.git diff --git a/src/uisupport/inputline.cpp b/src/uisupport/inputline.cpp index b48c053d..60f34fb0 100644 --- a/src/uisupport/inputline.cpp +++ b/src/uisupport/inputline.cpp @@ -19,7 +19,6 @@ ***************************************************************************/ #include "inputline.h" - #include "tabcompleter.h" InputLine::InputLine(QWidget *parent) @@ -40,19 +39,19 @@ void InputLine::keyPressEvent(QKeyEvent * event) { event->accept(); addToHistory(text(), true); - + if(idx > 0) { idx--; showHistoryEntry(); } break; - + case Qt::Key_Down: event->accept(); addToHistory(text(), true); - + if(idx < history.count()) { idx++; if(idx < history.count() || tempHistory.contains(idx)) // tempHistory might have an entry for idx == history.count() + 1 @@ -65,7 +64,7 @@ void InputLine::keyPressEvent(QKeyEvent * event) { } break; - + case Qt::Key_Select: // for Qtopia emit returnPressed(); @@ -79,7 +78,7 @@ bool InputLine::addToHistory(const QString &text, bool temporary) { return false; Q_ASSERT(0 <= idx && idx <= history.count()); - + if(history.isEmpty() || text != history[idx - (int)(idx == history.count())]) { // if an entry of the history is changed, we remember it and show it again at this // position until a line was actually sent @@ -103,22 +102,22 @@ void InputLine::on_returnPressed() { } void InputLine::on_textChanged(QString newText) { - QStringList lineSeperators; - lineSeperators << QString("\r\n") + QStringList lineSeparators; + lineSeparators << QString("\r\n") << QString('\n') << QString('\r'); - + QString lineSep; - foreach(QString seperator, lineSeperators) { - if(newText.contains(seperator)) { - lineSep = seperator; + foreach(QString separator, lineSeparators) { + if(newText.contains(separator)) { + lineSep = separator; break; } } if(lineSep.isEmpty()) return; - + if(newText.contains(lineSep)) { clear(); QString line = newText.section(lineSep, 0, 0);