From 631ea72b888456980d2ccdfa61d14a0a80fb7017 Mon Sep 17 00:00:00 2001 From: John Preston Date: Tue, 6 Jan 2015 15:14:59 +0300 Subject: [PATCH] warnings fixed --- Telegram/SourceFiles/gui/images.cpp | 4 ++-- Telegram/SourceFiles/localimageloader.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Telegram/SourceFiles/gui/images.cpp b/Telegram/SourceFiles/gui/images.cpp index 3919ce516..19468c2cd 100644 --- a/Telegram/SourceFiles/gui/images.cpp +++ b/Telegram/SourceFiles/gui/images.cpp @@ -337,7 +337,7 @@ QPixmap Image::pixNoCache(int32 w, int32 h, bool smooth) const { if (p.isNull()) { return blank()->pix(); } - if (w <= 0 || !width() || !height() || w == width() && (h <= 0 || h == height())) return p; + if (w <= 0 || !width() || !height() || (w == width() && (h <= 0 || h == height()))) return p; if (h <= 0) { return QPixmap::fromImage(p.toImage().scaledToWidth(w, smooth ? Qt::SmoothTransformation : Qt::FastTransformation), Qt::ColorOnly); } @@ -369,7 +369,7 @@ QPixmap Image::pixColoredNoCache(const style::color &add, int32 w, int32 h, bool if (p.isNull()) { return blank()->pix(); } - if (w <= 0 || !width() || !height() || w == width() && (h <= 0 || h == height())) return QPixmap::fromImage(imageColored(add, p.toImage())); + if (w <= 0 || !width() || !height() || (w == width() && (h <= 0 || h == height()))) return QPixmap::fromImage(imageColored(add, p.toImage())); if (h <= 0) { return QPixmap::fromImage(imageColored(add, p.toImage().scaledToWidth(w, smooth ? Qt::SmoothTransformation : Qt::FastTransformation)), Qt::ColorOnly); } diff --git a/Telegram/SourceFiles/localimageloader.h b/Telegram/SourceFiles/localimageloader.h index 2e77364b9..9ab1fa8c7 100644 --- a/Telegram/SourceFiles/localimageloader.h +++ b/Telegram/SourceFiles/localimageloader.h @@ -44,7 +44,7 @@ typedef QList ToPrepareMedias; typedef QMap LocalFileParts; struct ReadyLocalMedia { ReadyLocalMedia(ToPrepareMediaType type, const QString &file, const QString &filename, int32 filesize, const QByteArray &data, const uint64 &id, const uint64 &thumbId, const QString &thumbExt, const PeerId &peer, const MTPPhoto &photo, const PreparedPhotoThumbs &photoThumbs, const MTPDocument &document, const QByteArray &jpeg, bool ctrlShiftEnter) : - type(type), file(file), filename(filename), filesize(filesize), data(data), id(id), thumbId(thumbId), thumbExt(thumbExt), peer(peer), photo(photo), document(document), photoThumbs(photoThumbs), ctrlShiftEnter(ctrlShiftEnter) { + type(type), file(file), filename(filename), filesize(filesize), data(data), thumbExt(thumbExt), id(id), thumbId(thumbId), peer(peer), photo(photo), document(document), photoThumbs(photoThumbs), ctrlShiftEnter(ctrlShiftEnter) { if (!jpeg.isEmpty()) { int32 size = jpeg.size(); for (int32 i = 0, part = 0; i < size; i += UploadPartSize, ++part) {