From f0f3d2eb04c977bee37bed1f203b632bce47e426 Mon Sep 17 00:00:00 2001 From: lotodore Date: Sun, 6 Oct 2013 16:30:09 +0200 Subject: [PATCH] Running astyle. --- src/engine/local_engine/localplayer.cpp | 2 +- src/gui/qt/aboutpokerth/aboutpokerthimpl.cpp | 32 ++--- .../gamelobbydialog/gamelobbydialogimpl.cpp | 17 ++- .../qt/gamelobbydialog/mygamelisttreewidget.h | 2 +- src/gui/qt/gametable/gametableimpl.cpp | 3 +- src/gui/qt/gametable/gametableimpl.h | 2 +- src/gui/qt/gametable/log/guilog.h | 2 +- src/gui/qt/gametable/myactionbutton.h | 2 +- src/gui/qt/gametable/myavatarlabel.cpp | 7 +- src/gui/qt/gametable/myavatarlabel.h | 2 +- src/gui/qt/gametable/mycardspixmaplabel.h | 2 +- src/gui/qt/gametable/mycashlabel.h | 2 +- src/gui/qt/gametable/mychancelabel.h | 2 +- src/gui/qt/gametable/mylefttabwidget.h | 2 +- src/gui/qt/gametable/mymenubar.h | 2 +- src/gui/qt/gametable/mynamelabel.h | 2 +- src/gui/qt/gametable/myrighttabwidget.h | 2 +- src/gui/qt/gametable/mysetlabel.h | 2 +- src/gui/qt/gametable/mystatuslabel.h | 2 +- src/gui/qt/gametable/mytimeoutlabel.h | 2 +- .../qt/gametable/startsplash/startsplash.h | 2 +- src/gui/qt/logfiledialog/logfiledialog.cpp | 49 ++++---- .../qt/newlocalgamedialog/newgamedialogimpl.h | 2 +- .../serverlistdialog/serverlistdialogimpl.h | 2 +- src/gui/qt/settingsdialog/myavatarbutton.h | 2 +- src/gui/qt/settingsdialog/myhpavatarbutton.h | 2 +- src/gui/qt/settingsdialog/mystylelistitem.h | 2 +- .../selectavatardialog/myavatarlistitem.h | 2 +- .../selectavatardialogimpl.h | 2 +- .../qt/settingsdialog/settingsdialogimpl.h | 2 +- src/gui/qt/sound/soundevents.cpp | 22 ++-- src/gui/qt/sound/soundevents.h | 22 ++-- src/gui/qt/startwindow/startwindowimpl.cpp | 55 ++++----- src/gui/qt/timeoutmsgbox/timeoutmsgboximpl.h | 2 +- src/net/common/netpacketvalidator.cpp | 110 +++++++++--------- src/net/common/serveracceptwebhelper.cpp | 4 +- src/net/common/serverlobbythread.cpp | 11 +- src/net/common/servermanager.cpp | 3 +- src/net/netpacketvalidator.h | 2 +- src/net/serveracceptwebhelper.h | 2 +- src/net/servermanager.h | 2 +- src/net/servermanagerirc.h | 2 +- src/net/websocketdata.h | 3 +- src/pokerth.cpp | 3 +- 44 files changed, 201 insertions(+), 200 deletions(-) diff --git a/src/engine/local_engine/localplayer.cpp b/src/engine/local_engine/localplayer.cpp index a81f1e61..c3d16b25 100755 --- a/src/engine/local_engine/localplayer.cpp +++ b/src/engine/local_engine/localplayer.cpp @@ -3452,7 +3452,7 @@ int LocalPlayer::flopCardsValue(int* cards) return (71000 + temp*100 + array[j1][1]); } else { // Test auf Straight-Flush-Ausnahme 5-4-3-2-A - if(array[j1][1] == 12 && (array[j1+1][1]<=3 || (j1==0 && array[j1+2][1]<=3 && array[j1][0]==array[j1+4][0]))) { + if(array[j1][1] == 12 && (array[j1+1][1]<=3 || (j1==0 && array[j1+2][1]<=3 && array[j1][0]==array[j1+4][0]))) { // cout << "Straight-Flush-Draw Ass unten"; for(j2=0; j2<4; j2++) { if(array[j1+j2][2] <= 1) temp++; diff --git a/src/gui/qt/aboutpokerth/aboutpokerthimpl.cpp b/src/gui/qt/aboutpokerth/aboutpokerthimpl.cpp index 55c4a883..d342c14e 100755 --- a/src/gui/qt/aboutpokerth/aboutpokerthimpl.cpp +++ b/src/gui/qt/aboutpokerth/aboutpokerthimpl.cpp @@ -34,10 +34,10 @@ #include #ifdef ANDROID - #ifndef ANDROID_TEST - #include "QtGui/5.1.1/QtGui/qpa/qplatformnativeinterface.h" - #include - #endif +#ifndef ANDROID_TEST +#include "QtGui/5.1.1/QtGui/qpa/qplatformnativeinterface.h" +#include +#endif #endif aboutPokerthImpl::aboutPokerthImpl(QWidget *parent, ConfigFile *c) @@ -71,19 +71,19 @@ aboutPokerthImpl::aboutPokerthImpl(QWidget *parent, ConfigFile *c) #ifdef ANDROID int api = -2; - #ifndef ANDROID_TEST - JavaVM *currVM = (JavaVM *)QApplication::platformNativeInterface()->nativeResourceForIntegration("JavaVM"); - JNIEnv* env; - if (currVM->AttachCurrentThread(&env, NULL)<0) { - qCritical()<<"AttachCurrentThread failed"; - } else { - jclass jclassApplicationClass = env->FindClass("android/os/Build$VERSION"); - if (jclassApplicationClass) { - api = env->GetStaticIntField(jclassApplicationClass, env->GetStaticFieldID(jclassApplicationClass,"SDK_INT", "I")); - } - currVM->DetachCurrentThread(); +#ifndef ANDROID_TEST + JavaVM *currVM = (JavaVM *)QApplication::platformNativeInterface()->nativeResourceForIntegration("JavaVM"); + JNIEnv* env; + if (currVM->AttachCurrentThread(&env, NULL)<0) { + qCritical()<<"AttachCurrentThread failed"; + } else { + jclass jclassApplicationClass = env->FindClass("android/os/Build$VERSION"); + if (jclassApplicationClass) { + api = env->GetStaticIntField(jclassApplicationClass, env->GetStaticFieldID(jclassApplicationClass,"SDK_INT", "I")); } - #endif + currVM->DetachCurrentThread(); + } +#endif label_pokerthVersion->setText(QString(tr("PokerTH %1 for Android (API%2)").arg(POKERTH_BETA_RELEASE_STRING).arg(api))); #else label_pokerthVersion->setText(QString(tr("PokerTH %1").arg(POKERTH_BETA_RELEASE_STRING))); diff --git a/src/gui/qt/gamelobbydialog/gamelobbydialogimpl.cpp b/src/gui/qt/gamelobbydialog/gamelobbydialogimpl.cpp index 8169d531..2d0b8d99 100644 --- a/src/gui/qt/gamelobbydialog/gamelobbydialogimpl.cpp +++ b/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); } - else { nickListAdminTotalKickBan->setEnabled(true); } + if(playerUid == mySession->getClientUniquePlayerId()) { + 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); } - else { gameListAdminCloseGame->setEnabled(true); } + if(selectedGameId == mySession->getClientCurrentGameId()) { + gameListAdminCloseGame->setDisabled(true); + } else { + gameListAdminCloseGame->setEnabled(true); + } // check for admin and remove admin actions for non-admins if(!mySession->getClientPlayerInfo(mySession->getClientUniquePlayerId()).isAdmin) { diff --git a/src/gui/qt/gamelobbydialog/mygamelisttreewidget.h b/src/gui/qt/gamelobbydialog/mygamelisttreewidget.h index f97647e9..ea8985e3 100644 --- a/src/gui/qt/gamelobbydialog/mygamelisttreewidget.h +++ b/src/gui/qt/gamelobbydialog/mygamelisttreewidget.h @@ -34,7 +34,7 @@ #include #include #if QT_VERSION >= 0x050000 - #include +#include #endif class MyGameListTreeWidget : public QTreeWidget diff --git a/src/gui/qt/gametable/gametableimpl.cpp b/src/gui/qt/gametable/gametableimpl.cpp index 599a0309..375cbe1f 100755 --- a/src/gui/qt/gametable/gametableimpl.cpp +++ b/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(); } diff --git a/src/gui/qt/gametable/gametableimpl.h b/src/gui/qt/gametable/gametableimpl.h index 565ac770..c89c4d1f 100755 --- a/src/gui/qt/gametable/gametableimpl.h +++ b/src/gui/qt/gametable/gametableimpl.h @@ -48,7 +48,7 @@ #include #include #if QT_VERSION >= 0x050000 - #include +#include #endif class guiLog; diff --git a/src/gui/qt/gametable/log/guilog.h b/src/gui/qt/gametable/log/guilog.h index 41cdca5a..1202751e 100644 --- a/src/gui/qt/gametable/log/guilog.h +++ b/src/gui/qt/gametable/log/guilog.h @@ -42,7 +42,7 @@ #include #include #if QT_VERSION >= 0x050000 - #include +#include #endif struct result_struct { diff --git a/src/gui/qt/gametable/myactionbutton.h b/src/gui/qt/gametable/myactionbutton.h index b92a862e..f18ca078 100644 --- a/src/gui/qt/gametable/myactionbutton.h +++ b/src/gui/qt/gametable/myactionbutton.h @@ -34,7 +34,7 @@ #include #include #if QT_VERSION >= 0x050000 - #include +#include #endif class GameTableStyleReader; diff --git a/src/gui/qt/gametable/myavatarlabel.cpp b/src/gui/qt/gametable/myavatarlabel.cpp index fcf0c8ed..793bce28 100644 --- a/src/gui/qt/gametable/myavatarlabel.cpp +++ b/src/gui/qt/gametable/myavatarlabel.cpp @@ -397,10 +397,9 @@ void MyAvatarLabel::paintEvent(QPaintEvent*) //hide avatar if player is on ignore list boost::shared_ptr mySession = myW->myStartWindow->getSession(); if(!playerIsOnIgnoreList(QString::fromUtf8(mySession->getClientPlayerInfo(myUniqueId).playerName.c_str()))) { - painter.drawPixmap(0,0,myPixmap); - return; - } - else if(myW->getMyConfig()->readConfigInt("DontHideAvatarsOfIgnored")) { + painter.drawPixmap(0,0,myPixmap); + return; + } else if(myW->getMyConfig()->readConfigInt("DontHideAvatarsOfIgnored")) { painter.drawPixmap(0,0,myPixmap); return; } diff --git a/src/gui/qt/gametable/myavatarlabel.h b/src/gui/qt/gametable/myavatarlabel.h index 60d83ca9..fcf61647 100644 --- a/src/gui/qt/gametable/myavatarlabel.h +++ b/src/gui/qt/gametable/myavatarlabel.h @@ -36,7 +36,7 @@ #include #include #if QT_VERSION >= 0x050000 - #include +#include #endif class gameTableImpl; diff --git a/src/gui/qt/gametable/mycardspixmaplabel.h b/src/gui/qt/gametable/mycardspixmaplabel.h index 5cbd4272..c279f19f 100755 --- a/src/gui/qt/gametable/mycardspixmaplabel.h +++ b/src/gui/qt/gametable/mycardspixmaplabel.h @@ -36,7 +36,7 @@ #include #include #if QT_VERSION >= 0x050000 - #include +#include #endif class gameTableImpl; diff --git a/src/gui/qt/gametable/mycashlabel.h b/src/gui/qt/gametable/mycashlabel.h index 3ae3cf05..35a2adae 100644 --- a/src/gui/qt/gametable/mycashlabel.h +++ b/src/gui/qt/gametable/mycashlabel.h @@ -36,7 +36,7 @@ #include #include #if QT_VERSION >= 0x050000 - #include +#include #endif class gameTableImpl; diff --git a/src/gui/qt/gametable/mychancelabel.h b/src/gui/qt/gametable/mychancelabel.h index 120ab6ed..2d026acb 100644 --- a/src/gui/qt/gametable/mychancelabel.h +++ b/src/gui/qt/gametable/mychancelabel.h @@ -36,7 +36,7 @@ #include #include #if QT_VERSION >= 0x050000 - #include +#include #endif class gameTableImpl; diff --git a/src/gui/qt/gametable/mylefttabwidget.h b/src/gui/qt/gametable/mylefttabwidget.h index 2397a51e..a01e35bf 100755 --- a/src/gui/qt/gametable/mylefttabwidget.h +++ b/src/gui/qt/gametable/mylefttabwidget.h @@ -34,7 +34,7 @@ #include #include #if QT_VERSION >= 0x050000 - #include +#include #endif class MyLeftTabWidget : public QTabWidget diff --git a/src/gui/qt/gametable/mymenubar.h b/src/gui/qt/gametable/mymenubar.h index 4b588905..efe17037 100644 --- a/src/gui/qt/gametable/mymenubar.h +++ b/src/gui/qt/gametable/mymenubar.h @@ -34,7 +34,7 @@ #include #include #if QT_VERSION >= 0x050000 - #include +#include #endif class MyMenuBar : public QMenuBar diff --git a/src/gui/qt/gametable/mynamelabel.h b/src/gui/qt/gametable/mynamelabel.h index 9d62021c..93ed3a2d 100644 --- a/src/gui/qt/gametable/mynamelabel.h +++ b/src/gui/qt/gametable/mynamelabel.h @@ -36,7 +36,7 @@ #include #include #if QT_VERSION >= 0x050000 - #include +#include #endif class gameTableImpl; diff --git a/src/gui/qt/gametable/myrighttabwidget.h b/src/gui/qt/gametable/myrighttabwidget.h index a822c88e..71643862 100755 --- a/src/gui/qt/gametable/myrighttabwidget.h +++ b/src/gui/qt/gametable/myrighttabwidget.h @@ -34,7 +34,7 @@ #include #include #if QT_VERSION >= 0x050000 - #include +#include #endif class MyRightTabWidget : public QTabWidget diff --git a/src/gui/qt/gametable/mysetlabel.h b/src/gui/qt/gametable/mysetlabel.h index 67491d85..adf3ea1d 100644 --- a/src/gui/qt/gametable/mysetlabel.h +++ b/src/gui/qt/gametable/mysetlabel.h @@ -36,7 +36,7 @@ #include #include #if QT_VERSION >= 0x050000 - #include +#include #endif class gameTableImpl; diff --git a/src/gui/qt/gametable/mystatuslabel.h b/src/gui/qt/gametable/mystatuslabel.h index 673b48c2..e1107243 100755 --- a/src/gui/qt/gametable/mystatuslabel.h +++ b/src/gui/qt/gametable/mystatuslabel.h @@ -36,7 +36,7 @@ #include #include #if QT_VERSION >= 0x050000 - #include +#include #endif class gameTableImpl; diff --git a/src/gui/qt/gametable/mytimeoutlabel.h b/src/gui/qt/gametable/mytimeoutlabel.h index 8ceb9a14..749234a0 100644 --- a/src/gui/qt/gametable/mytimeoutlabel.h +++ b/src/gui/qt/gametable/mytimeoutlabel.h @@ -39,7 +39,7 @@ #include #endif #if QT_VERSION >= 0x050000 - #include +#include #endif class gameTableImpl; diff --git a/src/gui/qt/gametable/startsplash/startsplash.h b/src/gui/qt/gametable/startsplash/startsplash.h index 0d24b14c..d6c34e91 100755 --- a/src/gui/qt/gametable/startsplash/startsplash.h +++ b/src/gui/qt/gametable/startsplash/startsplash.h @@ -34,7 +34,7 @@ #include #include #if QT_VERSION >= 0x050000 - #include +#include #endif diff --git a/src/gui/qt/logfiledialog/logfiledialog.cpp b/src/gui/qt/logfiledialog/logfiledialog.cpp index 913b560b..1da92ecc 100644 --- a/src/gui/qt/logfiledialog/logfiledialog.cpp +++ b/src/gui/qt/logfiledialog/logfiledialog.cpp @@ -287,31 +287,30 @@ 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()) - { - case LOG_UPLOAD_ERROR_NO_FILE : - serverMsg += tr("No file received."); - break; - case LOG_UPLOAD_ERROR_MAX_NUM_TOTAL : - serverMsg += tr("File rejected because of too many uploads."); - break; - case LOG_UPLOAD_ERROR_MAX_NUM_IP : - serverMsg += tr("File rejected because of too many recent uploads. Please try again later."); - break; - case LOG_UPLOAD_ERROR_FILE_SIZE : - serverMsg += tr("The file is too large."); - break; - case LOG_UPLOAD_ERROR_FILE_EXT : - case LOG_UPLOAD_ERROR_FILE_HEAD : - serverMsg += tr("This file is not a valid and current PokerTH log file."); - break; - case LOG_UPLOAD_ERROR_OPEN_DB : - case LOG_UPLOAD_ERROR_ID : - case LOG_UPLOAD_ERROR_FILE_MOVE : - case LOG_UPLOAD_ERROR_INSERT_DB : - default : - serverMsg += tr("Internal error. Please try again later. ID: ") + returnMessage; - break; + switch (errorId.toInt()) { + case LOG_UPLOAD_ERROR_NO_FILE : + serverMsg += tr("No file received."); + break; + case LOG_UPLOAD_ERROR_MAX_NUM_TOTAL : + serverMsg += tr("File rejected because of too many uploads."); + break; + case LOG_UPLOAD_ERROR_MAX_NUM_IP : + serverMsg += tr("File rejected because of too many recent uploads. Please try again later."); + break; + case LOG_UPLOAD_ERROR_FILE_SIZE : + serverMsg += tr("The file is too large."); + break; + case LOG_UPLOAD_ERROR_FILE_EXT : + case LOG_UPLOAD_ERROR_FILE_HEAD : + serverMsg += tr("This file is not a valid and current PokerTH log file."); + break; + case LOG_UPLOAD_ERROR_OPEN_DB : + case LOG_UPLOAD_ERROR_ID : + case LOG_UPLOAD_ERROR_FILE_MOVE : + case LOG_UPLOAD_ERROR_INSERT_DB : + default : + serverMsg += tr("Internal error. Please try again later. ID: ") + returnMessage; + break; } } MyMessageBox::warning( diff --git a/src/gui/qt/newlocalgamedialog/newgamedialogimpl.h b/src/gui/qt/newlocalgamedialog/newgamedialogimpl.h index 3faf1e2d..ab0eda98 100755 --- a/src/gui/qt/newlocalgamedialog/newgamedialogimpl.h +++ b/src/gui/qt/newlocalgamedialog/newgamedialogimpl.h @@ -40,7 +40,7 @@ #include #include #if QT_VERSION >= 0x050000 - #include +#include #endif class ConfigFile; diff --git a/src/gui/qt/serverlistdialog/serverlistdialogimpl.h b/src/gui/qt/serverlistdialog/serverlistdialogimpl.h index 6ff6826f..18afec9d 100644 --- a/src/gui/qt/serverlistdialog/serverlistdialogimpl.h +++ b/src/gui/qt/serverlistdialog/serverlistdialogimpl.h @@ -40,7 +40,7 @@ #include #include #if QT_VERSION >= 0x050000 - #include +#include #endif class ConfigFile; diff --git a/src/gui/qt/settingsdialog/myavatarbutton.h b/src/gui/qt/settingsdialog/myavatarbutton.h index bff9a920..465f2065 100644 --- a/src/gui/qt/settingsdialog/myavatarbutton.h +++ b/src/gui/qt/settingsdialog/myavatarbutton.h @@ -34,7 +34,7 @@ #include #include #if QT_VERSION >= 0x050000 - #include +#include #endif class MyAvatarButton : public QPushButton diff --git a/src/gui/qt/settingsdialog/myhpavatarbutton.h b/src/gui/qt/settingsdialog/myhpavatarbutton.h index e2a79ffb..ac8ae2fa 100644 --- a/src/gui/qt/settingsdialog/myhpavatarbutton.h +++ b/src/gui/qt/settingsdialog/myhpavatarbutton.h @@ -34,7 +34,7 @@ #include #include #if QT_VERSION >= 0x050000 - #include +#include #endif class MyHPAvatarButton : public QPushButton diff --git a/src/gui/qt/settingsdialog/mystylelistitem.h b/src/gui/qt/settingsdialog/mystylelistitem.h index 08dfcc38..8575b70f 100644 --- a/src/gui/qt/settingsdialog/mystylelistitem.h +++ b/src/gui/qt/settingsdialog/mystylelistitem.h @@ -34,7 +34,7 @@ #include #include #if QT_VERSION >= 0x050000 - #include +#include #endif class MyStyleListItem : public QTreeWidgetItem diff --git a/src/gui/qt/settingsdialog/selectavatardialog/myavatarlistitem.h b/src/gui/qt/settingsdialog/selectavatardialog/myavatarlistitem.h index f0ee6b04..6f44af09 100644 --- a/src/gui/qt/settingsdialog/selectavatardialog/myavatarlistitem.h +++ b/src/gui/qt/settingsdialog/selectavatardialog/myavatarlistitem.h @@ -34,7 +34,7 @@ #include #include #if QT_VERSION >= 0x050000 - #include +#include #endif class MyAvatarListItem : public QListWidgetItem diff --git a/src/gui/qt/settingsdialog/selectavatardialog/selectavatardialogimpl.h b/src/gui/qt/settingsdialog/selectavatardialog/selectavatardialogimpl.h index 7fe52a2a..80cd9705 100644 --- a/src/gui/qt/settingsdialog/selectavatardialog/selectavatardialogimpl.h +++ b/src/gui/qt/settingsdialog/selectavatardialog/selectavatardialogimpl.h @@ -37,7 +37,7 @@ #include "ui_selectavatardialog.h" #endif #if QT_VERSION >= 0x050000 - #include +#include #endif #include #include diff --git a/src/gui/qt/settingsdialog/settingsdialogimpl.h b/src/gui/qt/settingsdialog/settingsdialogimpl.h index 6c588a7d..dce85786 100644 --- a/src/gui/qt/settingsdialog/settingsdialogimpl.h +++ b/src/gui/qt/settingsdialog/settingsdialogimpl.h @@ -42,7 +42,7 @@ #include #include #if QT_VERSION >= 0x050000 - #include +#include #endif #include diff --git a/src/gui/qt/sound/soundevents.cpp b/src/gui/qt/sound/soundevents.cpp index eb7ca68b..c100458b 100644 --- a/src/gui/qt/sound/soundevents.cpp +++ b/src/gui/qt/sound/soundevents.cpp @@ -31,13 +31,13 @@ #include "soundevents.h" #ifdef ANDROID - #ifdef ANDROID_API8 - #include "androidapi8dummy.h" - #else - #include "androidaudio.h" - #endif +#ifdef ANDROID_API8 +#include "androidapi8dummy.h" #else - #include "sdlplayer.h" +#include "androidaudio.h" +#endif +#else +#include "sdlplayer.h" #endif @@ -52,11 +52,11 @@ SoundEvents::SoundEvents(ConfigFile *c): myConfig(c), lastSBValue(0), lastSBLeve { #ifdef ANDROID - #ifdef ANDROID_API8 - myPlayer = new AndroidApi8Dummy(myConfig); - #else - myPlayer = new AndroidAudio(myConfig); - #endif +#ifdef ANDROID_API8 + myPlayer = new AndroidApi8Dummy(myConfig); +#else + myPlayer = new AndroidAudio(myConfig); +#endif #else myPlayer = new SDLPlayer(myConfig); #endif diff --git a/src/gui/qt/sound/soundevents.h b/src/gui/qt/sound/soundevents.h index da1aab19..77985489 100644 --- a/src/gui/qt/sound/soundevents.h +++ b/src/gui/qt/sound/soundevents.h @@ -34,13 +34,13 @@ #include #ifdef ANDROID - #ifdef ANDROID_API8 - class AndroidApi8Dummy; - #else - class AndroidAudio; - #endif +#ifdef ANDROID_API8 +class AndroidApi8Dummy; #else - class SDLPlayer; +class AndroidAudio; +#endif +#else +class SDLPlayer; #endif @@ -64,11 +64,11 @@ protected: private: #ifdef ANDROID - #ifdef ANDROID_API8 - AndroidApi8Dummy *myPlayer; - #else - AndroidAudio *myPlayer; - #endif +#ifdef ANDROID_API8 + AndroidApi8Dummy *myPlayer; +#else + AndroidAudio *myPlayer; +#endif #else SDLPlayer *myPlayer; #endif diff --git a/src/gui/qt/startwindow/startwindowimpl.cpp b/src/gui/qt/startwindow/startwindowimpl.cpp index 7059d84b..41004c23 100644 --- a/src/gui/qt/startwindow/startwindowimpl.cpp +++ b/src/gui/qt/startwindow/startwindowimpl.cpp @@ -60,10 +60,10 @@ #include "guilog.h" #ifdef ANDROID - #ifndef ANDROID_TEST - #include "QtGui/5.1.1/QtGui/qpa/qplatformnativeinterface.h" - #include - #endif +#ifndef ANDROID_TEST +#include "QtGui/5.1.1/QtGui/qpa/qplatformnativeinterface.h" +#include +#endif #endif using namespace std; @@ -96,25 +96,25 @@ startWindowImpl::startWindowImpl(ConfigFile *c, Log *l) this->setStatusBar(0); #ifdef GUI_800x480 - #ifdef ANDROID - this->menubar->hide(); +#ifdef ANDROID + this->menubar->hide(); - //check if custom background picture for the resolution is there. Otherwise create it! - QString UserDataDir = QString::fromUtf8(myConfig->readConfigString("UserDataDir").c_str()); - QDesktopWidget dw; - int screenWidth = dw.screenGeometry().width(); - int screenHeight = dw.screenGeometry().height(); - QString customStartWindowBgFileString(UserDataDir+"/startwindowbg10_"+QString::number(screenWidth)+"x"+QString::number(screenHeight)+".png"); - QFile customStartWindowBgFile(customStartWindowBgFileString); - if(customStartWindowBgFile.exists()) { - centralwidget->setStyleSheet(".QWidget { background-image: url("+QFileInfo(customStartWindowBgFile).absoluteFilePath()+"); background-position: top center; background-origin: content; background-repeat: no-repeat;}"); - } else { - //if custom bg file could not be found load the big origin file - centralwidget->setStyleSheet(".QWidget { background-image: url(:/android/android-data/gfx/gui/misc/startwindowbg10_mobile.png); background-position: top center; background-origin: content; background-repeat: no-repeat;}"); - } - this->showFullScreen(); + //check if custom background picture for the resolution is there. Otherwise create it! + QString UserDataDir = QString::fromUtf8(myConfig->readConfigString("UserDataDir").c_str()); + QDesktopWidget dw; + int screenWidth = dw.screenGeometry().width(); + int screenHeight = dw.screenGeometry().height(); + QString customStartWindowBgFileString(UserDataDir+"/startwindowbg10_"+QString::number(screenWidth)+"x"+QString::number(screenHeight)+".png"); + QFile customStartWindowBgFile(customStartWindowBgFileString); + if(customStartWindowBgFile.exists()) { + centralwidget->setStyleSheet(".QWidget { background-image: url("+QFileInfo(customStartWindowBgFile).absoluteFilePath()+"); background-position: top center; background-origin: content; background-repeat: no-repeat;}"); + } else { + //if custom bg file could not be found load the big origin file + centralwidget->setStyleSheet(".QWidget { background-image: url(:/android/android-data/gfx/gui/misc/startwindowbg10_mobile.png); background-position: top center; background-origin: content; background-repeat: no-repeat;}"); + } + this->showFullScreen(); - //TODO HACK Missing QSystemScreenSaver::setScreenSaverInhibited(true) + //TODO HACK Missing QSystemScreenSaver::setScreenSaverInhibited(true) // #ifndef ANDROID_TEST // JavaVM *currVM = (JavaVM *)QApplication::platformNativeInterface()->nativeResourceForWidget("JavaVM", 0); // JNIEnv* env; @@ -128,11 +128,11 @@ startWindowImpl::startWindowImpl(ConfigFile *c, Log *l) // currVM->DetachCurrentThread(); // } // #endif - #else +#else // Maemo - this->menubar->hide(); - centralwidget->setStyleSheet(".QWidget { background-image: url(\""+myAppDataPath+"gfx/gui/misc/startwindowbg10_desktop.png\"); background-position: bottom center; background-origin: content; background-repeat: no-repeat;}"); - #endif + this->menubar->hide(); + centralwidget->setStyleSheet(".QWidget { background-image: url(\""+myAppDataPath+"gfx/gui/misc/startwindowbg10_desktop.png\"); background-position: bottom center; background-origin: content; background-repeat: no-repeat;}"); +#endif // All mobile GUI's pushButtonStart_Local_Game->setStyleSheet("QPushButton { text-align:left; font-weight:bold; padding-left: 3px; padding-bottom: 3px; padding-top: 3px; padding-right: 3px; background-color: #505050; color: #FDC942; font-size:22px; border-width: 0px;}"); pushButtonInternet_Game->setStyleSheet("QPushButton { text-align:left; font-weight:bold; padding-left: 3px; padding-bottom: 3px; padding-top: 3px; padding-right: 3px; background-color: #505050; color: #FDC942; font-size:22px; border-width: 0px;}"); @@ -1186,8 +1186,9 @@ void startWindowImpl::networkMessage(unsigned msgId) msgText = tr("The player could not be found."); } break; - default: showMsgBox = false; - break; + default: + showMsgBox = false; + break; } if(showMsgBox) { diff --git a/src/gui/qt/timeoutmsgbox/timeoutmsgboximpl.h b/src/gui/qt/timeoutmsgbox/timeoutmsgboximpl.h index 50f2d66c..41c01f81 100644 --- a/src/gui/qt/timeoutmsgbox/timeoutmsgboximpl.h +++ b/src/gui/qt/timeoutmsgbox/timeoutmsgboximpl.h @@ -35,7 +35,7 @@ #include #include #if QT_VERSION >= 0x050000 - #include +#include #endif #ifndef Q_MOC_RUN #include diff --git a/src/net/common/netpacketvalidator.cpp b/src/net/common/netpacketvalidator.cpp index 99621995..5eb51849 100644 --- a/src/net/common/netpacketvalidator.cpp +++ b/src/net/common/netpacketvalidator.cpp @@ -158,11 +158,11 @@ NetPacketValidator::ValidateAnnounceMessage(const NetPacket &packet) if (packet.GetMsg()->has_announcemessage()) { const AnnounceMessage &msg = packet.GetMsg()->announcemessage(); if (VALIDATE_IS_UINT16(msg.protocolversion().majorversion()) - && VALIDATE_IS_UINT16(msg.protocolversion().minorversion()) - && VALIDATE_IS_UINT16(msg.latestgameversion().majorversion()) - && VALIDATE_IS_UINT16(msg.latestgameversion().minorversion()) - && VALIDATE_IS_UINT16(msg.latestbetarevision()) - && VALIDATE_IS_UINT16(msg.numplayersonserver())) { + && VALIDATE_IS_UINT16(msg.protocolversion().minorversion()) + && VALIDATE_IS_UINT16(msg.latestgameversion().majorversion()) + && VALIDATE_IS_UINT16(msg.latestgameversion().minorversion()) + && VALIDATE_IS_UINT16(msg.latestbetarevision()) + && VALIDATE_IS_UINT16(msg.numplayersonserver())) { retVal = true; } @@ -177,12 +177,12 @@ NetPacketValidator::ValidateInitMessage(const NetPacket &packet) if (packet.GetMsg()->has_initmessage()) { const InitMessage &msg = packet.GetMsg()->initmessage(); if (VALIDATE_IS_UINT16(msg.requestedversion().majorversion()) - && VALIDATE_IS_UINT16(msg.requestedversion().minorversion()) - && (!msg.has_mylastsessionid() || msg.mylastsessionid().size() == 16) - && (!msg.has_authserverpassword() || VALIDATE_STRING_SIZE(msg.authserverpassword(), 1, 64)) - && (!msg.has_nickname() || VALIDATE_STRING_SIZE(msg.nickname(), 1, 64)) - && (!msg.has_clientuserdata() || VALIDATE_STRING_SIZE(msg.clientuserdata(), 1, 256)) - && (!msg.has_avatarhash() || msg.avatarhash().size() == 16)) { + && VALIDATE_IS_UINT16(msg.requestedversion().minorversion()) + && (!msg.has_mylastsessionid() || msg.mylastsessionid().size() == 16) + && (!msg.has_authserverpassword() || VALIDATE_STRING_SIZE(msg.authserverpassword(), 1, 64)) + && (!msg.has_nickname() || VALIDATE_STRING_SIZE(msg.nickname(), 1, 64)) + && (!msg.has_clientuserdata() || VALIDATE_STRING_SIZE(msg.clientuserdata(), 1, 256)) + && (!msg.has_avatarhash() || msg.avatarhash().size() == 16)) { retVal = true; } @@ -236,9 +236,9 @@ NetPacketValidator::ValidateInitAckMessage(const NetPacket &packet) if (packet.GetMsg()->has_initackmessage()) { const InitAckMessage &msg = packet.GetMsg()->initackmessage(); if (msg.yoursessionid().size() == 16 - && msg.yourplayerid() != 0 - && (!msg.has_youravatarhash() || msg.youravatarhash().size() == 16) - && (!msg.has_rejoingameid() || msg.rejoingameid() != 0)) { + && msg.yourplayerid() != 0 + && (!msg.has_youravatarhash() || msg.youravatarhash().size() == 16) + && (!msg.has_rejoingameid() || msg.rejoingameid() != 0)) { retVal = true; } @@ -253,7 +253,7 @@ NetPacketValidator::ValidateAvatarRequestMessage(const NetPacket &packet) if (packet.GetMsg()->has_avatarrequestmessage()) { const AvatarRequestMessage &msg = packet.GetMsg()->avatarrequestmessage(); if (msg.requestid() != 0 - && msg.avatarhash().size() == 16) { + && msg.avatarhash().size() == 16) { retVal = true; } @@ -268,7 +268,7 @@ NetPacketValidator::ValidateAvatarHeaderMessage(const NetPacket &packet) if (packet.GetMsg()->has_avatarheadermessage()) { const AvatarHeaderMessage &msg = packet.GetMsg()->avatarheadermessage(); if (msg.requestid() != 0 - && VALIDATE_UINT_RANGE(msg.avatarsize(), 32, 30720)) { + && VALIDATE_UINT_RANGE(msg.avatarsize(), 32, 30720)) { retVal = true; } @@ -283,7 +283,7 @@ NetPacketValidator::ValidateAvatarDataMessage(const NetPacket &packet) if (packet.GetMsg()->has_avatardatamessage()) { const AvatarDataMessage &msg = packet.GetMsg()->avatardatamessage(); if (msg.requestid() != 0 - && VALIDATE_STRING_SIZE(msg.avatarblock(), 1, 256)) { + && VALIDATE_STRING_SIZE(msg.avatarblock(), 1, 256)) { retVal = true; } @@ -337,9 +337,9 @@ NetPacketValidator::ValidateGameListNewMessage(const NetPacket &packet) if (packet.GetMsg()->has_gamelistnewmessage()) { const GameListNewMessage &msg = packet.GetMsg()->gamelistnewmessage(); if (msg.gameid() != 0 - && VALIDATE_LIST_SIZE(msg.playerids(), 0, 10) - && msg.adminplayerid() != 0 - && ValidateGameInfo(msg.gameinfo())) { + && VALIDATE_LIST_SIZE(msg.playerids(), 0, 10) + && msg.adminplayerid() != 0 + && ValidateGameInfo(msg.gameinfo())) { retVal = true; } @@ -444,7 +444,7 @@ NetPacketValidator::ValidateJoinExistingGameMessage(const NetPacket &packet) if (packet.GetMsg()->has_joinexistinggamemessage()) { const JoinExistingGameMessage &msg = packet.GetMsg()->joinexistinggamemessage(); if (msg.gameid() != 0 - && (!msg.has_password() || VALIDATE_STRING_SIZE(msg.password(), 1, 64))) { + && (!msg.has_password() || VALIDATE_STRING_SIZE(msg.password(), 1, 64))) { retVal = true; } @@ -459,7 +459,7 @@ NetPacketValidator::ValidateJoinNewGameMessage(const NetPacket &packet) if (packet.GetMsg()->has_joinnewgamemessage()) { const JoinNewGameMessage &msg = packet.GetMsg()->joinnewgamemessage(); if (ValidateGameInfo(msg.gameinfo()) - && (!msg.has_password() || VALIDATE_STRING_SIZE(msg.password(), 1, 64))) { + && (!msg.has_password() || VALIDATE_STRING_SIZE(msg.password(), 1, 64))) { retVal = true; } @@ -669,8 +669,8 @@ NetPacketValidator::ValidateGameStartInitialMessage(const NetPacket &packet) if (packet.GetMsg()->has_gamestartinitialmessage()) { const GameStartInitialMessage &msg = packet.GetMsg()->gamestartinitialmessage(); if (msg.gameid() != 0 - && msg.startdealerplayerid() != 0 - && VALIDATE_LIST_SIZE(msg.playerseats(), 2, 10)) { + && msg.startdealerplayerid() != 0 + && VALIDATE_LIST_SIZE(msg.playerseats(), 2, 10)) { retVal = true; } @@ -685,9 +685,9 @@ NetPacketValidator::ValidateGameStartRejoinMessage(const NetPacket &packet) if (packet.GetMsg()->has_gamestartrejoinmessage()) { const GameStartRejoinMessage &msg = packet.GetMsg()->gamestartrejoinmessage(); if (msg.gameid() != 0 - && msg.startdealerplayerid() != 0 - && msg.handnum() != 0 - && VALIDATE_LIST_SIZE(msg.rejoinplayerdata(), 2, 10)) { + && msg.startdealerplayerid() != 0 + && msg.handnum() != 0 + && VALIDATE_LIST_SIZE(msg.rejoinplayerdata(), 2, 10)) { retVal = true; } @@ -702,8 +702,8 @@ NetPacketValidator::ValidateHandStartMessage(const NetPacket &packet) if (packet.GetMsg()->has_handstartmessage()) { const HandStartMessage &msg = packet.GetMsg()->handstartmessage(); if (msg.gameid() != 0 - && VALIDATE_UINT_RANGE(msg.smallblind(), 1, 100000000) - && VALIDATE_LIST_SIZE(msg.seatstates(), 2, 10)) { + && VALIDATE_UINT_RANGE(msg.smallblind(), 1, 100000000) + && VALIDATE_LIST_SIZE(msg.seatstates(), 2, 10)) { retVal = true; } @@ -731,8 +731,8 @@ NetPacketValidator::ValidateMyActionRequestMessage(const NetPacket &packet) if (packet.GetMsg()->has_myactionrequestmessage()) { const MyActionRequestMessage &msg = packet.GetMsg()->myactionrequestmessage(); if (msg.gameid() != 0 - && msg.handnum() != 0 - && VALIDATE_UINT_UPPER(msg.myrelativebet(), 10000000)) { + && msg.handnum() != 0 + && VALIDATE_UINT_UPPER(msg.myrelativebet(), 10000000)) { retVal = true; } @@ -773,9 +773,9 @@ NetPacketValidator::ValidateDealFlopCardsMessage(const NetPacket &packet) if (packet.GetMsg()->has_dealflopcardsmessage()) { const DealFlopCardsMessage &msg = packet.GetMsg()->dealflopcardsmessage(); if (msg.gameid() != 0 - && VALIDATE_UINT_UPPER(msg.flopcard1(), 51) - && VALIDATE_UINT_UPPER(msg.flopcard2(), 51) - && VALIDATE_UINT_UPPER(msg.flopcard3(), 51)) { + && VALIDATE_UINT_UPPER(msg.flopcard1(), 51) + && VALIDATE_UINT_UPPER(msg.flopcard2(), 51) + && VALIDATE_UINT_UPPER(msg.flopcard3(), 51)) { retVal = true; } @@ -790,7 +790,7 @@ NetPacketValidator::ValidateDealTurnCardMessage(const NetPacket &packet) if (packet.GetMsg()->has_dealturncardmessage()) { const DealTurnCardMessage &msg = packet.GetMsg()->dealturncardmessage(); if (msg.gameid() != 0 - && VALIDATE_UINT_UPPER(msg.turncard(), 51)) { + && VALIDATE_UINT_UPPER(msg.turncard(), 51)) { retVal = true; } @@ -805,7 +805,7 @@ NetPacketValidator::ValidateDealRiverCardMessage(const NetPacket &packet) if (packet.GetMsg()->has_dealrivercardmessage()) { const DealRiverCardMessage &msg = packet.GetMsg()->dealrivercardmessage(); if (msg.gameid() != 0 - && VALIDATE_UINT_UPPER(msg.rivercard(), 51)) { + && VALIDATE_UINT_UPPER(msg.rivercard(), 51)) { retVal = true; } @@ -820,7 +820,7 @@ NetPacketValidator::ValidateAllInShowCardsMessage(const NetPacket &packet) if (packet.GetMsg()->has_allinshowcardsmessage()) { const AllInShowCardsMessage &msg = packet.GetMsg()->allinshowcardsmessage(); if (msg.gameid() != 0 - && VALIDATE_LIST_SIZE(msg.playersallin(), 1, 10)) { + && VALIDATE_LIST_SIZE(msg.playersallin(), 1, 10)) { retVal = true; } @@ -835,7 +835,7 @@ NetPacketValidator::ValidateEndOfHandShowCardsMessage(const NetPacket &packet) if (packet.GetMsg()->has_endofhandshowcardsmessage()) { const EndOfHandShowCardsMessage &msg = packet.GetMsg()->endofhandshowcardsmessage(); if (msg.gameid() != 0 - && VALIDATE_LIST_SIZE(msg.playerresults(), 1, 10)) { + && VALIDATE_LIST_SIZE(msg.playerresults(), 1, 10)) { retVal = true; } @@ -938,11 +938,11 @@ NetPacketValidator::ValidateStartKickPetitionMessage(const NetPacket &packet) if (packet.GetMsg()->has_startkickpetitionmessage()) { const StartKickPetitionMessage &msg = packet.GetMsg()->startkickpetitionmessage(); if (msg.gameid() != 0 - && msg.petitionid() != 0 - && msg.proposingplayerid() != 0 - && msg.kickplayerid() != 0 - && msg.kicktimeoutsec() > 0 - && msg.numvotesneededtokick() > 0) { + && msg.petitionid() != 0 + && msg.proposingplayerid() != 0 + && msg.kickplayerid() != 0 + && msg.kicktimeoutsec() > 0 + && msg.numvotesneededtokick() > 0) { retVal = true; } @@ -1095,7 +1095,7 @@ NetPacketValidator::ValidateReportAvatarMessage(const NetPacket &packet) if (packet.GetMsg()->has_reportavatarmessage()) { const ReportAvatarMessage &msg = packet.GetMsg()->reportavatarmessage(); if (msg.reportedplayerid() != 0 - && msg.reportedavatarhash().size() == 16) { + && msg.reportedavatarhash().size() == 16) { retVal = true; } @@ -1210,17 +1210,17 @@ NetPacketValidator::ValidateGameInfo(const NetGameInfo &gameInfo) { bool retVal = false; if (VALIDATE_STRING_SIZE(gameInfo.gamename(), 1, 64) - && VALIDATE_UINT_RANGE(gameInfo.maxnumplayers(), 2, 10) - && (!gameInfo.has_raiseeveryhands() || VALIDATE_UINT_RANGE(gameInfo.raiseeveryhands(), 1, 1000)) - && (!gameInfo.has_raiseeveryminutes() || VALIDATE_UINT_RANGE(gameInfo.raiseeveryminutes(), 1, 1000)) - && (!gameInfo.has_endraisesmallblindvalue() || VALIDATE_UINT_UPPER(gameInfo.endraisesmallblindvalue(), 1000000)) - && VALIDATE_UINT_RANGE(gameInfo.proposedguispeed(), 1, 11) - && VALIDATE_UINT_RANGE(gameInfo.delaybetweenhands(), 5, 20) - && VALIDATE_UINT_UPPER(gameInfo.playeractiontimeout(), 60) - && VALIDATE_UINT_RANGE(gameInfo.firstsmallblind(), 1, 20000) - && VALIDATE_UINT_RANGE(gameInfo.startmoney(), 1, 1000000) - && VALIDATE_LIST_SIZE(gameInfo.manualblinds(), 0, 30) - && ValidateListIntRange(gameInfo.manualblinds(), 1, 1000000)) { + && VALIDATE_UINT_RANGE(gameInfo.maxnumplayers(), 2, 10) + && (!gameInfo.has_raiseeveryhands() || VALIDATE_UINT_RANGE(gameInfo.raiseeveryhands(), 1, 1000)) + && (!gameInfo.has_raiseeveryminutes() || VALIDATE_UINT_RANGE(gameInfo.raiseeveryminutes(), 1, 1000)) + && (!gameInfo.has_endraisesmallblindvalue() || VALIDATE_UINT_UPPER(gameInfo.endraisesmallblindvalue(), 1000000)) + && VALIDATE_UINT_RANGE(gameInfo.proposedguispeed(), 1, 11) + && VALIDATE_UINT_RANGE(gameInfo.delaybetweenhands(), 5, 20) + && VALIDATE_UINT_UPPER(gameInfo.playeractiontimeout(), 60) + && VALIDATE_UINT_RANGE(gameInfo.firstsmallblind(), 1, 20000) + && VALIDATE_UINT_RANGE(gameInfo.startmoney(), 1, 1000000) + && VALIDATE_LIST_SIZE(gameInfo.manualblinds(), 0, 30) + && ValidateListIntRange(gameInfo.manualblinds(), 1, 1000000)) { retVal = true; } diff --git a/src/net/common/serveracceptwebhelper.cpp b/src/net/common/serveracceptwebhelper.cpp index 8cfdd05a..1eb57b74 100644 --- a/src/net/common/serveracceptwebhelper.cpp +++ b/src/net/common/serveracceptwebhelper.cpp @@ -37,7 +37,7 @@ using namespace std; ServerAcceptWebHelper::ServerAcceptWebHelper(ServerCallback &serverCallback, boost::shared_ptr ioService, - const string &webSocketResource, const string &webSocketOrigin) + const string &webSocketResource, const string &webSocketOrigin) : m_ioService(ioService), m_serverCallback(serverCallback), m_webSocketResource(webSocketResource), m_webSocketOrigin(webSocketOrigin) { @@ -78,7 +78,7 @@ ServerAcceptWebHelper::validate(websocketpp::connection_hdl hdl) bool retVal = false; server::connection_ptr con = m_webSocketServer->get_con_from_hdl(hdl); if ((m_webSocketResource.empty() || con->get_resource() == m_webSocketResource) - && (m_webSocketOrigin.empty() || (con->get_origin() != "null" && con->get_origin() == m_webSocketOrigin))) { + && (m_webSocketOrigin.empty() || (con->get_origin() != "null" && con->get_origin() == m_webSocketOrigin))) { retVal = true; } return retVal; diff --git a/src/net/common/serverlobbythread.cpp b/src/net/common/serverlobbythread.cpp index c3c0d1d4..0dba087c 100644 --- a/src/net/common/serverlobbythread.cpp +++ b/src/net/common/serverlobbythread.cpp @@ -1372,7 +1372,7 @@ ServerLobbyThread::HandleNetPacketJoinGame(boost::shared_ptr sessio const GameData &tmpData = game->GetGameData(); // As guest, you are only allowed to join normal games or to join as spectator. if (session->GetPlayerData()->GetRights() == PLAYER_RIGHTS_GUEST - && tmpData.gameType != GAME_TYPE_NORMAL && !joinGame.spectateonly()) { + && tmpData.gameType != GAME_TYPE_NORMAL && !joinGame.spectateonly()) { SendJoinGameFailed(session, joinGame.gameid(), NTF_NET_JOIN_GUEST_FORBIDDEN); } else if (tmpData.gameType == GAME_TYPE_INVITE_ONLY && !game->IsPlayerInvited(session->GetPlayerData()->GetUniqueId())) { @@ -1583,9 +1583,9 @@ ServerLobbyThread::HandleNetPacketAdminBanPlayer(boost::shared_ptr RemovePlayer(tmpPlayer->GetUniqueId(), ERR_NET_PLAYER_KICKED); // Permanently ban the player in the database. if (tmpPlayer->GetDBId() != DB_ID_INVALID) { - LOG_ERROR("Player " << session->GetPlayerData()->GetName() << "(" << session->GetPlayerData()->GetDBId() - << ") bans player " << tmpPlayer->GetName() << "(" << tmpPlayer->GetDBId() - << ") who has IP " << tmpSession->GetClientAddr()); + LOG_ERROR("Player " << session->GetPlayerData()->GetName() << "(" << session->GetPlayerData()->GetDBId() + << ") bans player " << tmpPlayer->GetName() << "(" << tmpPlayer->GetDBId() + << ") who has IP " << tmpSession->GetClientAddr()); GetDatabase()->AsyncBlockPlayer(session->GetPlayerData()->GetUniqueId(), tmpPlayer->GetUniqueId(), tmpPlayer->GetDBId(), 0, 4); netBanAck->set_banplayerresult(AdminBanPlayerAckMessage::banPlayerPending); } else { @@ -1837,8 +1837,7 @@ ServerLobbyThread::TimerRemoveGame(const boost::system::error_code &ec) GameMap::iterator next = i; ++next; boost::shared_ptr tmpGame = i->second; - if (!tmpGame->GetSessionManager().HasSessionWithState(SessionData::Game)) - { + if (!tmpGame->GetSessionManager().HasSessionWithState(SessionData::Game)) { tmpGame->MoveSpectatorsToLobby(); InternalRemoveGame(tmpGame); // This will delete the game. } diff --git a/src/net/common/servermanager.cpp b/src/net/common/servermanager.cpp index 2be86e38..9c42f827 100644 --- a/src/net/common/servermanager.cpp +++ b/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 webAcceptHelper( new ServerAcceptWebHelper(GetGui(), m_ioService, webSocketResource, webSocketOrigin)); webAcceptHelper->Listen(websocketPort, ipv6, logDir, m_lobbyThread); diff --git a/src/net/netpacketvalidator.h b/src/net/netpacketvalidator.h index fef4059e..f6afaaaa 100644 --- a/src/net/netpacketvalidator.h +++ b/src/net/netpacketvalidator.h @@ -133,7 +133,7 @@ protected: typedef bool (*ValidateFunctor)(const NetPacket &); typedef std::map ValidateFunctorMap; private: - + ValidateFunctorMap m_validationMap; }; diff --git a/src/net/serveracceptwebhelper.h b/src/net/serveracceptwebhelper.h index e0e9faec..ea5b926e 100644 --- a/src/net/serveracceptwebhelper.h +++ b/src/net/serveracceptwebhelper.h @@ -52,7 +52,7 @@ protected: typedef std::map > SessionMap; - bool validate(websocketpp::connection_hdl hdl); + bool validate(websocketpp::connection_hdl hdl); void on_open(websocketpp::connection_hdl hdl); void on_close(websocketpp::connection_hdl hdl); void on_message(websocketpp::connection_hdl hdl, server::message_ptr msg); diff --git a/src/net/servermanager.h b/src/net/servermanager.h index cce0e467..600bc366 100644 --- a/src/net/servermanager.h +++ b/src/net/servermanager.h @@ -55,7 +55,7 @@ public: // Set the parameters. virtual void Init(unsigned serverPort, unsigned websocketPort, bool ipv6, int proto, const std::string &logDir, - const std::string &webSocketResource, const std::string &webSocketOrigin); + const std::string &webSocketResource, const std::string &webSocketOrigin); // Main start function. virtual void RunAll(); diff --git a/src/net/servermanagerirc.h b/src/net/servermanagerirc.h index feb7e684..31f79219 100644 --- a/src/net/servermanagerirc.h +++ b/src/net/servermanagerirc.h @@ -46,7 +46,7 @@ public: // Set the parameters. virtual void Init(unsigned serverPort, unsigned websocketPort, bool ipv6, int proto, const std::string &logDir, - const std::string &webSocketResource, const std::string &webSocketOrigin); + const std::string &webSocketResource, const std::string &webSocketOrigin); // Main start function. virtual void RunAll(); diff --git a/src/net/websocketdata.h b/src/net/websocketdata.h index 005b924b..a7f93503 100644 --- a/src/net/websocketdata.h +++ b/src/net/websocketdata.h @@ -36,8 +36,7 @@ #include -struct WebSocketData -{ +struct WebSocketData { boost::shared_ptr webSocketServer; websocketpp::connection_hdl webHandle; }; diff --git a/src/pokerth.cpp b/src/pokerth.cpp index 6038f4b3..46acdaf1 100755 --- a/src/pokerth.cpp +++ b/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);