X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=core%2Fcore.cpp;h=f7fedd117ca0004befdeaad62d3b030974d6fa9e;hp=0d4eaccbc912d926465eeffcc0f64f1306c875c5;hb=82403b8a8777d44cbc35619e3bbd4feabfad5dc4;hpb=63db3c5de9d76c5abc55b0cba86f66d2aba7745d

diff --git a/core/core.cpp b/core/core.cpp
index 0d4eaccb..f7fedd11 100644
--- a/core/core.cpp
+++ b/core/core.cpp
@@ -28,12 +28,12 @@
 Core::Core() {
   if(core) qFatal("Trying to instantiate more than one Core object!");
 
-  connect(coreProxy, SIGNAL(gsRequestConnect(QString, quint16)), this, SLOT(connectToIrc(QString, quint16)));
+  connect(coreProxy, SIGNAL(gsRequestConnect(QStringList)), this, SLOT(connectToIrc(QStringList)));
   connect(coreProxy, SIGNAL(gsUserInput(QString)), this, SLOT(inputLine(QString)));
+  connect(this, SIGNAL(sendMessage(QString, QString, QString)), coreProxy, SLOT(csSendMessage(QString, QString, QString)));
+  connect(this, SIGNAL(sendStatusMsg(QString, QString)), coreProxy, SLOT(csSendStatusMsg(QString, QString)));
 
-  connect(&server, SIGNAL(recvLine(QString)), coreProxy, SLOT(csCoreMessage(QString)));
-
-  // Read global settings from config file 
+  // Read global settings from config file
   QSettings s;
   s.beginGroup("Global");
   QString key;
@@ -46,24 +46,52 @@ Core::Core() {
   connect(global, SIGNAL(dataUpdatedRemotely(QString)), SLOT(globalDataUpdated(QString)));
   connect(global, SIGNAL(dataPutLocally(QString)), SLOT(globalDataUpdated(QString)));
 
-  server.start();
 }
 
-void Core::connectToIrc(const QString &h, quint16 port) {
-  if(server.isConnected()) return;
-  qDebug() << "Core: Connecting to " << h << ":" << port;
-  server.connectToIrc(h, port);
+void Core::globalDataUpdated(QString key) {
+  QVariant data = global->getData(key);
+  QSettings s;
+  s.setValue(QString("Global/")+key, data);
 }
 
+// temp
 void Core::inputLine(QString s) {
-  server.putRawLine(s);
+  emit msgFromGUI("", "", s);
 
 }
 
-void Core::globalDataUpdated(QString key) {
-  QVariant data = global->getData(key);
-  QSettings s;
-  s.setValue(QString("Global/")+key, data);
+void Core::connectToIrc(QStringList networks) {
+  foreach(QString net, networks) {
+    if(servers.contains(net)) {
+
+    } else {
+      Server *server = new Server(net);
+      connect(this, SIGNAL(connectToIrc(QString)), server, SLOT(connectToIrc(QString)));
+      connect(this, SIGNAL(disconnectFromIrc(QString)), server, SLOT(disconnectFromIrc(QString)));
+      connect(this, SIGNAL(msgFromGUI(QString, QString, QString)), server, SLOT(userInput(QString, QString, QString)));
+      connect(server, SIGNAL(sendMessage(QString, QString)), this, SLOT(recvMessageFromServer(QString, QString)));
+      connect(server, SIGNAL(sendStatusMsg(QString)), this, SLOT(recvStatusMsgFromServer(QString)));
+      // add error handling
+
+      server->start();
+      servers[net] = server;
+    }
+    emit connectToIrc(net);
+  }
+}
+
+void Core::recvMessageFromServer(QString buf, QString msg) {
+  Q_ASSERT(sender());
+  QString net = qobject_cast<Server*>(sender())->getNetwork();
+  emit sendMessage(net, buf, msg);
+}
+
+void Core::recvStatusMsgFromServer(QString msg) {
+  Q_ASSERT(sender());
+  QString net = qobject_cast<Server*>(sender())->getNetwork();
+  qDebug() << "sent status:"<<msg;
+  emit sendStatusMsg(net, msg);
 }
 
+
 Core *core = 0;