diff options
author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-10-09 17:56:51 +0200 |
---|---|---|
committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-10-09 17:56:52 +0200 |
commit | 881ceeff428c377d02ae3881beccdbb028385075 (patch) | |
tree | 65bd4335d7f67b81b04e33f2cbb17a41cf966dd8 /src/plugins/imageformats/ico/qicohandler.cpp | |
parent | b3d2c867ed14cd6337d5e32b8750f198b5b7d331 (diff) | |
parent | 106487387d493dab934e19b33bfed55b8df62d67 (diff) |
Merge remote-tracking branch 'origin/5.4' into dev
Change-Id: I05fcd8dc66d9ad0dc76bb7f5bae05c9876bfba14
Diffstat (limited to 'src/plugins/imageformats/ico/qicohandler.cpp')
-rw-r--r-- | src/plugins/imageformats/ico/qicohandler.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/plugins/imageformats/ico/qicohandler.cpp b/src/plugins/imageformats/ico/qicohandler.cpp index 73deb00941..00de0c80ad 100644 --- a/src/plugins/imageformats/ico/qicohandler.cpp +++ b/src/plugins/imageformats/ico/qicohandler.cpp @@ -163,7 +163,7 @@ static bool writeIconDirEntry(QIODevice *iodev, const ICONDIRENTRY &iconEntry) qToLittleEndian<quint16>(iconEntry.wBitCount, &tmp[6]); qToLittleEndian<quint32>(iconEntry.dwBytesInRes, &tmp[8]); qToLittleEndian<quint32>(iconEntry.dwImageOffset, &tmp[12]); - return (iodev->write((char*)tmp, ICONDIRENTRY_SIZE) == ICONDIRENTRY_SIZE) ? true : false; + return iodev->write((char*)tmp, ICONDIRENTRY_SIZE) == ICONDIRENTRY_SIZE; } return false; @@ -190,7 +190,7 @@ static bool writeIconDir(QIODevice *iodev, const ICONDIR &iconDir) qToLittleEndian(iconDir.idReserved, tmp); qToLittleEndian(iconDir.idType, &tmp[2]); qToLittleEndian(iconDir.idCount, &tmp[4]); - return (iodev->write((char*)tmp, 6) == 6) ? true : false; + return iodev->write((char*)tmp, 6) == 6; } return false; } @@ -233,7 +233,7 @@ static bool writeBMPInfoHeader(QIODevice *iodev, const BMP_INFOHDR &header) qToLittleEndian<quint32>(header.biClrUsed, &tmp[32]); qToLittleEndian<quint32>(header.biClrImportant, &tmp[36]); - return (iodev->write((char*)tmp, BMP_INFOHDR_SIZE) == BMP_INFOHDR_SIZE) ? true : false; + return iodev->write((char*)tmp, BMP_INFOHDR_SIZE) == BMP_INFOHDR_SIZE; } return false; } @@ -881,7 +881,7 @@ bool QtIcoHandler::jumpToImage(int imageNumber) m_currentIconIndex = imageNumber; } - return (imageNumber < imageCount()) ? true : false; + return imageNumber < imageCount(); } /*! \reimp |