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

Fix build for Xcode and GCC.

This commit is contained in:
John Preston 2017-04-01 11:10:13 +03:00
parent e8ed307278
commit a1b53f07d5
5 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Telegram/SourceFiles/inline_bots/inline_bot_layout_item.h
View File

@ -56,12 +56,12 @@ public:
class ItemBase : public LayoutItemBase { class ItemBase : public LayoutItemBase {
public: public:
ItemBase(gsl::not_null<Context*> context, Result *result) : _context(context), _result(result) { ItemBase(gsl::not_null<Context*> context, Result *result) : _result(result), _context(context) {
} }
ItemBase(gsl::not_null<Context*> context, DocumentData *doc) : _context(context), _doc(doc) { ItemBase(gsl::not_null<Context*> context, DocumentData *doc) : _doc(doc), _context(context) {
} }
// Not used anywhere currently. // Not used anywhere currently.
//ItemBase(gsl::not_null<Context*> context, PhotoData *photo) : _context(context), _photo(photo) { //ItemBase(gsl::not_null<Context*> context, PhotoData *photo) : _photo(photo), _context(context) {
//} //}
virtual void paint(Painter &p, const QRect &clip, const PaintContext *context) const = 0; virtual void paint(Painter &p, const QRect &clip, const PaintContext *context) const = 0;

3
Telegram/SourceFiles/inline_bots/inline_results_widget.cpp
View File

@ -406,7 +406,8 @@ int Inner::refreshInlineRows(UserData *bot, const CacheEntry *entry, bool result
} }
return false; return false;
}; };
if (clearResults()) { auto clearResultsResult = clearResults(); // Clang workaround.
if (clearResultsResult) {
if (resultsDeleted) { if (resultsDeleted) {
clearInlineRows(true); clearInlineRows(true);
deleteUnusedInlineLayouts(); deleteUnusedInlineLayouts();

8
Telegram/SourceFiles/stickers/emoji_list_widget.cpp
View File

@ -54,7 +54,7 @@ private:
EmojiListWidget::Footer::Footer(gsl::not_null<EmojiListWidget*> parent) : InnerFooter(parent) EmojiListWidget::Footer::Footer(gsl::not_null<EmojiListWidget*> parent) : InnerFooter(parent)
, _pan(parent) , _pan(parent)
, _sections { , _sections { {
object_ptr<Ui::IconButton>(this, st::emojiCategoryRecent), object_ptr<Ui::IconButton>(this, st::emojiCategoryRecent),
object_ptr<Ui::IconButton>(this, st::emojiCategoryPeople), object_ptr<Ui::IconButton>(this, st::emojiCategoryPeople),
object_ptr<Ui::IconButton>(this, st::emojiCategoryNature), object_ptr<Ui::IconButton>(this, st::emojiCategoryNature),
@ -63,7 +63,7 @@ EmojiListWidget::Footer::Footer(gsl::not_null<EmojiListWidget*> parent) : InnerF
object_ptr<Ui::IconButton>(this, st::emojiCategoryTravel), object_ptr<Ui::IconButton>(this, st::emojiCategoryTravel),
object_ptr<Ui::IconButton>(this, st::emojiCategoryObjects), object_ptr<Ui::IconButton>(this, st::emojiCategoryObjects),
object_ptr<Ui::IconButton>(this, st::emojiCategorySymbols), object_ptr<Ui::IconButton>(this, st::emojiCategorySymbols),
} { } } {
auto left = (st::emojiPanWidth - _sections.size() * st::emojiCategory.width) / 2; auto left = (st::emojiPanWidth - _sections.size() * st::emojiCategory.width) / 2;
for (auto i = 0; i != _sections.size(); ++i) { for (auto i = 0; i != _sections.size(); ++i) {
auto &button = _sections[i]; auto &button = _sections[i];
@ -79,7 +79,7 @@ void EmojiListWidget::Footer::processPanelHideFinished() {
} }
void EmojiListWidget::Footer::setCurrentSectionIcon(Section section) { void EmojiListWidget::Footer::setCurrentSectionIcon(Section section) {
std::array<const style::icon *, kEmojiSectionCount> overrides = { std::array<const style::icon *, kEmojiSectionCount> overrides = { {
&st::emojiRecentActive, &st::emojiRecentActive,
&st::emojiPeopleActive, &st::emojiPeopleActive,
&st::emojiNatureActive, &st::emojiNatureActive,
@ -88,7 +88,7 @@ void EmojiListWidget::Footer::setCurrentSectionIcon(Section section) {
&st::emojiTravelActive, &st::emojiTravelActive,
&st::emojiObjectsActive, &st::emojiObjectsActive,
&st::emojiSymbolsActive, &st::emojiSymbolsActive,
}; } };
for (auto i = 0; i != _sections.size(); ++i) { for (auto i = 0; i != _sections.size(); ++i) {
_sections[i]->setIconOverride((section == static_cast<Section>(i)) ? overrides[i] : nullptr); _sections[i]->setIconOverride((section == static_cast<Section>(i)) ? overrides[i] : nullptr);
} }

6
Telegram/SourceFiles/stickers/emoji_panel.cpp
View File

@ -280,15 +280,15 @@ void EmojiPanel::Tab::saveScrollTop() {
} }
EmojiPanel::EmojiPanel(QWidget *parent) : TWidget(parent) EmojiPanel::EmojiPanel(QWidget *parent) : TWidget(parent)
, _scroll(this, st::emojiScroll)
, _tabsSlider(this, st::emojiTabs) , _tabsSlider(this, st::emojiTabs)
, _topShadow(this, st::shadowFg) , _topShadow(this, st::shadowFg)
, _bottomShadow(this, st::shadowFg) , _bottomShadow(this, st::shadowFg)
, _tabs { , _scroll(this, st::emojiScroll)
, _tabs { {
Tab { TabType::Emoji, object_ptr<EmojiListWidget>(this) }, Tab { TabType::Emoji, object_ptr<EmojiListWidget>(this) },
Tab { TabType::Stickers, object_ptr<StickersListWidget>(this) }, Tab { TabType::Stickers, object_ptr<StickersListWidget>(this) },
Tab { TabType::Gifs, object_ptr<GifsListWidget>(this) }, Tab { TabType::Gifs, object_ptr<GifsListWidget>(this) },
} } }
, _currentTabType(AuthSession::Current().data().emojiPanelTab()) { , _currentTabType(AuthSession::Current().data().emojiPanelTab()) {
resize(QRect(0, 0, st::emojiPanWidth, st::emojiPanMaxHeight).marginsAdded(innerPadding()).size()); resize(QRect(0, 0, st::emojiPanWidth, st::emojiPanMaxHeight).marginsAdded(innerPadding()).size());
_width = width(); _width = width();

1
Telegram/gyp/qt.gypi
View File

@ -106,6 +106,7 @@
'fontconfig', 'fontconfig',
'expat', 'expat',
'freetype', 'freetype',
'z',
'xcb-shm', 'xcb-shm',
'xcb-xfixes', 'xcb-xfixes',
'xcb-render', 'xcb-render',