diff --git a/src/gui/qt/gamelobbydialog/gamelobbydialogimpl.cpp b/src/gui/qt/gamelobbydialog/gamelobbydialogimpl.cpp index 94cc7c42..29b3e91f 100644 --- a/src/gui/qt/gamelobbydialog/gamelobbydialogimpl.cpp +++ b/src/gui/qt/gamelobbydialog/gamelobbydialogimpl.cpp @@ -921,7 +921,8 @@ void gameLobbyDialogImpl::refreshConnectedPlayerAvatars() { if(mySession->getAvatarFile(playerInfo.avatar, myAvatarFileName)) { QString myAvatarString(QString::fromUtf8(myAvatarFileName.c_str())); - if(QFile::QFile(myAvatarString).exists()) { + QFile myAvatarFile(myAvatarString); + if(myAvatarFile.exists()) { QPixmap myAvatarPixmap(25,26); myAvatarPixmap.fill(Qt::transparent); diff --git a/src/gui/qt/gametable/gametableimpl.cpp b/src/gui/qt/gametable/gametableimpl.cpp index 773a0552..4224a31a 100755 --- a/src/gui/qt/gametable/gametableimpl.cpp +++ b/src/gui/qt/gametable/gametableimpl.cpp @@ -816,7 +816,8 @@ void gameTableImpl::refreshPlayerAvatar() { 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()) { + QFile myAvatarFile(QString::fromUtf8((*it_c)->getMyAvatar().c_str())); + if((*it_c)->getMyAvatar() == "" || !myAvatarFile.exists()) { playerAvatarLabelArray[(*it_c)->getMyID()]->setPixmap(QPixmap::fromImage(QImage(myGameTableStyle->getDefaultAvatar()))); } else { @@ -826,7 +827,8 @@ void gameTableImpl::refreshPlayerAvatar() { 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()) { + QFile myAvatarFile(QString::fromUtf8((*it_c)->getMyAvatar().c_str())); + if((*it_c)->getMyAvatar() == "" || !myAvatarFile.exists()) { playerAvatarLabelArray[(*it_c)->getMyID()]->setPixmap(QPixmap::fromImage(QImage(myGameTableStyle->getDefaultAvatar())), TRUE); } else { @@ -852,7 +854,8 @@ void gameTableImpl::setPlayerAvatar(int myID, QString myAvatar) { boost::shared_ptr tmpPlayer = myStartWindow->getSession()->getCurrentGame()->getPlayerByUniqueId(myID); if (tmpPlayer.get()) { - if(QFile::QFile(myAvatar).exists()) { + QFile myAvatarFile(myAvatar); + if(myAvatarFile.exists()) { playerAvatarLabelArray[tmpPlayer->getMyID()]->setPixmap(myAvatar); tmpPlayer->setMyAvatar(myAvatar.toUtf8().constData()); } diff --git a/src/gui/qt/gametable/log/log.cpp b/src/gui/qt/gametable/log/log.cpp index a68e5c60..d949e15c 100755 --- a/src/gui/qt/gametable/log/log.cpp +++ b/src/gui/qt/gametable/log/log.cpp @@ -54,13 +54,15 @@ Log::Log(gameTableImpl* w, ConfigFile *c) : myW(w), myConfig(c), myLogDir(0), my if(myConfig->readConfigInt("LogOnOff")) { //if write logfiles is enabled - if(myConfig->readConfigString("LogDir") != "" && QDir::QDir(QString::fromUtf8(myConfig->readConfigString("LogDir").c_str())).exists()) { + QDir logDir(QString::fromUtf8(myConfig->readConfigString("LogDir").c_str())); + if(myConfig->readConfigString("LogDir") != "" && logDir.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(":/gfx/logoChip3D.png").save(myLogDir->absolutePath()+"/logo.png"); + QPixmap logoChipPixmapFile(":/gfx/logoChip3D.png"); + logoChipPixmapFile.save(myLogDir->absolutePath()+"/logo.png"); // myW->textBrowser_Log->append(myLogFile->fileName()); diff --git a/src/gui/qt/settingsdialog/selectavatardialog/selectavatardialogimpl.cpp b/src/gui/qt/settingsdialog/selectavatardialog/selectavatardialogimpl.cpp index 7bbd065f..aec93a97 100644 --- a/src/gui/qt/settingsdialog/selectavatardialog/selectavatardialogimpl.cpp +++ b/src/gui/qt/settingsdialog/selectavatardialog/selectavatardialogimpl.cpp @@ -212,7 +212,8 @@ QString selectAvatarDialogImpl::getAvatarLink() { else return QString(""); } - if(groupBox_2->isChecked() && QFile::QFile(lineEdit->text()).exists() ) return externalAvatar; + QFile lineEditFile(lineEdit->text()); + if(groupBox_2->isChecked() && lineEditFile.exists() ) return externalAvatar; else return QString(""); } @@ -232,9 +233,10 @@ void selectAvatarDialogImpl::isAccepted() { } if(groupBox_2->isChecked()) { - if(QFile::QFile(lineEdit->text()).exists()) { + QFile lineEditFile(lineEdit->text()); + if(lineEditFile.exists()) { - if(QFile::QFile(lineEdit->text()).size() <= 30720 ) { + if(lineEditFile.size() <= 30720 ) { externalAvatar = lineEdit->text(); settingsCorrect = TRUE; } diff --git a/src/gui/qt/settingsdialog/settingsdialogimpl.cpp b/src/gui/qt/settingsdialog/settingsdialogimpl.cpp index 98d7478d..5efb00ac 100644 --- a/src/gui/qt/settingsdialog/settingsdialogimpl.cpp +++ b/src/gui/qt/settingsdialog/settingsdialogimpl.cpp @@ -566,7 +566,8 @@ void settingsDialogImpl::isAccepted() { 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()); } + QFile ownFlipsideFilename(lineEdit_OwnFlipsideFilename->text()); + if(ownFlipsideFilename.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!"), @@ -622,7 +623,8 @@ void settingsDialogImpl::isAccepted() { 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()); } + QDir logDir(lineEdit_logDir->text()); + if(logDir.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"