diff --git a/src/gui/qt/guiwrapper.cpp b/src/gui/qt/guiwrapper.cpp index af284a0c..3e11aa3d 100644 --- a/src/gui/qt/guiwrapper.cpp +++ b/src/gui/qt/guiwrapper.cpp @@ -23,11 +23,6 @@ using namespace std; -// NetSignalDispatcher::NetSignalDispatcher(connectToServerDialogImpl *dialog) -// { -// -// } - GuiWrapper::GuiWrapper() : myLog(0), myW(0) { @@ -37,10 +32,6 @@ GuiWrapper::GuiWrapper() : myLog(0), myW(0) myW->show(); myLog = new Log(myW); - myConnectToServerDialog = new connectToServerDialogImpl(); - -// myNetSignalDispatcher = new NetSignalDispatcher(myConnectToServerDialog); - myConfig = new ConfigFile; } diff --git a/src/gui/qt/guiwrapper.h b/src/gui/qt/guiwrapper.h index 2d7da1f5..2a5c31cf 100644 --- a/src/gui/qt/guiwrapper.h +++ b/src/gui/qt/guiwrapper.h @@ -34,17 +34,6 @@ #include "session.h" #include "game.h" -class NetSignalDispatcher : public QObject, public ClientCallback -{ -Q_OBJECT -public: - NetSignalDispatcher(connectToServerDialogImpl *dialog); - -signals: - void SignalNetClientSuccess(int actionID); - void SignalNetClientError(int errorID, int osErrorID); -friend class GuiWrapper; -}; class GuiWrapper : public GuiInterface { @@ -107,9 +96,6 @@ private: Log *myLog; mainWindowImpl *myW; ConfigFile *myConfig; - NetSignalDispatcher *myNetSignalDispatcher; - - connectToServerDialogImpl *myConnectToServerDialog; }; diff --git a/src/gui/qt/mainwindow/mainwindowimpl.cpp b/src/gui/qt/mainwindow/mainwindowimpl.cpp index a90b45b1..ce9653a4 100755 --- a/src/gui/qt/mainwindow/mainwindowimpl.cpp +++ b/src/gui/qt/mainwindow/mainwindowimpl.cpp @@ -452,8 +452,8 @@ mainWindowImpl::mainWindowImpl(QMainWindow *parent) connect ( pushButton_break, SIGNAL( clicked()), this, SLOT ( breakButtonClicked() ) ); // auch wieder starten!!!! //Nachrichten Thread-Save - connect(this, SIGNAL(SignalNetClientSuccess(int)), this, SLOT(refreshConnectToServerDialog(int))); - connect(this, SIGNAL(SignalNetClientError(int, int)), this, SLOT(errorConnectToServerDialog(int, int))); + connect(this, SIGNAL(SignalNetClientSuccess(int)), myConnectToServerDialog, SLOT(refresh(int))); + connect(this, SIGNAL(SignalNetClientError(int, int)), myConnectToServerDialog, SLOT(error(int, int))); } @@ -1915,5 +1915,3 @@ void mainWindowImpl::switchToolBox() { } -void mainWindowImpl::refreshConnectToServerDialog(int actionID) { myConnectToServerDialog->refresh(actionID); } -void mainWindowImpl::errorConnectToServerDialog(int errorID, int osErrorID) { myConnectToServerDialog->error(errorID, osErrorID); } diff --git a/src/gui/qt/mainwindow/mainwindowimpl.h b/src/gui/qt/mainwindow/mainwindowimpl.h index 2fa65201..7552bcd9 100755 --- a/src/gui/qt/mainwindow/mainwindowimpl.h +++ b/src/gui/qt/mainwindow/mainwindowimpl.h @@ -173,8 +173,6 @@ public slots: void paintStartSplash(); - void refreshConnectToServerDialog(int actionID); - void errorConnectToServerDialog(int errorID, int osErrorID); private: