Move to std::optional.

Telegram/SourceFiles/apiwrap.cpp

@@ -1927,7 +1927,7 @@ void ApiWrap::handlePrivacyChange(
 		mtpTypeId keyTypeId,
 		const MTPVector<MTPPrivacyRule> &rules) {
 	using Key = Privacy::Key;
-	const auto key = [&]() -> base::optional<Key> {
+	const auto key = [&]() -> std::optional<Key> {
 		switch (keyTypeId) {
 		case mtpc_privacyKeyStatusTimestamp:
 		case mtpc_inputPrivacyKeyStatusTimestamp: return Key::LastSeen;
@@ -1936,7 +1936,7 @@ void ApiWrap::handlePrivacyChange(
 		case mtpc_privacyKeyPhoneCall:
 		case mtpc_inputPrivacyKeyPhoneCall: return Key::Calls;
 		}
-		return base::none;
+		return std::nullopt;
 	}();
 	if (!key) {
 		return;
@@ -2582,7 +2582,7 @@ void ApiWrap::refreshFileReference(
 		request(
 			MTPmessages_GetSavedGifs(MTP_int(0)),
 			[] { crl::on_main([] { Local::writeSavedGifs(); }); });
-	}, [&](base::none_type) {
+	}, [&](std::nullopt_t) {
 		fail();
 	});
 }
@@ -4236,7 +4236,7 @@ void ApiWrap::sendUploadedPhoto(
 void ApiWrap::sendUploadedDocument(
 		FullMsgId localId,
 		const MTPInputFile &file,
-		const base::optional<MTPInputFile> &thumb,
+		const std::optional<MTPInputFile> &thumb,
 		bool silent) {
 	if (const auto item = App::histItemById(localId)) {
 		auto media = item->media();
@@ -4987,10 +4987,10 @@ rpl::producer<Core::CloudPasswordState> ApiWrap::passwordState() const {
 }
 
 auto ApiWrap::passwordStateCurrent() const
-->base::optional<Core::CloudPasswordState> {
+->std::optional<Core::CloudPasswordState> {
 	return _passwordState
 		? base::make_optional(*_passwordState)
-		: base::none;
+		: std::nullopt;
 }
 
 void ApiWrap::saveSelfBio(const QString &text, FnMut<void()> done) {

Telegram/SourceFiles/apiwrap.h

@@ -304,7 +304,7 @@ public:
 	void sendUploadedDocument(
 		FullMsgId localId,
 		const MTPInputFile &file,
-		const base::optional<MTPInputFile> &thumb,
+		const std::optional<MTPInputFile> &thumb,
 		bool silent);
 	void cancelLocalItem(not_null<HistoryItem*> item);
 
@@ -336,7 +336,7 @@ public:
 	void reloadPasswordState();
 	void clearUnconfirmedPassword();
 	rpl::producer<Core::CloudPasswordState> passwordState() const;
-	base::optional<Core::CloudPasswordState> passwordStateCurrent() const;
+	std::optional<Core::CloudPasswordState> passwordStateCurrent() const;
 
 	void saveSelfBio(const QString &text, FnMut<void()> done);
 
@@ -717,7 +717,7 @@ private:
 	std::map<Privacy::Key, rpl::event_stream<Privacy>> _privacyChanges;
 
 	mtpRequestId _selfDestructRequestId = 0;
-	base::optional<int> _selfDestructDays;
+	std::optional<int> _selfDestructDays;
 	rpl::event_stream<int> _selfDestructChanges;
 
 };

Telegram/SourceFiles/base/flat_map.h

@@ -722,10 +722,10 @@ public:
 		return where->second;
 	}
 
-	optional<Type> take(const Key &key) {
+	std::optional<Type> take(const Key &key) {
 		auto it = find(key);
 		if (it == this->end()) {
-			return base::none;
+			return std::nullopt;
 		}
 		auto result = std::move(it->second);
 		this->erase(it);

Telegram/SourceFiles/base/optional.h

@@ -7,39 +7,16 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 */
 #pragma once
 
+#include <optional>
 #include <gsl/gsl_assert>
 #include "base/variant.h"
 
 namespace base {
 
-struct none_type {
-	bool operator==(none_type other) const {
-		return true;
-	}
-	bool operator!=(none_type other) const {
-		return false;
-	}
-	bool operator<(none_type other) const {
-		return false;
-	}
-	bool operator<=(none_type other) const {
-		return true;
-	}
-	bool operator>(none_type other) const {
-		return false;
-	}
-	bool operator>=(none_type other) const {
-		return true;
-	}
-
-};
-
-constexpr none_type none = {};
-
 template <typename... Types>
 class optional_variant {
 public:
-	optional_variant() : _impl(none) {
+	optional_variant() : _impl(std::nullopt) {
 	}
 	optional_variant(const optional_variant &other) : _impl(other._impl) {
 	}
@@ -63,7 +40,7 @@ public:
 	}
 
 	bool has_value() const {
-		return !is<none_type>();
+		return !is<std::nullopt_t>();
 	}
 	explicit operator bool() const {
 		return has_value();
@@ -93,7 +70,7 @@ public:
 		return get_unchecked<T>();
 	}
 	void clear() {
-		_impl.template set<none_type>();
+		_impl.template set<std::nullopt_t>();
 	}
 
 	template <typename T>
@@ -119,7 +96,7 @@ public:
 	}
 
 private:
-	variant<none_type, Types...> _impl;
+	variant<std::nullopt_t, Types...> _impl;
 
 };
 
@@ -147,17 +124,14 @@ inline decltype(auto) match(
 	return value.match(std::forward<Methods>(methods)...);
 }
 
-template <typename Type>
-class optional;
-
 template <typename Type>
 struct optional_wrap_once {
-	using type = optional<Type>;
+	using type = std::optional<Type>;
 };
 
 template <typename Type>
-struct optional_wrap_once<optional<Type>> {
+struct optional_wrap_once<std::optional<Type>> {
-	using type = optional<Type>;
+	using type = std::optional<Type>;
 };
 
 template <typename Type>
@@ -176,58 +150,22 @@ struct optional_chain_result<void> {
 template <typename Type>
 using optional_chain_result_t = typename optional_chain_result<Type>::type;
 
-template <typename Type>
-class optional : public optional_variant<Type> {
-	using parent = optional_variant<Type>;
-
-public:
-	using parent::parent;
-
-	Type &operator*() & {
-		Expects(parent::template is<Type>());
-
-		return parent::template get_unchecked<Type>();
-	}
-	Type &&operator*() && {
-		Expects(parent::template is<Type>());
-
-		return std::move(parent::template get_unchecked<Type>());
-	}
-	const Type &operator*() const & {
-		Expects(parent::template is<Type>());
-
-		return parent::template get_unchecked<Type>();
-	}
-	Type *operator->() {
-		Expects(parent::template is<Type>());
-
-		return std::addressof(parent::template get_unchecked<Type>());
-	}
-	const Type *operator->() const {
-		Expects(parent::template is<Type>());
-
-		return std::addressof(parent::template get_unchecked<Type>());
-	}
-	template <typename ...Args>
-	Type &emplace(Args &&...args) {
-		return parent::template set<Type>(std::forward<Args>(args)...);
-	}
-
-};
-
 template <typename Type>
 optional_wrap_once_t<Type> make_optional(Type &&value) {
 	return optional_wrap_once_t<Type> { std::forward<Type>(value) };
 }
 
+} // namespace base
+
 template <typename Type, typename Method>
-inline auto operator|(const optional<Type> &value, Method method)
+inline auto operator|(const std::optional<Type> &value, Method method)
--> optional_chain_result_t<decltype(method(*value))> {
+-> base::optional_chain_result_t<decltype(method(*value))> {
 	if constexpr (std::is_same_v<decltype(method(*value)), void>) {
 		return value ? (method(*value), true) : false;
 	} else {
-		return value ? make_optional(method(*value)) : none;
+		return value
+			? base::optional_chain_result_t<decltype(method(*value))>(
+				method(*value))
+			: std::nullopt;
 	}
 }
-
-} // namespace base

Telegram/SourceFiles/base/variant.h

@@ -7,6 +7,27 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 */
 #pragma once
 
+#include <optional>
+
+inline bool operator<(std::nullopt_t, std::nullopt_t) {
+	return false;
+}
+inline bool operator>(std::nullopt_t, std::nullopt_t) {
+	return false;
+}
+inline bool operator<=(std::nullopt_t, std::nullopt_t) {
+	return true;
+}
+inline bool operator>=(std::nullopt_t, std::nullopt_t) {
+	return true;
+}
+inline bool operator==(std::nullopt_t, std::nullopt_t) {
+	return true;
+}
+inline bool operator!=(std::nullopt_t, std::nullopt_t) {
+	return false;
+}
+
 #include <mapbox/variant.hpp>
 #include <rpl/details/type_list.h>
 #include "base/match_method.h"

Telegram/SourceFiles/boxes/add_contact_box.cpp

@@ -414,7 +414,7 @@ void GroupInfoBox::createGroup(not_null<PeerListBox*> selectUsersBox, const QStr
 		App::main()->sentUpdatesReceived(result);
 
 		auto success = base::make_optional(&result)
-			| [](auto updates) -> base::optional<const QVector<MTPChat>*> {
+			| [](auto updates) -> std::optional<const QVector<MTPChat>*> {
 				switch (updates->type()) {
 				case mtpc_updates:
 					return &updates->c_updates().vchats.v;
@@ -422,12 +422,12 @@ void GroupInfoBox::createGroup(not_null<PeerListBox*> selectUsersBox, const QStr
 					return &updates->c_updatesCombined().vchats.v;
 				}
 				LOG(("API Error: unexpected update cons %1 (GroupInfoBox::creationDone)").arg(updates->type()));
-				return base::none;
+				return std::nullopt;
 			}
 			| [](auto chats) {
 				return (!chats->empty() && chats->front().type() == mtpc_chat)
 					? base::make_optional(chats)
-					: base::none;
+					: std::nullopt;
 			}
 			| [](auto chats) {
 				return App::chat(chats->front().c_chat().vid.v);
@@ -517,7 +517,7 @@ void GroupInfoBox::createChannel(const QString &title, const QString &descriptio
 		App::main()->sentUpdatesReceived(result);
 
 		auto success = base::make_optional(&result)
-			| [](auto updates) -> base::optional<const QVector<MTPChat>*> {
+			| [](auto updates) -> std::optional<const QVector<MTPChat>*> {
 				switch (updates->type()) {
 				case mtpc_updates:
 					return &updates->c_updates().vchats.v;
@@ -525,12 +525,12 @@ void GroupInfoBox::createChannel(const QString &title, const QString &descriptio
 					return &updates->c_updatesCombined().vchats.v;
 				}
 				LOG(("API Error: unexpected update cons %1 (GroupInfoBox::createChannel)").arg(updates->type()));
-				return base::none;
+				return std::nullopt;
 			}
 			| [](auto chats) {
 				return (!chats->empty() && chats->front().type() == mtpc_channel)
 					? base::make_optional(chats)
-					: base::none;
+					: std::nullopt;
 			}
 			| [](auto chats) {
 				return App::channel(chats->front().c_channel().vid.v);

Telegram/SourceFiles/boxes/peers/edit_peer_info_box.cpp

@@ -93,12 +93,12 @@ private:
 		Ui::Checkbox *signatures = nullptr;
 	};
 	struct Saving {
-		base::optional<QString> username;
+		std::optional<QString> username;
-		base::optional<QString> title;
+		std::optional<QString> title;
-		base::optional<QString> description;
+		std::optional<QString> description;
-		base::optional<bool> hiddenPreHistory;
+		std::optional<bool> hiddenPreHistory;
-		base::optional<bool> signatures;
+		std::optional<bool> signatures;
-		base::optional<bool> everyoneInvites;
+		std::optional<bool> everyoneInvites;
 	};
 
 	Fn<QString()> computeTitle() const;
@@ -143,7 +143,7 @@ private:
 	void revokeInviteLink();
 	void exportInviteLink(const QString &confirmation);
 
-	base::optional<Saving> validate() const;
+	std::optional<Saving> validate() const;
 	bool validateUsername(Saving &to) const;
 	bool validateTitle(Saving &to) const;
 	bool validateDescription(Saving &to) const;
@@ -1087,7 +1087,7 @@ void Controller::submitDescription() {
 	}
 }
 
-base::optional<Controller::Saving> Controller::validate() const {
+std::optional<Controller::Saving> Controller::validate() const {
 	auto result = Saving();
 	if (validateUsername(result)
 		&& validateTitle(result)

Telegram/SourceFiles/boxes/report_box.h

@@ -44,7 +44,7 @@ private:
 	bool reportFail(const RPCError &error);
 
 	not_null<PeerData*> _peer;
-	base::optional<MessageIdsList> _ids;
+	std::optional<MessageIdsList> _ids;
 
 	std::shared_ptr<Ui::RadioenumGroup<Reason>> _reasonGroup;
 	object_ptr<Ui::Radioenum<Reason>> _reasonSpam = { nullptr };

Telegram/SourceFiles/boxes/send_files_box.cpp

@@ -136,7 +136,7 @@ private:
 	void drawSimpleFrame(Painter &p, QRect to, QSize size) const;
 
 	Ui::GroupMediaLayout _layout;
-	base::optional<QRect> _animateFromGeometry;
+	std::optional<QRect> _animateFromGeometry;
 	const QImage _fullPreview;
 	const int _shrinkSize = 0;
 	QPixmap _albumImage;
@@ -229,7 +229,7 @@ AlbumThumb::AlbumThumb(
 }
 
 void AlbumThumb::resetLayoutAnimation() {
-	_animateFromGeometry = base::none;
+	_animateFromGeometry = std::nullopt;
 }
 
 void AlbumThumb::animateLayoutToInitial() {

Telegram/SourceFiles/chat_helpers/stickers.cpp

@@ -239,7 +239,7 @@ void MoveFavedToFront(Set &set, int index) {
 
 void RequestSetToPushFaved(not_null<DocumentData*> document);
 
-void SetIsFaved(not_null<DocumentData*> document, base::optional<std::vector<not_null<EmojiPtr>>> emojiList = base::none) {
+void SetIsFaved(not_null<DocumentData*> document, std::optional<std::vector<not_null<EmojiPtr>>> emojiList = std::nullopt) {
 	auto &sets = Auth().data().stickerSetsRef();
 	auto it = sets.find(FavedSetId);
 	if (it == sets.end()) {
@@ -825,17 +825,17 @@ std::vector<not_null<DocumentData*>> GetListByEmoji(
 	}) | ranges::to_vector;
 }
 
-base::optional<std::vector<not_null<EmojiPtr>>> GetEmojiListFromSet(
+std::optional<std::vector<not_null<EmojiPtr>>> GetEmojiListFromSet(
 		not_null<DocumentData*> document) {
 	if (auto sticker = document->sticker()) {
 		auto &inputSet = sticker->set;
 		if (inputSet.type() != mtpc_inputStickerSetID) {
-			return base::none;
+			return std::nullopt;
 		}
 		auto &sets = Auth().data().stickerSets();
 		auto it = sets.constFind(inputSet.c_inputStickerSetID().vid.v);
 		if (it == sets.cend()) {
-			return base::none;
+			return std::nullopt;
 		}
 		auto result = std::vector<not_null<EmojiPtr>>();
 		for (auto i = it->emoji.cbegin(), e = it->emoji.cend(); i != e; ++i) {
@@ -844,11 +844,11 @@ base::optional<std::vector<not_null<EmojiPtr>>> GetEmojiListFromSet(
 			}
 		}
 		if (result.empty()) {
-			return base::none;
+			return std::nullopt;
 		}
 		return std::move(result);
 	}
-	return base::none;
+	return std::nullopt;
 }
 
 Set *FeedSet(const MTPDstickerSet &set) {

Telegram/SourceFiles/chat_helpers/stickers.h

@@ -89,7 +89,7 @@ void GifsReceived(const QVector<MTPDocument> &items, int32 hash);
 std::vector<not_null<DocumentData*>> GetListByEmoji(
 	not_null<EmojiPtr> emoji,
 	uint64 seed);
-base::optional<std::vector<not_null<EmojiPtr>>> GetEmojiListFromSet(
+std::optional<std::vector<not_null<EmojiPtr>>> GetEmojiListFromSet(
 	not_null<DocumentData*> document);
 
 Set *FeedSet(const MTPDstickerSet &data);

Telegram/SourceFiles/chat_helpers/stickers_list_widget.cpp

@@ -1498,7 +1498,7 @@ void StickersListWidget::mouseReleaseEvent(QMouseEvent *e) {
 	_previewTimer.stop();
 
 	auto pressed = _pressed;
-	setPressed(base::none);
+	setPressed(std::nullopt);
 	if (pressed != _selected) {
 		update();
 	}
@@ -1652,8 +1652,8 @@ void StickersListWidget::enterFromChildEvent(QEvent *e, QWidget *child) {
 }
 
 void StickersListWidget::clearSelection() {
-	setPressed(base::none);
+	setPressed(std::nullopt);
-	setSelected(base::none);
+	setSelected(std::nullopt);
 	update();
 }
 
@@ -2058,7 +2058,7 @@ void StickersListWidget::updateSelected() {
 		return;
 	}
 
-	auto newSelected = OverState { base::none };
+	auto newSelected = OverState { std::nullopt };
 	auto p = mapFromGlobal(_lastMousePosition);
 	if (!rect().contains(p)
 		|| p.y() < getVisibleTop() || p.y() >= getVisibleBottom()

Telegram/SourceFiles/core/core_cloud_password.cpp

@@ -157,7 +157,7 @@ CloudPasswordResult ComputeCheck(
 }
 
 bytes::vector ComputeHash(
-		base::none_type,
+		std::nullopt_t,
 		bytes::const_span password) {
 	Unexpected("Bad secure secret algorithm.");
 }
@@ -203,7 +203,7 @@ CloudPasswordCheckRequest ParseCloudPasswordCheckRequest(
 
 CloudPasswordAlgo ValidateNewCloudPasswordAlgo(CloudPasswordAlgo &&parsed) {
 	if (!parsed.is<CloudPasswordAlgoModPow>()) {
-		return base::none;
+		return std::nullopt;
 	}
 	auto &value = parsed.get_unchecked<CloudPasswordAlgoModPow>();
 	const auto already = value.salt1.size();
@@ -219,7 +219,7 @@ MTPPasswordKdfAlgo PrepareCloudPasswordAlgo(const CloudPasswordAlgo &data) {
 			MTP_bytes(data.salt2),
 			MTP_int(data.g),
 			MTP_bytes(data.p));
-	}, [](base::none_type) {
+	}, [](std::nullopt_t) {
 		return MTP_passwordKdfAlgoUnknown();
 	});
 }
@@ -233,7 +233,7 @@ bytes::vector ComputeCloudPasswordHash(
 		bytes::const_span password) {
 	return algo.match([&](const CloudPasswordAlgoModPow &data) {
 		return ComputeHash(data, password);
-	}, [](base::none_type) -> bytes::vector {
+	}, [](std::nullopt_t) -> bytes::vector {
 		Unexpected("Bad cloud password algorithm.");
 	});
 }
@@ -243,7 +243,7 @@ CloudPasswordDigest ComputeCloudPasswordDigest(
 		bytes::const_span password) {
 	return algo.match([&](const CloudPasswordAlgoModPow &data) {
 		return ComputeDigest(data, password);
-	}, [](base::none_type) -> CloudPasswordDigest {
+	}, [](std::nullopt_t) -> CloudPasswordDigest {
 		Unexpected("Bad cloud password algorithm.");
 	});
 }
@@ -253,7 +253,7 @@ CloudPasswordResult ComputeCloudPasswordCheck(
 		bytes::const_span hash) {
 	return request.algo.match([&](const CloudPasswordAlgoModPow &data) {
 		return ComputeCheck(request, data, hash);
-	}, [](base::none_type) -> CloudPasswordResult {
+	}, [](std::nullopt_t) -> CloudPasswordResult {
 		Unexpected("Bad cloud password algorithm.");
 	});
 }
@@ -274,7 +274,7 @@ SecureSecretAlgo ParseSecureSecretAlgo(
 
 SecureSecretAlgo ValidateNewSecureSecretAlgo(SecureSecretAlgo &&parsed) {
 	if (!parsed.is<SecureSecretAlgoPBKDF2>()) {
-		return base::none;
+		return std::nullopt;
 	}
 	auto &value = parsed.get_unchecked<SecureSecretAlgoPBKDF2>();
 	const auto already = value.salt.size();
@@ -290,7 +290,7 @@ MTPSecurePasswordKdfAlgo PrepareSecureSecretAlgo(
 			MTP_bytes(data.salt));
 	}, [](const SecureSecretAlgoSHA512 &data) {
 		return MTP_securePasswordKdfAlgoSHA512(MTP_bytes(data.salt));
-	}, [](base::none_type) {
+	}, [](std::nullopt_t) {
 		return MTP_securePasswordKdfAlgoUnknown();
 	});
 }

Telegram/SourceFiles/core/launcher.h

@@ -41,10 +41,10 @@ private:
 	void processArguments();
 
 	QStringList readArguments(int argc, char *argv[]) const;
-	virtual base::optional<QStringList> readArgumentsHook(
+	virtual std::optional<QStringList> readArgumentsHook(
 			int argc,
 			char *argv[]) const {
-		return base::none;
+		return std::nullopt;
 	}
 
 	void init();

Telegram/SourceFiles/core/update_checker.cpp

@@ -158,9 +158,9 @@ private:
 	void gotFailure(QNetworkReply::NetworkError e);
 	void clearSentRequest();
 	bool handleResponse(const QByteArray &response);
-	base::optional<QString> parseOldResponse(
+	std::optional<QString> parseOldResponse(
 		const QByteArray &response) const;
-	base::optional<QString> parseResponse(const QByteArray &response) const;
+	std::optional<QString> parseResponse(const QByteArray &response) const;
 	QString validateLatestUrl(
 		uint64 availableVersion,
 		bool isAvailableBeta,
@@ -262,14 +262,14 @@ private:
 		const QString &username,
 		Fn<void(const MTPInputChannel &channel)> callback);
 	void gotMessage(const MTPmessages_Messages &result);
-	base::optional<FileLocation> parseMessage(
+	std::optional<FileLocation> parseMessage(
 		const MTPmessages_Messages &result) const;
-	base::optional<FileLocation> parseText(const QByteArray &text) const;
+	std::optional<FileLocation> parseText(const QByteArray &text) const;
 	FileLocation validateLatestLocation(
 		uint64 availableVersion,
 		const FileLocation &location) const;
 	void gotFile(const MTPmessages_Messages &result);
-	base::optional<ParsedFile> parseFile(
+	std::optional<ParsedFile> parseFile(
 		const MTPmessages_Messages &result) const;
 
 	MtpWeak _mtp;
@@ -597,7 +597,7 @@ bool UnpackUpdate(const QString &filepath) {
 	return true;
 }
 
-base::optional<MTPInputChannel> ExtractChannel(
+std::optional<MTPInputChannel> ExtractChannel(
 		const MTPcontacts_ResolvedPeer &result) {
 	const auto &data = result.c_contacts_resolvedPeer();
 	if (const auto peer = peerFromMTP(data.vpeer)) {
@@ -612,7 +612,7 @@ base::optional<MTPInputChannel> ExtractChannel(
 			}
 		}
 	}
-	return base::none;
+	return std::nullopt;
 }
 
 template <typename Callback>
@@ -717,11 +717,11 @@ bool ParseCommonMap(
 	return true;
 }
 
-base::optional<MTPMessage> GetMessagesElement(
+std::optional<MTPMessage> GetMessagesElement(
 		const MTPmessages_Messages &list) {
-	const auto get = [](auto &&data) -> base::optional<MTPMessage> {
+	const auto get = [](auto &&data) -> std::optional<MTPMessage> {
 		return data.vmessages.v.isEmpty()
-			? base::none
+			? std::nullopt
 			: base::make_optional(data.vmessages.v[0]);
 	};
 	switch (list.type()) {
@@ -732,7 +732,7 @@ base::optional<MTPMessage> GetMessagesElement(
 	case mtpc_messages_channelMessages:
 		return get(list.c_messages_channelMessages());
 	case mtpc_messages_messagesNotModified:
-		return base::none;
+		return std::nullopt;
 	default: Unexpected("Type of messages.Messages (GetMessagesElement)");
 	}
 }
@@ -961,14 +961,14 @@ void HttpChecker::gotFailure(QNetworkReply::NetworkError e) {
 	fail();
 }
 
-base::optional<QString> HttpChecker::parseOldResponse(
+std::optional<QString> HttpChecker::parseOldResponse(
 		const QByteArray &response) const {
 	const auto string = QString::fromLatin1(response);
 	const auto old = QRegularExpression(
 		qsl("^\\s*(\\d+)\\s*:\\s*([\\x21-\\x7f]+)\\s*$")
 	).match(string);
 	if (!old.hasMatch()) {
-		return base::none;
+		return std::nullopt;
 	}
 	const auto availableVersion = old.captured(1).toULongLong();
 	const auto url = old.captured(2);
@@ -979,7 +979,7 @@ base::optional<QString> HttpChecker::parseOldResponse(
 		isAvailableBeta ? url.mid(5) + "_{signature}" : url);
 }
 
-base::optional<QString> HttpChecker::parseResponse(
+std::optional<QString> HttpChecker::parseResponse(
 		const QByteArray &response) const {
 	auto bestAvailableVersion = 0ULL;
 	auto bestIsAvailableBeta = false;
@@ -1005,7 +1005,7 @@ base::optional<QString> HttpChecker::parseResponse(
 	};
 	const auto result = ParseCommonMap(response, testing(), accumulate);
 	if (!result) {
-		return base::none;
+		return std::nullopt;
 	}
 	return validateLatestUrl(
 		bestAvailableVersion,
@@ -1350,17 +1350,17 @@ void MtpChecker::gotMessage(const MTPmessages_Messages &result) {
 }
 
 auto MtpChecker::parseMessage(const MTPmessages_Messages &result) const
--> base::optional<FileLocation> {
+-> std::optional<FileLocation> {
 	const auto message = GetMessagesElement(result);
 	if (!message || message->type() != mtpc_message) {
 		LOG(("Update Error: MTP feed message not found."));
-		return base::none;
+		return std::nullopt;
 	}
 	return parseText(message->c_message().vmessage.v);
 }
 
 auto MtpChecker::parseText(const QByteArray &text) const
--> base::optional<FileLocation> {
+-> std::optional<FileLocation> {
 	auto bestAvailableVersion = 0ULL;
 	auto bestLocation = FileLocation();
 	const auto accumulate = [&](
@@ -1404,7 +1404,7 @@ auto MtpChecker::parseText(const QByteArray &text) const
 	};
 	const auto result = ParseCommonMap(text, testing(), accumulate);
 	if (!result) {
-		return base::none;
+		return std::nullopt;
 	}
 	return validateLatestLocation(bestAvailableVersion, bestLocation);
 }
@@ -1430,23 +1430,23 @@ void MtpChecker::gotFile(const MTPmessages_Messages &result) {
 }
 
 auto MtpChecker::parseFile(const MTPmessages_Messages &result) const
--> base::optional<ParsedFile> {
+-> std::optional<ParsedFile> {
 	const auto message = GetMessagesElement(result);
 	if (!message || message->type() != mtpc_message) {
 		LOG(("Update Error: MTP file message not found."));
-		return base::none;
+		return std::nullopt;
 	}
 	const auto &data = message->c_message();
 	if (!data.has_media()
 		|| data.vmedia.type() != mtpc_messageMediaDocument) {
 		LOG(("Update Error: MTP file media not found."));
-		return base::none;
+		return std::nullopt;
 	}
 	const auto &document = data.vmedia.c_messageMediaDocument();
 	if (!document.has_document()
 		|| document.vdocument.type() != mtpc_document) {
 		LOG(("Update Error: MTP file not found."));
-		return base::none;
+		return std::nullopt;
 	}
 	const auto &fields = document.vdocument.c_document();
 	const auto name = [&] {
@@ -1460,12 +1460,12 @@ auto MtpChecker::parseFile(const MTPmessages_Messages &result) const
 	}();
 	if (name.isEmpty()) {
 		LOG(("Update Error: MTP file name not found."));
-		return base::none;
+		return std::nullopt;
 	}
 	const auto size = fields.vsize.v;
 	if (size <= 0) {
 		LOG(("Update Error: MTP file size is invalid."));
-		return base::none;
+		return std::nullopt;
 	}
 	const auto location = MTP_inputDocumentFileLocation(
 		fields.vid,

Telegram/SourceFiles/data/data_feed.cpp

@@ -250,7 +250,7 @@ void Feed::changeChannelsList(
 	// After that we restore it.
 	const auto oldLastMessage = base::take(_lastMessage);
 	for (const auto channel : add) {
-		_lastMessage = base::none;
+		_lastMessage = std::nullopt;
 		channel->setFeed(this);
 	}
 	_lastMessage = oldLastMessage;
@@ -282,7 +282,7 @@ void Feed::historyCleared(not_null<History*> history) {
 }
 
 void Feed::recountLastMessage() {
-	_lastMessage = base::none;
+	_lastMessage = std::nullopt;
 	for (const auto history : _channels) {
 		if (!history->lastMessageKnown()) {
 			_parent->session().api().requestDialogEntry(this);

Telegram/SourceFiles/data/data_feed.h

@@ -103,10 +103,10 @@ private:
 	QString _name;
 	base::flat_set<QString> _nameWords;
 	base::flat_set<QChar> _nameFirstLetters;
-	base::optional<HistoryItem*> _lastMessage;
+	std::optional<HistoryItem*> _lastMessage;
 
 	rpl::variable<MessagePosition> _unreadPosition;
-	base::optional<int> _unreadCount;
+	std::optional<int> _unreadCount;
 	rpl::event_stream<int> _unreadCountChanges;
 	int _unreadMutedCount = 0;
 

Telegram/SourceFiles/data/data_messages.cpp

@@ -93,7 +93,7 @@ template <typename Range>
 void MessagesList::addRange(
 		const Range &messages,
 		MessagesRange noSkipRange,
-		base::optional<int> count,
+		std::optional<int> count,
 		bool incrementCount) {
 	Expects(!count || !incrementCount);
 
@@ -119,13 +119,13 @@ void MessagesList::addRange(
 
 void MessagesList::addNew(MessagePosition messageId) {
 	auto range = { messageId };
-	addRange(range, { messageId, MaxMessagePosition }, base::none, true);
+	addRange(range, { messageId, MaxMessagePosition }, std::nullopt, true);
 }
 
 void MessagesList::addSlice(
 		std::vector<MessagePosition> &&messageIds,
 		MessagesRange noSkipRange,
-		base::optional<int> count) {
+		std::optional<int> count) {
 	addRange(messageIds, noSkipRange, count);
 }
 
@@ -167,7 +167,7 @@ void MessagesList::removeAll(ChannelId channelId) {
 
 void MessagesList::invalidate() {
 	_slices.clear();
-	_count = base::none;
+	_count = std::nullopt;
 }
 
 void MessagesList::invalidateBottom() {
@@ -181,7 +181,7 @@ void MessagesList::invalidateBottom() {
 			});
 		}
 	}
-	_count = base::none;
+	_count = std::nullopt;
 }
 
 rpl::producer<MessagesResult> MessagesList::query(
@@ -272,10 +272,10 @@ bool MessagesSliceBuilder::applyUpdate(const MessagesSliceUpdate &update) {
 	}
 	auto skippedBefore = (update.range.from == MinMessagePosition)
 		? 0
-		: base::optional<int> {};
+		: std::optional<int> {};
 	auto skippedAfter = (update.range.till == MaxMessagePosition)
 		? 0
-		: base::optional<int> {};
+		: std::optional<int> {};
 	mergeSliceData(
 		update.count,
 		needMergeMessages
@@ -331,20 +331,20 @@ bool MessagesSliceBuilder::removeFromChannel(ChannelId channelId) {
 			++i;
 		}
 	}
-	_skippedBefore = _skippedAfter = base::none;
+	_skippedBefore = _skippedAfter = std::nullopt;
 	checkInsufficient();
 	return true;
 }
 
 bool MessagesSliceBuilder::invalidated() {
-	_fullCount = _skippedBefore = _skippedAfter = base::none;
+	_fullCount = _skippedBefore = _skippedAfter = std::nullopt;
 	_ids.clear();
 	checkInsufficient();
 	return false;
 }
 
 bool MessagesSliceBuilder::bottomInvalidated() {
-	_fullCount = _skippedAfter = base::none;
+	_fullCount = _skippedAfter = std::nullopt;
 	checkInsufficient();
 	return true;
 }
@@ -354,10 +354,10 @@ void MessagesSliceBuilder::checkInsufficient() {
 }
 
 void MessagesSliceBuilder::mergeSliceData(
-		base::optional<int> count,
+		std::optional<int> count,
 		const base::flat_set<MessagePosition> &messageIds,
-		base::optional<int> skippedBefore,
+		std::optional<int> skippedBefore,
-		base::optional<int> skippedAfter) {
+		std::optional<int> skippedAfter) {
 	if (messageIds.empty()) {
 		if (count && _fullCount != count) {
 			_fullCount = count;
@@ -388,7 +388,7 @@ void MessagesSliceBuilder::mergeSliceData(
 	} else if (wasMinId != impossible && _skippedBefore) {
 		adjustSkippedBefore(wasMinId, *_skippedBefore);
 	} else {
-		_skippedBefore = base::none;
+		_skippedBefore = std::nullopt;
 	}
 
 	auto adjustSkippedAfter = [&](MessagePosition oldId, int oldSkippedAfter) {
@@ -402,7 +402,7 @@ void MessagesSliceBuilder::mergeSliceData(
 	} else if (wasMaxId != impossible && _skippedAfter) {
 		adjustSkippedAfter(wasMaxId, *_skippedAfter);
 	} else {
-		_skippedAfter = base::none;
+		_skippedAfter = std::nullopt;
 	}
 	fillSkippedAndSliceToLimits();
 }

Telegram/SourceFiles/data/data_messages.h

@@ -93,9 +93,9 @@ constexpr auto UnreadMessagePosition = MessagePosition(
 
 struct MessagesSlice {
 	std::vector<FullMsgId> ids;
-	base::optional<int> skippedBefore;
+	std::optional<int> skippedBefore;
-	base::optional<int> skippedAfter;
+	std::optional<int> skippedAfter;
-	base::optional<int> fullCount;
+	std::optional<int> fullCount;
 
 };
 
@@ -116,16 +116,16 @@ struct MessagesQuery {
 };
 
 struct MessagesResult {
-	base::optional<int> count;
+	std::optional<int> count;
-	base::optional<int> skippedBefore;
+	std::optional<int> skippedBefore;
-	base::optional<int> skippedAfter;
+	std::optional<int> skippedAfter;
 	base::flat_set<MessagePosition> messageIds;
 };
 
 struct MessagesSliceUpdate {
 	const base::flat_set<MessagePosition> *messages = nullptr;
 	MessagesRange range;
-	base::optional<int> count;
+	std::optional<int> count;
 };
 
 class MessagesList {
@@ -134,7 +134,7 @@ public:
 	void addSlice(
 		std::vector<MessagePosition> &&messageIds,
 		MessagesRange noSkipRange,
-		base::optional<int> count);
+		std::optional<int> count);
 	void removeOne(MessagePosition messageId);
 	void removeAll(ChannelId channelId);
 	void invalidate();
@@ -178,14 +178,14 @@ private:
 	void addRange(
 		const Range &messages,
 		MessagesRange noSkipRange,
-		base::optional<int> count,
+		std::optional<int> count,
 		bool incrementCount = false);
 
 	MessagesResult queryFromSlice(
 		const MessagesQuery &query,
 		const Slice &slice) const;
 
-	base::optional<int> _count;
+	std::optional<int> _count;
 	base::flat_set<Slice> _slices;
 
 	rpl::event_stream<MessagesSliceUpdate> _sliceUpdated;
@@ -234,17 +234,17 @@ private:
 	void sliceToLimits();
 
 	void mergeSliceData(
-		base::optional<int> count,
+		std::optional<int> count,
 		const base::flat_set<MessagePosition> &messageIds,
-		base::optional<int> skippedBefore = base::none,
+		std::optional<int> skippedBefore = std::nullopt,
-		base::optional<int> skippedAfter = base::none);
+		std::optional<int> skippedAfter = std::nullopt);
 
 	MessagePosition _key;
 	base::flat_set<MessagePosition> _ids;
 	MessagesRange _range;
-	base::optional<int> _fullCount;
+	std::optional<int> _fullCount;
-	base::optional<int> _skippedBefore;
+	std::optional<int> _skippedBefore;
-	base::optional<int> _skippedAfter;
+	std::optional<int> _skippedAfter;
 	int _limitBefore = 0;
 	int _limitAfter = 0;
 

Telegram/SourceFiles/data/data_notify_settings.cpp

@@ -28,24 +28,24 @@ public:
 
 	bool change(const MTPDpeerNotifySettings &data);
 	bool change(
-		base::optional<int> muteForSeconds,
+		std::optional<int> muteForSeconds,
-		base::optional<bool> silentPosts);
+		std::optional<bool> silentPosts);
 
-	base::optional<TimeId> muteUntil() const;
+	std::optional<TimeId> muteUntil() const;
-	base::optional<bool> silentPosts() const;
+	std::optional<bool> silentPosts() const;
 	MTPinputPeerNotifySettings serialize() const;
 
 private:
 	bool change(
-		base::optional<int> mute,
+		std::optional<int> mute,
-		base::optional<QString> sound,
+		std::optional<QString> sound,
-		base::optional<bool> showPreviews,
+		std::optional<bool> showPreviews,
-		base::optional<bool> silentPosts);
+		std::optional<bool> silentPosts);
 
-	base::optional<TimeId> _mute;
+	std::optional<TimeId> _mute;
-	base::optional<QString> _sound;
+	std::optional<QString> _sound;
-	base::optional<bool> _silent;
+	std::optional<bool> _silent;
-	base::optional<bool> _showPreviews;
+	std::optional<bool> _showPreviews;
 
 };
 
@@ -57,18 +57,18 @@ NotifySettingsValue::NotifySettingsValue(
 bool NotifySettingsValue::change(const MTPDpeerNotifySettings &data) {
 	return change(data.has_mute_until()
 		? base::make_optional(data.vmute_until.v)
-		: base::none, data.has_sound()
+		: std::nullopt, data.has_sound()
 		? base::make_optional(qs(data.vsound))
-		: base::none, data.has_show_previews()
+		: std::nullopt, data.has_show_previews()
 		? base::make_optional(mtpIsTrue(data.vshow_previews))
-		: base::none, data.has_silent()
+		: std::nullopt, data.has_silent()
 		? base::make_optional(mtpIsTrue(data.vsilent))
-		: base::none);
+		: std::nullopt);
 }
 
 bool NotifySettingsValue::change(
-		base::optional<int> muteForSeconds,
+		std::optional<int> muteForSeconds,
-		base::optional<bool> silentPosts) {
+		std::optional<bool> silentPosts) {
 	const auto now = unixtime();
 	const auto notMuted = muteForSeconds
 		? !(*muteForSeconds)
@@ -92,10 +92,10 @@ bool NotifySettingsValue::change(
 }
 
 bool NotifySettingsValue::change(
-		base::optional<int> mute,
+		std::optional<int> mute,
-		base::optional<QString> sound,
+		std::optional<QString> sound,
-		base::optional<bool> showPreviews,
+		std::optional<bool> showPreviews,
-		base::optional<bool> silentPosts) {
+		std::optional<bool> silentPosts) {
 	if (_mute == mute
 		&& _sound == sound
 		&& _showPreviews == showPreviews
@@ -109,11 +109,11 @@ bool NotifySettingsValue::change(
 	return true;
 }
 
-base::optional<TimeId> NotifySettingsValue::muteUntil() const {
+std::optional<TimeId> NotifySettingsValue::muteUntil() const {
 	return _mute;
 }
 
-base::optional<bool> NotifySettingsValue::silentPosts() const {
+std::optional<bool> NotifySettingsValue::silentPosts() const {
 	return _silent;
 }
 
@@ -157,8 +157,8 @@ bool NotifySettings::change(const MTPPeerNotifySettings &settings) {
 }
 
 bool NotifySettings::change(
-		base::optional<int> muteForSeconds,
+		std::optional<int> muteForSeconds,
-		base::optional<bool> silentPosts) {
+		std::optional<bool> silentPosts) {
 	if (!muteForSeconds && !silentPosts) {
 		return false;
 	} else if (_value) {
@@ -178,20 +178,20 @@ bool NotifySettings::change(
 		MTPstring()));
 }
 
-base::optional<TimeId> NotifySettings::muteUntil() const {
+std::optional<TimeId> NotifySettings::muteUntil() const {
 	return _value
 		? _value->muteUntil()
-		: base::none;
+		: std::nullopt;
 }
 
 bool NotifySettings::settingsUnknown() const {
 	return !_known;
 }
 
-base::optional<bool> NotifySettings::silentPosts() const {
+std::optional<bool> NotifySettings::silentPosts() const {
 	return _value
 		? _value->silentPosts()
-		: base::none;
+		: std::nullopt;
 }
 
 MTPinputPeerNotifySettings NotifySettings::serialize() const {

Telegram/SourceFiles/data/data_notify_settings.h

@@ -19,12 +19,12 @@ public:
 
 	bool change(const MTPPeerNotifySettings &settings);
 	bool change(
-		base::optional<int> muteForSeconds,
+		std::optional<int> muteForSeconds,
-		base::optional<bool> silentPosts);
+		std::optional<bool> silentPosts);
 
 	bool settingsUnknown() const;
-	base::optional<TimeId> muteUntil() const;
+	std::optional<TimeId> muteUntil() const;
-	base::optional<bool> silentPosts() const;
+	std::optional<bool> silentPosts() const;
 	MTPinputPeerNotifySettings serialize() const;
 
 	~NotifySettings();

Telegram/SourceFiles/data/data_peer.h

@@ -68,21 +68,21 @@ public:
 	bool isVerified() const;
 	bool isMegagroup() const;
 
-	base::optional<TimeId> notifyMuteUntil() const {
+	std::optional<TimeId> notifyMuteUntil() const {
 		return _notify.muteUntil();
 	}
 	bool notifyChange(const MTPPeerNotifySettings &settings) {
 		return _notify.change(settings);
 	}
 	bool notifyChange(
-			base::optional<int> muteForSeconds,
+			std::optional<int> muteForSeconds,
-			base::optional<bool> silentPosts) {
+			std::optional<bool> silentPosts) {
 		return _notify.change(muteForSeconds, silentPosts);
 	}
 	bool notifySettingsUnknown() const {
 		return _notify.settingsUnknown();
 	}
-	base::optional<bool> notifySilentPosts() const {
+	std::optional<bool> notifySilentPosts() const {
 		return _notify.silentPosts();
 	}
 	MTPinputPeerNotifySettings notifySerialize() const {

Telegram/SourceFiles/data/data_peer_values.cpp

@@ -39,7 +39,7 @@ int OnlinePhraseChangeInSeconds(TimeId online, TimeId now) {
 	return std::max(static_cast<TimeId>(nowFull.secsTo(tomorrow)), 0);
 }
 
-base::optional<QString> OnlineTextSpecial(not_null<UserData*> user) {
+std::optional<QString> OnlineTextSpecial(not_null<UserData*> user) {
 	if (isNotificationsUser(user->id)) {
 		return lang(lng_status_service_notifications);
 	} else if (user->botInfo) {
@@ -47,10 +47,10 @@ base::optional<QString> OnlineTextSpecial(not_null<UserData*> user) {
 	} else if (isServiceUser(user->id)) {
 		return lang(lng_status_support);
 	}
-	return base::none;
+	return std::nullopt;
 }
 
-base::optional<QString> OnlineTextCommon(TimeId online, TimeId now) {
+std::optional<QString> OnlineTextCommon(TimeId online, TimeId now) {
 	if (online <= 0) {
 		switch (online) {
 		case 0:
@@ -65,7 +65,7 @@ base::optional<QString> OnlineTextCommon(TimeId online, TimeId now) {
 	} else if (online > now) {
 		return lang(lng_status_online);
 	}
-	return base::none;
+	return std::nullopt;
 }
 
 } // namespace

Telegram/SourceFiles/data/data_search_controller.cpp

@@ -180,7 +180,7 @@ SearchController::CacheEntry::CacheEntry(const Query &query)
 : peerData(App::peer(query.peerId))
 , migratedData(query.migratedPeerId
 	? base::make_optional(Data(App::peer(query.migratedPeerId)))
-	: base::none) {
+	: std::nullopt) {
 }
 
 bool SearchController::hasInCache(const Query &query) const {

Telegram/SourceFiles/data/data_search_controller.h

@@ -64,7 +64,7 @@ public:
 	struct SavedState {
 		Query query;
 		IdsList peerList;
-		base::optional<IdsList> migratedList;
+		std::optional<IdsList> migratedList;
 	};
 
 	void setQuery(const Query &query);
@@ -100,7 +100,7 @@ private:
 		CacheEntry(const Query &query);
 
 		Data peerData;
-		base::optional<Data> migratedData;
+		std::optional<Data> migratedData;
 	};
 
 	struct CacheLess {

Telegram/SourceFiles/data/data_session.cpp

@@ -1842,8 +1842,8 @@ void Session::applyNotifySetting(
 
 void Session::updateNotifySettings(
 		not_null<PeerData*> peer,
-		base::optional<int> muteForSeconds,
+		std::optional<int> muteForSeconds,
-		base::optional<bool> silentPosts) {
+		std::optional<bool> silentPosts) {
 	if (peer->notifyChange(muteForSeconds, silentPosts)) {
 		updateNotifySettingsLocal(peer);
 		_session->api().updateNotifySettingsDelayed(peer);

Telegram/SourceFiles/data/data_session.h

@@ -396,8 +396,8 @@ public:
 		const MTPPeerNotifySettings &settings);
 	void updateNotifySettings(
 		not_null<PeerData*> peer,
-		base::optional<int> muteForSeconds,
+		std::optional<int> muteForSeconds,
-		base::optional<bool> silentPosts = base::none);
+		std::optional<bool> silentPosts = std::nullopt);
 	bool notifyIsMuted(
 		not_null<const PeerData*> peer,
 		TimeMs *changesIn = nullptr) const;

Telegram/SourceFiles/data/data_shared_media.cpp

@@ -30,7 +30,7 @@ using Type = Storage::SharedMediaType;
 
 } // namespace
 
-base::optional<Storage::SharedMediaType> SharedMediaOverviewType(
+std::optional<Storage::SharedMediaType> SharedMediaOverviewType(
 		Storage::SharedMediaType type) {
 	switch (type) {
 	case Type::Photo:
@@ -40,7 +40,7 @@ base::optional<Storage::SharedMediaType> SharedMediaOverviewType(
 	case Type::VoiceFile:
 	case Type::Link: return type;
 	}
-	return base::none;
+	return std::nullopt;
 }
 
 void SharedMediaShowOverview(
@@ -177,7 +177,7 @@ SharedMediaWithLastSlice::SharedMediaWithLastSlice(Key key)
 SharedMediaWithLastSlice::SharedMediaWithLastSlice(
 	Key key,
 	SparseIdsMergedSlice slice,
-	base::optional<SparseIdsMergedSlice> ending)
+	std::optional<SparseIdsMergedSlice> ending)
 : _key(key)
 , _slice(std::move(slice))
 , _ending(std::move(ending))
@@ -187,21 +187,21 @@ SharedMediaWithLastSlice::SharedMediaWithLastSlice(
 	: false) {
 }
 
-base::optional<int> SharedMediaWithLastSlice::fullCount() const {
+std::optional<int> SharedMediaWithLastSlice::fullCount() const {
 	return Add(
 		_slice.fullCount(),
 		_isolatedLastPhoto | [](bool isolated) { return isolated ? 1 : 0; });
 }
 
-base::optional<int> SharedMediaWithLastSlice::skippedBeforeImpl() const {
+std::optional<int> SharedMediaWithLastSlice::skippedBeforeImpl() const {
 	return _slice.skippedBefore();
 }
 
-base::optional<int> SharedMediaWithLastSlice::skippedBefore() const {
+std::optional<int> SharedMediaWithLastSlice::skippedBefore() const {
 	return _reversed ? skippedAfterImpl() : skippedBeforeImpl();
 }
 
-base::optional<int> SharedMediaWithLastSlice::skippedAfterImpl() const {
+std::optional<int> SharedMediaWithLastSlice::skippedAfterImpl() const {
 	return isolatedInSlice()
 		? Add(
 			_slice.skippedAfter(),
@@ -209,21 +209,21 @@ base::optional<int> SharedMediaWithLastSlice::skippedAfterImpl() const {
 		: (lastPhotoSkip() | [](int) { return 0; });
 }
 
-base::optional<int> SharedMediaWithLastSlice::skippedAfter() const {
+std::optional<int> SharedMediaWithLastSlice::skippedAfter() const {
 	return _reversed ? skippedBeforeImpl() : skippedAfterImpl();
 }
 
-base::optional<int> SharedMediaWithLastSlice::indexOfImpl(Value value) const {
+std::optional<int> SharedMediaWithLastSlice::indexOfImpl(Value value) const {
 	return base::get_if<FullMsgId>(&value)
 		? _slice.indexOf(*base::get_if<FullMsgId>(&value))
 		: (isolatedInSlice()
 			|| !_lastPhotoId
 			|| (*base::get_if<not_null<PhotoData*>>(&value))->id != *_lastPhotoId)
-			? base::none
+			? std::nullopt
 			: Add(_slice.size() - 1, lastPhotoSkip());
 }
 
-base::optional<int> SharedMediaWithLastSlice::indexOf(Value value) const {
+std::optional<int> SharedMediaWithLastSlice::indexOf(Value value) const {
 	const auto result = indexOfImpl(value);
 	if (result && (*result < 0 || *result >= size())) {
 		// Should not happen.
@@ -296,7 +296,7 @@ SharedMediaWithLastSlice::Value SharedMediaWithLastSlice::operator[](int index)
 		: Value(Auth().data().photo(*_lastPhotoId));
 }
 
-base::optional<int> SharedMediaWithLastSlice::distance(
+std::optional<int> SharedMediaWithLastSlice::distance(
 		const Key &a,
 		const Key &b) const {
 	if (auto i = indexOf(ComputeId(a))) {
@@ -304,29 +304,29 @@ base::optional<int> SharedMediaWithLastSlice::distance(
 			return *j - *i;
 		}
 	}
-	return base::none;
+	return std::nullopt;
 }
 
 void SharedMediaWithLastSlice::reverse() {
 	_reversed = !_reversed;
 }
 
-base::optional<PhotoId> SharedMediaWithLastSlice::LastPeerPhotoId(
+std::optional<PhotoId> SharedMediaWithLastSlice::LastPeerPhotoId(
 		PeerId peerId) {
 	if (auto peer = App::peerLoaded(peerId)) {
 		return peer->userpicPhotoUnknown()
-			? base::none
+			? std::nullopt
 			: base::make_optional(peer->userpicPhotoId());
 	}
-	return base::none;
+	return std::nullopt;
 }
 
-base::optional<bool> SharedMediaWithLastSlice::IsLastIsolated(
+std::optional<bool> SharedMediaWithLastSlice::IsLastIsolated(
 		const SparseIdsMergedSlice &slice,
-		const base::optional<SparseIdsMergedSlice> &ending,
+		const std::optional<SparseIdsMergedSlice> &ending,
-		base::optional<PhotoId> lastPeerPhotoId) {
+		std::optional<PhotoId> lastPeerPhotoId) {
 	if (!lastPeerPhotoId) {
-		return base::none;
+		return std::nullopt;
 	} else if (!*lastPeerPhotoId) {
 		return false;
 	}
@@ -338,12 +338,12 @@ base::optional<bool> SharedMediaWithLastSlice::IsLastIsolated(
 		| [&](PhotoId photoId) { return *lastPeerPhotoId != photoId; };
 }
 
-base::optional<FullMsgId> SharedMediaWithLastSlice::LastFullMsgId(
+std::optional<FullMsgId> SharedMediaWithLastSlice::LastFullMsgId(
 		const SparseIdsMergedSlice &slice) {
 	if (slice.fullCount() == 0) {
 		return FullMsgId();
 	} else if (slice.size() == 0 || slice.skippedAfter() != 0) {
-		return base::none;
+		return std::nullopt;
 	}
 	return slice[slice.size() - 1];
 }
@@ -364,7 +364,7 @@ rpl::producer<SharedMediaWithLastSlice> SharedMediaWithLastViewer(
 				consumer.put_next(SharedMediaWithLastSlice(
 					key,
 					std::move(update),
-					base::none));
+					std::nullopt));
 			});
 		}
 		return rpl::combine(

Telegram/SourceFiles/data/data_shared_media.h

@@ -11,7 +11,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "base/weak_ptr.h"
 #include "data/data_sparse_ids.h"
 
-base::optional<Storage::SharedMediaType> SharedMediaOverviewType(
+std::optional<Storage::SharedMediaType> SharedMediaOverviewType(
 	Storage::SharedMediaType type);
 void SharedMediaShowOverview(
 	Storage::SharedMediaType type,
@@ -93,15 +93,15 @@ public:
 	SharedMediaWithLastSlice(
 		Key key,
 		SparseIdsMergedSlice slice,
-		base::optional<SparseIdsMergedSlice> ending);
+		std::optional<SparseIdsMergedSlice> ending);
 
-	base::optional<int> fullCount() const;
+	std::optional<int> fullCount() const;
-	base::optional<int> skippedBefore() const;
+	std::optional<int> skippedBefore() const;
-	base::optional<int> skippedAfter() const;
+	std::optional<int> skippedAfter() const;
-	base::optional<int> indexOf(Value fullId) const;
+	std::optional<int> indexOf(Value fullId) const;
 	int size() const;
 	Value operator[](int index) const;
-	base::optional<int> distance(const Key &a, const Key &b) const;
+	std::optional<int> distance(const Key &a, const Key &b) const;
 
 	void reverse();
 
@@ -123,23 +123,23 @@ public:
 	}
 
 private:
-	static base::optional<SparseIdsMergedSlice> EndingSlice(const Key &key) {
+	static std::optional<SparseIdsMergedSlice> EndingSlice(const Key &key) {
 		return base::get_if<MessageId>(&key.universalId)
 			? base::make_optional(SparseIdsMergedSlice(EndingKey(key)))
-			: base::none;
+			: std::nullopt;
 	}
 
-	static base::optional<PhotoId> LastPeerPhotoId(PeerId peerId);
+	static std::optional<PhotoId> LastPeerPhotoId(PeerId peerId);
-	static base::optional<bool> IsLastIsolated(
+	static std::optional<bool> IsLastIsolated(
 		const SparseIdsMergedSlice &slice,
-		const base::optional<SparseIdsMergedSlice> &ending,
+		const std::optional<SparseIdsMergedSlice> &ending,
-		base::optional<PhotoId> lastPeerPhotoId);
+		std::optional<PhotoId> lastPeerPhotoId);
-	static base::optional<FullMsgId> LastFullMsgId(
+	static std::optional<FullMsgId> LastFullMsgId(
 		const SparseIdsMergedSlice &slice);
-	static base::optional<int> Add(
+	static std::optional<int> Add(
-			const base::optional<int> &a,
+			const std::optional<int> &a,
-			const base::optional<int> &b) {
+			const std::optional<int> &b) {
-		return (a && b) ? base::make_optional(*a + *b) : base::none;
+		return (a && b) ? base::make_optional(*a + *b) : std::nullopt;
 	}
 	static Value ComputeId(PeerId peerId, MsgId msgId) {
 		return FullMsgId(
@@ -158,20 +158,20 @@ private:
 	bool isolatedInSlice() const {
 		return (_slice.skippedAfter() != 0);
 	}
-	base::optional<int> lastPhotoSkip() const {
+	std::optional<int> lastPhotoSkip() const {
 		return _isolatedLastPhoto
 			| [](bool isolated) { return isolated ? 1 : 0; };
 	}
 
-	base::optional<int> skippedBeforeImpl() const;
+	std::optional<int> skippedBeforeImpl() const;
-	base::optional<int> skippedAfterImpl() const;
+	std::optional<int> skippedAfterImpl() const;
-	base::optional<int> indexOfImpl(Value fullId) const;
+	std::optional<int> indexOfImpl(Value fullId) const;
 
 	Key _key;
 	SparseIdsMergedSlice _slice;
-	base::optional<SparseIdsMergedSlice> _ending;
+	std::optional<SparseIdsMergedSlice> _ending;
-	base::optional<PhotoId> _lastPhotoId;
+	std::optional<PhotoId> _lastPhotoId;
-	base::optional<bool> _isolatedLastPhoto;
+	std::optional<bool> _isolatedLastPhoto;
 	bool _reversed = false;
 
 };

Telegram/SourceFiles/data/data_sparse_ids.cpp

@@ -13,9 +13,9 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 SparseIdsSlice::SparseIdsSlice(
 	const base::flat_set<MsgId> &ids,
 	MsgRange range,
-	base::optional<int> fullCount,
+	std::optional<int> fullCount,
-	base::optional<int> skippedBefore,
+	std::optional<int> skippedBefore,
-	base::optional<int> skippedAfter)
+	std::optional<int> skippedAfter)
 : _ids(ids)
 , _range(range)
 , _fullCount(fullCount)
@@ -23,12 +23,12 @@ SparseIdsSlice::SparseIdsSlice(
 , _skippedAfter(skippedAfter) {
 }
 
-base::optional<int> SparseIdsSlice::indexOf(MsgId msgId) const {
+std::optional<int> SparseIdsSlice::indexOf(MsgId msgId) const {
 	auto it = _ids.find(msgId);
 	if (it != _ids.end()) {
 		return (it - _ids.begin());
 	}
-	return base::none;
+	return std::nullopt;
 }
 
 MsgId SparseIdsSlice::operator[](int index) const {
@@ -37,7 +37,7 @@ MsgId SparseIdsSlice::operator[](int index) const {
 	return *(_ids.begin() + index);
 }
 
-base::optional<int> SparseIdsSlice::distance(
+std::optional<int> SparseIdsSlice::distance(
 		MsgId a,
 		MsgId b) const {
 	if (auto i = indexOf(a)) {
@@ -45,14 +45,14 @@ base::optional<int> SparseIdsSlice::distance(
 			return *j - *i;
 		}
 	}
-	return base::none;
+	return std::nullopt;
 }
 
-base::optional<MsgId> SparseIdsSlice::nearest(MsgId msgId) const {
+std::optional<MsgId> SparseIdsSlice::nearest(MsgId msgId) const {
 	if (auto it = ranges::lower_bound(_ids, msgId); it != _ids.end()) {
 		return *it;
 	} else if (_ids.empty()) {
-		return base::none;
+		return std::nullopt;
 	}
 	return _ids.back();
 }
@@ -67,19 +67,19 @@ SparseIdsMergedSlice::SparseIdsMergedSlice(Key key)
 SparseIdsMergedSlice::SparseIdsMergedSlice(
 	Key key,
 	SparseIdsSlice part,
-	base::optional<SparseIdsSlice> migrated)
+	std::optional<SparseIdsSlice> migrated)
 : _key(key)
 , _part(std::move(part))
 , _migrated(std::move(migrated)) {
 }
 
-base::optional<int> SparseIdsMergedSlice::fullCount() const {
+std::optional<int> SparseIdsMergedSlice::fullCount() const {
 	return Add(
 		_part.fullCount(),
 		_migrated ? _migrated->fullCount() : 0);
 }
 
-base::optional<int> SparseIdsMergedSlice::skippedBefore() const {
+std::optional<int> SparseIdsMergedSlice::skippedBefore() const {
 	return Add(
 		isolatedInMigrated() ? 0 : _part.skippedBefore(),
 		_migrated
@@ -90,22 +90,22 @@ base::optional<int> SparseIdsMergedSlice::skippedBefore() const {
 	);
 }
 
-base::optional<int> SparseIdsMergedSlice::skippedAfter() const {
+std::optional<int> SparseIdsMergedSlice::skippedAfter() const {
 	return Add(
 		isolatedInMigrated() ? _part.fullCount() : _part.skippedAfter(),
 		isolatedInPart() ? 0 : _migrated->skippedAfter()
 	);
 }
 
-base::optional<int> SparseIdsMergedSlice::indexOf(
+std::optional<int> SparseIdsMergedSlice::indexOf(
 		FullMsgId fullId) const {
 	return isFromPart(fullId)
 		? (_part.indexOf(fullId.msg) | func::add(migratedSize()))
 		: isolatedInPart()
-			? base::none
+			? std::nullopt
 			: isFromMigrated(fullId)
 				? _migrated->indexOf(fullId.msg)
-				: base::none;
+				: std::nullopt;
 }
 
 int SparseIdsMergedSlice::size() const {
@@ -125,7 +125,7 @@ FullMsgId SparseIdsMergedSlice::operator[](int index) const {
 	return ComputeId(_key.peerId, _part[index]);
 }
 
-base::optional<int> SparseIdsMergedSlice::distance(
+std::optional<int> SparseIdsMergedSlice::distance(
 		const Key &a,
 		const Key &b) const {
 	if (auto i = indexOf(ComputeId(a))) {
@@ -133,11 +133,11 @@ base::optional<int> SparseIdsMergedSlice::distance(
 			return *j - *i;
 		}
 	}
-	return base::none;
+	return std::nullopt;
 }
 
 auto SparseIdsMergedSlice::nearest(
-		UniversalMsgId id) const -> base::optional<FullMsgId> {
+		UniversalMsgId id) const -> std::optional<FullMsgId> {
 	auto convertFromPartNearest = [&](MsgId result) {
 		return ComputeId(_key.peerId, result);
 	};
@@ -149,18 +149,18 @@ auto SparseIdsMergedSlice::nearest(
 			return partNearestId
 				| convertFromPartNearest;
 		} else if (isolatedInPart()) {
-			return base::none;
+			return std::nullopt;
 		}
 		return _migrated->nearest(ServerMaxMsgId - 1)
 			| convertFromMigratedNearest;
 	}
 	if (auto migratedNearestId = _migrated
 		? _migrated->nearest(id + ServerMaxMsgId)
-		: base::none) {
+		: std::nullopt) {
 		return migratedNearestId
 			| convertFromMigratedNearest;
 	} else if (isolatedInMigrated()) {
-		return base::none;
+		return std::nullopt;
 	}
 	return _part.nearest(0)
 		| convertFromPartNearest;
@@ -201,10 +201,10 @@ bool SparseIdsSliceBuilder::applyUpdate(
 	}
 	auto skippedBefore = (update.range.from == 0)
 		? 0
-		: base::optional<int> {};
+		: std::optional<int> {};
 	auto skippedAfter = (update.range.till == ServerMaxMsgId)
 		? 0
-		: base::optional<int> {};
+		: std::optional<int> {};
 	mergeSliceData(
 		update.count,
 		needMergeMessages
@@ -253,7 +253,7 @@ bool SparseIdsSliceBuilder::removeAll() {
 }
 
 bool SparseIdsSliceBuilder::invalidateBottom() {
-	_fullCount = _skippedAfter = base::none;
+	_fullCount = _skippedAfter = std::nullopt;
 	if (_range.till == ServerMaxMsgId) {
 		_range.till = _ids.empty() ? _range.from : _ids.back();
 	}
@@ -266,10 +266,10 @@ void SparseIdsSliceBuilder::checkInsufficient() {
 }
 
 void SparseIdsSliceBuilder::mergeSliceData(
-		base::optional<int> count,
+		std::optional<int> count,
 		const base::flat_set<MsgId> &messageIds,
-		base::optional<int> skippedBefore,
+		std::optional<int> skippedBefore,
-		base::optional<int> skippedAfter) {
+		std::optional<int> skippedAfter) {
 	if (messageIds.empty()) {
 		if (count && _fullCount != count) {
 			_fullCount = count;
@@ -299,7 +299,7 @@ void SparseIdsSliceBuilder::mergeSliceData(
 	} else if (wasMinId >= 0 && _skippedBefore) {
 		adjustSkippedBefore(wasMinId, *_skippedBefore);
 	} else {
-		_skippedBefore = base::none;
+		_skippedBefore = std::nullopt;
 	}
 
 	auto adjustSkippedAfter = [&](MsgId oldId, int oldSkippedAfter) {
@@ -313,7 +313,7 @@ void SparseIdsSliceBuilder::mergeSliceData(
 	} else if (wasMaxId >= 0 && _skippedAfter) {
 		adjustSkippedAfter(wasMaxId, *_skippedAfter);
 	} else {
-		_skippedAfter = base::none;
+		_skippedAfter = std::nullopt;
 	}
 	fillSkippedAndSliceToLimits();
 }
@@ -420,7 +420,7 @@ rpl::producer<SparseIdsMergedSlice> SparseIdsMergedSlice::CreateViewer(
 				consumer.put_next(SparseIdsMergedSlice(
 					key,
 					std::move(part),
-					base::none));
+					std::nullopt));
 			});
 		}
 		auto migratedViewer = simpleViewer(

Telegram/SourceFiles/data/data_sparse_ids.h

@@ -22,25 +22,25 @@ public:
 	SparseIdsSlice(
 		const base::flat_set<MsgId> &ids,
 		MsgRange range,
-		base::optional<int> fullCount,
+		std::optional<int> fullCount,
-		base::optional<int> skippedBefore,
+		std::optional<int> skippedBefore,
-		base::optional<int> skippedAfter);
+		std::optional<int> skippedAfter);
 
-	base::optional<int> fullCount() const { return _fullCount; }
+	std::optional<int> fullCount() const { return _fullCount; }
-	base::optional<int> skippedBefore() const { return _skippedBefore; }
+	std::optional<int> skippedBefore() const { return _skippedBefore; }
-	base::optional<int> skippedAfter() const { return _skippedAfter; }
+	std::optional<int> skippedAfter() const { return _skippedAfter; }
-	base::optional<int> indexOf(MsgId msgId) const;
+	std::optional<int> indexOf(MsgId msgId) const;
 	int size() const { return _ids.size(); }
 	MsgId operator[](int index) const;
-	base::optional<int> distance(MsgId a, MsgId b) const;
+	std::optional<int> distance(MsgId a, MsgId b) const;
-	base::optional<MsgId> nearest(MsgId msgId) const;
+	std::optional<MsgId> nearest(MsgId msgId) const;
 
 private:
 	base::flat_set<MsgId> _ids;
 	MsgRange _range;
-	base::optional<int> _fullCount;
+	std::optional<int> _fullCount;
-	base::optional<int> _skippedBefore;
+	std::optional<int> _skippedBefore;
-	base::optional<int> _skippedAfter;
+	std::optional<int> _skippedAfter;
 
 };
 
@@ -76,16 +76,16 @@ public:
 	SparseIdsMergedSlice(
 		Key key,
 		SparseIdsSlice part,
-		base::optional<SparseIdsSlice> migrated);
+		std::optional<SparseIdsSlice> migrated);
 
-	base::optional<int> fullCount() const;
+	std::optional<int> fullCount() const;
-	base::optional<int> skippedBefore() const;
+	std::optional<int> skippedBefore() const;
-	base::optional<int> skippedAfter() const;
+	std::optional<int> skippedAfter() const;
-	base::optional<int> indexOf(FullMsgId fullId) const;
+	std::optional<int> indexOf(FullMsgId fullId) const;
 	int size() const;
 	FullMsgId operator[](int index) const;
-	base::optional<int> distance(const Key &a, const Key &b) const;
+	std::optional<int> distance(const Key &a, const Key &b) const;
-	base::optional<FullMsgId> nearest(UniversalMsgId id) const;
+	std::optional<FullMsgId> nearest(UniversalMsgId id) const;
 
 	using SimpleViewerFunction = rpl::producer<SparseIdsSlice>(
 		PeerId peerId,
@@ -107,10 +107,10 @@ private:
 			? (ServerMaxMsgId + key.universalId)
 			: (key.universalId > 0) ? (ServerMaxMsgId - 1) : 0;
 	}
-	static base::optional<SparseIdsSlice> MigratedSlice(const Key &key) {
+	static std::optional<SparseIdsSlice> MigratedSlice(const Key &key) {
 		return key.migratedPeerId
 			? base::make_optional(SparseIdsSlice())
-			: base::none;
+			: std::nullopt;
 	}
 
 	static bool IsFromSlice(PeerId peerId, FullMsgId fullId) {
@@ -128,10 +128,10 @@ private:
 			? ComputeId(key.peerId, key.universalId)
 			: ComputeId(key.migratedPeerId, ServerMaxMsgId + key.universalId);
 	}
-	static base::optional<int> Add(
+	static std::optional<int> Add(
-			const base::optional<int> &a,
+			const std::optional<int> &a,
-			const base::optional<int> &b) {
+			const std::optional<int> &b) {
-		return (a && b) ? base::make_optional(*a + *b) : base::none;
+		return (a && b) ? base::make_optional(*a + *b) : std::nullopt;
 	}
 
 	bool isFromPart(FullMsgId fullId) const {
@@ -156,7 +156,7 @@ private:
 
 	Key _key;
 	SparseIdsSlice _part;
-	base::optional<SparseIdsSlice> _migrated;
+	std::optional<SparseIdsSlice> _migrated;
 
 };
 
@@ -200,17 +200,17 @@ private:
 	void sliceToLimits();
 
 	void mergeSliceData(
-		base::optional<int> count,
+		std::optional<int> count,
 		const base::flat_set<MsgId> &messageIds,
-		base::optional<int> skippedBefore = base::none,
+		std::optional<int> skippedBefore = std::nullopt,
-		base::optional<int> skippedAfter = base::none);
+		std::optional<int> skippedAfter = std::nullopt);
 
 	Key _key;
 	base::flat_set<MsgId> _ids;
 	MsgRange _range;
-	base::optional<int> _fullCount;
+	std::optional<int> _fullCount;
-	base::optional<int> _skippedBefore;
+	std::optional<int> _skippedBefore;
-	base::optional<int> _skippedAfter;
+	std::optional<int> _skippedAfter;
 	int _limitBefore = 0;
 	int _limitAfter = 0;
 

Telegram/SourceFiles/data/data_user_photos.cpp

@@ -29,16 +29,16 @@ public:
 
 private:
 	void mergeSliceData(
-		base::optional<int> count,
+		std::optional<int> count,
 		const std::deque<PhotoId> &photoIds,
-		base::optional<int> skippedBefore,
+		std::optional<int> skippedBefore,
 		int skippedAfter);
 	void sliceToLimits();
 
 	Key _key;
 	std::deque<PhotoId> _ids;
-	base::optional<int> _fullCount;
+	std::optional<int> _fullCount;
-	base::optional<int> _skippedBefore;
+	std::optional<int> _skippedBefore;
 	int _skippedAfter = 0;
 	int _limitBefore = 0;
 	int _limitAfter = 0;
@@ -51,17 +51,17 @@ UserPhotosSlice::UserPhotosSlice(Key key)
 : UserPhotosSlice(
 	key,
 	{},
-	base::none,
+	std::nullopt,
-	base::none,
+	std::nullopt,
-	base::none) {
+	std::nullopt) {
 }
 
 UserPhotosSlice::UserPhotosSlice(
 	Key key,
 	std::deque<PhotoId> &&ids,
-	base::optional<int> fullCount,
+	std::optional<int> fullCount,
-	base::optional<int> skippedBefore,
+	std::optional<int> skippedBefore,
-	base::optional<int> skippedAfter)
+	std::optional<int> skippedAfter)
 : _key(key)
 , _ids(std::move(ids))
 , _fullCount(fullCount)
@@ -74,12 +74,12 @@ void UserPhotosSlice::reverse() {
 	std::swap(_skippedBefore, _skippedAfter);
 }
 
-base::optional<int> UserPhotosSlice::indexOf(PhotoId photoId) const {
+std::optional<int> UserPhotosSlice::indexOf(PhotoId photoId) const {
 	auto it = ranges::find(_ids, photoId);
 	if (it != _ids.end()) {
 		return (it - _ids.begin());
 	}
-	return base::none;
+	return std::nullopt;
 }
 
 PhotoId UserPhotosSlice::operator[](int index) const {
@@ -88,17 +88,17 @@ PhotoId UserPhotosSlice::operator[](int index) const {
 	return *(_ids.begin() + index);
 }
 
-base::optional<int> UserPhotosSlice::distance(const Key &a, const Key &b) const {
+std::optional<int> UserPhotosSlice::distance(const Key &a, const Key &b) const {
 	if (a.userId != _key.userId
 		|| b.userId != _key.userId) {
-		return base::none;
+		return std::nullopt;
 	}
 	if (auto i = indexOf(a.photoId)) {
 		if (auto j = indexOf(b.photoId)) {
 			return *j - *i;
 		}
 	}
-	return base::none;
+	return std::nullopt;
 }
 
 UserPhotosSliceBuilder::UserPhotosSliceBuilder(
@@ -137,9 +137,9 @@ void UserPhotosSliceBuilder::checkInsufficientPhotos() {
 }
 
 void UserPhotosSliceBuilder::mergeSliceData(
-		base::optional<int> count,
+		std::optional<int> count,
 		const std::deque<PhotoId> &photoIds,
-		base::optional<int> skippedBefore,
+		std::optional<int> skippedBefore,
 		int skippedAfter) {
 	if (photoIds.empty()) {
 		if (_fullCount != count) {

Telegram/SourceFiles/data/data_user_photos.h

@@ -18,28 +18,28 @@ public:
 	UserPhotosSlice(
 		Key key,
 		std::deque<PhotoId> &&ids,
-		base::optional<int> fullCount,
+		std::optional<int> fullCount,
-		base::optional<int> skippedBefore,
+		std::optional<int> skippedBefore,
-		base::optional<int> skippedAfter);
+		std::optional<int> skippedAfter);
 
 	void reverse();
 
 	const Key &key() const { return _key; }
 
-	base::optional<int> fullCount() const { return _fullCount; }
+	std::optional<int> fullCount() const { return _fullCount; }
-	base::optional<int> skippedBefore() const { return _skippedBefore; }
+	std::optional<int> skippedBefore() const { return _skippedBefore; }
-	base::optional<int> skippedAfter() const { return _skippedAfter; }
+	std::optional<int> skippedAfter() const { return _skippedAfter; }
-	base::optional<int> indexOf(PhotoId msgId) const;
+	std::optional<int> indexOf(PhotoId msgId) const;
 	int size() const { return _ids.size(); }
 	PhotoId operator[](int index) const;
-	base::optional<int> distance(const Key &a, const Key &b) const;
+	std::optional<int> distance(const Key &a, const Key &b) const;
 
 private:
 	Key _key;
 	std::deque<PhotoId> _ids;
-	base::optional<int> _fullCount;
+	std::optional<int> _fullCount;
-	base::optional<int> _skippedBefore;
+	std::optional<int> _skippedBefore;
-	base::optional<int> _skippedAfter;
+	std::optional<int> _skippedAfter;
 
 	friend class UserPhotosSliceBuilder;
 

Telegram/SourceFiles/export/data/export_data_types.cpp

@@ -529,8 +529,8 @@ std::pair<QString, QSize> WriteImageThumb(
 		const QString &basePath,
 		const QString &largePath,
 		Fn<QSize(QSize)> convertSize,
-		base::optional<QByteArray> format,
+		std::optional<QByteArray> format,
-		base::optional<int> quality,
+		std::optional<int> quality,
 		const QString &postfix) {
 	if (largePath.isEmpty()) {
 		return {};
@@ -582,8 +582,8 @@ QString WriteImageThumb(
 		basePath,
 		largePath,
 		[=](QSize size) { return QSize(width, height); },
-		base::none,
+		std::nullopt,
-		base::none,
+		std::nullopt,
 		postfix).first;
 }
 

Telegram/SourceFiles/export/data/export_data_types.h

@@ -87,8 +87,8 @@ std::pair<QString, QSize> WriteImageThumb(
 	const QString &basePath,
 	const QString &largePath,
 	Fn<QSize(QSize)> convertSize,
-	base::optional<QByteArray> format = base::none,
+	std::optional<QByteArray> format = std::nullopt,
-	base::optional<int> quality = base::none,
+	std::optional<int> quality = std::nullopt,
 	const QString &postfix = "_thumb");
 
 QString WriteImageThumb(

Telegram/SourceFiles/export/export_api_wrap.cpp

@@ -97,7 +97,7 @@ public:
 	LoadedFileCache(int limit);
 
 	void save(const Location &location, const QString &relativePath);
-	base::optional<QString> find(const Location &location) const;
+	std::optional<QString> find(const Location &location) const;
 
 private:
 	int _limit = 0;
@@ -135,7 +135,7 @@ struct ApiWrap::UserpicsProcess {
 	FnMut<void()> finish;
 
 	int processed = 0;
-	base::optional<Data::UserpicsSlice> slice;
+	std::optional<Data::UserpicsSlice> slice;
 	uint64 maxId = 0;
 	bool lastSlice = false;
 	int fileIndex = 0;
@@ -207,7 +207,7 @@ struct ApiWrap::ChatProcess {
 	int32 largestIdPlusOne = 1;
 
 	Data::ParseMediaContext context;
-	base::optional<Data::MessagesSlice> slice;
+	std::optional<Data::MessagesSlice> slice;
 	bool lastSlice = false;
 	int fileIndex = 0;
 };
@@ -309,16 +309,16 @@ void ApiWrap::LoadedFileCache::save(
 	}
 }
 
-base::optional<QString> ApiWrap::LoadedFileCache::find(
+std::optional<QString> ApiWrap::LoadedFileCache::find(
 		const Location &location) const {
 	if (!location) {
-		return base::none;
+		return std::nullopt;
 	}
 	const auto key = ComputeLocationKey(location);
 	if (const auto i = _map.find(key); i != end(_map)) {
 		return i->second;
 	}
-	return base::none;
+	return std::nullopt;
 }
 
 ApiWrap::FileProcess::FileProcess(const QString &path, Output::Stats *stats)
@@ -954,7 +954,7 @@ void ApiWrap::requestMessagesCount(int localSplitIndex) {
 }
 
 void ApiWrap::finishExport(FnMut<void()> done) {
-	const auto guard = gsl::finally([&] { _takeoutId = base::none; });
+	const auto guard = gsl::finally([&] { _takeoutId = std::nullopt; });
 
 	mainRequest(MTPaccount_FinishTakeoutSession(
 		MTP_flags(MTPaccount_FinishTakeoutSession::Flag::f_success)

Telegram/SourceFiles/export/export_api_wrap.h

@@ -191,7 +191,7 @@ private:
 	void ioError(const Output::Result &result);
 
 	MTP::ConcurrentSender _mtp;
-	base::optional<uint64> _takeoutId;
+	std::optional<uint64> _takeoutId;
 	Output::Stats *_stats = nullptr;
 
 	std::unique_ptr<Settings> _settings;

Telegram/SourceFiles/export/output/export_output_file.cpp

@@ -32,7 +32,7 @@ bool File::empty() const {
 Result File::writeBlock(const QByteArray &block) {
 	const auto result = writeBlockAttempt(block);
 	if (!result) {
-		_file.clear();
+		_file.reset();
 	}
 	return result;
 }

Telegram/SourceFiles/export/output/export_output_file.h

@@ -46,7 +46,7 @@ private:
 
 	QString _path;
 	int _offset = 0;
-	base::optional<QFile> _file;
+	std::optional<QFile> _file;
 
 	Stats *_stats = nullptr;
 	bool _inStats = false;

Telegram/SourceFiles/export/output/export_output_html.cpp

@@ -1058,7 +1058,7 @@ auto HtmlWriter::Wrap::pushMessage(
 		}
 		return "You have sent the following documents: "
 			+ SerializeList(list);
-	}, [](const base::none_type &) { return QByteArray(); });
+	}, [](std::nullopt_t) { return QByteArray(); });
 
 	if (!serviceText.isEmpty()) {
 		const auto &content = message.action.content;
@@ -1658,7 +1658,7 @@ MediaData HtmlWriter::Wrap::prepareMediaData(
 		result.status = Data::FormatMoneyAmount(data.amount, data.currency);
 	}, [](const UnsupportedMedia &data) {
 		Unexpected("Unsupported message.");
-	}, [](const base::none_type &) {});
+	}, [](std::nullopt_t) {});
 	return result;
 }
 
@@ -2276,7 +2276,7 @@ Result HtmlWriter::writeDialogSlice(const Data::MessagesSlice &data) {
 		? ((_messagesCount - 1) / kMessagesInFile)
 		: 0;
 	auto previous = _lastMessageInfo.get();
-	auto saved = base::optional<MessageInfo>();
+	auto saved = std::optional<MessageInfo>();
 	auto block = QByteArray();
 	for (const auto &message : data.list) {
 		const auto newIndex = (_messagesCount / kMessagesInFile);
@@ -2291,7 +2291,7 @@ Result HtmlWriter::writeDialogSlice(const Data::MessagesSlice &data) {
 				block = QByteArray();
 				_lastMessageInfo = nullptr;
 				previous = nullptr;
-				saved = base::none;
+				saved = std::nullopt;
 				oldIndex = newIndex;
 			} else {
 				return next;

Telegram/SourceFiles/export/output/export_output_json.cpp

@@ -458,7 +458,7 @@ QByteArray SerializeMessage(
 			}()));
 		}
 		pushBare("values", SerializeArray(context, list));
-	}, [](const base::none_type &) {});
+	}, [](std::nullopt_t) {});
 
 	if (!message.action.content) {
 		pushFrom();
@@ -572,7 +572,7 @@ QByteArray SerializeMessage(
 		}));
 	}, [](const UnsupportedMedia &data) {
 		Unexpected("Unsupported message.");
-	}, [](const base::none_type &) {});
+	}, [](std::nullopt_t) {});
 
 	pushBare("text", SerializeText(context, message.text));
 

Telegram/SourceFiles/export/output/export_output_text.cpp

@@ -332,7 +332,7 @@ QByteArray SerializeMessage(
 		} else if (!list.empty()) {
 			push("Values", JoinList(", ", list));
 		}
-	}, [](const base::none_type &) {});
+	}, [](std::nullopt_t) {});
 
 	if (!message.action.content) {
 		pushFrom();
@@ -435,7 +435,7 @@ QByteArray SerializeMessage(
 		}));
 	}, [](const UnsupportedMedia &data) {
 		Unexpected("Unsupported message.");
-	}, [](const base::none_type &) {});
+	}, [](std::nullopt_t) {});
 
 	auto value = JoinList(QByteArray(), ranges::view::all(
 		message.text

Telegram/SourceFiles/history/feed/history_feed_section.cpp

@@ -199,7 +199,7 @@ void Widget::updateScrollDownVisibility() {
 		return;
 	}
 
-	const auto scrollDownIsVisible = [&]() -> base::optional<bool> {
+	const auto scrollDownIsVisible = [&]() -> std::optional<bool> {
 		const auto top = _scroll->scrollTop() + st::historyToDownShownAfter;
 		if (top < _scroll->scrollTopMax()) {
 			return true;
@@ -207,7 +207,7 @@ void Widget::updateScrollDownVisibility() {
 		if (_inner->loadedAtBottomKnown()) {
 			return !_inner->loadedAtBottom();
 		}
-		return base::none;
+		return std::nullopt;
 	};
 	const auto scrollDownIsShown = scrollDownIsVisible();
 	if (!scrollDownIsShown) {
@@ -368,11 +368,11 @@ void Widget::listVisibleItemsChanged(HistoryItemsList &&items) {
 	}
 }
 
-base::optional<int> Widget::listUnreadBarView(
+std::optional<int> Widget::listUnreadBarView(
 		const std::vector<not_null<Element*>> &elements) {
 	const auto position = _feed->unreadPosition();
 	if (!position || elements.empty() || !_feed->unreadCount()) {
-		return base::none;
+		return std::nullopt;
 	}
 	const auto minimal = ranges::upper_bound(
 		elements,
@@ -380,14 +380,14 @@ base::optional<int> Widget::listUnreadBarView(
 		std::less<>(),
 		[](auto view) { return view->data()->position(); });
 	if (minimal == end(elements)) {
-		return base::none;
+		return std::nullopt;
 	}
 	const auto view = *minimal;
 	const auto unreadMessagesHeight = elements.back()->y()
 		+ elements.back()->height()
 		- view->y();
 	if (unreadMessagesHeight < _scroll->height()) {
-		return base::none;
+		return std::nullopt;
 	}
 	return base::make_optional(int(minimal - begin(elements)));
 }
@@ -482,7 +482,7 @@ void Widget::updateControlsGeometry() {
 	const auto contentWidth = width();
 
 	const auto newScrollTop = _scroll->isHidden()
-		? base::none
+		? std::nullopt
 		: base::make_optional(_scroll->scrollTop() + topDelta());
 	_topBar->resizeToWidth(contentWidth);
 	_topBarShadow->resize(contentWidth, st::lineWidth);

Telegram/SourceFiles/history/feed/history_feed_section.h

@@ -86,7 +86,7 @@ public:
 	void listSelectionChanged(
 		HistoryView::SelectedItems &&items) override;
 	void listVisibleItemsChanged(HistoryItemsList &&items) override;
-	base::optional<int> listUnreadBarView(
+	std::optional<int> listUnreadBarView(
 		const std::vector<not_null<Element*>> &elements) override;
 	void listContentRefreshed() override;
 	ClickHandlerPtr listDateLink(not_null<Element*> view) override;
@@ -135,7 +135,7 @@ private:
 
 	FullMsgId _currentMessageId;
 	FullMsgId _highlightMessageId;
-	base::optional<Data::MessagePosition> _nextAnimatedScrollPosition;
+	std::optional<Data::MessagePosition> _nextAnimatedScrollPosition;
 	int _nextAnimatedScrollDelta = 0;
 
 	Animation _scrollDownShown;

Telegram/SourceFiles/history/history.cpp

@@ -294,7 +294,7 @@ void History::setHasPendingResizedItems() {
 void History::itemRemoved(not_null<HistoryItem*> item) {
 	item->removeMainView();
 	if (lastMessage() == item) {
-		_lastMessage = base::none;
+		_lastMessage = std::nullopt;
 		if (loadedAtBottom()) {
 			if (const auto last = lastAvailableMessage()) {
 				setLastMessage(last);
@@ -423,7 +423,7 @@ void History::setSentDraftText(const QString &text) {
 
 void History::clearSentDraftText(const QString &text) {
 	if (_lastSentDraftText && *_lastSentDraftText == text) {
-		_lastSentDraftText = base::none;
+		_lastSentDraftText = std::nullopt;
 	}
 	accumulate_max(_lastSentDraftTime, unixtime());
 }

Telegram/SourceFiles/history/history.h

@@ -491,12 +491,12 @@ private:
 	bool _loadedAtTop = false;
 	bool _loadedAtBottom = true;
 
-	base::optional<MsgId> _inboxReadBefore;
+	std::optional<MsgId> _inboxReadBefore;
-	base::optional<MsgId> _outboxReadBefore;
+	std::optional<MsgId> _outboxReadBefore;
-	base::optional<int> _unreadCount;
+	std::optional<int> _unreadCount;
-	base::optional<int> _unreadMentionsCount;
+	std::optional<int> _unreadMentionsCount;
 	base::flat_set<MsgId> _unreadMentions;
-	base::optional<HistoryItem*> _lastMessage;
+	std::optional<HistoryItem*> _lastMessage;
 	bool _unreadMark = false;
 
 	// A pointer to the block that is currently being built.
@@ -510,7 +510,7 @@ private:
 
 	std::unique_ptr<Data::Draft> _localDraft, _cloudDraft;
 	std::unique_ptr<Data::Draft> _editDraft;
-	base::optional<QString> _lastSentDraftText;
+	std::optional<QString> _lastSentDraftText;
 	TimeId _lastSentDraftTime = 0;
 	MessageIdsList _forwardDraft;
 

Telegram/SourceFiles/history/history_widget.cpp

@@ -4584,7 +4584,7 @@ void HistoryWidget::documentUploaded(
 		const FullMsgId &newId,
 		bool silent,
 		const MTPInputFile &file) {
-	Auth().api().sendUploadedDocument(newId, file, base::none, silent);
+	Auth().api().sendUploadedDocument(newId, file, std::nullopt, silent);
 }
 
 void HistoryWidget::thumbDocumentUploaded(
@@ -5071,7 +5071,7 @@ bool HistoryWidget::hasPendingResizedItems() const {
 		|| (_migrated && _migrated->hasPendingResizedItems());
 }
 
-base::optional<int> HistoryWidget::unreadBarTop() const {
+std::optional<int> HistoryWidget::unreadBarTop() const {
 	auto getUnreadBar = [this]() -> HistoryView::Element* {
 		if (const auto bar = _migrated ? _migrated->unreadBar() : nullptr) {
 			return bar;
@@ -5088,7 +5088,7 @@ base::optional<int> HistoryWidget::unreadBarTop() const {
 		}
 		return result;
 	}
-	return base::none;
+	return std::nullopt;
 }
 
 HistoryView::Element *HistoryWidget::firstUnreadMessage() const {

Telegram/SourceFiles/history/history_widget.h

@@ -684,7 +684,7 @@ private:
 
 	// Counts scrollTop for placing the scroll right at the unread
 	// messages bar, choosing from _history and _migrated unreadBar.
-	base::optional<int> unreadBarTop() const;
+	std::optional<int> unreadBarTop() const;
 	int itemTopForHighlight(not_null<HistoryView::Element*> view) const;
 	void scrollToCurrentVoiceMessage(FullMsgId fromId, FullMsgId toId);
 	HistoryView::Element *firstUnreadMessage() const;

Telegram/SourceFiles/history/view/history_view_list_widget.cpp

@@ -328,24 +328,24 @@ void ListWidget::refreshRows() {
 	_delegate->listContentRefreshed();
 }
 
-base::optional<int> ListWidget::scrollTopForPosition(
+std::optional<int> ListWidget::scrollTopForPosition(
 		Data::MessagePosition position) const {
 	if (position == Data::MaxMessagePosition) {
 		if (loadedAtBottom()) {
 			return height();
 		}
-		return base::none;
+		return std::nullopt;
 	} else if (_items.empty()
 		|| isBelowPosition(position)
 		|| isAbovePosition(position)) {
-		return base::none;
+		return std::nullopt;
 	}
 	const auto index = findNearestItem(position);
 	const auto view = _items[index];
 	return scrollTopForView(_items[index]);
 }
 
-base::optional<int> ListWidget::scrollTopForView(
+std::optional<int> ListWidget::scrollTopForView(
 		not_null<Element*> view) const {
 	if (view->isHiddenByGroup()) {
 		if (const auto group = Auth().data().groups().find(view->data())) {

Telegram/SourceFiles/history/view/history_view_list_widget.h

@@ -62,7 +62,7 @@ public:
 		not_null<HistoryItem*> second) = 0;
 	virtual void listSelectionChanged(SelectedItems &&items) = 0;
 	virtual void listVisibleItemsChanged(HistoryItemsList &&items) = 0;
-	virtual base::optional<int> listUnreadBarView(
+	virtual std::optional<int> listUnreadBarView(
 		const std::vector<not_null<Element*>> &elements) = 0;
 	virtual void listContentRefreshed() = 0;
 	virtual ClickHandlerPtr listDateLink(not_null<Element*> view) = 0;
@@ -136,9 +136,9 @@ public:
 
 	void saveState(not_null<ListMemento*> memento);
 	void restoreState(not_null<ListMemento*> memento);
-	base::optional<int> scrollTopForPosition(
+	std::optional<int> scrollTopForPosition(
 		Data::MessagePosition position) const;
-	base::optional<int> scrollTopForView(not_null<Element*> view) const;
+	std::optional<int> scrollTopForView(not_null<Element*> view) const;
 	enum class AnimatedScroll {
 		Full,
 		Part,

Telegram/SourceFiles/info/feed/info_feed_channels.h

@@ -33,7 +33,7 @@ namespace FeedProfile {
 class Memento;
 struct ChannelsState {
 	std::unique_ptr<PeerListState> list;
-	base::optional<QString> search;
+	std::optional<QString> search;
 };
 
 class Channels

Telegram/SourceFiles/info/media/info_media_list_widget.cpp

@@ -981,7 +981,7 @@ auto ListWidget::findItemByPoint(QPoint point) const -> FoundItem {
 }
 
 auto ListWidget::findItemById(
-		UniversalMsgId universalId) -> base::optional<FoundItem> {
+		UniversalMsgId universalId) -> std::optional<FoundItem> {
 	auto sectionIt = findSectionByItem(universalId);
 	if (sectionIt != _sections.end()) {
 		auto item = sectionIt->findItemNearId(universalId);
@@ -989,14 +989,14 @@ auto ListWidget::findItemById(
 			return foundItemInSection(item, *sectionIt);
 		}
 	}
-	return base::none;
+	return std::nullopt;
 }
 
 auto ListWidget::findItemDetails(
-		BaseLayout *item) -> base::optional<FoundItem> {
+		BaseLayout *item) -> std::optional<FoundItem> {
 	return item
 		? findItemById(GetUniversalId(item))
-		: base::none;
+		: std::nullopt;
 }
 
 auto ListWidget::foundItemInSection(
@@ -1058,7 +1058,7 @@ void ListWidget::checkMoveToOtherViewer() {
 			auto delta = _slice.distance(
 				sliceKey(_universalAroundId),
 				sliceKey(universalId));
-			Assert(delta != base::none);
+			Assert(delta != std::nullopt);
 			preloadRequired = (qAbs(*delta) >= minUniversalIdDelta);
 		}
 		if (preloadRequired) {

Telegram/SourceFiles/info/media/info_media_list_widget.h

@@ -230,8 +230,8 @@ private:
 		std::vector<Section>::const_iterator from,
 		int bottom) const;
 	FoundItem findItemByPoint(QPoint point) const;
-	base::optional<FoundItem> findItemById(UniversalMsgId universalId);
+	std::optional<FoundItem> findItemById(UniversalMsgId universalId);
-	base::optional<FoundItem> findItemDetails(BaseLayout *item);
+	std::optional<FoundItem> findItemDetails(BaseLayout *item);
 	FoundItem foundItemInSection(
 		const FoundItem &item,
 		const Section &section) const;

Telegram/SourceFiles/info/media/info_media_widget.cpp

@@ -16,13 +16,13 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 namespace Info {
 namespace Media {
 
-base::optional<int> TypeToTabIndex(Type type) {
+std::optional<int> TypeToTabIndex(Type type) {
 	switch (type) {
 	case Type::Photo: return 0;
 	case Type::Video: return 1;
 	case Type::File: return 2;
 	}
-	return base::none;
+	return std::nullopt;
 }
 
 Type TabIndexToType(int index) {

Telegram/SourceFiles/info/media/info_media_widget.h

@@ -17,7 +17,7 @@ namespace Media {
 
 using Type = Storage::SharedMediaType;
 
-base::optional<int> TypeToTabIndex(Type type);
+std::optional<int> TypeToTabIndex(Type type);
 Type TabIndexToType(int index);
 
 class InnerWidget;

Telegram/SourceFiles/info/profile/info_profile_button.cpp

@@ -62,7 +62,7 @@ bool Button::toggled() const {
 	return _toggle ? _toggle->checked() : false;
 }
 
-void Button::setColorOverride(base::optional<QColor> textColorOverride) {
+void Button::setColorOverride(std::optional<QColor> textColorOverride) {
 	_textColorOverride = textColorOverride;
 	update();
 }

Telegram/SourceFiles/info/profile/info_profile_button.h

@@ -30,7 +30,7 @@ public:
 	rpl::producer<bool> toggledValue() const;
 	bool toggled() const;
 
-	void setColorOverride(base::optional<QColor> textColorOverride);
+	void setColorOverride(std::optional<QColor> textColorOverride);
 
 protected:
 	int resizeGetHeight(int newWidth) override;
@@ -51,7 +51,7 @@ private:
 	int _originalWidth = 0;
 	int _textWidth = 0;
 	std::unique_ptr<Ui::ToggleView> _toggle;
-	base::optional<QColor> _textColorOverride;
+	std::optional<QColor> _textColorOverride;
 
 };
 

Telegram/SourceFiles/info/profile/info_profile_members.h

@@ -34,7 +34,7 @@ class Button;
 class Memento;
 struct MembersState {
 	std::unique_ptr<PeerListState> list;
-	base::optional<QString> search;
+	std::optional<QString> search;
 };
 
 class Members

Telegram/SourceFiles/media/player/media_player_instance.cpp

@@ -127,7 +127,7 @@ void Instance::playlistUpdated(not_null<Data*> data) {
 		const auto fullId = data->current.contextId();
 		data->playlistIndex = data->playlistSlice->indexOf(fullId);
 	} else {
-		data->playlistIndex = base::none;
+		data->playlistIndex = std::nullopt;
 	}
 	data->playlistChanges.fire({});
 }
@@ -146,7 +146,7 @@ bool Instance::validPlaylist(not_null<Data*> data) {
 			return [&](const SparseIdsMergedSlice &data) {
 				return inSameDomain(a, b)
 					? data.distance(a, b)
-					: base::optional<int>();
+					: std::optional<int>();
 			};
 		};
 
@@ -180,14 +180,14 @@ void Instance::validatePlaylist(not_null<Data*> data) {
 			playlistUpdated(data);
 		}, data->playlistLifetime);
 	} else {
-		data->playlistSlice = base::none;
+		data->playlistSlice = std::nullopt;
-		data->playlistSliceKey = data->playlistRequestedKey = base::none;
+		data->playlistSliceKey = data->playlistRequestedKey = std::nullopt;
 		playlistUpdated(data);
 	}
 }
 
 auto Instance::playlistKey(not_null<Data*> data) const
--> base::optional<SliceKey> {
+-> std::optional<SliceKey> {
 	const auto contextId = data->current.contextId();
 	const auto history = data->history;
 	if (!contextId || !history || !IsServerMsgId(contextId.msg)) {

Telegram/SourceFiles/media/player/media_player_instance.h

@@ -139,10 +139,10 @@ private:
 		Storage::SharedMediaType overview;
 		AudioMsgId current;
 		AudioMsgId seeking;
-		base::optional<SparseIdsMergedSlice> playlistSlice;
+		std::optional<SparseIdsMergedSlice> playlistSlice;
-		base::optional<SliceKey> playlistSliceKey;
+		std::optional<SliceKey> playlistSliceKey;
-		base::optional<SliceKey> playlistRequestedKey;
+		std::optional<SliceKey> playlistRequestedKey;
-		base::optional<int> playlistIndex;
+		std::optional<int> playlistIndex;
 		rpl::lifetime playlistLifetime;
 		rpl::event_stream<> playlistChanges;
 		History *history = nullptr;
@@ -156,7 +156,7 @@ private:
 
 	void setCurrent(const AudioMsgId &audioId);
 	void refreshPlaylist(not_null<Data*> data);
-	base::optional<SliceKey> playlistKey(not_null<Data*> data) const;
+	std::optional<SliceKey> playlistKey(not_null<Data*> data) const;
 	bool validPlaylist(not_null<Data*> data);
 	void validatePlaylist(not_null<Data*> data);
 	void playlistUpdated(not_null<Data*> data);

Telegram/SourceFiles/media/view/media_view_group_thumbs.cpp

@@ -53,7 +53,7 @@ Context ComputeContext(const SharedMediaWithLastSlice &slice, int index) {
 		if (const auto peer = (*photo)->peer) {
 			return peer->id;
 		}
-		return base::none;
+		return std::nullopt;
 	} else if (const auto msgId = base::get_if<FullMsgId>(&value)) {
 		if (const auto item = App::histItemById(*msgId)) {
 			if (!item->toHistoryMessage()) {
@@ -62,7 +62,7 @@ Context ComputeContext(const SharedMediaWithLastSlice &slice, int index) {
 				return groupId;
 			}
 		}
-		return base::none;
+		return std::nullopt;
 	}
 	Unexpected("Variant in ComputeContext(SharedMediaWithLastSlice::Value)");
 }

Telegram/SourceFiles/mediaview.cpp

@@ -464,7 +464,7 @@ void MediaView::updateActions() {
 }
 
 auto MediaView::computeOverviewType() const
--> base::optional<SharedMediaType> {
+-> std::optional<SharedMediaType> {
 	if (const auto mediaType = sharedMediaType()) {
 		if (const auto overviewType = SharedMediaOverviewType(*mediaType)) {
 			return overviewType;
@@ -476,7 +476,7 @@ auto MediaView::computeOverviewType() const
 			}
 		}
 	}
-	return base::none;
+	return std::nullopt;
 }
 
 void MediaView::step_state(TimeMs ms, bool timer) {
@@ -697,7 +697,7 @@ void MediaView::clearData() {
 	stopGif();
 	delete _menu;
 	_menu = nullptr;
-	setContext(base::none);
+	setContext(std::nullopt);
 	_from = nullptr;
 	_photo = nullptr;
 	_doc = nullptr;
@@ -1082,7 +1082,7 @@ void MediaView::onCopy() {
 	}
 }
 
-base::optional<MediaView::SharedMediaType> MediaView::sharedMediaType() const {
+std::optional<MediaView::SharedMediaType> MediaView::sharedMediaType() const {
 	using Type = SharedMediaType;
 	if (auto item = App::histItemById(_msgid)) {
 		if (_photo) {
@@ -1099,10 +1099,10 @@ base::optional<MediaView::SharedMediaType> MediaView::sharedMediaType() const {
 			return Type::File;
 		}
 	}
-	return base::none;
+	return std::nullopt;
 }
 
-base::optional<MediaView::SharedMediaKey> MediaView::sharedMediaKey() const {
+std::optional<MediaView::SharedMediaKey> MediaView::sharedMediaKey() const {
 	if (!_msgid && _peer && !_user && _photo && _peer->userpicPhotoId() == _photo->id) {
 		return SharedMediaKey {
 			_history->peer->id,
@@ -1112,7 +1112,7 @@ base::optional<MediaView::SharedMediaKey> MediaView::sharedMediaKey() const {
 		};
 	}
 	if (!IsServerMsgId(_msgid.msg)) {
-		return base::none;
+		return std::nullopt;
 	}
 	auto keyForType = [this](SharedMediaType type) -> SharedMediaKey {
 		return {
@@ -1152,7 +1152,7 @@ bool MediaView::validSharedMedia() const {
 			return [&](const SharedMediaWithLastSlice &data) {
 				return inSameDomain(a, b)
 					? data.distance(a, b)
-					: base::optional<int>();
+					: std::optional<int>();
 			};
 		};
 
@@ -1188,15 +1188,15 @@ void MediaView::validateSharedMedia() {
 		}, _sharedMedia->lifetime);
 	} else {
 		_sharedMedia = nullptr;
-		_sharedMediaData = base::none;
+		_sharedMediaData = std::nullopt;
-		_sharedMediaDataKey = base::none;
+		_sharedMediaDataKey = std::nullopt;
 	}
 }
 
 void MediaView::handleSharedMediaUpdate(SharedMediaWithLastSlice &&update) {
 	if ((!_photo && !_doc) || !_sharedMedia) {
-		_sharedMediaData = base::none;
+		_sharedMediaData = std::nullopt;
-		_sharedMediaDataKey = base::none;
+		_sharedMediaDataKey = std::nullopt;
 	} else {
 		_sharedMediaData = std::move(update);
 		_sharedMediaDataKey = _sharedMedia->key;
@@ -1206,14 +1206,14 @@ void MediaView::handleSharedMediaUpdate(SharedMediaWithLastSlice &&update) {
 	preloadData(0);
 }
 
-base::optional<MediaView::UserPhotosKey> MediaView::userPhotosKey() const {
+std::optional<MediaView::UserPhotosKey> MediaView::userPhotosKey() const {
 	if (!_msgid && _user && _photo) {
 		return UserPhotosKey {
 			_user->bareId(),
 			_photo->id
 		};
 	}
-	return base::none;
+	return std::nullopt;
 }
 
 bool MediaView::validUserPhotos() const {
@@ -1251,13 +1251,13 @@ void MediaView::validateUserPhotos() {
 		}, _userPhotos->lifetime);
 	} else {
 		_userPhotos = nullptr;
-		_userPhotosData = base::none;
+		_userPhotosData = std::nullopt;
 	}
 }
 
 void MediaView::handleUserPhotosUpdate(UserPhotosSlice &&update) {
 	if (!_photo || !_userPhotos) {
-		_userPhotosData = base::none;
+		_userPhotosData = std::nullopt;
 	} else {
 		_userPhotosData = std::move(update);
 	}
@@ -1358,7 +1358,7 @@ void MediaView::showPhoto(not_null<PhotoData*> photo, HistoryItem *context) {
 	if (context) {
 		setContext(context);
 	} else {
-		setContext(base::none);
+		setContext(std::nullopt);
 	}
 
 	_firstOpenedPeerPhoto = false;
@@ -1410,7 +1410,7 @@ void MediaView::showDocument(not_null<DocumentData*> document, HistoryItem *cont
 	if (context) {
 		setContext(context);
 	} else {
-		setContext(base::none);
+		setContext(std::nullopt);
 	}
 
 	_photo = nullptr;
@@ -2467,19 +2467,19 @@ MediaView::Entity MediaView::entityForUserPhotos(int index) const {
 	Expects(!!_userPhotosData);
 
 	if (index < 0 || index >= _userPhotosData->size()) {
-		return { base::none, nullptr };
+		return { std::nullopt, nullptr };
 	}
 	if (auto photo = Auth().data().photo((*_userPhotosData)[index])) {
 		return { photo, nullptr };
 	}
-	return { base::none, nullptr };
+	return { std::nullopt, nullptr };
 }
 
 MediaView::Entity MediaView::entityForSharedMedia(int index) const {
 	Expects(!!_sharedMediaData);
 
 	if (index < 0 || index >= _sharedMediaData->size()) {
-		return { base::none, nullptr };
+		return { std::nullopt, nullptr };
 	}
 	auto value = (*_sharedMediaData)[index];
 	if (const auto photo = base::get_if<not_null<PhotoData*>>(&value)) {
@@ -2488,7 +2488,7 @@ MediaView::Entity MediaView::entityForSharedMedia(int index) const {
 	} else if (const auto itemId = base::get_if<FullMsgId>(&value)) {
 		return entityForItemId(*itemId);
 	}
-	return { base::none, nullptr };
+	return { std::nullopt, nullptr };
 }
 
 MediaView::Entity MediaView::entityForItemId(const FullMsgId &itemId) const {
@@ -2500,9 +2500,9 @@ MediaView::Entity MediaView::entityForItemId(const FullMsgId &itemId) const {
 				return { document, item };
 			}
 		}
-		return { base::none, item };
+		return { std::nullopt, item };
 	}
-	return { base::none, nullptr };
+	return { std::nullopt, nullptr };
 }
 
 MediaView::Entity MediaView::entityByIndex(int index) const {
@@ -2511,7 +2511,7 @@ MediaView::Entity MediaView::entityByIndex(int index) const {
 	} else if (_userPhotosData) {
 		return entityForUserPhotos(index);
 	}
-	return { base::none, nullptr };
+	return { std::nullopt, nullptr };
 }
 
 void MediaView::setContext(base::optional_variant<
@@ -2563,7 +2563,7 @@ bool MediaView::moveToEntity(const Entity &entity, int preloadDelta) {
 	} else if (_peer) {
 		setContext(_peer);
 	} else {
-		setContext(base::none);
+		setContext(std::nullopt);
 	}
 	stopGif();
 	if (auto photo = base::get_if<not_null<PhotoData*>>(&entity.data)) {
@@ -3004,10 +3004,10 @@ bool MediaView::eventFilter(QObject *obj, QEvent *e) {
 void MediaView::setVisible(bool visible) {
 	if (!visible) {
 		_sharedMedia = nullptr;
-		_sharedMediaData = base::none;
+		_sharedMediaData = std::nullopt;
-		_sharedMediaDataKey = base::none;
+		_sharedMediaDataKey = std::nullopt;
 		_userPhotos = nullptr;
-		_userPhotosData = base::none;
+		_userPhotosData = std::nullopt;
 		if (_menu) _menu->hideMenu(true);
 		_controlsHideTimer.stop();
 		_controlsState = ControlsShown;
@@ -3064,19 +3064,19 @@ void MediaView::findCurrent() {
 	if (_sharedMediaData) {
 		_index = _msgid
 			? _sharedMediaData->indexOf(_msgid)
-			: _photo ? _sharedMediaData->indexOf(_photo) : base::none;
+			: _photo ? _sharedMediaData->indexOf(_photo) : std::nullopt;
 		_fullIndex = _sharedMediaData->skippedBefore()
 			? (_index | func::add(*_sharedMediaData->skippedBefore()))
-			: base::none;
+			: std::nullopt;
 		_fullCount = _sharedMediaData->fullCount();
 	} else if (_userPhotosData) {
-		_index = _photo ? _userPhotosData->indexOf(_photo->id) : base::none;
+		_index = _photo ? _userPhotosData->indexOf(_photo->id) : std::nullopt;
 		_fullIndex = _userPhotosData->skippedBefore()
 			? (_index | func::add(*_userPhotosData->skippedBefore()))
-			: base::none;
+			: std::nullopt;
 		_fullCount = _userPhotosData->fullCount();
 	} else {
-		_index = _fullIndex = _fullCount = base::none;
+		_index = _fullIndex = _fullCount = std::nullopt;
 	}
 }
 
@@ -3105,7 +3105,7 @@ void MediaView::updateHeader() {
 			_headerText = lang(lng_mediaview_single_photo);
 		}
 	}
-	_headerHasLink = computeOverviewType() != base::none;
+	_headerHasLink = computeOverviewType() != std::nullopt;
 	auto hwidth = st::mediaviewThickFont->width(_headerText);
 	if (hwidth > width() / 3) {
 		hwidth = width() / 3;

Telegram/SourceFiles/mediaview.h

@@ -161,16 +161,16 @@ private:
 	struct SharedMedia;
 	using SharedMediaType = SharedMediaWithLastSlice::Type;
 	using SharedMediaKey = SharedMediaWithLastSlice::Key;
-	base::optional<SharedMediaType> sharedMediaType() const;
+	std::optional<SharedMediaType> sharedMediaType() const;
-	base::optional<SharedMediaKey> sharedMediaKey() const;
+	std::optional<SharedMediaKey> sharedMediaKey() const;
-	base::optional<SharedMediaType> computeOverviewType() const;
+	std::optional<SharedMediaType> computeOverviewType() const;
 	bool validSharedMedia() const;
 	void validateSharedMedia();
 	void handleSharedMediaUpdate(SharedMediaWithLastSlice &&update);
 
 	struct UserPhotos;
 	using UserPhotosKey = UserPhotosSlice::Key;
-	base::optional<UserPhotosKey> userPhotosKey() const;
+	std::optional<UserPhotosKey> userPhotosKey() const;
 	bool validUserPhotos() const;
 	void validateUserPhotos();
 	void handleUserPhotosUpdate(UserPhotosSlice &&update);
@@ -249,10 +249,10 @@ private:
 	PhotoData *_photo = nullptr;
 	DocumentData *_doc = nullptr;
 	std::unique_ptr<SharedMedia> _sharedMedia;
-	base::optional<SharedMediaWithLastSlice> _sharedMediaData;
+	std::optional<SharedMediaWithLastSlice> _sharedMediaData;
-	base::optional<SharedMediaWithLastSlice::Key> _sharedMediaDataKey;
+	std::optional<SharedMediaWithLastSlice::Key> _sharedMediaDataKey;
 	std::unique_ptr<UserPhotos> _userPhotos;
-	base::optional<UserPhotosSlice> _userPhotosData;
+	std::optional<UserPhotosSlice> _userPhotosData;
 
 	QRect _closeNav, _closeNavIcon;
 	QRect _leftNav, _leftNavIcon, _rightNav, _rightNavIcon;
@@ -332,9 +332,9 @@ private:
 	PeerData *_from = nullptr;
 	Text _fromName;
 
-	base::optional<int> _index; // Index in current _sharedMedia data.
+	std::optional<int> _index; // Index in current _sharedMedia data.
-	base::optional<int> _fullIndex; // Index in full shared media.
+	std::optional<int> _fullIndex; // Index in full shared media.
-	base::optional<int> _fullCount;
+	std::optional<int> _fullCount;
 	FullMsgId _msgid;
 	bool _canForwardItem = false;
 	bool _canDeleteItem = false;

Telegram/SourceFiles/messenger.cpp

@@ -969,8 +969,8 @@ void Messenger::unlockTerms() {
 	}
 }
 
-base::optional<Window::TermsLock> Messenger::termsLocked() const {
+std::optional<Window::TermsLock> Messenger::termsLocked() const {
-	return _termsLock ? base::make_optional(*_termsLock) : base::none;
+	return _termsLock ? base::make_optional(*_termsLock) : std::nullopt;
 }
 
 rpl::producer<bool> Messenger::termsLockChanges() const {

Telegram/SourceFiles/messenger.h

@@ -177,7 +177,7 @@ public:
 
 	void lockByTerms(const Window::TermsLock &data);
 	void unlockTerms();
-	[[nodiscard]] base::optional<Window::TermsLock> termsLocked() const;
+	[[nodiscard]] std::optional<Window::TermsLock> termsLocked() const;
 	rpl::producer<bool> termsLockChanges() const;
 	rpl::producer<bool> termsLockValue() const;
 	void termsDeleteNow();

Telegram/SourceFiles/mtproto/mtp_instance.cpp

@@ -151,9 +151,9 @@ private:
 	void configLoadDone(const MTPConfig &result);
 	bool configLoadFail(const RPCError &error);
 
-	base::optional<ShiftedDcId> queryRequestByDc(
+	std::optional<ShiftedDcId> queryRequestByDc(
 		mtpRequestId requestId) const;
-	base::optional<ShiftedDcId> changeRequestByDc(
+	std::optional<ShiftedDcId> changeRequestByDc(
 		mtpRequestId requestId, DcId newdc);
 
 	// RPCError::NoError means do not toggle onError callback.
@@ -806,17 +806,17 @@ bool Instance::Private::configLoadFail(const RPCError &error) {
 	return false;
 }
 
-base::optional<ShiftedDcId> Instance::Private::queryRequestByDc(
+std::optional<ShiftedDcId> Instance::Private::queryRequestByDc(
 		mtpRequestId requestId) const {
 	QMutexLocker locker(&_requestByDcLock);
 	auto it = _requestsByDc.find(requestId);
 	if (it != _requestsByDc.cend()) {
 		return it->second;
 	}
-	return base::none;
+	return std::nullopt;
 }
 
-base::optional<ShiftedDcId> Instance::Private::changeRequestByDc(
+std::optional<ShiftedDcId> Instance::Private::changeRequestByDc(
 		mtpRequestId requestId,
 		DcId newdc) {
 	QMutexLocker locker(&_requestByDcLock);
@@ -829,7 +829,7 @@ base::optional<ShiftedDcId> Instance::Private::changeRequestByDc(
 		}
 		return it->second;
 	}
-	return base::none;
+	return std::nullopt;
 }
 
 void Instance::Private::checkDelayedRequests() {

Telegram/SourceFiles/passport/passport_encryption.h

@@ -24,7 +24,7 @@ std::map<QString, QString> DeserializeData(bytes::const_span bytes);
 struct DataError {
 	// QByteArray - bad existing scan with such file_hash
 	// QString - bad data field value with such key
-	// base::none - additional scan required
+	// std::nullopt - additional scan required
 	base::optional_variant<QByteArray, QString> key;
 	QString type; // personal_details, passport, etc.
 	QString text;

Telegram/SourceFiles/passport/passport_form_controller.cpp

@@ -559,7 +559,7 @@ const std::vector<EditFile> &Value::filesInEdit(FileType type) const {
 	Unexpected("Type in Value::filesInEdit() const.");
 }
 
-EditFile &Value::fileInEdit(FileType type, base::optional<int> fileIndex) {
+EditFile &Value::fileInEdit(FileType type, std::optional<int> fileIndex) {
 	switch (type) {
 	case FileType::Scan:
 	case FileType::Translation: {
@@ -577,7 +577,7 @@ EditFile &Value::fileInEdit(FileType type, base::optional<int> fileIndex) {
 
 const EditFile &Value::fileInEdit(
 		FileType type,
-		base::optional<int> fileIndex) const {
+		std::optional<int> fileIndex) const {
 	switch (type) {
 	case FileType::Scan:
 	case FileType::Translation: {
@@ -1232,7 +1232,7 @@ void FormController::fillNativeFromFallback() {
 	// Check if additional values should be copied from fallback values.
 	const auto scheme = GetDocumentScheme(
 		Scope::Type::PersonalDetails,
-		base::none,
+		std::nullopt,
 		true);
 	const auto dependencyIt = values.fields.find(
 		scheme.additionalDependencyKey);
@@ -1363,7 +1363,7 @@ void FormController::uploadScan(
 		return;
 	}
 	const auto nonconst = findValue(value);
-	const auto fileIndex = [&]() -> base::optional<int> {
+	const auto fileIndex = [&]() -> std::optional<int> {
 		auto scanInEdit = EditFile{ nonconst, type, File(), nullptr };
 		if (type == FileType::Scan || type == FileType::Translation) {
 			auto &list = nonconst->filesInEdit(type);
@@ -1379,7 +1379,7 @@ void FormController::uploadScan(
 				type,
 				std::move(scanInEdit)).first;
 		}
-		return base::none;
+		return std::nullopt;
 	}();
 	auto &scan = nonconst->fileInEdit(type, fileIndex);
 	encryptFile(scan, std::move(content), [=](UploadScanData &&result) {
@@ -1392,14 +1392,14 @@ void FormController::uploadScan(
 void FormController::deleteScan(
 		not_null<const Value*> value,
 		FileType type,
-		base::optional<int> fileIndex) {
+		std::optional<int> fileIndex) {
 	scanDeleteRestore(value, type, fileIndex, true);
 }
 
 void FormController::restoreScan(
 		not_null<const Value*> value,
 		FileType type,
-		base::optional<int> fileIndex) {
+		std::optional<int> fileIndex) {
 	scanDeleteRestore(value, type, fileIndex, false);
 }
 
@@ -1454,7 +1454,7 @@ void FormController::encryptFile(
 void FormController::scanDeleteRestore(
 		not_null<const Value*> value,
 		FileType type,
-		base::optional<int> fileIndex,
+		std::optional<int> fileIndex,
 		bool deleted) {
 	const auto nonconst = findValue(value);
 	auto &scan = nonconst->fileInEdit(type, fileIndex);
@@ -1723,7 +1723,7 @@ void FormController::loadFile(File &file) {
 			file.id,
 			file.accessHash,
 			QByteArray(), // file_reference
-			base::none, // origin
+			std::nullopt, // origin
 			SecureFileLocation,
 			QString(),
 			file.size,
@@ -2299,10 +2299,10 @@ auto FormController::parseFiles(
 auto FormController::parseFile(
 	const MTPSecureFile &data,
 	const std::vector<EditFile> &editData) const
--> base::optional<File> {
+-> std::optional<File> {
 	switch (data.type()) {
 	case mtpc_secureFileEmpty:
-		return base::none;
+		return std::nullopt;
 
 	case mtpc_secureFile: {
 		const auto &fields = data.c_secureFile();

Telegram/SourceFiles/passport/passport_form_controller.h

@@ -205,10 +205,10 @@ struct Value {
 	const QString &fileMissingError(FileType type) const;
 	std::vector<EditFile> &filesInEdit(FileType type);
 	const std::vector<EditFile> &filesInEdit(FileType type) const;
-	EditFile &fileInEdit(FileType type, base::optional<int> fileIndex);
+	EditFile &fileInEdit(FileType type, std::optional<int> fileIndex);
 	const EditFile &fileInEdit(
 		FileType type,
-		base::optional<int> fileIndex) const;
+		std::optional<int> fileIndex) const;
 
 	std::vector<EditFile> takeAllFilesInEdit();
 
@@ -345,11 +345,11 @@ public:
 	void deleteScan(
 		not_null<const Value*> value,
 		FileType type,
-		base::optional<int> fileIndex);
+		std::optional<int> fileIndex);
 	void restoreScan(
 		not_null<const Value*> value,
 		FileType type,
-		base::optional<int> fileIndex);
+		std::optional<int> fileIndex);
 
 	rpl::producer<> secretReadyEvents() const;
 
@@ -407,7 +407,7 @@ private:
 	std::vector<File> parseFiles(
 		const QVector<MTPSecureFile> &data,
 		const std::vector<EditFile> &editData) const;
-	base::optional<File> parseFile(
+	std::optional<File> parseFile(
 		const MTPSecureFile &data,
 		const std::vector<EditFile> &editData) const;
 	void fillDownloadedFile(
@@ -474,7 +474,7 @@ private:
 	void scanDeleteRestore(
 		not_null<const Value*> value,
 		FileType type,
-		base::optional<int> fileIndex,
+		std::optional<int> fileIndex,
 		bool deleted);
 
 	QString getPhoneFromValue(not_null<const Value*> value) const;

Telegram/SourceFiles/passport/passport_form_view_controller.cpp

@@ -376,7 +376,7 @@ QString ComputeScopeRowReadyString(const Scope &scope) {
 		}
 		const auto scheme = GetDocumentScheme(
 			scope.type,
-			document ? base::make_optional(document->type) : base::none,
+			document ? base::make_optional(document->type) : std::nullopt,
 			scope.details ? scope.details->nativeNames : false);
 		using ValueClass = EditDocumentScheme::ValueClass;
 		const auto skipAdditional = [&] {

Telegram/SourceFiles/passport/passport_panel_controller.cpp

@@ -106,7 +106,7 @@ std::map<FileType, ScanInfo> PrepareSpecialFiles(const Value &value) {
 
 EditDocumentScheme GetDocumentScheme(
 		Scope::Type type,
-		base::optional<Value::Type> scansType,
+		std::optional<Value::Type> scansType,
 		bool nativeNames) {
 	using Scheme = EditDocumentScheme;
 	using ValueClass = Scheme::ValueClass;
@@ -127,7 +127,7 @@ EditDocumentScheme GetDocumentScheme(
 	const auto FromBoolean = [](auto validation) {
 		return [=](const QString &value) {
 			return validation(value)
-				? base::none
+				? std::nullopt
 				: base::make_optional(QString());
 		};
 	};
@@ -136,7 +136,7 @@ EditDocumentScheme GetDocumentScheme(
 			return (value.size() >= min) && (value.size() <= max);
 		});
 	};
-	using Result = base::optional<QString>;
+	using Result = std::optional<QString>;
 	const auto NameValidate = [](const QString &value) -> Result {
 		if (value.isEmpty() || value.size() > kMaxNameSize) {
 			return QString();
@@ -145,7 +145,7 @@ EditDocumentScheme GetDocumentScheme(
 		).match(value).hasMatch()) {
 			return lang(lng_passport_bad_name);
 		}
-		return base::none;
+		return std::nullopt;
 	};
 	const auto NativeNameValidate = LimitedValidate(kMaxNameSize);
 	const auto NativeNameOrEmptyValidate = LimitedValidate(kMaxNameSize, 0);
@@ -174,7 +174,7 @@ EditDocumentScheme GetDocumentScheme(
 	});
 	const auto NameOrEmptyValidate = [=](const QString &value) -> Result {
 		if (value.isEmpty()) {
-			return base::none;
+			return std::nullopt;
 		}
 		return NameValidate(value);
 	};
@@ -765,7 +765,7 @@ void PanelController::uploadScan(FileType type, QByteArray &&content) {
 
 void PanelController::deleteScan(
 		FileType type,
-		base::optional<int> fileIndex) {
+		std::optional<int> fileIndex) {
 	Expects(_editScope != nullptr);
 	Expects(_editDocument != nullptr);
 	Expects(_editDocument->requiresScan(type));
@@ -775,7 +775,7 @@ void PanelController::deleteScan(
 
 void PanelController::restoreScan(
 		FileType type,
-		base::optional<int> fileIndex) {
+		std::optional<int> fileIndex) {
 	Expects(_editScope != nullptr);
 	Expects(_editDocument != nullptr);
 	Expects(_editDocument->requiresScan(type));
@@ -808,13 +808,13 @@ std::vector<ScopeError> PanelController::collectSaveErrors(
 }
 
 auto PanelController::deleteValueLabel() const
--> base::optional<rpl::producer<QString>> {
+-> std::optional<rpl::producer<QString>> {
 	Expects(_editScope != nullptr);
 
 	if (hasValueDocument()) {
 		return Lang::Viewer(lng_passport_delete_document);
 	} else if (!hasValueFields()) {
-		return base::none;
+		return std::nullopt;
 	}
 	switch (_editScope->type) {
 	case Scope::Type::PersonalDetails:
@@ -969,7 +969,7 @@ void PanelController::ensurePanelCreated() {
 	}
 }
 
-base::optional<int> PanelController::findBestDocumentIndex(
+std::optional<int> PanelController::findBestDocumentIndex(
 		const Scope &scope) const {
 	Expects(!scope.documents.empty());
 
@@ -981,7 +981,7 @@ base::optional<int> PanelController::findBestDocumentIndex(
 			return document->whatNotFilled();
 		});
 	return ((*i)->whatNotFilled() == Value::kNothingFilled)
-		? base::none
+		? std::nullopt
 		: base::make_optional(int(i - begin(documents)));
 	return -1;
 }
@@ -992,7 +992,7 @@ void PanelController::editScope(int index) {
 
 	const auto &scope = _scopes[index];
 	if (scope.documents.empty()) {
-		editScope(index, base::none);
+		editScope(index, std::nullopt);
 	} else {
 		const auto documentIndex = findBestDocumentIndex(scope);
 		if (documentIndex || scope.documents.size() == 1) {
@@ -1106,7 +1106,7 @@ void PanelController::readScanError(ReadScanError error) {
 
 bool PanelController::editRequiresScanUpload(
 		int index,
-		base::optional<int> documentIndex) const {
+		std::optional<int> documentIndex) const {
 	Expects(index >= 0 && index < _scopes.size());
 	Expects(!documentIndex
 		|| (*documentIndex >= 0
@@ -1125,7 +1125,7 @@ bool PanelController::editRequiresScanUpload(
 
 void PanelController::editScope(
 		int index,
-		base::optional<int> documentIndex) {
+		std::optional<int> documentIndex) {
 	if (editRequiresScanUpload(index, documentIndex)) {
 		editWithUpload(index, *documentIndex);
 	} else {
@@ -1135,7 +1135,7 @@ void PanelController::editScope(
 
 void PanelController::startScopeEdit(
 		int index,
-		base::optional<int> documentIndex) {
+		std::optional<int> documentIndex) {
 	Expects(_panel != nullptr);
 	Expects(index >= 0 && index < _scopes.size());
 	Expects(_scopes[index].details != 0 || documentIndex.has_value());
@@ -1168,7 +1168,7 @@ void PanelController::startScopeEdit(
 				? base::make_optional(PrepareScanListData(
 					*_editDocument,
 					FileType::Translation))
-				: base::none;
+				: std::nullopt;
 			auto result = _editValue
 				? object_ptr<PanelEditDocument>(
 					_panel->widget(),
@@ -1210,7 +1210,7 @@ void PanelController::startScopeEdit(
 				this,
 				GetDocumentScheme(
 					_editScope->type,
-					base::none,
+					std::nullopt,
 					_editValue->nativeNames),
 				_editValue->error,
 				_editValue->data.parsedInEdit);

Telegram/SourceFiles/passport/passport_panel_controller.h

@@ -22,7 +22,7 @@ enum class ReadScanError;
 
 EditDocumentScheme GetDocumentScheme(
 	Scope::Type type,
-	base::optional<Value::Type> scansType,
+	std::optional<Value::Type> scansType,
 	bool nativeNames);
 EditContactScheme GetContactScheme(Scope::Type type);
 
@@ -98,13 +98,13 @@ public:
 
 	bool canAddScan(FileType type) const;
 	void uploadScan(FileType type, QByteArray &&content);
-	void deleteScan(FileType type, base::optional<int> fileIndex);
+	void deleteScan(FileType type, std::optional<int> fileIndex);
-	void restoreScan(FileType type, base::optional<int> fileIndex);
+	void restoreScan(FileType type, std::optional<int> fileIndex);
 	rpl::producer<ScanInfo> scanUpdated() const;
 	rpl::producer<ScopeError> saveErrors() const;
 	void readScanError(ReadScanError error);
 
-	base::optional<rpl::producer<QString>> deleteValueLabel() const;
+	std::optional<rpl::producer<QString>> deleteValueLabel() const;
 	void deleteValue();
 
 	QString defaultEmail() const;
@@ -149,13 +149,13 @@ public:
 private:
 	void ensurePanelCreated();
 
-	void editScope(int index, base::optional<int> documentIndex);
+	void editScope(int index, std::optional<int> documentIndex);
 	void editWithUpload(int index, int documentIndex);
 	bool editRequiresScanUpload(
 		int index,
-		base::optional<int> documentIndex) const;
+		std::optional<int> documentIndex) const;
-	void startScopeEdit(int index, base::optional<int> documentIndex);
+	void startScopeEdit(int index, std::optional<int> documentIndex);
-	base::optional<int> findBestDocumentIndex(const Scope &scope) const;
+	std::optional<int> findBestDocumentIndex(const Scope &scope) const;
 	void requestScopeFilesType(int index);
 	void cancelValueEdit();
 	void processValueSaveFinished(not_null<const Value*> value);

Telegram/SourceFiles/passport/passport_panel_details_row.cpp

@@ -225,7 +225,7 @@ private:
 		Female,
 	};
 
-	static base::optional<Gender> StringToGender(const QString &value);
+	static std::optional<Gender> StringToGender(const QString &value);
 	static QString GenderToString(Gender gender);
 
 	int resizeInner(int left, int top, int width) override;
@@ -366,7 +366,7 @@ void CountryRow::toggleError(bool shown) {
 void CountryRow::errorAnimationCallback() {
 	const auto error = _errorAnimation.current(_errorShown ? 1. : 0.);
 	if (error == 0.) {
-		_link->setColorOverride(base::none);
+		_link->setColorOverride(std::nullopt);
 	} else {
 		_link->setColorOverride(anim::color(
 			st::boxLinkButton.color,
@@ -877,13 +877,13 @@ std::unique_ptr<Ui::AbstractCheckView> GenderRow::createRadioView(
 }
 
 auto GenderRow::StringToGender(const QString &value)
--> base::optional<Gender> {
+-> std::optional<Gender> {
 	if (value == qstr("male")) {
 		return Gender::Male;
 	} else if (value == qstr("female")) {
 		return Gender::Female;
 	}
-	return base::none;
+	return std::nullopt;
 }
 
 QString GenderRow::GenderToString(Gender gender) {
@@ -936,8 +936,8 @@ void GenderRow::toggleError(bool shown) {
 void GenderRow::errorAnimationCallback() {
 	const auto error = _errorAnimation.current(_errorShown ? 1. : 0.);
 	if (error == 0.) {
-		_maleRadio->setUntoggledOverride(base::none);
+		_maleRadio->setUntoggledOverride(std::nullopt);
-		_femaleRadio->setUntoggledOverride(base::none);
+		_femaleRadio->setUntoggledOverride(std::nullopt);
 	} else {
 		const auto color = anim::color(
 			st::defaultRadio.untoggledFg,
@@ -1041,7 +1041,7 @@ int PanelDetailsRow::resizeGetHeight(int newWidth) {
 	return result;
 }
 
-void PanelDetailsRow::showError(base::optional<QString> error) {
+void PanelDetailsRow::showError(std::optional<QString> error) {
 	if (!_errorHideSubscription) {
 		_errorHideSubscription = true;
 

Telegram/SourceFiles/passport/passport_panel_details_row.h

@@ -54,7 +54,7 @@ public:
 	virtual bool setFocusFast();
 	virtual rpl::producer<QString> value() const = 0;
 	virtual QString valueCurrent() const = 0;
-	void showError(base::optional<QString> error = base::none);
+	void showError(std::optional<QString> error = std::nullopt);
 	bool errorShown() const;
 	void hideError();
 	void finishAnimating();

Telegram/SourceFiles/passport/passport_panel_edit_document.cpp

@@ -215,7 +215,7 @@ PanelEditDocument::PanelEditDocument(
 	const QString &scansError,
 	const ValueMap &scansData,
 	ScanListData &&scans,
-	base::optional<ScanListData> &&translations,
+	std::optional<ScanListData> &&translations,
 	std::map<FileType, ScanInfo> &&specialFiles)
 : _controller(controller)
 , _scheme(std::move(scheme))
@@ -243,7 +243,7 @@ PanelEditDocument::PanelEditDocument(
 	const QString &scansError,
 	const ValueMap &scansData,
 	ScanListData &&scans,
-	base::optional<ScanListData> &&translations,
+	std::optional<ScanListData> &&translations,
 	std::map<FileType, ScanInfo> &&specialFiles)
 : _controller(controller)
 , _scheme(std::move(scheme))
@@ -288,7 +288,7 @@ void PanelEditDocument::setupControls(
 		const QString *scansError,
 		const ValueMap *scansData,
 		ScanListData &&scans,
-		base::optional<ScanListData> &&translations,
+		std::optional<ScanListData> &&translations,
 		std::map<FileType, ScanInfo> &&specialFiles) {
 	const auto inner = setupContent(
 		error,
@@ -316,7 +316,7 @@ not_null<Ui::RpWidget*> PanelEditDocument::setupContent(
 		const QString *scansError,
 		const ValueMap *scansData,
 		ScanListData &&scans,
-		base::optional<ScanListData> &&translations,
+		std::optional<ScanListData> &&translations,
 		std::map<FileType, ScanInfo> &&specialFiles) {
 	const auto inner = _scroll->setOwnedWidget(
 		object_ptr<Ui::VerticalLayout>(this));
@@ -629,7 +629,7 @@ void PanelEditDocument::fillAdditionalFromFallbacks(Result &result) const {
 bool PanelEditDocument::validate() {
 	auto error = _editScans
 		? _editScans->validateGetErrorTop()
-		: base::none;
+		: std::nullopt;
 	if (error) {
 		const auto errortop = _editScans->mapToGlobal(QPoint(0, *error));
 		const auto scrolltop = _scroll->mapToGlobal(QPoint(0, 0));

Telegram/SourceFiles/passport/passport_panel_edit_document.h

@@ -50,7 +50,7 @@ struct EditDocumentScheme {
 		Shown,
 	};
 	struct Row {
-		using Validator = Fn<base::optional<QString>(const QString &value)>;
+		using Validator = Fn<std::optional<QString>(const QString &value)>;
 		using Formatter = Fn<QString(const QString &value)>;
 		ValueClass valueClass = ValueClass::Fields;
 		PanelDetailsType inputType = PanelDetailsType();
@@ -87,7 +87,7 @@ public:
 		const QString &scansError,
 		const ValueMap &scansData,
 		ScanListData &&scans,
-		base::optional<ScanListData> &&translations,
+		std::optional<ScanListData> &&translations,
 		std::map<FileType, ScanInfo> &&specialFiles);
 	PanelEditDocument(
 		QWidget *parent,
@@ -96,7 +96,7 @@ public:
 		const QString &scansError,
 		const ValueMap &scansData,
 		ScanListData &&scans,
-		base::optional<ScanListData> &&translations,
+		std::optional<ScanListData> &&translations,
 		std::map<FileType, ScanInfo> &&specialFiles);
 	PanelEditDocument(
 		QWidget *parent,
@@ -119,7 +119,7 @@ private:
 		const QString *scansError,
 		const ValueMap *scansData,
 		ScanListData &&scans,
-		base::optional<ScanListData> &&translations,
+		std::optional<ScanListData> &&translations,
 		std::map<FileType, ScanInfo> &&specialFiles);
 	not_null<Ui::RpWidget*> setupContent(
 		const QString *error,
@@ -127,7 +127,7 @@ private:
 		const QString *scansError,
 		const ValueMap *scansData,
 		ScanListData &&scans,
-		base::optional<ScanListData> &&translations,
+		std::optional<ScanListData> &&translations,
 		std::map<FileType, ScanInfo> &&specialFiles);
 	void updateControlsGeometry();
 	void updateCommonError();

Telegram/SourceFiles/passport/passport_panel_edit_scans.cpp

@@ -160,10 +160,10 @@ EditScans::List::List(
 
 EditScans::List::List(
 	not_null<PanelController*> controller,
-	base::optional<ScanListData> &&data)
+	std::optional<ScanListData> &&data)
 : controller(controller)
 , files(data ? std::move(data->files) : std::vector<ScanInfo>())
-, initialCount(data ? base::make_optional(int(files.size())) : base::none)
+, initialCount(data ? base::make_optional(int(files.size())) : std::nullopt)
 , errorMissing(data ? std::move(data->errorMissing) : QString()) {
 }
 
@@ -232,7 +232,7 @@ void EditScans::List::toggleError(bool shown) {
 void EditScans::List::errorAnimationCallback() {
 	const auto error = errorAnimation.current(errorShown ? 1. : 0.);
 	if (error == 0.) {
-		upload->setColorOverride(base::none);
+		upload->setColorOverride(std::nullopt);
 	} else {
 		upload->setColorOverride(anim::color(
 			st::passportUploadButton.textFg,
@@ -428,7 +428,7 @@ EditScans::EditScans(
 	const QString &header,
 	const QString &error,
 	ScanListData &&scans,
-	base::optional<ScanListData> &&translations)
+	std::optional<ScanListData> &&translations)
 : RpWidget(parent)
 , _controller(controller)
 , _error(error)
@@ -444,7 +444,7 @@ EditScans::EditScans(
 	const QString &header,
 	const QString &error,
 	std::map<FileType, ScanInfo> &&specialFiles,
-	base::optional<ScanListData> &&translations)
+	std::optional<ScanListData> &&translations)
 : RpWidget(parent)
 , _controller(controller)
 , _error(error)
@@ -454,8 +454,8 @@ EditScans::EditScans(
 	setupSpecialScans(header, std::move(specialFiles));
 }
 
-base::optional<int> EditScans::validateGetErrorTop() {
+std::optional<int> EditScans::validateGetErrorTop() {
-	auto result = base::optional<int>();
+	auto result = std::optional<int>();
 	const auto suggestResult = [&](int value) {
 		if (!result || *result > value) {
 			result = value;
@@ -828,12 +828,12 @@ void EditScans::createSpecialScanRow(
 
 	row->deleteClicks(
 	) | rpl::start_with_next([=] {
-		_controller->deleteScan(type, base::none);
+		_controller->deleteScan(type, std::nullopt);
 	}, row->lifetime());
 
 	row->restoreClicks(
 	) | rpl::start_with_next([=] {
-		_controller->restoreScan(type, base::none);
+		_controller->restoreScan(type, std::nullopt);
 	}, row->lifetime());
 
 	scan.rowCreated = !info.deleted;
@@ -974,7 +974,7 @@ void EditScans::specialScanErrorAnimationCallback(FileType type) {
 	const auto error = scan.errorAnimation.current(
 		scan.errorShown ? 1. : 0.);
 	if (error == 0.) {
-		scan.upload->setColorOverride(base::none);
+		scan.upload->setColorOverride(std::nullopt);
 	} else {
 		scan.upload->setColorOverride(anim::color(
 			st::passportUploadButton.textFg,

Telegram/SourceFiles/passport/passport_panel_edit_scans.h

@@ -51,16 +51,16 @@ public:
 		const QString &header,
 		const QString &error,
 		ScanListData &&scans,
-		base::optional<ScanListData> &&translations);
+		std::optional<ScanListData> &&translations);
 	EditScans(
 		QWidget *parent,
 		not_null<PanelController*> controller,
 		const QString &header,
 		const QString &error,
 		std::map<FileType, ScanInfo> &&specialFiles,
-		base::optional<ScanListData> &&translations);
+		std::optional<ScanListData> &&translations);
 
-	base::optional<int> validateGetErrorTop();
+	std::optional<int> validateGetErrorTop();
 
 	void scanFieldsChanged(bool changed);
 
@@ -78,7 +78,7 @@ private:
 		List(not_null<PanelController*> controller, ScanListData &&data);
 		List(
 			not_null<PanelController*> controller,
-			base::optional<ScanListData> &&data = base::none);
+			std::optional<ScanListData> &&data = std::nullopt);
 
 		bool uploadedSomeMore() const;
 		bool uploadMoreRequired() const;
@@ -92,7 +92,7 @@ private:
 
 		not_null<PanelController*> controller;
 		std::vector<ScanInfo> files;
-		base::optional<int> initialCount;
+		std::optional<int> initialCount;
 		QString errorMissing;
 		QPointer<Ui::SlideWrap<BoxContentDivider>> divider;
 		QPointer<Ui::SlideWrap<Ui::FlatLabel>> header;

Telegram/SourceFiles/platform/mac/specific_mac_p.mm

@@ -29,7 +29,7 @@ namespace {
 
 constexpr auto kIgnoreActivationTimeoutMs = 500;
 
-base::optional<bool> ApplicationIsActive;
+std::optional<bool> ApplicationIsActive;
 
 } // namespace
 

Telegram/SourceFiles/platform/win/launcher_win.cpp

@@ -40,7 +40,7 @@ Launcher::Launcher(int argc, char *argv[])
 : Core::Launcher(argc, argv, DeviceModel(), SystemVersion()) {
 }
 
-base::optional<QStringList> Launcher::readArgumentsHook(
+std::optional<QStringList> Launcher::readArgumentsHook(
 		int argc,
 		char *argv[]) const {
 	auto count = 0;
@@ -55,7 +55,7 @@ base::optional<QStringList> Launcher::readArgumentsHook(
 			return result;
 		}
 	}
-	return base::none;
+	return std::nullopt;
 }
 
 bool Launcher::launchUpdater(UpdaterLaunch action) {

Telegram/SourceFiles/platform/win/launcher_win.h

@@ -16,7 +16,7 @@ public:
 	Launcher(int argc, char *argv[]);
 
 private:
-	base::optional<QStringList> readArgumentsHook(
+	std::optional<QStringList> readArgumentsHook(
 		int argc,
 		char *argv[]) const override;
 

Telegram/SourceFiles/rpl/combine.h

@@ -21,17 +21,17 @@ namespace details {
 
 template <typename ...Values>
 struct combine_state {
-	combine_state() : accumulated(std::tuple<base::optional<Values>...>()) {
+	combine_state() : accumulated(std::tuple<std::optional<Values>...>()) {
 	}
-	base::optional<std::tuple<base::optional<Values>...>> accumulated;
+	std::optional<std::tuple<std::optional<Values>...>> accumulated;
-	base::optional<std::tuple<Values...>> latest;
+	std::optional<std::tuple<Values...>> latest;
 	int invalid = sizeof...(Values);
 	int working = sizeof...(Values);
 };
 
 template <typename ...Values, std::size_t ...I>
 inline std::tuple<Values...> combine_make_first(
-		std::tuple<base::optional<Values>...> &&accumulated,
+		std::tuple<std::optional<Values>...> &&accumulated,
 		std::index_sequence<I...>) {
 	return std::make_tuple(std::move(*std::get<I>(accumulated))...);
 }
@@ -65,7 +65,7 @@ public:
 						state->latest = combine_make_first(
 							std::move(*state->accumulated),
 							std::make_index_sequence<kArity>());
-						state->accumulated = base::none;
+						state->accumulated = std::nullopt;
 						consumer.put_next_copy(*state->latest);
 					}
 				}
@@ -276,7 +276,7 @@ namespace details {
 
 template <typename Value>
 struct combine_vector_state {
-	std::vector<base::optional<Value>> accumulated;
+	std::vector<std::optional<Value>> accumulated;
 	std::vector<Value> latest;
 	int invalid = 0;
 	int working = 0;

Telegram/SourceFiles/rpl/combine_previous.h

@@ -22,7 +22,7 @@ public:
 			initial = std::move(initial)
 		](const auto &consumer) mutable {
 			auto previous = consumer.template make_state<
-				base::optional<Value>
+				std::optional<Value>
 			>();
 			return std::move(initial).start(
 				[consumer, previous](auto &&value) {

Telegram/SourceFiles/rpl/distinct_until_changed.h

@@ -22,7 +22,7 @@ public:
 			initial = std::move(initial)
 		](const auto &consumer) mutable {
 			auto previous = consumer.template make_state<
-				base::optional<Value>
+				std::optional<Value>
 			>();
 			return std::move(initial).start(
 				[consumer, previous](auto &&value) {

Telegram/SourceFiles/rpl/filter.h

@@ -95,13 +95,13 @@ private:
 
 template <typename Value>
 inline const Value &deref_optional_helper(
-		const base::optional<Value> &value) {
+		const std::optional<Value> &value) {
 	return *value;
 }
 
 template <typename Value>
 inline Value &&deref_optional_helper(
-		base::optional<Value> &&value) {
+		std::optional<Value> &&value) {
 	return std::move(*value);
 }
 
@@ -109,7 +109,7 @@ class filter_optional_helper {
 public:
 	template <typename Value, typename Error, typename Generator>
 	auto operator()(producer<
-			base::optional<Value>,
+			std::optional<Value>,
 			Error,
 			Generator> &&initial) const {
 		return make_producer<Value, Error>([

Telegram/SourceFiles/stdafx.h

@@ -55,6 +55,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include <unordered_set>
 #include <algorithm>
 #include <memory>
+#include <optional>
 
 #include <range/v3/all.hpp>
 #ifdef Q_OS_WIN

Telegram/SourceFiles/storage/cache/storage_cache_binlog_reader.cpp

@@ -30,7 +30,7 @@ bool BinlogWrapper::failed() const {
 	return _failed;
 }
 
-base::optional<BasicHeader> BinlogWrapper::ReadHeader(
+std::optional<BasicHeader> BinlogWrapper::ReadHeader(
 		File &binlog,
 		const Settings &settings) {
 	auto result = BasicHeader();

Telegram/SourceFiles/storage/cache/storage_cache_binlog_reader.h

@@ -26,7 +26,7 @@ public:
 	bool finished() const;
 	bool failed() const;
 
-	static base::optional<BasicHeader> ReadHeader(
+	static std::optional<BasicHeader> ReadHeader(
 		File &binlog,
 		const Settings &settings);
 

Telegram/SourceFiles/storage/cache/storage_cache_database_object.cpp

@@ -814,7 +814,7 @@ void DatabaseObject::put(
 }
 
 template <typename StoreRecord>
-base::optional<QString> DatabaseObject::writeKeyPlaceGeneric(
+std::optional<QString> DatabaseObject::writeKeyPlaceGeneric(
 		StoreRecord &&record,
 		const Key &key,
 		const TaggedValue &value,
@@ -856,7 +856,7 @@ base::optional<QString> DatabaseObject::writeKeyPlaceGeneric(
 	return result;
 }
 
-base::optional<QString> DatabaseObject::writeKeyPlace(
+std::optional<QString> DatabaseObject::writeKeyPlace(
 		const Key &key,
 		const TaggedValue &data,
 		uint32 checksum) {

Telegram/SourceFiles/storage/cache/storage_cache_database_object.h

@@ -187,12 +187,12 @@ private:
 	bool isFreePlace(PlaceId place) const;
 
 	template <typename StoreRecord>
-	base::optional<QString> writeKeyPlaceGeneric(
+	std::optional<QString> writeKeyPlaceGeneric(
 		StoreRecord &&record,
 		const Key &key,
 		const TaggedValue &value,
 		uint32 checksum);
-	base::optional<QString> writeKeyPlace(
+	std::optional<QString> writeKeyPlace(
 		const Key &key,
 		const TaggedValue &value,
 		uint32 checksum);

Telegram/SourceFiles/storage/cache/storage_cache_types.cpp

@@ -59,14 +59,14 @@ QString VersionFilePath(const QString &base) {
 	return base + QStringLiteral("version");
 }
 
-base::optional<Version> ReadVersionValue(const QString &base) {
+std::optional<Version> ReadVersionValue(const QString &base) {
 	QFile file(VersionFilePath(base));
 	if (!file.open(QIODevice::ReadOnly)) {
-		return base::none;
+		return std::nullopt;
 	}
 	const auto bytes = file.read(sizeof(Version));
 	if (bytes.size() != sizeof(Version)) {
-		return base::none;
+		return std::nullopt;
 	}
 	return *reinterpret_cast<const Version*>(bytes.data());
 }

Telegram/SourceFiles/storage/cache/storage_cache_types.h

@@ -111,7 +111,7 @@ using Version = int32;
 
 QString ComputeBasePath(const QString &original);
 QString VersionFilePath(const QString &base);
-base::optional<Version> ReadVersionValue(const QString &base);
+std::optional<Version> ReadVersionValue(const QString &base);
 bool WriteVersionValue(const QString &base, Version value);
 
 template <typename Record>

Telegram/SourceFiles/storage/file_download.cpp

@@ -1110,7 +1110,7 @@ void mtpFileLoader::changeCDNParams(
 	makeRequest(offset);
 }
 
-base::optional<Storage::Cache::Key> mtpFileLoader::cacheKey() const {
+std::optional<Storage::Cache::Key> mtpFileLoader::cacheKey() const {
 	if (_urlLocation) {
 		return Data::WebDocumentCacheKey(*_urlLocation);
 	} else if (_location) {
@@ -1118,7 +1118,7 @@ base::optional<Storage::Cache::Key> mtpFileLoader::cacheKey() const {
 	} else if (_toCache == LoadToCacheAsWell) {
 		return Data::DocumentCacheKey(_dcId, _id);
 	}
-	return base::none;
+	return std::nullopt;
 }
 
 mtpFileLoader::~mtpFileLoader() {
@@ -1219,7 +1219,7 @@ void webFileLoader::onError() {
 	cancel(true);
 }
 
-base::optional<Storage::Cache::Key> webFileLoader::cacheKey() const {
+std::optional<Storage::Cache::Key> webFileLoader::cacheKey() const {
 	return Data::UrlCacheKey(_url);
 }
 

Telegram/SourceFiles/storage/file_download.h

@@ -153,7 +153,7 @@ protected:
 
 	bool tryLoadLocal();
 	void loadLocal(const Storage::Cache::Key &key);
-	virtual base::optional<Storage::Cache::Key> cacheKey() const = 0;
+	virtual std::optional<Storage::Cache::Key> cacheKey() const = 0;
 	virtual void cancelRequests() = 0;
 
 	void startLoading(bool loadFirst, bool prior);
@@ -257,7 +257,7 @@ private:
 		int limit = 0;
 		QByteArray hash;
 	};
-	base::optional<Storage::Cache::Key> cacheKey() const override;
+	std::optional<Storage::Cache::Key> cacheKey() const override;
 	void cancelRequests() override;
 
 	int partSize() const;
@@ -346,7 +346,7 @@ public:
 
 protected:
 	void cancelRequests() override;
-	base::optional<Storage::Cache::Key> cacheKey() const override;
+	std::optional<Storage::Cache::Key> cacheKey() const override;
 	bool loadPart() override;
 
 	QString _url;

Telegram/SourceFiles/storage/localimageloader.h

@@ -165,7 +165,7 @@ struct SendingAlbum {
 		}
 		TaskId taskId;
 		FullMsgId msgId;
-		base::optional<MTPInputSingleMedia> media;
+		std::optional<MTPInputSingleMedia> media;
 	};
 
 	SendingAlbum();

Telegram/SourceFiles/storage/localstorage.cpp

@@ -4232,7 +4232,7 @@ void incrementRecentHashtag(RecentHashtagPack &recent, const QString &tag) {
 	}
 }
 
-base::optional<RecentHashtagPack> saveRecentHashtags(
+std::optional<RecentHashtagPack> saveRecentHashtags(
 		Fn<RecentHashtagPack()> getPack,
 		const QString &text) {
 	auto found = false;
@@ -4262,7 +4262,7 @@ base::optional<RecentHashtagPack> saveRecentHashtags(
 		found = true;
 		incrementRecentHashtag(recent, tag);
 	}
-	return found ? base::make_optional(recent) : base::none;
+	return found ? base::make_optional(recent) : std::nullopt;
 }
 
 void saveRecentSentHashtags(const QString &text) {

Telegram/SourceFiles/storage/storage_encrypted_file.cpp

@@ -295,7 +295,7 @@ void File::close() {
 	_data.close();
 	_data.setFileName(QString());
 	_dataSize = _encryptionOffset = 0;
-	_state = base::none;
+	_state = std::nullopt;
 }
 
 bool File::isOpen() const {

Telegram/SourceFiles/storage/storage_encrypted_file.h

@@ -66,7 +66,7 @@ private:
 	int64 _encryptionOffset = 0;
 	int64 _dataSize = 0;
 
-	base::optional<CtrState> _state;
+	std::optional<CtrState> _state;
 
 };
 

Telegram/SourceFiles/storage/storage_feed_messages.cpp

@@ -36,7 +36,7 @@ void FeedMessages::add(FeedMessagesAddSlice &&query) {
 	feedIt->second.addSlice(
 		std::move(query.messageIds),
 		query.noSkipRange,
-		base::none);
+		std::nullopt);
 }
 
 void FeedMessages::remove(FeedMessagesRemoveOne &&query) {

Telegram/SourceFiles/storage/storage_shared_media.h

@@ -73,7 +73,7 @@ struct SharedMediaAddSlice {
 		SharedMediaType type,
 		std::vector<MsgId> &&messageIds,
 		MsgRange noSkipRange,
-		base::optional<int> count = base::none)
+		std::optional<int> count = std::nullopt)
 		: peerId(peerId)
 		, messageIds(std::move(messageIds))
 		, noSkipRange(noSkipRange)
@@ -85,7 +85,7 @@ struct SharedMediaAddSlice {
 	std::vector<MsgId> messageIds;
 	MsgRange noSkipRange;
 	SharedMediaType type = SharedMediaType::kCount;
-	base::optional<int> count;
+	std::optional<int> count;
 
 };