mir/tdesktop
2
0
Fork 0
mirror of https://github.com/telegramdesktop/tdesktop synced 2025-08-31 06:26:18 +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

14
Telegram/SourceFiles/structs.h
View File

@@ -1032,7 +1032,7 @@ public:
ImagePtr makeReplyPreview();
StickerData *sticker() {
return (type == StickerDocument) ? static_cast<StickerData*>(_additional.data()) : nullptr;
return (type == StickerDocument) ? static_cast<StickerData*>(_additional.get()) : nullptr;
}
void checkSticker() {
StickerData *s = sticker();
@@ -1052,16 +1052,16 @@ public:
}
}
SongData *song() {
return (type == SongDocument) ? static_cast<SongData*>(_additional.data()) : nullptr;
return (type == SongDocument) ? static_cast<SongData*>(_additional.get()) : nullptr;
}
const SongData *song() const {
return (type == SongDocument) ? static_cast<const SongData*>(_additional.data()) : nullptr;
return (type == SongDocument) ? static_cast<const SongData*>(_additional.get()) : nullptr;
}
VoiceData *voice() {
return (type == VoiceDocument) ? static_cast<VoiceData*>(_additional.data()) : nullptr;
return (type == VoiceDocument) ? static_cast<VoiceData*>(_additional.get()) : nullptr;
}
const VoiceData *voice() const {
return (type == VoiceDocument) ? static_cast<const VoiceData*>(_additional.data()) : nullptr;
return (type == VoiceDocument) ? static_cast<const VoiceData*>(_additional.get()) : nullptr;
}
bool isAnimation() const {
return (type == AnimatedDocument) || !mime.compare(qstr("image/gif"), Qt::CaseInsensitive);
@@ -1070,7 +1070,7 @@ public:
return (type == AnimatedDocument) && !mime.compare(qstr("video/mp4"), Qt::CaseInsensitive);
}
bool isMusic() const {
return (type == SongDocument) ? !static_cast<SongData*>(_additional.data())->title.isEmpty() : false;
return (type == SongDocument) ? !static_cast<SongData*>(_additional.get())->title.isEmpty() : false;
}
bool isVideo() const {
return (type == VideoDocument);
@@ -1142,7 +1142,7 @@ private:
FileLocation _location;
QByteArray _data;
UniquePointer<DocumentAdditionalData> _additional;
std_::unique_ptr<DocumentAdditionalData> _additional;
int32 _duration = -1;
ActionOnLoad _actionOnLoad = ActionOnLoadNone;