From: Manuel Nickschas <sputnick@quassel-irc.org>
Date: Wed, 25 Feb 2009 17:38:21 +0000 (+0100)
Subject: Slot is gone from Client
X-Git-Tag: 0.5-rc1~343
X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=commitdiff_plain;h=43e87fcf51fd300b56c65ede848a60cf11dfd682;hp=69bcf3951b6c243d36a043d68a9c9329e2f5be8f

Slot is gone from Client
---

diff --git a/src/qtui/inputwidget.cpp b/src/qtui/inputwidget.cpp
index 3c7bec53..30cfcc7d 100644
--- a/src/qtui/inputwidget.cpp
+++ b/src/qtui/inputwidget.cpp
@@ -37,7 +37,6 @@ InputWidget::InputWidget(QWidget *parent)
   ui.setupUi(this);
   connect(ui.inputEdit, SIGNAL(sendText(QString)), this, SLOT(sendText(QString)));
   connect(ui.ownNick, SIGNAL(activated(QString)), this, SLOT(changeNick(QString)));
-  connect(this, SIGNAL(userInput(BufferInfo, QString)), Client::instance(), SIGNAL(sendInput(BufferInfo, QString)));
   setFocusProxy(ui.inputEdit);
 
   ui.ownNick->setSizeAdjustPolicy(QComboBox::AdjustToContents);
@@ -219,11 +218,11 @@ void InputWidget::changeNick(const QString &newNick) const {
   const Network *net = currentNetwork();
   if(!net || net->isMyNick(newNick))
     return;
-  emit userInput(currentBufferInfo(), QString("/nick %1").arg(newNick));
+  sendText(QString("/NICK %1").arg(newNick));
 }
 
-void InputWidget::sendText(QString text) {
-  emit userInput(currentBufferInfo(), text);
+void InputWidget::sendText(const QString &text) const {
+  Client::userInput(currentBufferInfo(), text);
 }
 
 
diff --git a/src/qtui/inputwidget.h b/src/qtui/inputwidget.h
index 297830b9..fae3d7f0 100644
--- a/src/qtui/inputwidget.h
+++ b/src/qtui/inputwidget.h
@@ -49,7 +49,7 @@ protected slots:
 
 private slots:
   void setCustomFont(const QVariant &font);
-  void sendText(QString text);
+  void sendText(const QString &text) const;
   void changeNick(const QString &newNick) const;
 
   void setNetwork(NetworkId networkId);
@@ -60,12 +60,9 @@ private slots:
 
   BufferInfo currentBufferInfo() const;
 
-signals:
-  void userInput(BufferInfo, QString msg) const;
-
 private:
   Ui::InputWidget ui;
-  
+
   NetworkId _networkId;
   IdentityId _identityId;
 };