2
0
mirror of https://github.com/telegramdesktop/tdesktop synced 2025-08-30 22:16:14 +00:00

warnings fixed, 0.8.25.dev code for os x and linux

This commit is contained in:
John Preston
2015-06-15 20:36:16 +03:00
parent 9fee0ace4c
commit ec1d547f27
5 changed files with 12 additions and 7 deletions

View File

@@ -1446,7 +1446,8 @@ void MessageField::focusInEvent(QFocusEvent *e) {
emit focused();
}
BotKeyboard::BotKeyboard() : _wasForMsgId(0), _hoverAnim(animFunc(this, &BotKeyboard::hoverStep)), _st(&st::botKbButton), _sel(-1), _down(-1) {
BotKeyboard::BotKeyboard() : _wasForMsgId(0),
_sel(-1), _down(-1), _hoverAnim(animFunc(this, &BotKeyboard::hoverStep)), _st(&st::botKbButton) {
setGeometry(0, 0, _st->margin, _st->margin);
setMouseTracking(true);
@@ -4343,7 +4344,7 @@ void HistoryWidget::addMessagesToBack(const QVector<MTPMessage> &messages) {
void HistoryWidget::updateBotKeyboard() {
bool changed = false;
bool wasVisible = _kbShown;
if (_replyToId && !_replyTo || !hist) {
if ((_replyToId && !_replyTo) || !hist) {
changed = _keyboard.updateMarkup(0);
} else if (_replyTo) {
changed = _keyboard.updateMarkup(_replyTo);