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

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

6
Telegram/SourceFiles/structs.h
View File

@@ -172,7 +172,7 @@ struct NotifySettings {
}
MTPDpeerNotifySettings::Flags flags;
TimeId mute;
string sound;
std::string sound;
bool previews() const {
return flags & MTPDpeerNotifySettings::Flag::f_show_previews;
}
@@ -288,9 +288,9 @@ public:
QString name;
Text nameText;
typedef QSet<QString> Names;
using Names = OrderedSet<QString>;
Names names; // for filtering
typedef QSet<QChar> NameFirstChars;
using NameFirstChars = OrderedSet<QChar>;
NameFirstChars chars;
enum LoadedStatus {