projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Another big update today.
[quassel.git]
/
main
/
main_gui.cpp
diff --git
a/main/main_gui.cpp
b/main/main_gui.cpp
index
bf6ed14
..
31f30e6
100644
(file)
--- a/
main/main_gui.cpp
+++ b/
main/main_gui.cpp
@@
-22,7
+22,7
@@
#include <QApplication>
#include <QApplication>
-#include "
quasse
l.h"
+#include "
globa
l.h"
#include "guiproxy.h"
#include "util.h"
#include "guiproxy.h"
#include "util.h"
@@
-61,9
+61,6
@@
GUIProxy::GUIProxy() {
void GUIProxy::connectToCore(QString host, quint16 port) {
socket.connectToHost(host, port);
void GUIProxy::connectToCore(QString host, quint16 port) {
socket.connectToHost(host, port);
- //VarMap initmsg;
- //initmsg["GUIProtocol"] = GUI_PROTOCOL;
- //send(GS_CLIENT_INIT, QVariant(initmsg));
}
void GUIProxy::disconnectFromCore() {
}
void GUIProxy::disconnectFromCore() {
@@
-72,6
+69,7
@@
void GUIProxy::disconnectFromCore() {
void GUIProxy::serverError(QAbstractSocket::SocketError) {
emit coreConnectionError(socket.errorString());
void GUIProxy::serverError(QAbstractSocket::SocketError) {
emit coreConnectionError(socket.errorString());
+ //qFatal(QString("Connection error: %1").arg(socket.errorString()).toAscii());
}
void GUIProxy::serverHasData() {
}
void GUIProxy::serverHasData() {