From 35c05cdba7b9aecb8e6b3eee73e3fb8f94785bcd Mon Sep 17 00:00:00 2001 From: John Preston Date: Thu, 7 Apr 2016 20:49:15 +0400 Subject: [PATCH] Build fixed for gcc, QtCreator. --- Telegram/SourceFiles/_other/genstyles.cpp | 2 +- Telegram/SourceFiles/mtproto/core_types.h | 2 +- Telegram/Telegram.pro | 12 ++++++++++-- 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/Telegram/SourceFiles/_other/genstyles.cpp b/Telegram/SourceFiles/_other/genstyles.cpp index 55fe18a87..218d5267c 100644 --- a/Telegram/SourceFiles/_other/genstyles.cpp +++ b/Telegram/SourceFiles/_other/genstyles.cpp @@ -1064,7 +1064,7 @@ ScalarValue prepareFont(int variant, const string &name, const char *&text, cons string size, family; int flags = 0; - bool sizepx; + bool sizepx = false; readStyleGenToken(text, end, type, token); if (type != stConsStart) throw Exception(QString("Unexpected token %1 (%2) while reading font() cons!").arg(type).arg(token.c_str())); diff --git a/Telegram/SourceFiles/mtproto/core_types.h b/Telegram/SourceFiles/mtproto/core_types.h index 6b42f1eeb..fb71cc760 100644 --- a/Telegram/SourceFiles/mtproto/core_types.h +++ b/Telegram/SourceFiles/mtproto/core_types.h @@ -759,7 +759,6 @@ private: friend MTPstring MTP_string(const QString &v); friend MTPstring MTP_string(const char *v); - friend MTPstring MTP_string(const QByteArray &v) = delete; friend MTPstring MTP_bytes(const QByteArray &v); }; inline MTPstring MTP_string(const string &v) { @@ -771,6 +770,7 @@ inline MTPstring MTP_string(const QString &v) { inline MTPstring MTP_string(const char *v) { return MTPstring(new MTPDstring(v)); } +MTPstring MTP_string(const QByteArray &v) = delete; typedef MTPBoxed MTPString; using MTPbytes = MTPstring; diff --git a/Telegram/Telegram.pro b/Telegram/Telegram.pro index ced9e915b..87f469455 100644 --- a/Telegram/Telegram.pro +++ b/Telegram/Telegram.pro @@ -112,7 +112,7 @@ SOURCES += \ ./SourceFiles/structs.cpp \ ./SourceFiles/sysbuttons.cpp \ ./SourceFiles/title.cpp \ - ./SourceFiles/types.cpp \ + ./SourceFiles/basic_types.cpp \ ./SourceFiles/window.cpp \ ./SourceFiles/mtproto/facade.cpp \ ./SourceFiles/mtproto/auth_key.cpp \ @@ -165,6 +165,10 @@ SOURCES += \ ./SourceFiles/boxes/sessionsbox.cpp \ ./SourceFiles/boxes/stickersetbox.cpp \ ./SourceFiles/boxes/usernamebox.cpp \ + ./SourceFiles/inline_bots/inline_bot_layout_internal.cpp \ + ./SourceFiles/inline_bots/inline_bot_layout_item.cpp \ + ./SourceFiles/inline_bots/inline_bot_result.cpp \ + ./SourceFiles/inline_bots/inline_bot_send_data.cpp \ ./SourceFiles/intro/introwidget.cpp \ ./SourceFiles/intro/introcode.cpp \ ./SourceFiles/intro/introphone.cpp \ @@ -208,7 +212,7 @@ HEADERS += \ ./SourceFiles/gui/style.h \ ./SourceFiles/sysbuttons.h \ ./SourceFiles/title.h \ - ./SourceFiles/types.h \ + ./SourceFiles/basic_types.h \ ./SourceFiles/window.h \ ./SourceFiles/mtproto/facade.h \ ./SourceFiles/mtproto/auth_key.h \ @@ -262,6 +266,10 @@ HEADERS += \ ./SourceFiles/boxes/sessionsbox.h \ ./SourceFiles/boxes/stickersetbox.h \ ./SourceFiles/boxes/usernamebox.h \ + ./SourceFiles/inline_bots/inline_bot_layout_internal.h \ + ./SourceFiles/inline_bots/inline_bot_layout_item.h \ + ./SourceFiles/inline_bots/inline_bot_result.h \ + ./SourceFiles/inline_bots/inline_bot_send_data.h \ ./SourceFiles/intro/introwidget.h \ ./SourceFiles/intro/introcode.h \ ./SourceFiles/intro/introphone.h \