X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=main%2Fmain_gui.cpp;fp=main%2Fmain_gui.cpp;h=e9bd6c8ed92751e482394df823ca4f7ca830e89c;hb=26586e615ffe42bb2b1b307ed1324a6e3051f5da;hp=f48f615c4abca5172c3134c5f812a636c607e132;hpb=0d5499deed248902ce2341208cbc33acd8cace19;p=quassel.git

diff --git a/main/main_gui.cpp b/main/main_gui.cpp
index f48f615c..e9bd6c8e 100644
--- a/main/main_gui.cpp
+++ b/main/main_gui.cpp
@@ -42,7 +42,7 @@ int main(int argc, char **argv) {
   Global::quasselDir = QDir::homePath() + "/.quassel";
 
   global = new Global();
-  guiProxy = new GUIProxy();
+  guiProxy = new GuiProxy();
 
   Style::init();
 
@@ -89,7 +89,9 @@ void MainWin::syncToCore() {
   foreach(QVariant v, state["CoreBuffers"].toList()) { coreBuffers.append(v.value<BufferId>()); }
 }
 
-GUIProxy::GUIProxy() {
+/*
+
+GuiProxy::GuiProxy() {
   if(guiProxy) qFatal("Trying to instantiate more than one CoreProxy object!");
 
   blockSize = 0;
@@ -104,20 +106,20 @@ GUIProxy::GUIProxy() {
 
 }
 
-void GUIProxy::connectToCore(QString host, quint16 port) {
+void GuiProxy::connectToCore(QString host, quint16 port) {
   socket.connectToHost(host, port);
 }
 
-void GUIProxy::disconnectFromCore() {
+void GuiProxy::disconnectFromCore() {
   socket.close();
 }
 
-void GUIProxy::serverError(QAbstractSocket::SocketError) {
+void GuiProxy::serverError(QAbstractSocket::SocketError) {
   emit coreConnectionError(socket.errorString());
   //qFatal(QString("Connection error: %1").arg(socket.errorString()).toAscii());
 }
 
-void GUIProxy::serverHasData() {
+void GuiProxy::serverHasData() {
   QVariant item;
   while(readDataFromDevice(&socket, blockSize, item)) {
     emit recvPartialItem(1,1);
@@ -130,15 +132,17 @@ void GUIProxy::serverHasData() {
     emit recvPartialItem(socket.bytesAvailable(), blockSize);
   }
 }
-
-void GUIProxy::send(GUISignal sig, QVariant arg1, QVariant arg2, QVariant arg3) {
+*/
+/*
+void GuiProxy::send(GuiSignal sig, QVariant arg1, QVariant arg2, QVariant arg3) {
   QList<QVariant> sigdata;
   sigdata.append(sig); sigdata.append(arg1); sigdata.append(arg2); sigdata.append(arg3);
   //qDebug() << "Sending signal: " << sigdata;
   writeDataToDevice(&socket, QVariant(sigdata));
 }
+*/
 
-void GUIProxy::updateCoreData(QString key) {
+void GuiProxy::updateCoreData(QString key) {
   QVariant data = global->getData(key);
   send(GS_UPDATE_GLOBAL_DATA, key, data);
 }