mir/tdesktop
2
0
Fork 0
mirror of https://github.com/telegramdesktop/tdesktop synced 2025-08-31 14:38:15 +00:00
Code Issues Releases Wiki Activity

Merge branch 'game_media' into player

Browse Source 
Conflicts:
	Telegram/SourceFiles/core/basic_types.h
	Telegram/SourceFiles/sysbuttons.h
	Telegram/SourceFiles/title.cpp
This commit is contained in:
John Preston
2016-09-29 16:48:43 +03:00
parent 903795d0e5 01a5aa30df
commit 5b3ac58578
64 changed files with 1674 additions and 1612 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Telegram/SourceFiles/ui/twidget.h
View File

@@ -310,7 +310,7 @@ private:
template <typename T>
class ChildWidget {
public:
ChildWidget(std::nullptr_t) : _widget(nullptr) {
ChildWidget(std_::nullptr_t) : _widget(nullptr) {
}
// No default constructor, but constructors with at least
@@ -322,7 +322,7 @@ public:
ChildWidget(const ChildWidget<T> &other) = delete;
ChildWidget<T> &operator=(const ChildWidget<T> &other) = delete;
ChildWidget<T> &operator=(std::nullptr_t) {
ChildWidget<T> &operator=(std_::nullptr_t) {
_widget = nullptr;
return *this;
}