cleaned
This commit is contained in:
@@ -23,11 +23,6 @@
|
|||||||
|
|
||||||
using namespace std;
|
using namespace std;
|
||||||
|
|
||||||
// NetSignalDispatcher::NetSignalDispatcher(connectToServerDialogImpl *dialog)
|
|
||||||
// {
|
|
||||||
//
|
|
||||||
// }
|
|
||||||
|
|
||||||
|
|
||||||
GuiWrapper::GuiWrapper() : myLog(0), myW(0)
|
GuiWrapper::GuiWrapper() : myLog(0), myW(0)
|
||||||
{
|
{
|
||||||
@@ -37,10 +32,6 @@ GuiWrapper::GuiWrapper() : myLog(0), myW(0)
|
|||||||
myW->show();
|
myW->show();
|
||||||
|
|
||||||
myLog = new Log(myW);
|
myLog = new Log(myW);
|
||||||
myConnectToServerDialog = new connectToServerDialogImpl();
|
|
||||||
|
|
||||||
// myNetSignalDispatcher = new NetSignalDispatcher(myConnectToServerDialog);
|
|
||||||
|
|
||||||
myConfig = new ConfigFile;
|
myConfig = new ConfigFile;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -34,17 +34,6 @@
|
|||||||
#include "session.h"
|
#include "session.h"
|
||||||
#include "game.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
|
class GuiWrapper : public GuiInterface
|
||||||
{
|
{
|
||||||
@@ -107,9 +96,6 @@ private:
|
|||||||
Log *myLog;
|
Log *myLog;
|
||||||
mainWindowImpl *myW;
|
mainWindowImpl *myW;
|
||||||
ConfigFile *myConfig;
|
ConfigFile *myConfig;
|
||||||
NetSignalDispatcher *myNetSignalDispatcher;
|
|
||||||
|
|
||||||
connectToServerDialogImpl *myConnectToServerDialog;
|
|
||||||
|
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
@@ -452,8 +452,8 @@ mainWindowImpl::mainWindowImpl(QMainWindow *parent)
|
|||||||
connect ( pushButton_break, SIGNAL( clicked()), this, SLOT ( breakButtonClicked() ) ); // auch wieder starten!!!!
|
connect ( pushButton_break, SIGNAL( clicked()), this, SLOT ( breakButtonClicked() ) ); // auch wieder starten!!!!
|
||||||
|
|
||||||
//Nachrichten Thread-Save
|
//Nachrichten Thread-Save
|
||||||
connect(this, SIGNAL(SignalNetClientSuccess(int)), this, SLOT(refreshConnectToServerDialog(int)));
|
connect(this, SIGNAL(SignalNetClientSuccess(int)), myConnectToServerDialog, SLOT(refresh(int)));
|
||||||
connect(this, SIGNAL(SignalNetClientError(int, int)), this, SLOT(errorConnectToServerDialog(int, 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); }
|
|
||||||
|
|||||||
@@ -173,8 +173,6 @@ public slots:
|
|||||||
|
|
||||||
void paintStartSplash();
|
void paintStartSplash();
|
||||||
|
|
||||||
void refreshConnectToServerDialog(int actionID);
|
|
||||||
void errorConnectToServerDialog(int errorID, int osErrorID);
|
|
||||||
|
|
||||||
private:
|
private:
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user