mir/tdesktop
2
0
Fork 0
mirror of https://github.com/telegramdesktop/tdesktop synced 2025-09-01 06:55:58 +00:00
Code Issues Releases Wiki Activity

UniquePointer > std_::unique_ptr, MakeUnique > std_::make_unique.

Browse Source
This commit is contained in:
John Preston
2016-04-10 23:20:48 +04:00
parent dd1d04e9b0
commit 460e2ec0ac
29 changed files with 214 additions and 177 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Telegram/SourceFiles/history.cpp
View File

@@ -1969,7 +1969,7 @@ HistoryBlock *History::finishBuildingFrontBlock() {
}
}
_buildingFrontBlock.clear();
_buildingFrontBlock = nullptr;
return block;
}
@@ -2641,7 +2641,7 @@ int ReplyKeyboard::naturalHeight() const {
}
void ReplyKeyboard::paint(Painter &p, const QRect &clip) const {
t_assert(!_st.isNull());
t_assert(_st != nullptr);
t_assert(_width > 0);
_st->startPaint(p);
@@ -2815,7 +2815,7 @@ void HistoryMessageReplyMarkup::createFromButtonRows(const QVector<MTPKeyboardBu
void HistoryMessageReplyMarkup::create(const MTPReplyMarkup &markup) {
flags = 0;
rows.clear();
inlineKeyboard.clear();
inlineKeyboard = nullptr;
switch (markup.type()) {
case mtpc_replyKeyboardMarkup: {
@@ -6349,7 +6349,7 @@ bool HistoryMessageReply::updateData(HistoryMessage *holder, bool force) {
}
void HistoryMessageReply::clearData(HistoryMessage *holder) {
_replyToVia.clear();
_replyToVia = nullptr;
if (replyToMsg) {
App::historyUnregDependency(holder, replyToMsg);
replyToMsg = nullptr;
@@ -6817,7 +6817,7 @@ void HistoryMessage::initDimensions() {
}
if (HistoryMessageReplyMarkup *markup = inlineReplyMarkup()) {
if (!markup->inlineKeyboard) {
markup->inlineKeyboard.reset(new ReplyKeyboard(this, MakeUnique<KeyboardStyle>(st::msgBotKbButton)));
markup->inlineKeyboard.reset(new ReplyKeyboard(this, std_::make_unique<KeyboardStyle>(st::msgBotKbButton)));
}
// if we have a text bubble we can resize it to fit the keyboard