From e8398e7db28292f224df7b477e384e876174265b Mon Sep 17 00:00:00 2001 From: John Preston Date: Wed, 28 Oct 2015 00:12:01 -0400 Subject: [PATCH] warnings fixed, 0.9.8.dev --- Telegram/SourceFiles/fileuploader.h | 4 ++-- Telegram/SourceFiles/localimageloader.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Telegram/SourceFiles/fileuploader.h b/Telegram/SourceFiles/fileuploader.h index 68476043f..26b542bdb 100644 --- a/Telegram/SourceFiles/fileuploader.h +++ b/Telegram/SourceFiles/fileuploader.h @@ -102,13 +102,13 @@ private: ReadyLocalMedia media; int32 partsCount; - const uint64 &id() const { + uint64 id() const { return file ? file->id : media.id; } PrepareMediaType type() const { return file ? file->type : media.type; } - const uint64 &thumbId() const { + uint64 thumbId() const { return file ? file->thumbId : media.thumbId; } const QString &filename() const { diff --git a/Telegram/SourceFiles/localimageloader.h b/Telegram/SourceFiles/localimageloader.h index 3b3770f9e..35f12c630 100644 --- a/Telegram/SourceFiles/localimageloader.h +++ b/Telegram/SourceFiles/localimageloader.h @@ -175,7 +175,7 @@ struct FileLoadTo { }; struct FileLoadResult { - FileLoadResult(const uint64 &id, const FileLoadTo &to) : id(id), to(to), type(PrepareAuto), thumbId(0), filesize(0) { + FileLoadResult(const uint64 &id, const FileLoadTo &to) : id(id), to(to), type(PrepareAuto), filesize(0), thumbId(0) { } uint64 id;