From 84e9e37353cc72f45515fca00cf9c97f23cf00ef Mon Sep 17 00:00:00 2001 From: John Preston Date: Tue, 26 Mar 2019 18:00:47 +0400 Subject: [PATCH] Closed alpha version 1.6.3.1: Fix build for Xcode. --- Telegram/SourceFiles/history/history_item_text.cpp | 2 +- .../media/streaming/media_streaming_loader_mtproto.h | 1 - Telegram/SourceFiles/passport/passport_form_view_controller.cpp | 2 +- Telegram/SourceFiles/ui/image/image_location.cpp | 2 -- 4 files changed, 2 insertions(+), 5 deletions(-) diff --git a/Telegram/SourceFiles/history/history_item_text.cpp b/Telegram/SourceFiles/history/history_item_text.cpp index a5c5bf9eb..e5f10588c 100644 --- a/Telegram/SourceFiles/history/history_item_text.cpp +++ b/Telegram/SourceFiles/history/history_item_text.cpp @@ -68,7 +68,7 @@ TextWithEntities WrapAsItem( if (const auto forwarded = item->Get()) { result = WrapAsForwarded(std::move(result), forwarded); } - return result; + return std::move(result); } TextWithEntities HistoryItemText(not_null item) { diff --git a/Telegram/SourceFiles/media/streaming/media_streaming_loader_mtproto.h b/Telegram/SourceFiles/media/streaming/media_streaming_loader_mtproto.h index 83300f6c6..f52a0bb98 100644 --- a/Telegram/SourceFiles/media/streaming/media_streaming_loader_mtproto.h +++ b/Telegram/SourceFiles/media/streaming/media_streaming_loader_mtproto.h @@ -55,7 +55,6 @@ private: const QVector &hashes); const not_null _api; - const MTP::DcId _dcId = 0; // _location can be changed with an updated file_reference. StorageFileLocation _location; diff --git a/Telegram/SourceFiles/passport/passport_form_view_controller.cpp b/Telegram/SourceFiles/passport/passport_form_view_controller.cpp index 3cff0e2e0..95e1fbfeb 100644 --- a/Telegram/SourceFiles/passport/passport_form_view_controller.cpp +++ b/Telegram/SourceFiles/passport/passport_form_view_controller.cpp @@ -524,7 +524,7 @@ ScopeRow ComputeScopeRow(const Scope &scope) { } } } - return row; + return std::move(row); }; switch (scope.type) { case Scope::Type::PersonalDetails: diff --git a/Telegram/SourceFiles/ui/image/image_location.cpp b/Telegram/SourceFiles/ui/image/image_location.cpp index ba79e89d2..7c91b971c 100644 --- a/Telegram/SourceFiles/ui/image/image_location.cpp +++ b/Telegram/SourceFiles/ui/image/image_location.cpp @@ -343,8 +343,6 @@ Storage::Cache::Key StorageFileLocation::cacheKey() const { } Storage::Cache::Key StorageFileLocation::bigFileBaseCacheKey() const { - using Key = Storage::Cache::Key; - // Skip '1' and '2' for legacy document cache keys. const auto shifted = ((uint64(_type) + 3) << 8); const auto sliced = uint64(_dcId) & 0xFFULL;