From: "Samuli Suominen (ssuominen)" <ssuominen@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] gentoo-x86 commit in games-board/pokerth/files: pokerth-0.7.1-gcc45.patch
Date: Fri, 14 May 2010 18:13:22 +0000 (UTC) [thread overview]
Message-ID: <20100514181322.31E212C04D@corvid.gentoo.org> (raw)
ssuominen 10/05/14 18:13:22
Added: pokerth-0.7.1-gcc45.patch
Log:
Fix building with GCC 4.5 wrt #318591 by Kacper Kowalik.
(Portage version: 2.2_rc67/cvs/Linux x86_64)
Revision Changes Path
1.1 games-board/pokerth/files/pokerth-0.7.1-gcc45.patch
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-board/pokerth/files/pokerth-0.7.1-gcc45.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-board/pokerth/files/pokerth-0.7.1-gcc45.patch?rev=1.1&content-type=text/plain
Index: pokerth-0.7.1-gcc45.patch
===================================================================
Fixing build with gcc 4.5
http://bugs.gentoo.org/show_bug.cgi?id=318591
--- src/gui/qt/gametable/gametableimpl.cpp
+++ src/gui/qt/gametable/gametableimpl.cpp
@@ -811,7 +811,7 @@
for (it_c=currentHand->getSeatsList()->begin(); it_c!=currentHand->getSeatsList()->end(); it_c++) {
if((*it_c)->getMyActiveStatus()) {
- if((*it_c)->getMyAvatar() == "" || !QFile::QFile(QString::fromUtf8((*it_c)->getMyAvatar().c_str())).exists()) {
+ if((*it_c)->getMyAvatar() == "" || !QFile(QString::fromUtf8((*it_c)->getMyAvatar().c_str())).exists()) {
playerAvatarLabelArray[(*it_c)->getMyID()]->setPixmap(QPixmap::fromImage(QImage(myGameTableStyle->getDefaultAvatar())));
}
else {
@@ -821,7 +821,7 @@
else {
if((myStartWindow->getSession()->getGameType() == Session::GAME_TYPE_INTERNET || myStartWindow->getSession()->getGameType() == Session::GAME_TYPE_NETWORK)) {
if((*it_c)->getMyStayOnTableStatus() == TRUE && (*it_c)->getMyType() != PLAYER_TYPE_COMPUTER) {
- if((*it_c)->getMyAvatar() == "" || !QFile::QFile(QString::fromUtf8((*it_c)->getMyAvatar().c_str())).exists()) {
+ if((*it_c)->getMyAvatar() == "" || !QFile(QString::fromUtf8((*it_c)->getMyAvatar().c_str())).exists()) {
playerAvatarLabelArray[(*it_c)->getMyID()]->setPixmap(QPixmap::fromImage(QImage(myGameTableStyle->getDefaultAvatar())), TRUE);
}
else {
@@ -847,7 +847,7 @@
boost::shared_ptr<PlayerInterface> tmpPlayer = myStartWindow->getSession()->getCurrentGame()->getPlayerByUniqueId(myID);
if (tmpPlayer.get()) {
- if(QFile::QFile(myAvatar).exists()) {
+ if(QFile(myAvatar).exists()) {
playerAvatarLabelArray[tmpPlayer->getMyID()]->setPixmap(myAvatar);
tmpPlayer->setMyAvatar(myAvatar.toUtf8().constData());
}
--- src/gui/qt/gametable/log/log.cpp
+++ src/gui/qt/gametable/log/log.cpp
@@ -54,13 +54,13 @@
if(myConfig->readConfigInt("LogOnOff")) {
//if write logfiles is enabled
- if(myConfig->readConfigString("LogDir") != "" && QDir::QDir(QString::fromUtf8(myConfig->readConfigString("LogDir").c_str())).exists()) {
+ if(myConfig->readConfigString("LogDir") != "" && QDir(QString::fromUtf8(myConfig->readConfigString("LogDir").c_str())).exists()) {
myLogDir = new QDir(QString::fromUtf8(myConfig->readConfigString("LogDir").c_str()));
myLogFile = new QFile(myLogDir->absolutePath()+"/pokerth-log-"+QDateTime::currentDateTime().toString("yyyy-MM-dd_hh.mm.ss")+".html");
//Logo-Pixmap extrahieren
- QPixmap::QPixmap(myAppDataPath +"gfx/gui/misc/logoChip3D.png").save(myLogDir->absolutePath()+"/logo.png");
+ QPixmap(myAppDataPath +"gfx/gui/misc/logoChip3D.png").save(myLogDir->absolutePath()+"/logo.png");
// myW->textBrowser_Log->append(myLogFile->fileName());
--- src/gui/qt/gamelobbydialog/gamelobbydialogimpl.cpp
+++ src/gui/qt/gamelobbydialog/gamelobbydialogimpl.cpp
@@ -716,7 +716,7 @@
if(mySession->getAvatarFile(playerInfo.avatar, myAvatarFileName)) {
QString myAvatarString(QString::fromUtf8(myAvatarFileName.c_str()));
- if(QFile::QFile(myAvatarString).exists()) {
+ if(QFile(myAvatarString).exists()) {
QPixmap myAvatarPixmap(25,26);
myAvatarPixmap.fill(Qt::transparent);
--- src/gui/qt/settingsdialog/selectavatardialog/selectavatardialogimpl.cpp
+++ src/gui/qt/settingsdialog/selectavatardialog/selectavatardialogimpl.cpp
@@ -212,7 +212,7 @@
else return QString("");
}
- if(groupBox_2->isChecked() && QFile::QFile(lineEdit->text()).exists() ) return externalAvatar;
+ if(groupBox_2->isChecked() && QFile(lineEdit->text()).exists() ) return externalAvatar;
else return QString("");
}
@@ -232,9 +232,9 @@
}
if(groupBox_2->isChecked()) {
- if(QFile::QFile(lineEdit->text()).exists()) {
+ if(QFile(lineEdit->text()).exists()) {
- if(QFile::QFile(lineEdit->text()).size() <= 30720 ) {
+ if(QFile(lineEdit->text()).size() <= 30720 ) {
externalAvatar = lineEdit->text();
settingsCorrect = TRUE;
}
--- src/gui/qt/settingsdialog/settingsdialogimpl.cpp
+++ src/gui/qt/settingsdialog/settingsdialogimpl.cpp
@@ -559,7 +559,7 @@
myConfig->writeConfigInt("FlipsideOwn", radioButton_flipsideOwn->isChecked());
if(radioButton_flipsideOwn->isChecked()) {
- if(QFile::QFile(lineEdit_OwnFlipsideFilename->text()).exists() && lineEdit_OwnFlipsideFilename->text() != "") {myConfig->writeConfigString("FlipsideOwnFile", lineEdit_OwnFlipsideFilename->text().toUtf8().constData()); }
+ if(QFile(lineEdit_OwnFlipsideFilename->text()).exists() && lineEdit_OwnFlipsideFilename->text() != "") {myConfig->writeConfigString("FlipsideOwnFile", lineEdit_OwnFlipsideFilename->text().toUtf8().constData()); }
else { QMessageBox::warning(this, tr("Settings Error"),
tr("The entered flipside picture doesn't exist.\n"
"Please enter an valid picture!"),
@@ -615,7 +615,7 @@
myConfig->writeConfigInt("LogOnOff", groupBox_logOnOff->isChecked());
if (myConfig->readConfigInt("LogOnOff")) {
// if log On
- if(QDir::QDir(lineEdit_logDir->text()).exists() && lineEdit_logDir->text() != "") { myConfig->writeConfigString("LogDir", lineEdit_logDir->text().toUtf8().constData()); }
+ if(QDir(lineEdit_logDir->text()).exists() && lineEdit_logDir->text() != "") { myConfig->writeConfigString("LogDir", lineEdit_logDir->text().toUtf8().constData()); }
else {
QMessageBox::warning(this, tr("Settings Error"),
tr("The log file directory doesn't exist.\n"
next reply other threads:[~2010-05-14 18:13 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-05-14 18:13 Samuli Suominen (ssuominen) [this message]
-- strict thread matches above, loose matches on Subject: below --
2011-01-10 21:19 [gentoo-commits] gentoo-x86 commit in games-board/pokerth/files: pokerth-0.7.1-gcc45.patch Michael Sterrett (mr_bones_)
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20100514181322.31E212C04D@corvid.gentoo.org \
--to=ssuominen@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox