mir/tdesktop
2
0
Fork 0
mirror of https://github.com/telegramdesktop/tdesktop synced 2025-10-01 11:22:00 +00:00
Code Issues Releases Wiki Activity

Move to std::optional.

Browse Source
This commit is contained in:
John Preston
2018-09-21 19:28:46 +03:00
parent 850efbde95
commit 2e5a0e056c
115 changed files with 632 additions and 672 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Telegram/SourceFiles/export/output/export_output_html.cpp
View File

@@ -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;