Really really don't send empty lines anymore, fixes #623 for non-KDE as well
authorManuel Nickschas <sputnick@quassel-irc.org>
Thu, 26 Mar 2009 22:39:50 +0000 (23:39 +0100)
committerManuel Nickschas <sputnick@quassel-irc.org>
Thu, 26 Mar 2009 22:39:50 +0000 (23:39 +0100)
src/uisupport/inputline.cpp

index 593af03..f9c8a65 100644 (file)
@@ -130,15 +130,9 @@ void InputLine::keyPressEvent(QKeyEvent * event) {
 #ifdef HAVE_KDE
 //Since this is a ktextedit, we don't have this signal "natively"
   case Qt::Key_Return:
 #ifdef HAVE_KDE
 //Since this is a ktextedit, we don't have this signal "natively"
   case Qt::Key_Return:
-    event->accept();
-    if(!text().isEmpty())
-      emit returnPressed();
-    break;
-
   case Qt::Key_Enter:
     event->accept();
   case Qt::Key_Enter:
     event->accept();
-    if(!text().isEmpty())
-      emit returnPressed();
+    emit returnPressed();
     break;
 
 #endif
     break;
 
 #endif
@@ -175,9 +169,11 @@ bool InputLine::addToHistory(const QString &text, bool temporary) {
 }
 
 void InputLine::on_returnPressed() {
 }
 
 void InputLine::on_returnPressed() {
-  addToHistory(text());
-  emit sendText(text());
-  resetLine();
+  if(!text().isEmpty()) {
+    addToHistory(text());
+    emit sendText(text());
+    resetLine();
+  }
 }
 
 void InputLine::on_textChanged(QString newText) {
 }
 
 void InputLine::on_textChanged(QString newText) {