Running astyle.

src/gui/qt/gamelobbydialog/gamelobbydialogimpl.cpp

@@ -1041,7 +1041,8 @@ void gameLobbyDialogImpl::addConnectedPlayer(unsigned playerId, QString playerNa
 		refreshConnectedPlayerAvatars();
 }
 
-void gameLobbyDialogImpl::addConnectedSpectator(unsigned spectatorId, QString spectatorName) {
+void gameLobbyDialogImpl::addConnectedSpectator(unsigned spectatorId, QString spectatorName)
+{
 
 	QTreeWidgetItem *item = new QTreeWidgetItem(treeWidget_connectedSpectators, 0);
 	item->setData(0, Qt::UserRole, spectatorId);
@@ -1672,8 +1673,11 @@ void gameLobbyDialogImpl::showNickListContextMenu(QPoint p)
 		nickListPlayerInGameInfo->setText(playerInGameInfoString);
 
 		//prevent admin to total kickban himself
-		if(playerUid == mySession->getClientUniquePlayerId()) {	nickListAdminTotalKickBan->setDisabled(true); }
+		if(playerUid == mySession->getClientUniquePlayerId()) {
-		else { nickListAdminTotalKickBan->setEnabled(true);	}
+			nickListAdminTotalKickBan->setDisabled(true);
+		} else {
+			nickListAdminTotalKickBan->setEnabled(true);
+		}
 
 //		check for admin	and remove admin actions for non-admins
 		if(!mySession->getClientPlayerInfo(mySession->getClientUniquePlayerId()).isAdmin) {
@@ -1693,8 +1697,11 @@ void gameLobbyDialogImpl::showGameListContextMenu(QPoint p)
 
 		assert(mySession);
 		unsigned selectedGameId = myGameListSelectionModel->selectedRows().first().data(Qt::UserRole).toUInt();
-		if(selectedGameId == mySession->getClientCurrentGameId()) { gameListAdminCloseGame->setDisabled(true); }
+		if(selectedGameId == mySession->getClientCurrentGameId()) {
-		else { gameListAdminCloseGame->setEnabled(true); }
+			gameListAdminCloseGame->setDisabled(true);
+		} else {
+			gameListAdminCloseGame->setEnabled(true);
+		}
 
 //		check for admin	and remove admin actions for non-admins
 		if(!mySession->getClientPlayerInfo(mySession->getClientUniquePlayerId()).isAdmin) {

src/gui/qt/gametable/gametableimpl.cpp

@@ -4482,8 +4482,7 @@ void gameTableImpl::refreshSpectatorsDisplay()
 		}
 		spectatorList.remove(spectatorList.size()-4,4);
 		spectatorIcon->setToolTip(spectatorList);
-	}
+	} else {
-	else {
 		spectatorIcon->setToolTip("");
 		spectatorIcon->clear();
 	}

src/gui/qt/gametable/myavatarlabel.cpp

@@ -399,8 +399,7 @@ void MyAvatarLabel::paintEvent(QPaintEvent*)
 	if(!playerIsOnIgnoreList(QString::fromUtf8(mySession->getClientPlayerInfo(myUniqueId).playerName.c_str()))) {
 		painter.drawPixmap(0,0,myPixmap);
 		return;
-	}
+	} else if(myW->getMyConfig()->readConfigInt("DontHideAvatarsOfIgnored")) {
-	else if(myW->getMyConfig()->readConfigInt("DontHideAvatarsOfIgnored")) {
 		painter.drawPixmap(0,0,myPixmap);
 		return;
 	}

src/gui/qt/logfiledialog/logfiledialog.cpp

@@ -287,8 +287,7 @@ void LogFileDialog::showLogAnalysis(QString /*filename*/, QString returnMessage)
 		if (retStr == LOG_UPLOAD_ERROR_STR) {
 			QString errorId(returnMessage.mid(retStr.size()).trimmed());
 			serverMsg += "\n" + tr("Failure reason: ");
-			switch (errorId.toInt())
+			switch (errorId.toInt()) {
-			{
 			case LOG_UPLOAD_ERROR_NO_FILE :
 				serverMsg += tr("No file received.");
 				break;

src/gui/qt/startwindow/startwindowimpl.cpp

@@ -1186,7 +1186,8 @@ void startWindowImpl::networkMessage(unsigned msgId)
 		msgText = tr("The player could not be found.");
 	}
 	break;
-	default: showMsgBox = false;
+	default:
+		showMsgBox = false;
 		break;
 	}
 

src/net/common/serverlobbythread.cpp

@@ -1837,8 +1837,7 @@ ServerLobbyThread::TimerRemoveGame(const boost::system::error_code &ec)
 			GameMap::iterator next = i;
 			++next;
 			boost::shared_ptr<ServerGame> tmpGame = i->second;
-			if (!tmpGame->GetSessionManager().HasSessionWithState(SessionData::Game))
+			if (!tmpGame->GetSessionManager().HasSessionWithState(SessionData::Game)) {
-			{
 				tmpGame->MoveSpectatorsToLobby();
 				InternalRemoveGame(tmpGame); // This will delete the game.
 			}

src/net/common/servermanager.cpp

@@ -94,8 +94,7 @@ ServerManager::Init(unsigned serverPort, unsigned websocketPort, bool ipv6, int
 			sctpAcceptHelper->Listen(serverPort, ipv6, logDir, m_lobbyThread);
 			m_acceptHelperPool.push_back(sctpAcceptHelper);
 		}*/
-	if (proto & TRANSPORT_PROTOCOL_WEBSOCKET)
+	if (proto & TRANSPORT_PROTOCOL_WEBSOCKET) {
-	{
 		boost::shared_ptr<ServerAcceptInterface> webAcceptHelper(
 			new ServerAcceptWebHelper(GetGui(), m_ioService, webSocketResource, webSocketOrigin));
 		webAcceptHelper->Listen(websocketPort, ipv6, logDir, m_lobbyThread);

src/net/websocketdata.h

@@ -36,8 +36,7 @@
 #include <net/websocket_defs.h>
 
 
-struct WebSocketData
+struct WebSocketData {
-{
 	boost::shared_ptr<server> webSocketServer;
 	websocketpp::connection_hdl webHandle;
 };

src/pokerth.cpp

@@ -211,8 +211,7 @@ int main( int argc, char **argv )
 	QPixmap pixmap;
 	if(customWelcomePokerTHFile.exists()) {
 		pixmap.load(QFileInfo(customWelcomePokerTHFile).absoluteFilePath());
-	}
+	} else {
-	else {
 		//if custom welcome pic could not be saved locally we need to scale it on the fly
 		pixmap.load(":/android/android-data/gfx/gui/misc/welcomepokerth10_mobile.png");
 		pixmap = pixmap.scaled(screenWidth, screenHeight, Qt::KeepAspectRatioByExpanding, Qt::SmoothTransformation);