diff --git a/src/engine/local_engine/localhand.cpp b/src/engine/local_engine/localhand.cpp index 180bcd12..c0d09f09 100755 --- a/src/engine/local_engine/localhand.cpp +++ b/src/engine/local_engine/localhand.cpp @@ -22,6 +22,8 @@ #include "cardsvalue.h" #include +#include + using namespace std; LocalHand::LocalHand(boost::shared_ptr f, GuiInterface *g, BoardInterface *b, PlayerInterface **p, int id, int sP, int aP, int dP, int sB,int sC) diff --git a/src/engine/local_engine/tools.h b/src/engine/local_engine/tools.h index 2d635c08..d8b02aa5 100755 --- a/src/engine/local_engine/tools.h +++ b/src/engine/local_engine/tools.h @@ -20,7 +20,6 @@ #ifndef TOOLS_H #define TOOLS_H -#include #include diff --git a/src/gui/qt/connecttoserverdialog/connecttoserverdialogimpl.h b/src/gui/qt/connecttoserverdialog/connecttoserverdialogimpl.h index 5ba3c0e3..4f2e4f97 100644 --- a/src/gui/qt/connecttoserverdialog/connecttoserverdialogimpl.h +++ b/src/gui/qt/connecttoserverdialog/connecttoserverdialogimpl.h @@ -22,7 +22,6 @@ #include "ui_connecttoserverdialog.h" -#include #include #include diff --git a/src/gui/qt/createnetworkgamedialog/createnetworkgamedialogimpl.h b/src/gui/qt/createnetworkgamedialog/createnetworkgamedialogimpl.h index b21d3384..3df153b0 100644 --- a/src/gui/qt/createnetworkgamedialog/createnetworkgamedialogimpl.h +++ b/src/gui/qt/createnetworkgamedialog/createnetworkgamedialogimpl.h @@ -22,7 +22,6 @@ #include "ui_createnetworkgamedialog.h" -#include #include #include diff --git a/src/gui/qt/guiwrapper.h b/src/gui/qt/guiwrapper.h index 3b833ef9..70cb0673 100644 --- a/src/gui/qt/guiwrapper.h +++ b/src/gui/qt/guiwrapper.h @@ -23,7 +23,6 @@ #include #include -#include class Session; class mainWindowImpl; diff --git a/src/gui/qt/joinnetworkgamedialog/joinnetworkgamedialogimpl.h b/src/gui/qt/joinnetworkgamedialog/joinnetworkgamedialogimpl.h index d81cf6c1..8730529e 100644 --- a/src/gui/qt/joinnetworkgamedialog/joinnetworkgamedialogimpl.h +++ b/src/gui/qt/joinnetworkgamedialog/joinnetworkgamedialogimpl.h @@ -22,7 +22,6 @@ #include "ui_joinnetworkgamedialog.h" -#include #include #include "configfile.h" #include diff --git a/src/gui/qt/mainwindow/chat/chat.h b/src/gui/qt/mainwindow/chat/chat.h index 8da883a8..c4f1b9a6 100644 --- a/src/gui/qt/mainwindow/chat/chat.h +++ b/src/gui/qt/mainwindow/chat/chat.h @@ -21,7 +21,6 @@ #define CHAT_H #include -#include #include "configfile.h" diff --git a/src/gui/qt/mainwindow/log/log.h b/src/gui/qt/mainwindow/log/log.h index a5662c34..42edf04a 100644 --- a/src/gui/qt/mainwindow/log/log.h +++ b/src/gui/qt/mainwindow/log/log.h @@ -21,7 +21,6 @@ #define LOG_H #include -#include #include "configfile.h" diff --git a/src/gui/qt/mainwindow/mainwindowimpl.h b/src/gui/qt/mainwindow/mainwindowimpl.h index 34fcd649..6063cad8 100755 --- a/src/gui/qt/mainwindow/mainwindowimpl.h +++ b/src/gui/qt/mainwindow/mainwindowimpl.h @@ -23,7 +23,6 @@ #include "ui_mainwindow.h" #include "game_defs.h" -#include #include #include diff --git a/src/gui/qt/mainwindow/mycardspixmaplabel.h b/src/gui/qt/mainwindow/mycardspixmaplabel.h index 4ef307ee..44abbc5d 100644 --- a/src/gui/qt/mainwindow/mycardspixmaplabel.h +++ b/src/gui/qt/mainwindow/mycardspixmaplabel.h @@ -15,7 +15,6 @@ #include #include -#include class MyCardsPixmapLabel : public QLabel { diff --git a/src/gui/qt/mainwindow/mylefttabwidget.h b/src/gui/qt/mainwindow/mylefttabwidget.h index 87ae1975..1737ae04 100644 --- a/src/gui/qt/mainwindow/mylefttabwidget.h +++ b/src/gui/qt/mainwindow/mylefttabwidget.h @@ -15,7 +15,6 @@ #include #include -#include class MyLeftTabWidget : public QTabWidget { diff --git a/src/gui/qt/mainwindow/myrighttabwidget.h b/src/gui/qt/mainwindow/myrighttabwidget.h index 0d9801d4..f0cf4a30 100644 --- a/src/gui/qt/mainwindow/myrighttabwidget.h +++ b/src/gui/qt/mainwindow/myrighttabwidget.h @@ -15,8 +15,6 @@ #include #include -#include - class MyRightTabWidget : public QTabWidget { Q_OBJECT diff --git a/src/gui/qt/mainwindow/mysetlabel.h b/src/gui/qt/mainwindow/mysetlabel.h index 8b99794f..eabab5f0 100644 --- a/src/gui/qt/mainwindow/mysetlabel.h +++ b/src/gui/qt/mainwindow/mysetlabel.h @@ -15,8 +15,6 @@ #include #include -#include - class mainWindowImpl; diff --git a/src/gui/qt/mainwindow/startsplash/startsplash.h b/src/gui/qt/mainwindow/startsplash/startsplash.h index a4ea5305..74780579 100644 --- a/src/gui/qt/mainwindow/startsplash/startsplash.h +++ b/src/gui/qt/mainwindow/startsplash/startsplash.h @@ -12,8 +12,6 @@ #ifndef STARTSPLASH_H #define STARTSPLASH_H -#include - #include "mainwindowimpl.h" #include diff --git a/src/gui/qt/newlocalgamedialog/newgamedialogimpl.h b/src/gui/qt/newlocalgamedialog/newgamedialogimpl.h index 6e80c790..1ef9d18f 100755 --- a/src/gui/qt/newlocalgamedialog/newgamedialogimpl.h +++ b/src/gui/qt/newlocalgamedialog/newgamedialogimpl.h @@ -22,7 +22,6 @@ #include "ui_newgamedialog.h" -#include #include #include diff --git a/src/gui/qt/qttools/qttoolswrapper.h b/src/gui/qt/qttools/qttoolswrapper.h index 82098685..892a216a 100644 --- a/src/gui/qt/qttools/qttoolswrapper.h +++ b/src/gui/qt/qttools/qttoolswrapper.h @@ -24,7 +24,6 @@ #include #include -#include class QtHelper; diff --git a/src/gui/qt/settingsdialog/myavatarbutton.h b/src/gui/qt/settingsdialog/myavatarbutton.h index f53ca82d..236ba7f3 100644 --- a/src/gui/qt/settingsdialog/myavatarbutton.h +++ b/src/gui/qt/settingsdialog/myavatarbutton.h @@ -15,8 +15,6 @@ #include #include -#include - class MyAvatarButton : public QPushButton { public: diff --git a/src/gui/qt/settingsdialog/myhpavatarbutton.h b/src/gui/qt/settingsdialog/myhpavatarbutton.h index d99c3278..f76b044f 100644 --- a/src/gui/qt/settingsdialog/myhpavatarbutton.h +++ b/src/gui/qt/settingsdialog/myhpavatarbutton.h @@ -15,8 +15,6 @@ #include #include -#include - class MyHPAvatarButton : public QPushButton { public: diff --git a/src/gui/qt/settingsdialog/selectavatardialog/myavatarlistitem.h b/src/gui/qt/settingsdialog/selectavatardialog/myavatarlistitem.h index 893076c8..78be5ba4 100644 --- a/src/gui/qt/settingsdialog/selectavatardialog/myavatarlistitem.h +++ b/src/gui/qt/settingsdialog/selectavatardialog/myavatarlistitem.h @@ -15,8 +15,6 @@ #include #include -#include - class MyAvatarListItem : public QListWidgetItem { public: diff --git a/src/gui/qt/startnetworkgamedialog/startnetworkgamedialogimpl.cpp b/src/gui/qt/startnetworkgamedialog/startnetworkgamedialogimpl.cpp index b1042179..4d671f71 100644 --- a/src/gui/qt/startnetworkgamedialog/startnetworkgamedialogimpl.cpp +++ b/src/gui/qt/startnetworkgamedialog/startnetworkgamedialogimpl.cpp @@ -18,12 +18,13 @@ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * ***************************************************************************/ #include "startnetworkgamedialogimpl.h" -// #include "session.h" +#include "session.h" #include "configfile.h" -startNetworkGameDialogImpl::startNetworkGameDialogImpl(QWidget *parent, ConfigFile *config) - : QDialog(parent), myConfig(config) +startNetworkGameDialogImpl::startNetworkGameDialogImpl(QWidget *parent, ConfigFile *config, Session *session) + : QDialog(parent), myConfig(config), mySession(session) { + assert(mySession); setupUi(this); @@ -71,17 +72,19 @@ void startNetworkGameDialogImpl::kickPlayer() { QTreeWidgetItem *item = treeWidget->currentItem(); - QString playerName = item->text(0); - if(playerName == QString::fromUtf8(myConfig->readConfigString("MyName").c_str())) { - { QMessageBox::warning(this, tr("Server Error"), - tr("You should not kick yourself from this game!"), - QMessageBox::Close); } - } - else { -// kickplayerFunktion(playerName.toStdString()); + if (item) + { + QString playerName = item->text(0); + if(playerName == QString::fromUtf8(myConfig->readConfigString("MyName").c_str())) { + { QMessageBox::warning(this, tr("Server Error"), + tr("You should not kick yourself from this game!"), + QMessageBox::Close); } + } + else { + // kickplayerFunktion(playerName.toStdString()); + } } pushButton_Kick->setEnabled(FALSE); - } void startNetworkGameDialogImpl::checkPlayerQuantity() { diff --git a/src/gui/qt/startnetworkgamedialog/startnetworkgamedialogimpl.h b/src/gui/qt/startnetworkgamedialog/startnetworkgamedialogimpl.h index 1324bd6a..a93516e5 100644 --- a/src/gui/qt/startnetworkgamedialog/startnetworkgamedialogimpl.h +++ b/src/gui/qt/startnetworkgamedialog/startnetworkgamedialogimpl.h @@ -22,17 +22,16 @@ #include "ui_startnetworkgamedialog.h" -#include #include #include -// class Session; +class Session; class ConfigFile; class startNetworkGameDialogImpl: public QDialog, public Ui::startNetworkGameDialog { Q_OBJECT public: - startNetworkGameDialogImpl(QWidget *parent = 0, ConfigFile *config = 0); + startNetworkGameDialogImpl(QWidget *parent = 0, ConfigFile *config = 0, Session *session = 0); public slots: @@ -54,6 +53,7 @@ private: int maxPlayerNumber; ConfigFile *myConfig; + Session *mySession; }; #endif diff --git a/src/gui/qt/waitforservertostartgamedialog/waitforservertostartgamedialogimpl.h b/src/gui/qt/waitforservertostartgamedialog/waitforservertostartgamedialogimpl.h index a9227e46..6ca5c9b1 100644 --- a/src/gui/qt/waitforservertostartgamedialog/waitforservertostartgamedialogimpl.h +++ b/src/gui/qt/waitforservertostartgamedialog/waitforservertostartgamedialogimpl.h @@ -22,7 +22,6 @@ #include "ui_waitforservertostartgamedialog.h" -#include #include #include diff --git a/src/session.h b/src/session.h index e776c207..86617cfe 100755 --- a/src/session.h +++ b/src/session.h @@ -23,7 +23,6 @@ #include "playerdata.h" #include "game_defs.h" #include -#include #include class GuiInterface;