sco/pokerth
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
doitux
2012-09-06 21:56:11 +02:00
parent 8fb65486d6 e79aebd774
commit e6690633a2
12 changed files with 28 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gui/qt/gametable/gametableimpl.cpp
+2 -2
View File
@@ -1876,13 +1876,13 @@ void gameTableImpl::meInAction()
myActionIsRaise = 0;
myActionIsBet = 0;
if(myConfig->readConfigInt("ShowStatusbarMessages")) {
/* if(myConfig->readConfigInt("ShowStatusbarMessages")) {
if ( myConfig->readConfigInt("AlternateFKeysUserActionMode") == 0 ) {
// // statusBar()->showMessage(tr("F1 - Fold | F2 - Check/Call | F3 - Bet/Raise | F4 - All-In"), 15000);
} else {
// statusBar()->showMessage(tr("F1 - All-In | F2 - Bet/Raise | F3 - Check/Call | F4 - Fold"), 15000);
}
}
}*/
QString lastPushButtonFoldString = pushButton_Fold->text();
src/gui/qt/gametable/myavatarlabel.cpp
-1
View File
@@ -129,7 +129,6 @@ void MyAvatarLabel::setPlayerRating(QString playerInfo)
int found=0;
QStringList playerInfoList=playerInfo.split("\"", QString::KeepEmptyParts, Qt::CaseSensitive), tipInfo;
boost::shared_ptr<Game> currentGame = myW->myStartWindow->getSession()->getCurrentGame();
PlayerListConstIterator it_c;
PlayerList seatsList = currentGame->getSeatsList();
std::list<std::string> tipsList = myW->getMyConfig()->readConfigStringList("PlayerTooltips");
std::list<std::string> result;
src/gui/qt/sound/sdlplayer.cpp
+1 -1
View File
@@ -29,7 +29,7 @@ using namespace std;
SDLPlayer::SDLPlayer(ConfigFile *c)
#ifndef ANDROID
: soundData(NULL), currentChannel(0) , audioEnabled(0), myConfig(c), sound(NULL)
: sound(NULL), soundData(NULL), currentChannel(0) , audioEnabled(0), myConfig(c)
#endif
{
#ifndef ANDROID