procxx
/
kepka
mirror of https://github.com/procxx/kepka.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge branch 'master' of https://github.com/telegramdesktop/tdesktop

This commit is contained in:
John Preston 2014-12-06 14:21:34 +03:00
parent 77b35891d4 917b1b86ea
commit a96e90003b
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Telegram/SourceFiles/app.cpp
View File

@ -266,7 +266,7 @@ namespace App {
} }
UserData *feedUsers(const MTPVector<MTPUser> &users) { UserData *feedUsers(const MTPVector<MTPUser> &users) {
UserData *data; UserData *data = 0;
const QVector<MTPUser> &v(users.c_vector().v); const QVector<MTPUser> &v(users.c_vector().v);
for (QVector<MTPUser>::const_iterator i = v.cbegin(), e = v.cend(); i != e; ++i) { for (QVector<MTPUser>::const_iterator i = v.cbegin(), e = v.cend(); i != e; ++i) {
const MTPuser &user(*i); const MTPuser &user(*i);

2
Telegram/SourceFiles/gui/flatcheckbox.cpp
View File

@ -27,7 +27,7 @@ FlatCheckbox::FlatCheckbox(QWidget *parent, const QString &text, bool checked, c
connect(this, SIGNAL(stateChanged(int, ButtonStateChangeSource)), this, SLOT(onStateChange(int, ButtonStateChangeSource))); connect(this, SIGNAL(stateChanged(int, ButtonStateChangeSource)), this, SLOT(onStateChange(int, ButtonStateChangeSource)));
setCursor(_st.cursor); setCursor(_st.cursor);
int32 w = _st.width, h = _st.height; int32 w = _st.width, h = _st.height;
if (w <= 0) w = _st.textLeft + _st.font->m.width(_text) + 1; if (w <= 0) w = _st.textLeft + _st.font->m.width(_text) + 2;
if (h <= 0) h = qMax(_st.font->height, _st.imageRect.pxHeight()); if (h <= 0) h = qMax(_st.font->height, _st.imageRect.pxHeight());
resize(QSize(w, h)); resize(QSize(w, h));
} }