diff --git a/src/chatcleaner/cleanerconfig.cpp b/src/chatcleaner/cleanerconfig.cpp
index f6423546..9db977f0 100644
--- a/src/chatcleaner/cleanerconfig.cpp
+++ b/src/chatcleaner/cleanerconfig.cpp
@@ -278,7 +278,7 @@ void CleanerConfig::writeBuffer() const {
 			tmpElement->SetAttribute("type", "list");
 			list<string> tempList = configBufferList[i].defaultListValue;
 			list<string>::iterator it;
-			for(it = tempList.begin(); it != tempList.end(); it++) {
+			for(it = tempList.begin(); it != tempList.end(); ++it) {
 		
 				TiXmlElement *tmpSubElement = new TiXmlElement(configBufferList[i].defaultValue);
 				tmpElement->LinkEndChild( tmpSubElement );
@@ -319,7 +319,7 @@ void CleanerConfig::updateConfig(ConfigState myConfigState) {
 				tmpElement->SetAttribute("type", "list");
 				list<string> tempList = configList[i].defaultListValue;
 				list<string>::iterator it;
-				for(it = tempList.begin(); it != tempList.end(); it++) {
+				for(it = tempList.begin(); it != tempList.end(); ++it) {
 			
 					TiXmlElement *tmpSubElement = new TiXmlElement(configList[i].defaultValue);
 					tmpElement->LinkEndChild( tmpSubElement );
@@ -397,7 +397,7 @@ void CleanerConfig::updateConfig(ConfigState myConfigState) {
 								tmpElement->SetAttribute("type", "list");
 								list<string> tempList = tempStringList2;
 								list<string>::iterator it;
-								for(it = tempList.begin(); it != tempList.end(); it++) {
+								for(it = tempList.begin(); it != tempList.end(); ++it) {
 								
 									TiXmlElement *tmpSubElement = new TiXmlElement(tempString1);
 									tmpElement->LinkEndChild( tmpSubElement );
@@ -418,7 +418,7 @@ void CleanerConfig::updateConfig(ConfigState myConfigState) {
 						tmpElement->SetAttribute("type", "list");
 						list<string> tempList = configList[i].defaultListValue;
 						list<string>::iterator it;
-						for(it = tempList.begin(); it != tempList.end(); it++) {
+						for(it = tempList.begin(); it != tempList.end(); ++it) {
 					
 							TiXmlElement *tmpSubElement = new TiXmlElement(configList[i].defaultValue);
 							tmpElement->LinkEndChild( tmpSubElement );
@@ -507,7 +507,7 @@ list<int> CleanerConfig::readConfigIntList(string varName) const
 	string tempString;
 	int tempInt;
 	list<string>::iterator it;
-	for(it = tempStringList.begin(); it != tempStringList.end(); it++) {
+	for(it = tempStringList.begin(); it != tempStringList.end(); ++it) {
 		
 		isst.str(*it);
 		isst >> tempInt;
@@ -549,7 +549,7 @@ void CleanerConfig::writeConfigIntList(string varName, list<int> varCont)
 		if (configBufferList[i].name == varName) {
 			string tempString;
 			list<int>::iterator it;
-			for(it = varCont.begin(); it != varCont.end(); it++) {
+			for(it = varCont.begin(); it != varCont.end(); ++it) {
 			
 				intToString << (*it);	
 				stringList.push_back(intToString.str());
diff --git a/src/chatcleaner/messagefilter.cpp b/src/chatcleaner/messagefilter.cpp
index 08b126a4..a4bbea9c 100644
--- a/src/chatcleaner/messagefilter.cpp
+++ b/src/chatcleaner/messagefilter.cpp
@@ -172,7 +172,7 @@ void MessageFilter::refreshConfig() {
     std::list<std::string> badWordsList = config->readConfigStringList("BadWordsList");
     std::list<std::string>::iterator it1;
     QStringList bwList;
-    for(it1= badWordsList.begin(); it1 != badWordsList.end(); it1++) {
+	for(it1= badWordsList.begin(); it1 != badWordsList.end(); ++it1) {
         bwList << QString::fromUtf8(it1->c_str());
     }
     myBadWordCheck->setBadWords(bwList);
@@ -180,7 +180,7 @@ void MessageFilter::refreshConfig() {
     std::list<std::string> urlStringsList = config->readConfigStringList("UrlStringsList");
     std::list<std::string>::iterator it2;
     QStringList urlList;
-    for(it2= urlStringsList.begin(); it2 != urlStringsList.end(); it2++) {
+	for(it2= urlStringsList.begin(); it2 != urlStringsList.end(); ++it2) {
         urlList << QString::fromUtf8(it2->c_str());
     }
     myUrlCheck->setUrlStrings(urlList);
@@ -188,7 +188,7 @@ void MessageFilter::refreshConfig() {
     std::list<std::string> urlExceptionStringsList = config->readConfigStringList("UrlExceptionStringsList");
     std::list<std::string>::iterator it3;
     QStringList urlExceptionList;
-    for(it3= urlExceptionStringsList.begin(); it3 != urlExceptionStringsList.end(); it3++) {
+	for(it3= urlExceptionStringsList.begin(); it3 != urlExceptionStringsList.end(); ++it3) {
         urlExceptionList << QString::fromUtf8(it3->c_str());
     }
     myUrlCheck->setUrlExceptionStrings(urlExceptionList);
diff --git a/src/config/configfile.cpp b/src/config/configfile.cpp
index 60a27b9e..2d682d5f 100644
--- a/src/config/configfile.cpp
+++ b/src/config/configfile.cpp
@@ -416,7 +416,7 @@ void ConfigFile::writeBuffer() const {
                 tmpElement->SetAttribute("type", "list");
                 list<string> tempList = configBufferList[i].defaultListValue;
                 list<string>::iterator it;
-                for(it = tempList.begin(); it != tempList.end(); it++) {
+				for(it = tempList.begin(); it != tempList.end(); ++it) {
 
                     TiXmlElement *tmpSubElement = new TiXmlElement(configBufferList[i].defaultValue);
                     tmpElement->LinkEndChild( tmpSubElement );
@@ -460,7 +460,7 @@ void ConfigFile::updateConfig(ConfigState myConfigState) {
                 tmpElement->SetAttribute("type", "list");
                 list<string> tempList = configList[i].defaultListValue;
                 list<string>::iterator it;
-                for(it = tempList.begin(); it != tempList.end(); it++) {
+				for(it = tempList.begin(); it != tempList.end(); ++it) {
 
                     TiXmlElement *tmpSubElement = new TiXmlElement(configList[i].defaultValue);
                     tmpElement->LinkEndChild( tmpSubElement );
@@ -545,7 +545,7 @@ void ConfigFile::updateConfig(ConfigState myConfigState) {
                                 tmpElement->SetAttribute("type", "list");
                                 list<string> tempList = tempStringList2;
                                 list<string>::iterator it;
-                                for(it = tempList.begin(); it != tempList.end(); it++) {
+								for(it = tempList.begin(); it != tempList.end(); ++it) {
 
                                     TiXmlElement *tmpSubElement = new TiXmlElement(tempString1);
                                     tmpElement->LinkEndChild( tmpSubElement );
@@ -566,7 +566,7 @@ void ConfigFile::updateConfig(ConfigState myConfigState) {
                         tmpElement->SetAttribute("type", "list");
                         list<string> tempList = configList[i].defaultListValue;
                         list<string>::iterator it;
-                        for(it = tempList.begin(); it != tempList.end(); it++) {
+						for(it = tempList.begin(); it != tempList.end(); ++it) {
 
                             TiXmlElement *tmpSubElement = new TiXmlElement(configList[i].defaultValue);
                             tmpElement->LinkEndChild( tmpSubElement );
@@ -641,7 +641,7 @@ list<int> ConfigFile::readConfigIntList(string varName) const
     string tempString;
     int tempInt;
     list<string>::iterator it;
-    for(it = tempStringList.begin(); it != tempStringList.end(); it++) {
+	for(it = tempStringList.begin(); it != tempStringList.end(); ++it) {
 
         isst.str(*it);
         isst >> tempInt;
@@ -700,7 +700,7 @@ void ConfigFile::writeConfigIntList(string varName, list<int> varCont)
         if (configBufferList[i].name == varName) {
             string tempString;
             list<int>::iterator it;
-            for(it = varCont.begin(); it != varCont.end(); it++) {
+			for(it = varCont.begin(); it != varCont.end(); ++it) {
 
                 intToString << (*it);
                 stringList.push_back(intToString.str());
diff --git a/src/engine/local_engine/localbero.cpp b/src/engine/local_engine/localbero.cpp
index 782e784b..0b325b3e 100644
--- a/src/engine/local_engine/localbero.cpp
+++ b/src/engine/local_engine/localbero.cpp
@@ -34,7 +34,7 @@ LocalBeRo::LocalBeRo(HandInterface* hi, int id, unsigned dP, int sB, GameState g
 	PlayerListConstIterator it_c;
 
 	// determine bigBlindPosition
-	for(it_c=myHand->getActivePlayerList()->begin(); it_c!=myHand->getActivePlayerList()->end(); it_c++) {
+	for(it_c=myHand->getActivePlayerList()->begin(); it_c!=myHand->getActivePlayerList()->end(); ++it_c) {
 		if((*it_c)->getMyButton() == BUTTON_BIG_BLIND) {
 			bigBlindPositionId = (*it_c)->getMyUniqueID();
 			break;
@@ -45,7 +45,7 @@ LocalBeRo::LocalBeRo(HandInterface* hi, int id, unsigned dP, int sB, GameState g
 	}
 
 	// determine smallBlindPosition
-	for(it_c=myHand->getActivePlayerList()->begin(); it_c!=myHand->getActivePlayerList()->end(); it_c++) {
+	for(it_c=myHand->getActivePlayerList()->begin(); it_c!=myHand->getActivePlayerList()->end(); ++it_c) {
 		if((*it_c)->getMyButton() == BUTTON_SMALL_BLIND) {
 			smallBlindPositionId = (*it_c)->getMyUniqueID();
 			break;
@@ -108,7 +108,7 @@ void LocalBeRo::run() {
 					for(size_t i=0; i<myHand->getActivePlayerList()->size(); i++) {
 		
 						if(it_1 == myHand->getActivePlayerList()->begin()) it_1 = myHand->getActivePlayerList()->end();
-						it_1--;
+						--it_1;
 		
 						it_2 = myHand->getRunningPlayerIt((*it_1)->getMyUniqueID());
 						// running player found
@@ -157,7 +157,7 @@ void LocalBeRo::run() {
 
 
 		// check if all running players have same sets (else allHighestSet = false)
-		for( it_c = myHand->getRunningPlayerList()->begin(); it_c != myHand->getRunningPlayerList()->end(); it_c++) {
+		for( it_c = myHand->getRunningPlayerList()->begin(); it_c != myHand->getRunningPlayerList()->end(); ++it_c) {
 			if(highestSet != (*it_c)->getMySet()) {
 				allHighestSet = false;
 				break;
@@ -172,7 +172,7 @@ void LocalBeRo::run() {
 			myHand->setCurrentRound(myBeRoID+1);
 
 			//Action loeschen und ActionButtons refresh
-			for(it_c=myHand->getRunningPlayerList()->begin(); it_c!=myHand->getRunningPlayerList()->end(); it_c++) {
+			for(it_c=myHand->getRunningPlayerList()->begin(); it_c!=myHand->getRunningPlayerList()->end(); ++it_c) {
 				(*it_c)->setMyAction(PLAYER_ACTION_NONE);
 			}
 
@@ -205,7 +205,7 @@ void LocalBeRo::run() {
 				throw LocalException(__FILE__, __LINE__, ERR_RUNNING_PLAYER_NOT_FOUND);
 			}
 			
-			currentPlayersTurnIt++;
+			++currentPlayersTurnIt;
 			if(currentPlayersTurnIt == myHand->getRunningPlayerList()->end()) currentPlayersTurnIt = myHand->getRunningPlayerList()->begin();
 			
 			currentPlayersTurnId = (*currentPlayersTurnIt)->getMyUniqueID();
diff --git a/src/engine/local_engine/localberopostriver.cpp b/src/engine/local_engine/localberopostriver.cpp
index c568ff9b..2796f559 100644
--- a/src/engine/local_engine/localberopostriver.cpp
+++ b/src/engine/local_engine/localberopostriver.cpp
@@ -42,7 +42,7 @@ void LocalBeRoPostRiver::postRiverRun() {
 	PlayerListIterator it;
 
 	// who is the winner
-	for(it_c=getMyHand()->getActivePlayerList()->begin(); it_c!=getMyHand()->getActivePlayerList()->end(); it_c++) {
+	for(it_c=getMyHand()->getActivePlayerList()->begin(); it_c!=getMyHand()->getActivePlayerList()->end(); ++it_c) {
 
 		if( (*it_c)->getMyAction() != PLAYER_ACTION_FOLD && (*it_c)->getMyCardsValueInt() > highestCardsValue ) { 
 			highestCardsValue = (*it_c)->getMyCardsValueInt(); 
@@ -51,7 +51,7 @@ void LocalBeRoPostRiver::postRiverRun() {
 
 	int potPlayers = 0;
 
-	for(it_c=getMyHand()->getActivePlayerList()->begin(); it_c!=getMyHand()->getActivePlayerList()->end(); it_c++) {
+	for(it_c=getMyHand()->getActivePlayerList()->begin(); it_c!=getMyHand()->getActivePlayerList()->end(); ++it_c) {
 		if( (*it_c)->getMyAction() != PLAYER_ACTION_FOLD) {
 			potPlayers++;
 		}
@@ -59,7 +59,7 @@ void LocalBeRoPostRiver::postRiverRun() {
 
 	// prüfen ob nur noch human player an der verteilung teilnimmt und myAggressive für human player setzen
 	if(potPlayers == 1) {
-		for(it=getMyHand()->getActivePlayerList()->begin(); it!=getMyHand()->getActivePlayerList()->end(); it++) {
+		for(it=getMyHand()->getActivePlayerList()->begin(); it!=getMyHand()->getActivePlayerList()->end(); ++it) {
 			if( (*it)->getMyAction() != PLAYER_ACTION_FOLD) {
 				(*it)->setMyAggressive(true);
 			}
diff --git a/src/engine/local_engine/localberopreflop.cpp b/src/engine/local_engine/localberopreflop.cpp
index f5403730..0db1562b 100644
--- a/src/engine/local_engine/localberopreflop.cpp
+++ b/src/engine/local_engine/localberopreflop.cpp
@@ -65,7 +65,7 @@ void LocalBeRoPreflop::run() {
 					}
 	
 					if(it == getMyHand()->getActivePlayerList()->begin()) it = getMyHand()->getActivePlayerList()->end();
-					it--;
+					--it;
 	
 					setFirstRoundLastPlayersTurnId( (*it)->getMyUniqueID() );
 	
@@ -114,7 +114,7 @@ void LocalBeRoPreflop::run() {
 	PlayerListConstIterator it_c;
 
 	// check if all running players have same sets (else allHighestSet = false)
-	for(it_c=getMyHand()->getRunningPlayerList()->begin(); it_c!=getMyHand()->getRunningPlayerList()->end(); it_c++) {
+	for(it_c=getMyHand()->getRunningPlayerList()->begin(); it_c!=getMyHand()->getRunningPlayerList()->end(); ++it_c) {
 		if(getHighestSet() != (*it_c)->getMySet()) {
 			allHighestSet = false;
 			break;
@@ -127,7 +127,7 @@ void LocalBeRoPreflop::run() {
 		throw LocalException(__FILE__, __LINE__, ERR_RUNNING_PLAYER_NOT_FOUND);
 	}
 
-	currentPlayersTurnIt++;
+	++currentPlayersTurnIt;
 	if(currentPlayersTurnIt == getMyHand()->getRunningPlayerList()->end()) currentPlayersTurnIt = getMyHand()->getRunningPlayerList()->begin();
 
 	setCurrentPlayersTurnId( (*currentPlayersTurnIt)->getMyUniqueID() );
@@ -140,7 +140,7 @@ void LocalBeRoPreflop::run() {
 		getMyHand()->setCurrentRound(GAME_STATE_FLOP);
 
 		//Action loeschen und ActionButtons refresh
-		for(it_c=getMyHand()->getRunningPlayerList()->begin(); it_c!=getMyHand()->getRunningPlayerList()->end(); it_c++) {
+		for(it_c=getMyHand()->getRunningPlayerList()->begin(); it_c!=getMyHand()->getRunningPlayerList()->end(); ++it_c) {
 			(*it_c)->setMyAction(PLAYER_ACTION_NONE);
 		}
 
diff --git a/src/engine/local_engine/localboard.cpp b/src/engine/local_engine/localboard.cpp
index 1f3883d0..835a34b5 100755
--- a/src/engine/local_engine/localboard.cpp
+++ b/src/engine/local_engine/localboard.cpp
@@ -47,7 +47,7 @@ void LocalBoard::collectSets() {
 	sets = 0;
 
 	PlayerListConstIterator it_c;
-	for(it_c=seatsList->begin(); it_c!=seatsList->end(); it_c++) {
+	for(it_c=seatsList->begin(); it_c!=seatsList->end(); ++it_c) {
 		sets += (*it_c)->getMySet();
 	}
 
@@ -59,7 +59,7 @@ void LocalBoard::collectPot() {
 	sets = 0;
 
 	PlayerListIterator it;
-	for(it=seatsList->begin(); it!=seatsList->end(); it++) {
+	for(it=seatsList->begin(); it!=seatsList->end(); ++it) {
 		(*it)->setMySetNull();
 	}
 
@@ -75,7 +75,7 @@ void LocalBoard::distributePot() {
 
 	// filling player sets vector
 	vector<unsigned> playerSets;
-	for(it=seatsList->begin(); it!=seatsList->end(); it++) {
+	for(it=seatsList->begin(); it!=seatsList->end(); ++it) {
 		if((*it)->getMyActiveStatus()) {
 			playerSets.push_back( ( ((*it)->getMyRoundStartCash()) - ((*it)->getMyCash()) ) );
 		} else {
@@ -114,14 +114,14 @@ void LocalBoard::distributePot() {
 			potLevel.push_back((playerSetsSort.size()-i)*potLevel[0]);
 
 			// determine level highestCardsValue
-			for(it_c=seatsList->begin(), j=0; it_c!=seatsList->end(); it_c++,j++) {
+			for(it_c=seatsList->begin(), j=0; it_c!=seatsList->end(); ++it_c,j++) {
 				if((*it_c)->getMyActiveStatus() && (*it_c)->getMyCardsValueInt() > highestCardsValue && (*it_c)->getMyAction() != PLAYER_ACTION_FOLD && playerSets[j] >= potLevel[0]) { 
 					highestCardsValue = (*it_c)->getMyCardsValueInt(); 
 				}
 			}
 
 			// level winners
-			for(it_c=seatsList->begin(), j=0; it_c!=seatsList->end(); it_c++,j++) {
+			for(it_c=seatsList->begin(), j=0; it_c!=seatsList->end(); ++it_c,j++) {
 				if((*it_c)->getMyActiveStatus() && highestCardsValue == (*it_c)->getMyCardsValueInt() && (*it_c)->getMyAction() != PLAYER_ACTION_FOLD && playerSets[j] >= potLevel[0]) {
 					potLevel.push_back((*it_c)->getMyUniqueID());
 				}
@@ -140,7 +140,7 @@ void LocalBoard::distributePot() {
 
 				for(j=2; j<potLevel.size(); j++) {
                     // find seat with potLevel[j]-ID
-                    for(it=seatsList->begin(); it!=seatsList->end(); it++) {
+					for(it=seatsList->begin(); it!=seatsList->end(); ++it) {
                         if((*it)->getMyUniqueID() == potLevel[j]) {
                             break;
                         }
@@ -163,7 +163,7 @@ void LocalBoard::distributePot() {
 // 				winnerPointer = currentHand->getDealerPosition();
 
                 // find Seat with dealerPosition
-                for(it=seatsList->begin(); it!=seatsList->end(); it++) {
+				for(it=seatsList->begin(); it!=seatsList->end(); ++it) {
                     if((*it)->getMyUniqueID() == dealerPosition) {
                         break;
                     }
@@ -182,7 +182,7 @@ void LocalBoard::distributePot() {
 
 // 						winnerHit = false;
 
-						it++;
+						++it;
 						if(it == seatsList->end())
 							it = seatsList->begin();
 
@@ -256,7 +256,7 @@ void LocalBoard::determinePlayerNeedToShowCards() {
 
         PlayerListConstIterator it_c;
 
-        for(it_c = activePlayerList->begin(); it_c != activePlayerList->end(); it_c++) {
+		for(it_c = activePlayerList->begin(); it_c != activePlayerList->end(); ++it_c) {
             if((*it_c)->getMyAction() != PLAYER_ACTION_FOLD) {
                 playerNeedToShowCards.push_back((*it_c)->getMyUniqueID());
             }
@@ -296,7 +296,7 @@ void LocalBoard::determinePlayerNeedToShowCards() {
 
         //    cout << "lAP-Ende: " << currentHand->getLastActionPlayer() << endl;
             // search lastActionPlayer
-            for(it_c = activePlayerList->begin(); it_c != activePlayerList->end(); it_c++) {
+			for(it_c = activePlayerList->begin(); it_c != activePlayerList->end(); ++it_c) {
                 if((*it_c)->getMyUniqueID() == lastActionPlayer && (*it_c)->getMyAction() != PLAYER_ACTION_FOLD) {
                     lastActionPlayerIt = it_c;
 //                    cout << (*it_c)->getMyUniqueID() << endl;
@@ -305,7 +305,7 @@ void LocalBoard::determinePlayerNeedToShowCards() {
             }
 
             if(it_c == activePlayerList->end()) {
-                for(it_c = activePlayerList->begin(); it_c != activePlayerList->end(); it_c++) {
+				for(it_c = activePlayerList->begin(); it_c != activePlayerList->end(); ++it_c) {
                     if((*it_c)->getMyAction() != PLAYER_ACTION_FOLD) {
                         lastActionPlayerIt = it_c;
                         break;
@@ -337,7 +337,7 @@ void LocalBoard::determinePlayerNeedToShowCards() {
         //    firstAfterLastActionPlayerIt++;
 
             it_c = lastActionPlayerIt;
-            it_c++;
+			++it_c;
 
             for(unsigned i = 0; i < activePlayerList->size(); i++) {
 
@@ -404,7 +404,7 @@ void LocalBoard::determinePlayerNeedToShowCards() {
 
                 }
 
-                it_c++;
+				++it_c;
 
             }
 
diff --git a/src/engine/local_engine/localhand.cpp b/src/engine/local_engine/localhand.cpp
index a7bdb837..6dbf3e49 100755
--- a/src/engine/local_engine/localhand.cpp
+++ b/src/engine/local_engine/localhand.cpp
@@ -40,7 +40,7 @@ LocalHand::LocalHand(boost::shared_ptr<EngineFactory> f, GuiInterface *g, boost:
 
 	CardsValue myCardsValue;
 
-	for(it=seatsList->begin(); it!=seatsList->end(); it++) {
+	for(it=seatsList->begin(); it!=seatsList->end(); ++it) {
 		(*it)->setHand(this);
 		// set myFlipCards 0
 		(*it)->setMyCardsFlip(0, 0);
@@ -61,7 +61,7 @@ LocalHand::LocalHand(boost::shared_ptr<EngineFactory> f, GuiInterface *g, boost:
 
 	k = 0;
 	myBoard->setMyCards(tempBoardArray);
-	for(it=activePlayerList->begin(); it!=activePlayerList->end(); it++, k++) {
+	for(it=activePlayerList->begin(); it!=activePlayerList->end(); ++it, k++) {
 
 		(*it)->getMyBestHandPosition(bestHandPos);
 
@@ -144,7 +144,7 @@ LocalHand::LocalHand(boost::shared_ptr<EngineFactory> f, GuiInterface *g, boost:
 				(*it)->setMyBestHandPosition(temp5Array);
 
 				// player1
-				it++;
+				++it;
 		
                                 tempPlayerArray[0] = 31;
                                 tempPlayerArray[1] = 8;
@@ -157,7 +157,7 @@ LocalHand::LocalHand(boost::shared_ptr<EngineFactory> f, GuiInterface *g, boost:
 				(*it)->setMyBestHandPosition(temp5Array);
 			
 				// player2
-				it++;
+				++it;
 		
                                 tempPlayerArray[0] = 26;
                                 tempPlayerArray[1] = 27;
@@ -170,7 +170,7 @@ LocalHand::LocalHand(boost::shared_ptr<EngineFactory> f, GuiInterface *g, boost:
 				(*it)->setMyBestHandPosition(temp5Array);
 	
 				// player3
-				it++;
+				++it;
 			
                                 tempPlayerArray[0] = 31;
                                 tempPlayerArray[1] = 30;
@@ -183,7 +183,7 @@ LocalHand::LocalHand(boost::shared_ptr<EngineFactory> f, GuiInterface *g, boost:
                                 (*it)->setMyBestHandPosition(temp5Array);
 
 				// player4
-				it++;
+				++it;
 			
                                 tempPlayerArray[0] = 50;
                                 tempPlayerArray[1] = 51;
@@ -196,7 +196,7 @@ LocalHand::LocalHand(boost::shared_ptr<EngineFactory> f, GuiInterface *g, boost:
 				(*it)->setMyBestHandPosition(temp5Array);
 
 				// player5
-				it++;
+				++it;
 			
                                 tempPlayerArray[0] = 25;
                                 tempPlayerArray[1] = 24;
@@ -209,7 +209,7 @@ LocalHand::LocalHand(boost::shared_ptr<EngineFactory> f, GuiInterface *g, boost:
                                 (*it)->setMyBestHandPosition(temp5Array);
 
 				// player6
-				it++;
+				++it;
 			
                                 tempPlayerArray[0] = 38;
                                 tempPlayerArray[1] = 37;
@@ -222,7 +222,7 @@ LocalHand::LocalHand(boost::shared_ptr<EngineFactory> f, GuiInterface *g, boost:
 				(*it)->setMyBestHandPosition(temp5Array);
 
                                 // player7
-                                it++;
+								++it;
 
                                 tempPlayerArray[0] = 32;
                                 tempPlayerArray[1] = 33;
@@ -235,7 +235,7 @@ LocalHand::LocalHand(boost::shared_ptr<EngineFactory> f, GuiInterface *g, boost:
                                 (*it)->setMyBestHandPosition(temp5Array);
 
                                 // player8
-                                it++;
+								++it;
 
                                 tempPlayerArray[0] = 19;
                                 tempPlayerArray[1] = 20;
@@ -279,7 +279,7 @@ LocalHand::LocalHand(boost::shared_ptr<EngineFactory> f, GuiInterface *g, boost:
 // 				(*it)->setMyBestHandPosition(temp5Array);
 
 				// player1
-				it++;
+				++it;
 		
 // 				tempPlayerArray[0] = 47;
 // 				tempPlayerArray[1] = 22;
@@ -292,7 +292,7 @@ LocalHand::LocalHand(boost::shared_ptr<EngineFactory> f, GuiInterface *g, boost:
 // 				(*it)->setMyBestHandPosition(temp5Array);
 			
 				// player2
-				it++;
+				++it;
 		
 // 				tempPlayerArray[0] = 33;
 // 				tempPlayerArray[1] = 27;
@@ -305,7 +305,7 @@ LocalHand::LocalHand(boost::shared_ptr<EngineFactory> f, GuiInterface *g, boost:
 // 				(*it)->setMyBestHandPosition(temp5Array);
 	
 				// player3
-				it++;
+				++it;
 			
 // 				tempPlayerArray[0] = 38;
 // 				tempPlayerArray[1] = 22;
@@ -318,7 +318,7 @@ LocalHand::LocalHand(boost::shared_ptr<EngineFactory> f, GuiInterface *g, boost:
 // 				(*it)->setMyBestHandPosition(temp5Array);
 
 				// player4
-				it++;
+				++it;
 			
 // 				tempPlayerArray[0] = 25;
 // 				tempPlayerArray[1] = 16;
@@ -331,7 +331,7 @@ LocalHand::LocalHand(boost::shared_ptr<EngineFactory> f, GuiInterface *g, boost:
 // 				(*it)->setMyBestHandPosition(temp5Array);
 
 				// player5
-				it++;
+				++it;
 			
 // 				tempPlayerArray[0] = 27;
 // 				tempPlayerArray[1] = 10;
@@ -396,7 +396,7 @@ void LocalHand::assignButtons() {
 	PlayerListConstIterator it_c;
 
 	// delete all buttons
-	for (it=seatsList->begin(); it!=seatsList->end(); it++) {
+	for (it=seatsList->begin(); it!=seatsList->end(); ++it) {
 		(*it)->setMyButton(BUTTON_NONE);
 	}
 
@@ -418,7 +418,7 @@ void LocalHand::assignButtons() {
 
 	for(i=0; i<seatsList->size(); i++) {
 
-		dealerPositionIt++;
+		++dealerPositionIt;
 		if(dealerPositionIt == seatsList->end()) dealerPositionIt = seatsList->begin();
 
 		it = getActivePlayerIt( (*dealerPositionIt)->getMyUniqueID() );
@@ -439,7 +439,7 @@ void LocalHand::assignButtons() {
                         lastActionPlayer = (*it)->getMyUniqueID();
                         myBoard->setLastActionPlayer(lastActionPlayer);
 
-			it++;
+			++it;
 			if(it == activePlayerList->end()) it = activePlayerList->begin();
 
                         if(activePlayerList->size() > 2) {
@@ -463,7 +463,7 @@ void LocalHand::assignButtons() {
 //        cout << "lAP-Button: " << lastActionPlayer << endl;
 
 	//do sets --> TODO switch?
-	for (it_c=runningPlayerList->begin(); it_c!=runningPlayerList->end(); it_c++) { 
+	for (it_c=runningPlayerList->begin(); it_c!=runningPlayerList->end(); ++it_c) {
 
 		//small blind
 		if((*it_c)->getMyButton() == BUTTON_SMALL_BLIND) { 
@@ -514,24 +514,24 @@ void LocalHand::switchRounds() {
 
 				it_1 = it;
 				if(it_1 == runningPlayerList->begin()) it_1 = runningPlayerList->end();
-				it_1--;
+				--it_1;
 				getCurrentBeRo()->setCurrentPlayersTurnId((*it_1)->getMyUniqueID());
 
 			}
 		} else {
-			it++;
+			++it;
 		}
 	}
 
 	// determine number of all in players
 	int allInPlayersCounter = 0;
-	for (it_c=activePlayerList->begin(); it_c!=activePlayerList->end(); it_c++) {
+	for (it_c=activePlayerList->begin(); it_c!=activePlayerList->end(); ++it_c) {
 		if ((*it_c)->getMyAction() == PLAYER_ACTION_ALLIN) allInPlayersCounter++;
 	}
 
 	// determine number of non-fold players
 	int nonFoldPlayerCounter = 0;
-	for (it_c=activePlayerList->begin(); it_c!=activePlayerList->end(); it_c++) {
+	for (it_c=activePlayerList->begin(); it_c!=activePlayerList->end(); ++it_c) {
 		if ((*it_c)->getMyAction() != PLAYER_ACTION_FOLD) nonFoldPlayerCounter++;
 	}
 
@@ -556,7 +556,7 @@ void LocalHand::switchRounds() {
 		// 2) all players but one all in and he has highest set
 		if(allInPlayersCounter+1 == nonFoldPlayerCounter) {
 
-			for(it_c=runningPlayerList->begin(); it_c!=runningPlayerList->end(); it_c++) {
+			for(it_c=runningPlayerList->begin(); it_c!=runningPlayerList->end(); ++it_c) {
 
 				if((*it_c)->getMySet() >= myBeRo[currentRound]->getHighestSet()) {
 						allInCondition = true;
@@ -572,7 +572,7 @@ void LocalHand::switchRounds() {
 				if(smallBlindIt_c!=runningPlayerList->end() &&  bigBlindIt_c!=activePlayerList->end() && currentRound == GAME_STATE_PREFLOP && myBeRo[currentRound]->getFirstRound()) {
 					// determine player who are all in with less than small blind amount
 					int tempCounter = 0;
-					for(it_c=activePlayerList->begin(); it_c!=activePlayerList->end(); it_c++) {
+					for(it_c=activePlayerList->begin(); it_c!=activePlayerList->end(); ++it_c) {
 						if((*it_c)->getMyAction() == PLAYER_ACTION_ALLIN && (*it_c)->getMySet() <= smallBlind) {
 							tempCounter++;
 						}
@@ -584,7 +584,7 @@ void LocalHand::switchRounds() {
 				}
 
 				// no.2: heads up -> detect player who is all in and bb but could set less than sb
-				for(it_c=activePlayerList->begin(); it_c!=activePlayerList->end(); it_c++) {
+				for(it_c=activePlayerList->begin(); it_c!=activePlayerList->end(); ++it_c) {
 	
                     if(activePlayerList->size()==2 && (*it_c)->getMyAction() == PLAYER_ACTION_ALLIN && (*it_c)->getMyButton()==BUTTON_BIG_BLIND && (*it_c)->getMySet()<=smallBlind && currentRound == GAME_STATE_PREFLOP) {
                         allInCondition = true;
@@ -659,7 +659,7 @@ PlayerListIterator LocalHand::getSeatIt(unsigned uniqueId) const {
 
 	PlayerListIterator it;
 
-	for(it=seatsList->begin(); it!=seatsList->end(); it++) {
+	for(it=seatsList->begin(); it!=seatsList->end(); ++it) {
 		if((*it)->getMyUniqueID() == uniqueId) {
 			break;
 		}
@@ -673,7 +673,7 @@ PlayerListIterator LocalHand::getActivePlayerIt(unsigned uniqueId) const {
 
 	PlayerListIterator it;
 
-	for(it=activePlayerList->begin(); it!=activePlayerList->end(); it++) {
+	for(it=activePlayerList->begin(); it!=activePlayerList->end(); ++it) {
 		if((*it)->getMyUniqueID() == uniqueId) {
 			break;
 		}
@@ -687,7 +687,7 @@ PlayerListIterator LocalHand::getRunningPlayerIt(unsigned uniqueId) const {
 
 	PlayerListIterator it;
 
-	for(it=runningPlayerList->begin(); it!=runningPlayerList->end(); it++) {
+	for(it=runningPlayerList->begin(); it!=runningPlayerList->end(); ++it) {
 
 		if((*it)->getMyUniqueID() == uniqueId) {
 			break;
diff --git a/src/engine/local_engine/localplayer.cpp b/src/engine/local_engine/localplayer.cpp
index ab482fb5..80fbec9e 100755
--- a/src/engine/local_engine/localplayer.cpp
+++ b/src/engine/local_engine/localplayer.cpp
@@ -1150,7 +1150,7 @@ void LocalPlayer::preflopEngine() {
 
     // count number of active human players
     size_t countHumanPlayers = 0;
-    for(it_c=currentHand->getActivePlayerList()->begin(); it_c!=currentHand->getActivePlayerList()->end(); it_c++) {
+	for(it_c=currentHand->getActivePlayerList()->begin(); it_c!=currentHand->getActivePlayerList()->end(); ++it_c) {
         if((*it_c)->getMyType() == PLAYER_TYPE_HUMAN) {
             countHumanPlayers++;
         }
@@ -1159,7 +1159,7 @@ void LocalPlayer::preflopEngine() {
         // local or network game and only one human player is active --> set aggValue
         if(countHumanPlayers == 1) {
 
-            for(it_c=currentHand->getActivePlayerList()->begin(); it_c!=currentHand->getActivePlayerList()->end(); it_c++) {
+			for(it_c=currentHand->getActivePlayerList()->begin(); it_c!=currentHand->getActivePlayerList()->end(); ++it_c) {
                 if((*it_c)->getMyType() == PLAYER_TYPE_HUMAN &&  (*it_c)->getMyAction() != PLAYER_ACTION_FOLD) {
                     int aggValue = (int)((( (*it_c)->getMyAggressive()*1.0)/7.0 - 1.0/currentHand->getActivePlayerList()->size())*21.0);
                     myNiveau[0] -= aggValue;
@@ -1506,7 +1506,7 @@ void LocalPlayer::flopEngine() {
 
     // count number of active human players
     size_t countHumanPlayers = 0;
-    for(it_c=currentHand->getActivePlayerList()->begin(); it_c!=currentHand->getActivePlayerList()->end(); it_c++) {
+	for(it_c=currentHand->getActivePlayerList()->begin(); it_c!=currentHand->getActivePlayerList()->end(); ++it_c) {
         if((*it_c)->getMyType() == PLAYER_TYPE_HUMAN) {
             countHumanPlayers++;
         }
@@ -1515,7 +1515,7 @@ void LocalPlayer::flopEngine() {
         // local or network game and only one human player is active --> set aggValue
         if(countHumanPlayers == 1) {
 
-            for(it_c=currentHand->getActivePlayerList()->begin(); it_c!=currentHand->getActivePlayerList()->end(); it_c++) {
+			for(it_c=currentHand->getActivePlayerList()->begin(); it_c!=currentHand->getActivePlayerList()->end(); ++it_c) {
                 if((*it_c)->getMyType() == PLAYER_TYPE_HUMAN &&  (*it_c)->getMyAction() != PLAYER_ACTION_FOLD) {
                     int aggValue = (int)((( (*it_c)->getMyAggressive()*1.0)/7.0 - 1.0/currentHand->getActivePlayerList()->size())*21.0);
                     myNiveau[0] -= aggValue;
@@ -2201,7 +2201,7 @@ void LocalPlayer::turnEngine() {
 
     // count number of active human players
     size_t countHumanPlayers = 0;
-    for(it_c=currentHand->getActivePlayerList()->begin(); it_c!=currentHand->getActivePlayerList()->end(); it_c++) {
+	for(it_c=currentHand->getActivePlayerList()->begin(); it_c!=currentHand->getActivePlayerList()->end(); ++it_c) {
         if((*it_c)->getMyType() == PLAYER_TYPE_HUMAN) {
             countHumanPlayers++;
         }
@@ -2210,7 +2210,7 @@ void LocalPlayer::turnEngine() {
         // local or network game and only one human player is active --> set aggValue
         if(countHumanPlayers == 1) {
 
-            for(it_c=currentHand->getActivePlayerList()->begin(); it_c!=currentHand->getActivePlayerList()->end(); it_c++) {
+			for(it_c=currentHand->getActivePlayerList()->begin(); it_c!=currentHand->getActivePlayerList()->end(); ++it_c) {
                 if((*it_c)->getMyType() == PLAYER_TYPE_HUMAN &&  (*it_c)->getMyAction() != PLAYER_ACTION_FOLD) {
                     int aggValue = (int)((( (*it_c)->getMyAggressive()*1.0)/7.0 - 1.0/currentHand->getActivePlayerList()->size())*21.0);
                     myNiveau[0] -= aggValue;
@@ -2729,7 +2729,7 @@ void LocalPlayer::riverEngine() {
 
     // count number of active human players
     size_t countHumanPlayers = 0;
-    for(it_c=currentHand->getActivePlayerList()->begin(); it_c!=currentHand->getActivePlayerList()->end(); it_c++) {
+	for(it_c=currentHand->getActivePlayerList()->begin(); it_c!=currentHand->getActivePlayerList()->end(); ++it_c) {
         if((*it_c)->getMyType() == PLAYER_TYPE_HUMAN) {
             countHumanPlayers++;
         }
@@ -2738,7 +2738,7 @@ void LocalPlayer::riverEngine() {
         // local or network game and only one human player is active --> set aggValue
         if(countHumanPlayers == 1) {
 
-            for(it_c=currentHand->getActivePlayerList()->begin(); it_c!=currentHand->getActivePlayerList()->end(); it_c++) {
+			for(it_c=currentHand->getActivePlayerList()->begin(); it_c!=currentHand->getActivePlayerList()->end(); ++it_c) {
                 if((*it_c)->getMyType() == PLAYER_TYPE_HUMAN &&  (*it_c)->getMyAction() != PLAYER_ACTION_FOLD) {
                     int aggValue = (int)((( (*it_c)->getMyAggressive()*1.0)/7.0 - 1.0/currentHand->getActivePlayerList()->size())*21.0);
                     myNiveau[0] -= aggValue;
@@ -5131,7 +5131,7 @@ LocalPlayer::resetActionTimeoutCounter()
 bool LocalPlayer::checkIfINeedToShowCards()
 {
 	std::list<unsigned> playerNeedToShowCardsList = currentHand->getBoard()->getPlayerNeedToShowCards();
-    for(std::list<unsigned>::iterator it = playerNeedToShowCardsList.begin(); it != playerNeedToShowCardsList.end(); it++)
+	for(std::list<unsigned>::iterator it = playerNeedToShowCardsList.begin(); it != playerNeedToShowCardsList.end(); ++it)
     {
         if(*it == myUniqueID) return true;
     }
diff --git a/src/engine/network_engine/clientboard.cpp b/src/engine/network_engine/clientboard.cpp
index de30217f..3c26ef54 100644
--- a/src/engine/network_engine/clientboard.cpp
+++ b/src/engine/network_engine/clientboard.cpp
@@ -107,7 +107,7 @@ ClientBoard::collectSets()
 	boost::recursive_mutex::scoped_lock lock(m_syncMutex);
 	sets = 0;
 	PlayerListConstIterator it_c;
-	for (it_c=seatsList->begin(); it_c!=seatsList->end(); it_c++)
+	for (it_c=seatsList->begin(); it_c!=seatsList->end(); ++it_c)
 		sets += (*it_c)->getMySet();
 
 }
diff --git a/src/engine/network_engine/clienthand.cpp b/src/engine/network_engine/clienthand.cpp
index 4a8b8081..8f135a42 100644
--- a/src/engine/network_engine/clienthand.cpp
+++ b/src/engine/network_engine/clienthand.cpp
@@ -28,7 +28,7 @@ ClientHand::ClientHand(boost::shared_ptr<EngineFactory> f, GuiInterface *g, boos
 {
 	PlayerListIterator it;
 
-	for(it=seatsList->begin(); it!=seatsList->end(); it++) {
+	for(it=seatsList->begin(); it!=seatsList->end(); ++it) {
 		(*it)->setHand(this);
 	// myFlipCards auf 0 setzen
 		(*it)->setMyCardsFlip(0, 0);
@@ -37,7 +37,7 @@ ClientHand::ClientHand(boost::shared_ptr<EngineFactory> f, GuiInterface *g, boos
 	// roundStartCashArray fuellen
 	// cardsvalue zuruecksetzen
 	// remove all buttons
-	for(it=activePlayerList->begin(); it!=activePlayerList->end(); it++) {
+	for(it=activePlayerList->begin(); it!=activePlayerList->end(); ++it) {
 
 		boost::shared_ptr<PlayerInterface> tmpPlayer = *it;
 
@@ -92,7 +92,7 @@ ClientHand::getSeatIt(unsigned uniqueId) const
 	boost::recursive_mutex::scoped_lock lock(m_syncMutex);
 	PlayerListIterator it;
 
-	for(it=seatsList->begin(); it!=seatsList->end(); it++) {
+	for(it=seatsList->begin(); it!=seatsList->end(); ++it) {
 		if((*it)->getMyUniqueID() == uniqueId) {
 			break;
 		}
@@ -107,7 +107,7 @@ ClientHand::getActivePlayerIt(unsigned uniqueId) const
 	boost::recursive_mutex::scoped_lock lock(m_syncMutex);
 	PlayerListIterator it;
 
-	for(it=activePlayerList->begin(); it!=activePlayerList->end(); it++) {
+	for(it=activePlayerList->begin(); it!=activePlayerList->end(); ++it) {
 		if((*it)->getMyUniqueID() == uniqueId) {
 			break;
 		}
@@ -122,7 +122,7 @@ ClientHand::getRunningPlayerIt(unsigned uniqueId) const
 	boost::recursive_mutex::scoped_lock lock(m_syncMutex);
 	PlayerListIterator it;
 
-	for(it=runningPlayerList->begin(); it!=runningPlayerList->end(); it++) {
+	for(it=runningPlayerList->begin(); it!=runningPlayerList->end(); ++it) {
 		if((*it)->getMyUniqueID() == uniqueId) {
 			break;
 		}
@@ -348,7 +348,7 @@ ClientHand::switchRounds()
 
 			}
 		} else {
-			it++;
+			++it;
 		}
 	}
 }
diff --git a/src/engine/network_engine/clientplayer.cpp b/src/engine/network_engine/clientplayer.cpp
index cbfe4ed8..1329e4e7 100644
--- a/src/engine/network_engine/clientplayer.cpp
+++ b/src/engine/network_engine/clientplayer.cpp
@@ -527,7 +527,7 @@ bool ClientPlayer::checkIfINeedToShowCards()
 {
 	boost::recursive_mutex::scoped_lock lock(m_syncMutex);
 	std::list<unsigned> playerNeedToShowCardsList = currentHand->getBoard()->getPlayerNeedToShowCards();
-    for(std::list<unsigned>::iterator it = playerNeedToShowCardsList.begin(); it != playerNeedToShowCardsList.end(); it++)
+	for(std::list<unsigned>::iterator it = playerNeedToShowCardsList.begin(); it != playerNeedToShowCardsList.end(); ++it)
     {
         if(*it == myUniqueID) return true;
     }
diff --git a/src/game.cpp b/src/game.cpp
index cf68234b..88b473e1 100755
--- a/src/game.cpp
+++ b/src/game.cpp
@@ -143,7 +143,7 @@ void Game::initHand()
 	raiseBlinds();
 
 	// set player action none
-	for(it=seatsList->begin(); it!=seatsList->end(); it++) {
+	for(it=seatsList->begin(); it!=seatsList->end(); ++it) {
 		(*it)->setMyAction(PLAYER_ACTION_NONE);
 	}
 
@@ -155,7 +155,7 @@ void Game::initHand()
                         (*it)->setMyActiveStatus(false);
 			it = activePlayerList->erase(it);
 		} else {
-			it++;
+			++it;
 		}
 	}
 
@@ -174,7 +174,7 @@ void Game::initHand()
 
 	for(i=0; i<seatsList->size(); i++) {
 
-		dealerPositionIt++;
+		++dealerPositionIt;
 		if(dealerPositionIt == seatsList->end()) dealerPositionIt = seatsList->begin();
 
 		it_c = currentHand->getActivePlayerIt( (*dealerPositionIt)->getMyUniqueID() );
diff --git a/src/gui/qt/chattools/chattools.cpp b/src/gui/qt/chattools/chattools.cpp
index 052768cc..fd547996 100644
--- a/src/gui/qt/chattools/chattools.cpp
+++ b/src/gui/qt/chattools/chattools.cpp
@@ -118,7 +118,7 @@ void ChatTools::receiveMessage(QString playerName, QString message) {
 
         bool nickFoundOnIgnoreList = false;
         list<std::string>::iterator it1;
-        for(it1=ignoreList.begin(); it1 != ignoreList.end(); it1++) {
+		for(it1=ignoreList.begin(); it1 != ignoreList.end(); ++it1) {
 
             if(playerName == QString::fromUtf8(it1->c_str())) {
                 nickFoundOnIgnoreList = true;
diff --git a/src/gui/qt/createnetworkgamedialog/createnetworkgamedialogimpl.cpp b/src/gui/qt/createnetworkgamedialog/createnetworkgamedialogimpl.cpp
index 542cb8ee..64be9a83 100644
--- a/src/gui/qt/createnetworkgamedialog/createnetworkgamedialogimpl.cpp
+++ b/src/gui/qt/createnetworkgamedialog/createnetworkgamedialogimpl.cpp
@@ -84,7 +84,7 @@ void createNetworkGameDialogImpl::fillFormular() {
 	std::list<int> myBlindsList = myConfig->readConfigIntList("NetManualBlindsList");
 	std::list<int>::iterator it1;
 	
-	for(it1= myBlindsList.begin(); it1 != myBlindsList.end(); it1++) {
+	for(it1= myBlindsList.begin(); it1 != myBlindsList.end(); ++it1) {
 		myChangeCompleteBlindsDialog->listWidget_blinds->addItem(QString::number(*it1,10));
 	}
 	myChangeCompleteBlindsDialog->sortBlindsList();
diff --git a/src/gui/qt/gamelobbydialog/gamelobbydialogimpl.cpp b/src/gui/qt/gamelobbydialog/gamelobbydialogimpl.cpp
index 2b1b1a81..9c4541cd 100644
--- a/src/gui/qt/gamelobbydialog/gamelobbydialogimpl.cpp
+++ b/src/gui/qt/gamelobbydialog/gamelobbydialogimpl.cpp
@@ -1151,7 +1151,7 @@ void gameLobbyDialogImpl::updateDialogBlinds(const GameData &gameData) {
 
         QString blindsListString;
         std::list<int>::const_iterator it1;
-        for(it1= gameData.manualBlindsList.begin(); it1 != gameData.manualBlindsList.end(); it1++) {
+		for(it1= gameData.manualBlindsList.begin(); it1 != gameData.manualBlindsList.end(); ++it1) {
             blindsListString.append(QString("%L1").arg(*it1)).append(", ");
         }
         blindsListString.remove(blindsListString.length()-2,2);
@@ -1542,7 +1542,7 @@ bool gameLobbyDialogImpl::playerIsOnIgnoreList(unsigned playerId) {
 
     list<std::string> playerIgnoreList = myConfig->readConfigStringList("PlayerIgnoreList");
     list<std::string>::iterator it1;
-    for(it1= playerIgnoreList.begin(); it1 != playerIgnoreList.end(); it1++) {
+	for(it1= playerIgnoreList.begin(); it1 != playerIgnoreList.end(); ++it1) {
 
         if(QString::fromUtf8(mySession->getClientPlayerInfo(playerId).playerName.c_str()) == QString::fromUtf8(it1->c_str())) {
             return true;
diff --git a/src/gui/qt/gametable/gametableimpl.cpp b/src/gui/qt/gametable/gametableimpl.cpp
index 7a327e24..67cc9020 100755
--- a/src/gui/qt/gametable/gametableimpl.cpp
+++ b/src/gui/qt/gametable/gametableimpl.cpp
@@ -796,7 +796,7 @@ void gameTableImpl::refreshSet() {
 
     PlayerListConstIterator it_c;
     PlayerList seatsList = currentGame->getSeatsList();
-    for (it_c=seatsList->begin(); it_c!=seatsList->end(); it_c++) {
+	for (it_c=seatsList->begin(); it_c!=seatsList->end(); ++it_c) {
         if( (*it_c)->getMySet() == 0 )
             setLabelArray[(*it_c)->getMyID()]->setText("");
         else
@@ -816,7 +816,7 @@ void gameTableImpl::refreshButton() {
     PlayerListConstIterator it_c;
     PlayerList seatsList = currentGame->getSeatsList();
     PlayerList activePlayerList = currentGame->getActivePlayerList();
-    for (it_c=seatsList->begin(); it_c!=seatsList->end(); it_c++) {
+	for (it_c=seatsList->begin(); it_c!=seatsList->end(); ++it_c) {
         if( (*it_c)->getMyActiveStatus() ) {
             if( activePlayerList->size() > 2 ) {
                 switch ( (*it_c)->getMyButton() ) {
@@ -870,7 +870,7 @@ void gameTableImpl::refreshPlayerName() {
     boost::shared_ptr<Game> currentGame = myStartWindow->getSession()->getCurrentGame();
         PlayerListConstIterator it_c;
 		PlayerList seatsList = currentGame->getSeatsList();
-        for (it_c=seatsList->begin(); it_c!=seatsList->end(); it_c++) {
+		for (it_c=seatsList->begin(); it_c!=seatsList->end(); ++it_c) {
             if((*it_c)->getMyActiveStatus()) {
 
                 bool guest = myStartWindow->getSession()->getClientPlayerInfo((*it_c)->getMyUniqueID()).isGuest;
@@ -915,7 +915,7 @@ void gameTableImpl::refreshPlayerAvatar() {
 		int seatPlace;
 		PlayerListConstIterator it_c;
 		PlayerList seatsList = currentGame->getSeatsList();
-		for (it_c=seatsList->begin(), seatPlace=0; it_c!=seatsList->end(); it_c++, seatPlace++) {
+		for (it_c=seatsList->begin(), seatPlace=0; it_c!=seatsList->end(); ++it_c, seatPlace++) {
 
             QString countryString(QString(myStartWindow->getSession()->getClientPlayerInfo((*it_c)->getMyUniqueID()).countryCode.c_str()).toLower());
             countryString = QString(":/cflags/cflags/%1.png").arg(countryString);
@@ -987,7 +987,7 @@ void gameTableImpl::refreshAction(int playerID, int playerAction) {
 
         PlayerListConstIterator it_c;
 		PlayerList seatsList = currentGame->getSeatsList();
-        for (it_c=seatsList->begin(); it_c!=seatsList->end(); it_c++) {
+		for (it_c=seatsList->begin(); it_c!=seatsList->end(); ++it_c) {
 
             //if no action --> clear Pixmap
             if( (*it_c)->getMyAction() == 0) {
@@ -1042,7 +1042,7 @@ void gameTableImpl::refreshCash() {
 
     PlayerListConstIterator it_c;
 	PlayerList seatsList = currentGame->getSeatsList();
-    for (it_c=seatsList->begin(); it_c!=seatsList->end(); it_c++) {
+	for (it_c=seatsList->begin(); it_c!=seatsList->end(); ++it_c) {
         if((*it_c)->getMyActiveStatus()) {
 
             cashLabelArray[(*it_c)->getMyID()]->setText("$"+QString("%L1").arg((*it_c)->getMyCash()));
@@ -1062,7 +1062,7 @@ void gameTableImpl::refreshGroupbox(int playerID, int status) {
 		boost::shared_ptr<Game> currentGame = myStartWindow->getSession()->getCurrentGame();
         PlayerListConstIterator it_c;
 		PlayerList seatsList = currentGame->getSeatsList();
-        for (it_c=seatsList->begin(); it_c!=seatsList->end(); it_c++) {
+		for (it_c=seatsList->begin(); it_c!=seatsList->end(); ++it_c) {
 
             if((*it_c)->getMyTurn()) {
                 //Groupbox glow wenn der Spiele dran ist.
@@ -1173,7 +1173,7 @@ void gameTableImpl::refreshAll() {
 	boost::shared_ptr<Game> currentGame = myStartWindow->getSession()->getCurrentGame();
     PlayerListConstIterator it_c;
 	PlayerList seatsList = currentGame->getSeatsList();
-    for (it_c=seatsList->begin(); it_c!=seatsList->end(); it_c++) {
+	for (it_c=seatsList->begin(); it_c!=seatsList->end(); ++it_c) {
         refreshAction( (*it_c)->getMyID(), (*it_c)->getMyAction());
     }
 
@@ -1190,7 +1190,7 @@ void gameTableImpl::refreshChangePlayer() {
 	boost::shared_ptr<Game> currentGame = myStartWindow->getSession()->getCurrentGame();
     PlayerListConstIterator it_c;
 	PlayerList seatsList = currentGame->getSeatsList();
-    for (it_c=seatsList->begin(); it_c!=seatsList->end(); it_c++) {
+	for (it_c=seatsList->begin(); it_c!=seatsList->end(); ++it_c) {
         refreshAction( (*it_c)->getMyID(), (*it_c)->getMyAction());
     }
 
@@ -1234,7 +1234,7 @@ void gameTableImpl::dealHoleCards() {
 
     PlayerListConstIterator it_c;
     PlayerList seatsList = currentGame->getSeatsList();
-    for (it_c=seatsList->begin(); it_c!=seatsList->end(); it_c++) {
+	for (it_c=seatsList->begin(); it_c!=seatsList->end(); ++it_c) {
         (*it_c)->getMyCards(tempCardsIntArray);
         for(j=0; j<2; j++) {
             if((*it_c)->getMyActiveStatus()) {
@@ -2081,7 +2081,7 @@ void gameTableImpl::nextPlayerAnimation() {
 
     PlayerListConstIterator it_c;
     PlayerList seatsList = currentHand->getSeatsList();
-    for (it_c=seatsList->begin(); it_c!=seatsList->end(); it_c++) {
+	for (it_c=seatsList->begin(); it_c!=seatsList->end(); ++it_c) {
         if((*it_c)->getMyID() == currentHand->getLastPlayersTurn()) break;
     }
 
@@ -2160,7 +2160,7 @@ void gameTableImpl::postRiverRunAnimation2() {
     int nonfoldPlayersCounter = 0;
     PlayerListConstIterator it_c;
 	PlayerList activePlayerList = currentGame->getActivePlayerList();
-    for (it_c=activePlayerList->begin(); it_c!=activePlayerList->end(); it_c++) {
+	for (it_c=activePlayerList->begin(); it_c!=activePlayerList->end(); ++it_c) {
         if ((*it_c)->getMyAction() != PLAYER_ACTION_FOLD)
             nonfoldPlayersCounter++;
     }
@@ -2169,7 +2169,7 @@ void gameTableImpl::postRiverRunAnimation2() {
 
         if(!flipHolecardsAllInAlreadyDone) {
 
-            for (it_c=activePlayerList->begin(); it_c!=activePlayerList->end(); it_c++) {
+			for (it_c=activePlayerList->begin(); it_c!=activePlayerList->end(); ++it_c) {
                 if((*it_c)->getMyAction() != PLAYER_ACTION_FOLD && (*it_c)->checkIfINeedToShowCards()) {
 
                     showHoleCards((*it_c)->getMyUniqueID());
@@ -2185,7 +2185,7 @@ void gameTableImpl::postRiverRunAnimation2() {
             flipHolecardsAllInAlreadyDone = TRUE;
         }
         else {          
-            for (it_c=activePlayerList->begin(); it_c!=activePlayerList->end(); it_c++) {
+			for (it_c=activePlayerList->begin(); it_c!=activePlayerList->end(); ++it_c) {
                 if((*it_c)->getMyAction() != PLAYER_ACTION_FOLD) {
                     //set Player value (logging) for all in already shown cards
                     (*it_c)->setMyCardsFlip(1,3);
@@ -2216,7 +2216,7 @@ void gameTableImpl::postRiverRunAnimation3() {
     PlayerListConstIterator it_c;
 
     PlayerList activePlayerList = currentHand->getActivePlayerList();
-    for(it_c=activePlayerList->begin(); it_c!=activePlayerList->end(); it_c++) {
+	for(it_c=activePlayerList->begin(); it_c!=activePlayerList->end(); ++it_c) {
         if((*it_c)->getMyAction() != PLAYER_ACTION_FOLD) {
             nonfoldPlayerCounter++;
         }
@@ -2224,7 +2224,7 @@ void gameTableImpl::postRiverRunAnimation3() {
 
     list<unsigned> winners = currentHand->getBoard()->getWinners();
 
-    for(it_c=activePlayerList->begin(); it_c!=activePlayerList->end(); it_c++) {
+	for(it_c=activePlayerList->begin(); it_c!=activePlayerList->end(); ++it_c) {
         if((*it_c)->getMyAction() != PLAYER_ACTION_FOLD && (*it_c)->getMyCardsValueInt() == currentHand->getCurrentBeRo()->getHighestCardsValue() ) {
 
             //Show "Winner" label
@@ -2307,7 +2307,7 @@ void gameTableImpl::postRiverRunAnimation3() {
 
     // log side pot winners -> TODO
     list<unsigned>::iterator it_int;
-    for(it_c=activePlayerList->begin(); it_c!=activePlayerList->end(); it_c++) {
+	for(it_c=activePlayerList->begin(); it_c!=activePlayerList->end(); ++it_c) {
         if((*it_c)->getMyAction() != PLAYER_ACTION_FOLD && (*it_c)->getMyCardsValueInt() != currentHand->getCurrentBeRo()->getHighestCardsValue() ) {
 
             for(it_int = winners.begin(); it_int != winners.end(); it_int++) {
@@ -2320,7 +2320,7 @@ void gameTableImpl::postRiverRunAnimation3() {
         }
     }
 
-    for(it_c=activePlayerList->begin(); it_c!=activePlayerList->end(); it_c++) {
+	for(it_c=activePlayerList->begin(); it_c!=activePlayerList->end(); ++it_c) {
         if((*it_c)->getMyCash() == 0) {
             currentHand->getGuiInterface()->logPlayerSitsOut((*it_c)->getMyName());
         }
@@ -2349,7 +2349,7 @@ void gameTableImpl::postRiverRunAnimation5() {
 
             label_Pot->setText("");
 
-            for(it_c=activePlayerList->begin(); it_c!=activePlayerList->end(); it_c++) {
+			for(it_c=activePlayerList->begin(); it_c!=activePlayerList->end(); ++it_c) {
 
                 if((*it_c)->getMyAction() != PLAYER_ACTION_FOLD && (*it_c)->getMyCardsValueInt() == currentHand->getCurrentBeRo()->getHighestCardsValue() ) {
 
@@ -2360,7 +2360,7 @@ void gameTableImpl::postRiverRunAnimation5() {
         else {
             label_Pot->setText(PotString);
 
-            for(it_c=activePlayerList->begin(); it_c!=activePlayerList->end(); it_c++) {
+			for(it_c=activePlayerList->begin(); it_c!=activePlayerList->end(); ++it_c) {
 
                 if((*it_c)->getMyAction() != PLAYER_ACTION_FOLD && (*it_c)->getMyCardsValueInt() == currentHand->getCurrentBeRo()->getHighestCardsValue() ) {
 
@@ -2400,14 +2400,14 @@ void gameTableImpl::postRiverRunAnimation6() {
 
     PlayerListConstIterator it_c;
     PlayerList activePlayerList = currentHand->getActivePlayerList();
-    for (it_c=activePlayerList->begin(); it_c!=activePlayerList->end(); it_c++) {
+	for (it_c=activePlayerList->begin(); it_c!=activePlayerList->end(); ++it_c) {
 
         if ((*it_c)->getMyCash() > 0) playersPositiveCashCounter++;
     }
 
     if (playersPositiveCashCounter==1) {
 
-        for (it_c=activePlayerList->begin(); it_c!=activePlayerList->end(); it_c++) {
+		for (it_c=activePlayerList->begin(); it_c!=activePlayerList->end(); ++it_c) {
 
             if ((*it_c)->getMyCash() > 0) {
                 currentHand->getGuiInterface()->logPlayerWinGame((*it_c)->getMyName(),  myStartWindow->getSession()->getCurrentGame()->getMyGameID());
@@ -2446,7 +2446,7 @@ void gameTableImpl::showHoleCards(unsigned playerId, bool allIn)
     int j;
     PlayerListConstIterator it_c;
     PlayerList activePlayerList = currentHand->getActivePlayerList();
-    for (it_c=activePlayerList->begin(); it_c!=activePlayerList->end(); it_c++) {
+	for (it_c=activePlayerList->begin(); it_c!=activePlayerList->end(); ++it_c) {
 
         if((*it_c)->getMyUniqueID() == playerId) {
 
@@ -2481,12 +2481,12 @@ void gameTableImpl::flipHolecardsAllIn() {
         int nonfoldPlayersCounter = 0;
         PlayerListConstIterator it_c;
 		PlayerList activePlayerList = currentGame->getActivePlayerList();
-        for (it_c=activePlayerList->begin(); it_c!=activePlayerList->end(); it_c++) {
+		for (it_c=activePlayerList->begin(); it_c!=activePlayerList->end(); ++it_c) {
             if ((*it_c)->getMyAction() != PLAYER_ACTION_FOLD) nonfoldPlayersCounter++;
         }
 
         if(nonfoldPlayersCounter!=1) {       
-            for (it_c=activePlayerList->begin(); it_c!=activePlayerList->end(); it_c++) {
+			for (it_c=activePlayerList->begin(); it_c!=activePlayerList->end(); ++it_c) {
                 if((*it_c)->getMyAction() != PLAYER_ACTION_FOLD) {
 
                     showHoleCards((*it_c)->getMyUniqueID());
diff --git a/src/gui/qt/gametable/log/guilog.cpp b/src/gui/qt/gametable/log/guilog.cpp
index b32b5ec4..e0562dcd 100644
--- a/src/gui/qt/gametable/log/guilog.cpp
+++ b/src/gui/qt/gametable/log/guilog.cpp
@@ -216,7 +216,7 @@ void guiLog::logNewGameHandMsg(int gameID, int handID) {
             logFileStreamString += "BLIND LEVEL: $"+QString::number(currentHand->getSmallBlind())+" / $"+QString::number(currentHand->getSmallBlind()*2)+"</br>";
 
             //print cash only for active players
-            for(it_c=activePlayerList->begin(); it_c!=activePlayerList->end(); it_c++) {
+			for(it_c=activePlayerList->begin(); it_c!=activePlayerList->end(); ++it_c) {
 
                 logFileStreamString += "Seat " + QString::number((*it_c)->getMyID()+1,10) + ": <b>" +  QString::fromUtf8((*it_c)->getMyName().c_str()) + "</b> ($" + QString::number((*it_c)->getMyCash()+(*it_c)->getMySet(),10)+")</br>";
 
@@ -249,7 +249,7 @@ void guiLog::logNewGameHandMsg(int gameID, int handID) {
                         sql += "," + boost::lexical_cast<string>(myW->getSession()->getCurrentGame()->getStartSmallBlind());
                         sql += "," + boost::lexical_cast<string>(myW->getSession()->getCurrentGame()->getDealerPosition());
                         PlayerList seatList = currentHand->getSeatsList();
-                        for(it_c = seatList->begin();it_c!=seatList->end();it_c++) {
+						for(it_c = seatList->begin();it_c!=seatList->end();++it_c) {
                             if((*it_c)->getMyActiveStatus()) {
                                 sql += ",\"" + (*it_c)->getMyName() +"\"";
                             } else {
@@ -276,7 +276,7 @@ void guiLog::logNewGameHandMsg(int gameID, int handID) {
 
 //                // hand data
 //                sql = "INSERT INTO Hand (HandID,GameID,Sb_Amount,Bb_Amount";
-//                for(it_c=currentHand->getActivePlayerList()->begin(); it_c!=currentHand->getActivePlayerList()->end(); it_c++) {
+//                for(it_c=currentHand->getActivePlayerList()->begin(); it_c!=currentHand->getActivePlayerList()->end(); ++it_c) {
 //                    sql += ",Seat_" + QString::number((*it_c)->getMyID()+1,10) + "_Cash";
 //                }
 ////                for(i=1;i<=MAX_NUMBER_OF_PLAYERS; i++) {
@@ -287,10 +287,10 @@ void guiLog::logNewGameHandMsg(int gameID, int handID) {
 //                sql += "," + QString::number(gameID,10);
 //                sql += "," + QString::number(currentHand->getSmallBlind(),10);
 //                sql += "," + QString::number(currentHand->getSmallBlind()*2,10);
-//                for(it_c=currentHand->getActivePlayerList()->begin(); it_c!=currentHand->getActivePlayerList()->end(); it_c++) {
+//                for(it_c=currentHand->getActivePlayerList()->begin(); it_c!=currentHand->getActivePlayerList()->end(); ++it_c) {
 //                    sql += "," + QString::number((*it_c)->getMyCash()+(*it_c)->getMySet(),10);
 //                }
-////                for(it_c = currentHand->getSeatsList()->begin();it_c!=currentHand->getSeatsList()->end();it_c++) {
+////                for(it_c = currentHand->getSeatsList()->begin();it_c!=currentHand->getSeatsList()->end();++it_c) {
 ////                    if((*it_c)->getMyActiveStatus()) {
 ////                        sql += "," + QString::number((*it_c)->getMyCash()+(*it_c)->getMySet(),10);
 ////                    } else {
@@ -310,7 +310,7 @@ void guiLog::logNewGameHandMsg(int gameID, int handID) {
 //                // beginning of a game
 //                if(handID == 1) {
 //                    sql = "INSERT INTO Game (GameID,Startmoney,StartSb,DealerPos";
-//                    for(it_c=currentHand->getActivePlayerList()->begin(); it_c!=currentHand->getActivePlayerList()->end(); it_c++) {
+//                    for(it_c=currentHand->getActivePlayerList()->begin(); it_c!=currentHand->getActivePlayerList()->end(); ++it_c) {
 //                        sql += ",Seat_" + QString::number((*it_c)->getMyID()+1,10);
 //                    }
 ////                    for(i=1;i<=MAX_NUMBER_OF_PLAYERS; i++) {
@@ -321,10 +321,10 @@ void guiLog::logNewGameHandMsg(int gameID, int handID) {
 //                    sql += QString::number(myW->getSession()->getCurrentGame()->getStartCash(),10) + ",";
 //                    sql += QString::number(myW->getSession()->getCurrentGame()->getStartSmallBlind(),10) + ",";
 //                    sql += QString::number(myW->getSession()->getCurrentGame()->getDealerPosition(),10);
-//                    for(it_c=currentHand->getActivePlayerList()->begin(); it_c!=currentHand->getActivePlayerList()->end(); it_c++) {
+//                    for(it_c=currentHand->getActivePlayerList()->begin(); it_c!=currentHand->getActivePlayerList()->end(); ++it_c) {
 //                        sql += ",'" + QString::fromUtf8((*it_c)->getMyName().c_str()) +"'";
 //                    }
-////                    for(it_c = currentHand->getSeatsList()->begin();it_c!=currentHand->getSeatsList()->end();it_c++) {
+////                    for(it_c = currentHand->getSeatsList()->begin();it_c!=currentHand->getSeatsList()->end();++it_c) {
 ////                        if((*it_c)->getMyActiveStatus()) {
 ////                            sql += ",'" + QString::fromUtf8((*it_c)->getMyName().c_str()) +"'";
 ////                        } else {
@@ -339,7 +339,7 @@ void guiLog::logNewGameHandMsg(int gameID, int handID) {
 
 //                // beginning of a hand
 //                sql = "INSERT INTO Hand (HandID,GameID,Sb_Amount,Bb_Amount";
-//                for(it_c=currentHand->getActivePlayerList()->begin(); it_c!=currentHand->getActivePlayerList()->end(); it_c++) {
+//                for(it_c=currentHand->getActivePlayerList()->begin(); it_c!=currentHand->getActivePlayerList()->end(); ++it_c) {
 //                    sql += ",Seat_" + QString::number((*it_c)->getMyID()+1,10) + "_Cash";
 //                }
 ////                for(i=1;i<=MAX_NUMBER_OF_PLAYERS; i++) {
@@ -350,10 +350,10 @@ void guiLog::logNewGameHandMsg(int gameID, int handID) {
 //                sql += "," + QString::number(gameID,10);
 //                sql += "," + QString::number(currentHand->getSmallBlind(),10);
 //                sql += "," + QString::number(currentHand->getSmallBlind()*2,10);
-//                for(it_c=currentHand->getActivePlayerList()->begin(); it_c!=currentHand->getActivePlayerList()->end(); it_c++) {
+//                for(it_c=currentHand->getActivePlayerList()->begin(); it_c!=currentHand->getActivePlayerList()->end(); ++it_c) {
 //                    sql += "," + QString::number((*it_c)->getMyCash()+(*it_c)->getMySet(),10);
 //                }
-////                for(it_c = currentHand->getSeatsList()->begin();it_c!=currentHand->getSeatsList()->end();it_c++) {
+////                for(it_c = currentHand->getSeatsList()->begin();it_c!=currentHand->getSeatsList()->end();++it_c) {
 ////                    if((*it_c)->getMyActiveStatus()) {
 ////                        sql += "," + QString::number((*it_c)->getMyCash()+(*it_c)->getMySet(),10);
 ////                    } else {
@@ -397,7 +397,7 @@ void guiLog::logNewBlindsSetsMsg(int sbSet, int bbSet, QString sbName, QString b
 			boost::shared_ptr<Game> currentGame = myW->getSession()->getCurrentGame();
 			PlayerList activePlayerList = currentGame->getActivePlayerList();
 
-            for(it_c=activePlayerList->begin(); it_c!=activePlayerList->end(); it_c++) {
+			for(it_c=activePlayerList->begin(); it_c!=activePlayerList->end(); ++it_c) {
 
                 if(activePlayerList->size() > 2) {
                     if((*it_c)->getMyButton() == BUTTON_DEALER) {
@@ -1548,7 +1548,7 @@ QString guiLog::determineHandName(int myCardsValueInt) {
 		PlayerList activePlayerList = currentGame->getActivePlayerList();
 
 	// collect cardsValueInt of all players who will show their cards
-        for(it_c=activePlayerList->begin(); it_c!=activePlayerList->end(); it_c++) {
+		for(it_c=activePlayerList->begin(); it_c!=activePlayerList->end(); ++it_c) {
 
 		if( (*it_c)->getMyAction() != PLAYER_ACTION_FOLD) {
 			shownCardsValueInt.push_back( (*it_c)->getMyCardsValueInt());
@@ -1557,7 +1557,7 @@ QString guiLog::determineHandName(int myCardsValueInt) {
 
 	// erase own cardsValueInt
 	list<int>::iterator it;
-	for(it = shownCardsValueInt.begin(); it != shownCardsValueInt.end(); it++) {
+	for(it = shownCardsValueInt.begin(); it != shownCardsValueInt.end(); ++it) {
 		if((*it) == myCardsValueInt) {
 			shownCardsValueInt.erase(it);
 			break;
@@ -1583,7 +1583,7 @@ QString guiLog::determineHandName(int myCardsValueInt) {
 			handName = translateCardsValueCode(myCardsValueInt).at(0)+translateCardsValueCode(myCardsValueInt).at(1);
 
 			// same hand detection
-			for(it = shownCardsValueInt.begin(); it != shownCardsValueInt.end(); it++) {
+			for(it = shownCardsValueInt.begin(); it != shownCardsValueInt.end(); ++it) {
 				if(((*it)/1000000) == (myCardsValueInt/1000000)) {
 					sameHandCardsValueInt.push_back(*it);
 				}
@@ -1595,7 +1595,7 @@ QString guiLog::determineHandName(int myCardsValueInt) {
 				for(it = sameHandCardsValueInt.begin(); it != sameHandCardsValueInt.end(); ) {
 					if(((*it)/10000) == (myCardsValueInt/10000)) {
 						equal = true;
-						it++;
+						++it;
 					} else {
 						different = true;
 						it = sameHandCardsValueInt.erase(it);
@@ -1620,7 +1620,7 @@ QString guiLog::determineHandName(int myCardsValueInt) {
 			handName = translateCardsValueCode(myCardsValueInt).at(0)+translateCardsValueCode(myCardsValueInt).at(1);
 
 			// same hand detection
-			for(it = shownCardsValueInt.begin(); it != shownCardsValueInt.end(); it++) {
+			for(it = shownCardsValueInt.begin(); it != shownCardsValueInt.end(); ++it) {
 				if(((*it)/1000000) == (myCardsValueInt/1000000)) {
 					sameHandCardsValueInt.push_back(*it);
 				}
@@ -1632,7 +1632,7 @@ QString guiLog::determineHandName(int myCardsValueInt) {
 				for(it = sameHandCardsValueInt.begin(); it != sameHandCardsValueInt.end(); ) {
 					if(((*it)/10000) == (myCardsValueInt/10000)) {
 						equal = true;
-						it++;
+						++it;
 					} else {
 						different = true;
 						it = sameHandCardsValueInt.erase(it);
@@ -1649,7 +1649,7 @@ QString guiLog::determineHandName(int myCardsValueInt) {
 					for(it = sameHandCardsValueInt.begin(); it != sameHandCardsValueInt.end(); ) {
 						if(((*it)/100) == (myCardsValueInt/100)) {
 							equal = true;
-							it++;
+							++it;
 						} else {
 							different = true;
 							it = sameHandCardsValueInt.erase(it);
@@ -1666,7 +1666,7 @@ QString guiLog::determineHandName(int myCardsValueInt) {
 						for(it = sameHandCardsValueInt.begin(); it != sameHandCardsValueInt.end(); ) {
 							if(((*it)/10) == (myCardsValueInt/10)) {
 								equal = true;
-								it++;
+								++it;
 							} else {
 								different = true;
 								it = sameHandCardsValueInt.erase(it);
@@ -1683,7 +1683,7 @@ QString guiLog::determineHandName(int myCardsValueInt) {
 							for(it = sameHandCardsValueInt.begin(); it != sameHandCardsValueInt.end(); ) {
 								if((*it) == myCardsValueInt) {
 									equal = true;
-									it++;
+									++it;
 								} else {
 									different = true;
 									it = sameHandCardsValueInt.erase(it);
@@ -1709,7 +1709,7 @@ QString guiLog::determineHandName(int myCardsValueInt) {
 			handName = translateCardsValueCode(myCardsValueInt).at(0)+translateCardsValueCode(myCardsValueInt).at(1);
 
 			// same hand detection
-			for(it = shownCardsValueInt.begin(); it != shownCardsValueInt.end(); it++) {
+			for(it = shownCardsValueInt.begin(); it != shownCardsValueInt.end(); ++it) {
 				if(((*it)/1000000) == (myCardsValueInt/1000000)) {
 					sameHandCardsValueInt.push_back(*it);
 				}
@@ -1721,7 +1721,7 @@ QString guiLog::determineHandName(int myCardsValueInt) {
 				for(it = sameHandCardsValueInt.begin(); it != sameHandCardsValueInt.end(); ) {
 					if(((*it)/10000) == (myCardsValueInt/10000)) {
 						equal = true;
-						it++;
+						++it;
 					} else {
 						different = true;
 						it = sameHandCardsValueInt.erase(it);
@@ -1738,7 +1738,7 @@ QString guiLog::determineHandName(int myCardsValueInt) {
 					for(it = sameHandCardsValueInt.begin(); it != sameHandCardsValueInt.end(); ) {
 						if(((*it)/100) == (myCardsValueInt/100)) {
 							equal = true;
-							it++;
+							++it;
 						} else {
 							different = true;
 							it = sameHandCardsValueInt.erase(it);
@@ -1758,7 +1758,7 @@ QString guiLog::determineHandName(int myCardsValueInt) {
 			handName = translateCardsValueCode(myCardsValueInt).at(0)+translateCardsValueCode(myCardsValueInt).at(1)+translateCardsValueCode(myCardsValueInt).at(2);
 
 			// same hand detection
-			for(it = shownCardsValueInt.begin(); it != shownCardsValueInt.end(); it++) {
+			for(it = shownCardsValueInt.begin(); it != shownCardsValueInt.end(); ++it) {
 				if(((*it)/10000) == (myCardsValueInt/10000)) {
 					sameHandCardsValueInt.push_back(*it);
 				}
@@ -1770,7 +1770,7 @@ QString guiLog::determineHandName(int myCardsValueInt) {
 				for(it = sameHandCardsValueInt.begin(); it != sameHandCardsValueInt.end(); ) {
 					if(((*it)/100) == (myCardsValueInt/100)) {
 						equal = true;
-						it++;
+						++it;
 					} else {
 						different = true;
 						it = sameHandCardsValueInt.erase(it);
@@ -1790,7 +1790,7 @@ QString guiLog::determineHandName(int myCardsValueInt) {
 			handName = translateCardsValueCode(myCardsValueInt).at(0)+translateCardsValueCode(myCardsValueInt).at(1);
 
 			// same hand detection
-			for(it = shownCardsValueInt.begin(); it != shownCardsValueInt.end(); it++) {
+			for(it = shownCardsValueInt.begin(); it != shownCardsValueInt.end(); ++it) {
 				if(((*it)/1000000) == (myCardsValueInt/1000000)) {
 					sameHandCardsValueInt.push_back(*it);
 				}
@@ -1802,7 +1802,7 @@ QString guiLog::determineHandName(int myCardsValueInt) {
 				for(it = sameHandCardsValueInt.begin(); it != sameHandCardsValueInt.end(); ) {
 					if(((*it)/10000) == (myCardsValueInt/10000)) {
 						equal = true;
-						it++;
+						++it;
 					} else {
 						different = true;
 						it = sameHandCardsValueInt.erase(it);
@@ -1819,7 +1819,7 @@ QString guiLog::determineHandName(int myCardsValueInt) {
 					for(it = sameHandCardsValueInt.begin(); it != sameHandCardsValueInt.end(); ) {
 						if(((*it)/100) == (myCardsValueInt/100)) {
 							equal = true;
-							it++;
+							++it;
 						} else {
 							different = true;
 							it = sameHandCardsValueInt.erase(it);
@@ -1836,7 +1836,7 @@ QString guiLog::determineHandName(int myCardsValueInt) {
 						for(it = sameHandCardsValueInt.begin(); it != sameHandCardsValueInt.end(); ) {
 							if((*it) == myCardsValueInt) {
 								equal = true;
-								it++;
+								++it;
 							} else {
 								different = true;
 								it = sameHandCardsValueInt.erase(it);
@@ -1857,7 +1857,7 @@ QString guiLog::determineHandName(int myCardsValueInt) {
 			handName = translateCardsValueCode(myCardsValueInt).at(0)+translateCardsValueCode(myCardsValueInt).at(1);
 
 			// same hand detection
-			for(it = shownCardsValueInt.begin(); it != shownCardsValueInt.end(); it++) {
+			for(it = shownCardsValueInt.begin(); it != shownCardsValueInt.end(); ++it) {
 				if(((*it)/1000000) == (myCardsValueInt/1000000)) {
 					sameHandCardsValueInt.push_back(*it);
 				}
@@ -1869,7 +1869,7 @@ QString guiLog::determineHandName(int myCardsValueInt) {
 				for(it = sameHandCardsValueInt.begin(); it != sameHandCardsValueInt.end(); ) {
 					if(((*it)/10000) == (myCardsValueInt/10000)) {
 						equal = true;
-						it++;
+						++it;
 					} else {
 						different = true;
 						it = sameHandCardsValueInt.erase(it);
@@ -1886,7 +1886,7 @@ QString guiLog::determineHandName(int myCardsValueInt) {
 					for(it = sameHandCardsValueInt.begin(); it != sameHandCardsValueInt.end(); ) {
 						if(((*it)/100) == (myCardsValueInt/100)) {
 							equal = true;
-							it++;
+							++it;
 						} else {
 							different = true;
 							it = sameHandCardsValueInt.erase(it);
@@ -1903,7 +1903,7 @@ QString guiLog::determineHandName(int myCardsValueInt) {
 						for(it = sameHandCardsValueInt.begin(); it != sameHandCardsValueInt.end(); ) {
 							if(((*it)/10) == (myCardsValueInt/10)) {
 								equal = true;
-								it++;
+								++it;
 							} else {
 								different = true;
 								it = sameHandCardsValueInt.erase(it);
@@ -1920,7 +1920,7 @@ QString guiLog::determineHandName(int myCardsValueInt) {
 							for(it = sameHandCardsValueInt.begin(); it != sameHandCardsValueInt.end(); ) {
 								if((*it) == myCardsValueInt) {
 									equal = true;
-									it++;
+									++it;
 								} else {
 									different = true;
 									it = sameHandCardsValueInt.erase(it);
diff --git a/src/gui/qt/gametable/myavatarlabel.cpp b/src/gui/qt/gametable/myavatarlabel.cpp
index 33a8a124..44212c22 100644
--- a/src/gui/qt/gametable/myavatarlabel.cpp
+++ b/src/gui/qt/gametable/myavatarlabel.cpp
@@ -60,7 +60,7 @@ void MyAvatarLabel::contextMenuEvent ( QContextMenuEvent *event ) {
             PlayerListConstIterator it_c;
             int activePlayerCounter=0;
             PlayerList seatList = currentGame->getSeatsList();
-            for (it_c=seatList->begin(); it_c!=seatList->end(); it_c++) {
+			for (it_c=seatList->begin(); it_c!=seatList->end(); ++it_c) {
                 if((*it_c)->getMyActiveStatus()) activePlayerCounter++;
             }
             GameInfo info(myW->getSession()->getClientGameInfo(myW->getSession()->getClientCurrentGameId()));
@@ -75,7 +75,7 @@ void MyAvatarLabel::contextMenuEvent ( QContextMenuEvent *event ) {
             action_IgnorePlayer->setEnabled(true);
 	    action_EditTip->setEnabled(true);
             int j=0;
-            for (it_c=seatList->begin(); it_c!=seatList->end(); it_c++) {
+			for (it_c=seatList->begin(); it_c!=seatList->end(); ++it_c) {
 
                 if(myId == j) {
 		    if(j == 0)
@@ -103,7 +103,7 @@ void MyAvatarLabel::contextMenuEvent ( QContextMenuEvent *event ) {
             }
 
             int i=0;
-            for (it_c=seatList->begin(); it_c!=seatList->end(); it_c++) {
+			for (it_c=seatList->begin(); it_c!=seatList->end(); ++it_c) {
 
                 //also inactive player which stays on table can be voted to kick
                 if(myContextMenuEnabled && myId != 0 && myId == i && (*it_c)->getMyType() != PLAYER_TYPE_COMPUTER && ( (*it_c)->getMyActiveStatus() || (*it_c)->getMyStayOnTableStatus() ) )
@@ -174,7 +174,7 @@ boost::shared_ptr<Game> curGame = myW->myStartWindow->getSession()->getCurrentGa
 PlayerListConstIterator it_c;
 int seatPlace;
 PlayerList seatsList = curGame->getSeatsList();
-for (seatPlace=0,it_c=seatsList->begin(); it_c!=seatsList->end(); it_c++, seatPlace++) {
+for (seatPlace=0,it_c=seatsList->begin(); it_c!=seatsList->end(); ++it_c, seatPlace++) {
 	for(int i=1;i<=5;i++)myW->playerStarsArray[i][seatPlace]->setText("");
 	if(myW->myStartWindow->getSession()->getGameType() == Session::GAME_TYPE_INTERNET && !myW->getSession()->getClientPlayerInfo((*it_c)->getMyUniqueID()).isGuest && (*it_c)->getMyType() != PLAYER_TYPE_COMPUTER)
 	if((*it_c)->getMyStayOnTableStatus() == TRUE && (*it_c)->getMyName()!="" && seatPlace!=0) {
@@ -197,7 +197,7 @@ void MyAvatarLabel::refreshTooltips() {
         PlayerListConstIterator it_c;
 	int seatPlace;
         PlayerList seatsList = currentGame->getSeatsList();
-        for (seatPlace=0,it_c=seatsList->begin(); it_c!=seatsList->end(); it_c++, seatPlace++) {
+		for (seatPlace=0,it_c=seatsList->begin(); it_c!=seatsList->end(); ++it_c, seatPlace++) {
             if((*it_c)->getMyStayOnTableStatus() == TRUE || (*it_c)->getMyActiveStatus()) {
                 bool computerPlayer = false;
                 if((*it_c)->getMyType() == PLAYER_TYPE_COMPUTER) { computerPlayer = true; }
@@ -377,7 +377,7 @@ void MyAvatarLabel::putPlayerOnIgnoreList() {
     QStringList list;
     PlayerListConstIterator it_c;
     PlayerList seatList = myW->getSession()->getCurrentGame()->getSeatsList();
-    for (it_c=seatList->begin(); it_c!=seatList->end(); it_c++) {
+	for (it_c=seatList->begin(); it_c!=seatList->end(); ++it_c) {
         list << QString::fromUtf8((*it_c)->getMyName().c_str());
     }
 
@@ -402,7 +402,7 @@ void MyAvatarLabel::reportBadAvatar() {
     int j=0;
     PlayerListConstIterator it_c;
     PlayerList seatList = currentGame->getSeatsList();
-    for (it_c=seatList->begin(); it_c!=seatList->end(); it_c++) {
+	for (it_c=seatList->begin(); it_c!=seatList->end(); ++it_c) {
 
         if(myId == j) {
 
@@ -430,7 +430,7 @@ void MyAvatarLabel::startEditTip() {
     int j=0;
     PlayerListConstIterator it_c;
     PlayerList seatList = currentGame->getSeatsList();
-    for (it_c=seatList->begin(); it_c!=seatList->end(); it_c++) {
+	for (it_c=seatList->begin(); it_c!=seatList->end(); ++it_c) {
         if(myId == j) {
                 QString nick = QString::fromUtf8((*it_c)->getMyName().c_str());
                 startChangePlayerTip(nick);
diff --git a/src/gui/qt/mymessagedialog/mymessagedialogimpl.cpp b/src/gui/qt/mymessagedialog/mymessagedialogimpl.cpp
index 65ff5c57..74ec1a01 100644
--- a/src/gui/qt/mymessagedialog/mymessagedialogimpl.cpp
+++ b/src/gui/qt/mymessagedialog/mymessagedialogimpl.cpp
@@ -51,7 +51,7 @@ int myMessageDialogImpl::exec(int messageId, QString msg, QString title, QPixmap
 
     currentMsgShowList = myConfig->readConfigStringList("IfInfoMessageShowList");
     list<std::string>::iterator it1;
-    for(it1= currentMsgShowList.begin(); it1 != currentMsgShowList.end(); it1++) {
+	for(it1= currentMsgShowList.begin(); it1 != currentMsgShowList.end(); ++it1) {
 
         QString tmpString = QString::fromUtf8(it1->c_str());
         if(QString("%1").arg(messageId) ==  tmpString.split(",").at(1)) {
@@ -99,7 +99,7 @@ void myMessageDialogImpl::writeConfig()
     if(checkBox->isChecked()) {
 
         list<std::string>::iterator it1;
-        for(it1= currentMsgShowList.begin(); it1 != currentMsgShowList.end(); it1++) {
+		for(it1= currentMsgShowList.begin(); it1 != currentMsgShowList.end(); ++it1) {
 
             QString tmpString = QString::fromUtf8(it1->c_str());
             if(QString("%1").arg(currentMsgId) == tmpString.split(",").at(1)) {
@@ -121,7 +121,7 @@ bool myMessageDialogImpl::checkIfMesssageWillBeDisplayed(int id)
 
     currentMsgShowList = myConfig->readConfigStringList("IfInfoMessageShowList");
     list<std::string>::iterator it1;
-    for(it1= currentMsgShowList.begin(); it1 != currentMsgShowList.end(); it1++) {
+	for(it1= currentMsgShowList.begin(); it1 != currentMsgShowList.end(); ++it1) {
 
         QString tmpString = QString::fromUtf8(it1->c_str());
         if(QString("%1").arg(id) ==  tmpString.split(",").at(1)) {
diff --git a/src/gui/qt/newlocalgamedialog/newgamedialogimpl.cpp b/src/gui/qt/newlocalgamedialog/newgamedialogimpl.cpp
index bce9ebcf..2faa5f68 100755
--- a/src/gui/qt/newlocalgamedialog/newgamedialogimpl.cpp
+++ b/src/gui/qt/newlocalgamedialog/newgamedialogimpl.cpp
@@ -57,7 +57,7 @@ void newGameDialogImpl::exec() {
 	std::list<int> myBlindsList = myConfig->readConfigIntList("ManualBlindsList");
 	std::list<int>::iterator it1;
 	
-	for(it1= myBlindsList.begin(); it1 != myBlindsList.end(); it1++) {
+	for(it1= myBlindsList.begin(); it1 != myBlindsList.end(); ++it1) {
 		myChangeCompleteBlindsDialog->listWidget_blinds->addItem(QString::number(*it1,10));
 	}
 	myChangeCompleteBlindsDialog->sortBlindsList();
diff --git a/src/gui/qt/settingsdialog/settingsdialogimpl.cpp b/src/gui/qt/settingsdialog/settingsdialogimpl.cpp
index 6fa001c1..e8fd3534 100644
--- a/src/gui/qt/settingsdialog/settingsdialogimpl.cpp
+++ b/src/gui/qt/settingsdialog/settingsdialogimpl.cpp
@@ -237,7 +237,7 @@ void settingsDialogImpl::prepareDialog()
     std::list<std::string> playerIgnoreList = myConfig->readConfigStringList("PlayerIgnoreList");
     std::list<std::string>::iterator it5;
     treeWidget_internetGameIgnoredPlayers->clear();
-    for(it5= playerIgnoreList.begin(); it5 != playerIgnoreList.end(); it5++) {
+	for(it5= playerIgnoreList.begin(); it5 != playerIgnoreList.end(); ++it5) {
         QTreeWidgetItem *item = new QTreeWidgetItem(treeWidget_internetGameIgnoredPlayers);
         item->setText(0, QString::fromUtf8(it5->c_str()));
     }
@@ -293,7 +293,7 @@ void settingsDialogImpl::prepareDialog()
     //load secondary styles into list (if fallback no entry)
     myGameTableStylesList = myConfig->readConfigStringList("GameTableStylesList");
     list<std::string>::iterator it1;
-    for(it1= myGameTableStylesList.begin(); it1 != myGameTableStylesList.end(); it1++) {
+	for(it1= myGameTableStylesList.begin(); it1 != myGameTableStylesList.end(); ++it1) {
         GameTableStyleReader nextStyle(myConfig, this);
         nextStyle.readStyleFile(QString::fromUtf8(it1->c_str()));
         if(!nextStyle.getFallBack() && nextStyle.getLoadedSuccessfull()) {
@@ -375,7 +375,7 @@ void settingsDialogImpl::prepareDialog()
     //load secondary card styles into list (if fallback no entry)
     myCardDeckStylesList = myConfig->readConfigStringList("CardDeckStylesList");
     list<std::string>::iterator it2;
-    for(it2= myCardDeckStylesList.begin(); it2 != myCardDeckStylesList.end(); it2++) {
+	for(it2= myCardDeckStylesList.begin(); it2 != myCardDeckStylesList.end(); ++it2) {
         CardDeckStyleReader nextStyle(myConfig, this);
         nextStyle.readStyleFile(QString::fromUtf8(it2->c_str()));
         if(!nextStyle.getFallBack() && nextStyle.getLoadedSuccessfull()) {
@@ -865,7 +865,7 @@ void settingsDialogImpl::callManualBlindsOrderDialog() {
     myManualBlindsOrderDialog->spinBox_input->setMinimum(spinBox_firstSmallBlind->value());
 
     list<int>::iterator it1;
-    for(it1= myManualBlindsList.begin(); it1 != myManualBlindsList.end(); it1++) {
+	for(it1= myManualBlindsList.begin(); it1 != myManualBlindsList.end(); ++it1) {
         myManualBlindsOrderDialog->listWidget_blinds->addItem(QString::number(*it1,10));
     }
     myManualBlindsOrderDialog->sortBlindsList();
@@ -900,7 +900,7 @@ void settingsDialogImpl::callNetManualBlindsOrderDialog() {
     myManualBlindsOrderDialog->spinBox_input->setMinimum(spinBox_netFirstSmallBlind->value());
 
     list<int>::iterator it1;
-    for(it1= myNetManualBlindsList.begin(); it1 != myNetManualBlindsList.end(); it1++) {
+	for(it1= myNetManualBlindsList.begin(); it1 != myNetManualBlindsList.end(); ++it1) {
         myManualBlindsOrderDialog->listWidget_blinds->addItem(QString::number(*it1,10));
     }
     myManualBlindsOrderDialog->sortBlindsList();
diff --git a/src/gui/qt/startwindow/startwindowimpl.cpp b/src/gui/qt/startwindow/startwindowimpl.cpp
index 24558c81..14c0f7aa 100644
--- a/src/gui/qt/startwindow/startwindowimpl.cpp
+++ b/src/gui/qt/startwindow/startwindowimpl.cpp
@@ -985,7 +985,7 @@ QStringList startWindowImpl::getPlayerNicksList() {
     QStringList list;
     PlayerListConstIterator it_c;
     PlayerList seatList = mySession->getCurrentGame()->getSeatsList();
-    for (it_c=seatList->begin(); it_c!=seatList->end(); it_c++) {
+	for (it_c=seatList->begin(); it_c!=seatList->end(); ++it_c) {
 
         list << QString::fromUtf8((*it_c)->getMyName().c_str());
     }
diff --git a/src/net/common/sessionmanager.cpp b/src/net/common/sessionmanager.cpp
index 520fbeb0..32a25219 100644
--- a/src/net/common/sessionmanager.cpp
+++ b/src/net/common/sessionmanager.cpp
@@ -250,7 +250,7 @@ SessionManager::ForEach(boost::function<void (SessionWrapper)> func)
 	while (i != end)
 	{
 		SessionMap::iterator next = i;
-		next++;
+		++next;
 		func((*i).second);
 		i = next;
 	}