Removed iostream includes, as they slow down compilation.

src/engine/local_engine/localhand.cpp

@@ -22,6 +22,8 @@
 #include "cardsvalue.h"
 #include <game_defs.h>
 
+#include <iostream>
+
 using namespace std;
 
 LocalHand::LocalHand(boost::shared_ptr<EngineFactory> f, GuiInterface *g, BoardInterface *b, PlayerInterface **p, int id, int sP, int aP, int dP, int sB,int sC)

src/engine/local_engine/tools.h

@@ -20,7 +20,6 @@
 #ifndef TOOLS_H
 #define TOOLS_H
 
-#include <iostream>
 #include <limits>
 
 

src/gui/qt/connecttoserverdialog/connecttoserverdialogimpl.h

@@ -22,7 +22,6 @@
 
 #include "ui_connecttoserverdialog.h"
 
-#include <iostream>
 #include <QtGui>
 #include <QtCore>
 

src/gui/qt/createnetworkgamedialog/createnetworkgamedialogimpl.h

@@ -22,7 +22,6 @@
 
 #include "ui_createnetworkgamedialog.h"
 
-#include <iostream>
 #include <QtGui>
 #include <QtCore>
 

src/gui/qt/guiwrapper.h

@@ -23,7 +23,6 @@
 #include <guiinterface.h>
 
 #include <string>
-#include <iostream>
 
 class Session;
 class mainWindowImpl;

src/gui/qt/joinnetworkgamedialog/joinnetworkgamedialogimpl.h

@@ -22,7 +22,6 @@
 
 #include "ui_joinnetworkgamedialog.h"
 
-#include <iostream>
 #include <string>
 #include "configfile.h"
 #include <QtGui>

src/gui/qt/mainwindow/chat/chat.h

@@ -21,7 +21,6 @@
 #define CHAT_H
 
 #include <string>
-#include <iostream>
 
 #include "configfile.h"
 

src/gui/qt/mainwindow/log/log.h

@@ -21,7 +21,6 @@
 #define LOG_H
 
 #include <string>
-#include <iostream>
 
 #include "configfile.h"
 

src/gui/qt/mainwindow/mainwindowimpl.h

@@ -23,7 +23,6 @@
 #include "ui_mainwindow.h"
 #include "game_defs.h"
 
-#include <iostream>
 #include <string>
 #include <boost/shared_ptr.hpp>
 

src/gui/qt/mainwindow/mycardspixmaplabel.h

@@ -15,7 +15,6 @@
 #include <QtGui>
 #include <QtCore>
 
-#include <iostream>
 
 class MyCardsPixmapLabel : public QLabel
 {

src/gui/qt/mainwindow/mylefttabwidget.h

@@ -15,7 +15,6 @@
 #include <QtGui>
 #include <QtCore>
 
-#include <iostream>
 
 class MyLeftTabWidget : public QTabWidget
 {

src/gui/qt/mainwindow/myrighttabwidget.h

@@ -15,8 +15,6 @@
 #include <QtGui>
 #include <QtCore>
 
-#include <iostream>
-
 class MyRightTabWidget : public QTabWidget
 {
 Q_OBJECT

src/gui/qt/mainwindow/mysetlabel.h

@@ -15,8 +15,6 @@
 #include <QtGui>
 #include <QtCore>
 
-#include <iostream>
-
 
 class mainWindowImpl;
 

src/gui/qt/mainwindow/startsplash/startsplash.h

@@ -12,8 +12,6 @@
 #ifndef STARTSPLASH_H
 #define STARTSPLASH_H
 
-#include <iostream>
-
 #include "mainwindowimpl.h"
 
 #include <QtGui>

src/gui/qt/newlocalgamedialog/newgamedialogimpl.h

@@ -22,7 +22,6 @@
 
 #include "ui_newgamedialog.h"
 
-#include <iostream>
 #include <QtGui>
 #include <QtCore>
 

src/gui/qt/qttools/qttoolswrapper.h

@@ -24,7 +24,6 @@
 #include <qthelper.h>
 
 #include <string>
-#include <iostream>
 
 class QtHelper;
 

src/gui/qt/settingsdialog/myavatarbutton.h

@@ -15,8 +15,6 @@
 #include <QtGui>
 #include <QtCore>
 
-#include <iostream>
-
 class MyAvatarButton : public QPushButton
 {
 public:

src/gui/qt/settingsdialog/myhpavatarbutton.h

@@ -15,8 +15,6 @@
 #include <QtGui>
 #include <QtCore>
 
-#include <iostream>
-
 class MyHPAvatarButton : public QPushButton
 {
 public:

src/gui/qt/settingsdialog/selectavatardialog/myavatarlistitem.h

@@ -15,8 +15,6 @@
 #include <QtGui>
 #include <QtCore>
 
-#include <iostream>
-
 class MyAvatarListItem : public QListWidgetItem
 {
 public:

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)
+startNetworkGameDialogImpl::startNetworkGameDialogImpl(QWidget *parent, ConfigFile *config, Session *session)
-      : QDialog(parent), myConfig(config)
+      : 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 (item)
-	if(playerName == QString::fromUtf8(myConfig->readConfigString("MyName").c_str())) {
+	{
-		{ QMessageBox::warning(this, tr("Server Error"),
+		QString playerName = item->text(0);
-				tr("You should not kick yourself from this game!"),
+		if(playerName == QString::fromUtf8(myConfig->readConfigString("MyName").c_str())) {
-				QMessageBox::Close); }
+			{ QMessageBox::warning(this, tr("Server Error"),
-	}
+					tr("You should not kick yourself from this game!"),
-	else {
+					QMessageBox::Close); }
-// 		kickplayerFunktion(playerName.toStdString());
+		}
+		else {
+	// 		kickplayerFunktion(playerName.toStdString());
+		}
 	}
 	pushButton_Kick->setEnabled(FALSE);
-
 }
 
 void startNetworkGameDialogImpl::checkPlayerQuantity() {

src/gui/qt/startnetworkgamedialog/startnetworkgamedialogimpl.h

@@ -22,17 +22,16 @@
 
 #include "ui_startnetworkgamedialog.h"
 
-#include <iostream>
 #include <QtGui>
 #include <QtCore>
 
-// 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

src/gui/qt/waitforservertostartgamedialog/waitforservertostartgamedialogimpl.h

@@ -22,7 +22,6 @@
 
 #include "ui_waitforservertostartgamedialog.h"
 
-#include <iostream>
 #include <QtGui>
 #include <QtCore>
 

src/session.h

@@ -23,7 +23,6 @@
 #include "playerdata.h"
 #include "game_defs.h"
 #include <string>
-#include <iostream>
 #include <boost/shared_ptr.hpp>
 
 class GuiInterface;