From 6fbb5c98416d43d816f1e90eb765b2fbbf37a643 Mon Sep 17 00:00:00 2001 From: floty Date: Wed, 2 Nov 2011 18:27:15 +0000 Subject: [PATCH] running astyle --- src/engine/log.cpp | 6 ++++-- src/gui/qt/gametable/gametableimpl.cpp | 3 +-- src/gui/qt/gametable/mychancelabel.cpp | 7 +++++-- src/gui/qt/guiwrapper.cpp | 2 +- 4 files changed, 11 insertions(+), 7 deletions(-) diff --git a/src/engine/log.cpp b/src/engine/log.cpp index 72bf4378..ffa2b632 100644 --- a/src/engine/log.cpp +++ b/src/engine/log.cpp @@ -435,14 +435,16 @@ Log::logHoleCardsHandName(int bero, PlayerList activePlayerList) } void -Log::logAfterHand() { +Log::logAfterHand() +{ if(myConfig->readConfigInt("LogInterval") == 1) { exec_transaction(); } } void -Log::logAfterGame() { +Log::logAfterGame() +{ if(myConfig->readConfigInt("LogInterval") == 2) { exec_transaction(); } diff --git a/src/gui/qt/gametable/gametableimpl.cpp b/src/gui/qt/gametable/gametableimpl.cpp index ea0bc6c4..32df22b3 100755 --- a/src/gui/qt/gametable/gametableimpl.cpp +++ b/src/gui/qt/gametable/gametableimpl.cpp @@ -3533,8 +3533,7 @@ void gameTableImpl::refreshCardsChance(GameState bero) if(humanPlayer->getMyAction() == PLAYER_ACTION_FOLD) { label_chance->refreshChance(CardsValue::calcCardsChance(bero, holeCards, boardCards), true); - } - else { + } else { label_chance->refreshChance(CardsValue::calcCardsChance(bero, holeCards, boardCards), false); } } else { diff --git a/src/gui/qt/gametable/mychancelabel.cpp b/src/gui/qt/gametable/mychancelabel.cpp index c19ed361..58c90b32 100644 --- a/src/gui/qt/gametable/mychancelabel.cpp +++ b/src/gui/qt/gametable/mychancelabel.cpp @@ -184,8 +184,11 @@ void MyChanceLabel::paintEvent(QPaintEvent * /*event*/) linearGrad.setColorAt(1, Qt::red); painter.setBrush(linearGrad); - if(myFoldState) { painter.setOpacity(0.4); } - else { painter.setOpacity(1.0); } + if(myFoldState) { + painter.setOpacity(0.4); + } else { + painter.setOpacity(1.0); + } if(RFChance[1] != 0) painter.drawRect(89,3,(108*RFChance[0])/100,7); if(SFChance[1] != 0) painter.drawRect(89,16,(108*SFChance[0])/100,7); diff --git a/src/gui/qt/guiwrapper.cpp b/src/gui/qt/guiwrapper.cpp index afd66c7d..bcf3be7a 100644 --- a/src/gui/qt/guiwrapper.cpp +++ b/src/gui/qt/guiwrapper.cpp @@ -336,7 +336,7 @@ void GuiWrapper::SignalNetClientSelfJoined(unsigned playerId, const string &play } void GuiWrapper::SignalNetClientPlayerJoined(unsigned playerId, const string &playerName, bool isGameAdmin) { - myStartWindow->signalNetClientPlayerJoined(playerId, QString::fromUtf8(playerName.c_str()), isGameAdmin); + myStartWindow->signalNetClientPlayerJoined(playerId, QString::fromUtf8(playerName.c_str()), isGameAdmin); if (!playerName.empty() && playerName[0] != '#' && myW->isVisible()) { QString tmpName(QString::fromUtf8(playerName.c_str())); myGuiLog->signalLogPlayerJoinedMsg(tmpName);