X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=gui%2Fchannelwidget.cpp;h=9cc05763426bdd75e4ec611474721be185f92045;hp=71a40755db8ec03a4a3fbd2f1662ef85d10dd77d;hb=a7afccdbf779b959a4ce3fe88ec42590e3df6cfe;hpb=e368a1672c4f917bfa6adb52dae3b5ebfcd0db18

diff --git a/gui/channelwidget.cpp b/gui/channelwidget.cpp
index 71a40755..9cc05763 100644
--- a/gui/channelwidget.cpp
+++ b/gui/channelwidget.cpp
@@ -41,22 +41,24 @@ ChannelWidget::ChannelWidget(QWidget *parent) : QWidget(parent) {
   */
   //connect(&core, SIGNAL(outputLine( const QString& )), ui.textBrowser, SLOT(insertPlainText(const QString &)));
   //connect(ui.lineEdit, SIGNAL(
-  connect(&core, SIGNAL(outputLine( const QString& )), this, SLOT(lineReceived(const QString &)));
-  connect(ui.lineEdit, SIGNAL(returnPressed()), this, SLOT(enterPressed()));
-  connect(this, SIGNAL(inputLine( const QString& )), &core, SLOT(inputLine( const QString& )));
+  //connect(&core, SIGNAL(outputLine( const QString& )), this, SLOT(lineReceived(const QString &)));
+  connect(ui.inputEdit, SIGNAL(returnPressed()), this, SLOT(enterPressed()));
+  //connect(this, SIGNAL(inputLine( const QString& )), &core, SLOT(inputLine( const QString& )));
 
   connect(this, SIGNAL(inputLine(QString)), guiProxy, SLOT(gsUserInput(QString)));
+  connect(this, SIGNAL(requestConnect(QString, quint16)), guiProxy, SLOT(gsRequestConnect(QString, quint16)));
+  connect(guiProxy, SIGNAL(csCoreMessage(QString)), this, SLOT(lineReceived(QString)));
 
-  core.start();
-  core.connectToIrc("irc.moep.net", 6668);
+  //emit requestConnect("irc.scortum.moep.net", 6668);
+  emit requestConnect("irc.quakenet.org", 6668);
 }
 
 void ChannelWidget::enterPressed() {
-  emit inputLine(ui.lineEdit->text());
-  ui.lineEdit->clear();
+  emit inputLine(ui.inputEdit->text());
+  ui.inputEdit->clear();
 }
 
 void ChannelWidget::lineReceived(QString s) {
-  ui.textBrowser->insertPlainText(s + "\n");
-  ui.textBrowser->ensureCursorVisible();
+  ui.chatWidget->insertPlainText(s + "\n");
+  ui.chatWidget->ensureCursorVisible();
 }