/***************************************************************************
- * Copyright (C) 2005 by The Quassel Team *
+ * Copyright (C) 2005-07 by The Quassel IRC Development Team *
* devel@quassel-irc.org *
- * *
+ * *
* This program is free software; you can redistribute it and/or modify *
* it under the terms of the GNU General Public License as published by *
* the Free Software Foundation; either version 2 of the License, or *
#include <QApplication>
+#include "gui.h"
#include "core.h"
-#include "quassel.h"
+#include "style.h"
+#include "global.h"
#include "guiproxy.h"
#include "coreproxy.h"
+#include "settings.h"
+#include "chatwidget.h"
#include "mainwin.h"
int main(int argc, char **argv) {
QApplication app(argc, argv);
- QApplication::setOrganizationDomain("quassel-irc.org");
- QApplication::setApplicationName("Quassel IRC");
- QApplication::setOrganizationName("The Quassel Team");
+ QCoreApplication::setOrganizationDomain("quassel-irc.org");
+ QCoreApplication::setApplicationName("Quassel IRC");
+ QCoreApplication::setOrganizationName("Quassel IRC Development Team");
Global::runMode = Global::Monolithic;
- global = new Global();
- guiProxy = new GUIProxy();
- coreProxy = new CoreProxy();
- core = new Core();
+ Global::quasselDir = QDir::homePath() + "/.quassel";
+
+ //settings = new Settings();
+ //global = new Global();
+ //guiProxy = new GUIProxy();
+ //coreProxy = new CoreProxy();
+ QObject::connect(Core::localSession(), SIGNAL(proxySignal(CoreSignal, QVariant, QVariant, QVariant)), ClientProxy::instance(), SLOT(recv(CoreSignal, QVariant, QVariant, QVariant)));
+ QObject::connect(ClientProxy::instance(), SIGNAL(send(ClientSignal, QVariant, QVariant, QVariant)), Core::localSession(), SLOT(processSignal(ClientSignal, QVariant, QVariant, QVariant)));
- MainWin mainWin;
- mainWin.show();
+ Settings::init();
+ Style::init();
+
+ //MainWin *mainWin = new MainWin();
+ //mainWin->show();
+ //mainWin->init();
+ Client::instance();
int exitCode = app.exec();
- delete core;
- delete guiProxy;
- delete coreProxy;
- delete global;
+ //delete core;
+ Client::destroy();
+ Core::destroy();
+ //delete guiProxy;
+ //delete coreProxy;
+ //delete global;
+ //delete mainWin;
+ //delete settings;
return exitCode;
}
+void Client::syncToCore() {
+ //Q_ASSERT(Global::data("CoreReady").toBool());
+ coreBuffers = Core::localSession()->buffers();
+ // NOTE: We don't need to request server states, because in the monolithic version there can't be
+ // any servers connected at this stage...
+}
+
+/*
void CoreProxy::sendToGUI(CoreSignal sig, QVariant arg1, QVariant arg2, QVariant arg3) {
guiProxy->recv(sig, arg1, arg2, arg3);
}
+*/
+/*
GUIProxy::GUIProxy() {
- if(guiProxy) qFatal("Trying to instantiate more than one CoreProxy object!");
+ if(guiProxy) qFatal("Trying to instantiate more than one GUIProxy object!");
}
-
+*/
+/*
void GUIProxy::send(GUISignal sig, QVariant arg1, QVariant arg2, QVariant arg3) {
coreProxy->recv(sig, arg1, arg2, arg3);
}
+*/
// Dummy function definitions
// These are not needed, since we don't have a network connection to the core.
+/*
void GUIProxy::serverHasData() {}
void GUIProxy::connectToCore(QString, quint16) {}
void GUIProxy::disconnectFromCore() {}
void GUIProxy::updateCoreData(QString) {}
void GUIProxy::serverError(QAbstractSocket::SocketError) {}
-
+*/