From a08dd1f6e1b439ecf8135ffdd27c1961e8f967f5 Mon Sep 17 00:00:00 2001 From: John Preston Date: Tue, 10 Oct 2017 09:01:19 +0100 Subject: [PATCH] Fix build for macOS. --- Telegram/SourceFiles/info/info_wrap_widget.h | 4 ++-- Telegram/SourceFiles/info/media/info_media_list_widget.h | 4 ++-- Telegram/SourceFiles/overview/overview_layout.cpp | 4 ++++ Telegram/SourceFiles/overview/overview_layout.h | 6 +++++- Telegram/SourceFiles/ui/wrap/fade_wrap.cpp | 4 ++-- 5 files changed, 15 insertions(+), 7 deletions(-) diff --git a/Telegram/SourceFiles/info/info_wrap_widget.h b/Telegram/SourceFiles/info/info_wrap_widget.h index ce65bffca4..0926088bad 100644 --- a/Telegram/SourceFiles/info/info_wrap_widget.h +++ b/Telegram/SourceFiles/info/info_wrap_widget.h @@ -115,7 +115,7 @@ public: const Window::SectionShow ¶ms) override; std::unique_ptr createMemento() override; - rpl::producer desiredHeightValue() const; + rpl::producer desiredHeightValue() const override; void updateInternalState(not_null memento); void saveState(not_null memento); @@ -127,7 +127,7 @@ public: ~WrapWidget(); protected: - void resizeEvent(QResizeEvent *e); + void resizeEvent(QResizeEvent *e) override; void doSetInnerFocus() override; void showFinishedHook() override; diff --git a/Telegram/SourceFiles/info/media/info_media_list_widget.h b/Telegram/SourceFiles/info/media/info_media_list_widget.h index c2bb70815d..f406aa60d3 100644 --- a/Telegram/SourceFiles/info/media/info_media_list_widget.h +++ b/Telegram/SourceFiles/info/media/info_media_list_widget.h @@ -189,7 +189,7 @@ private: BaseLayout *_itemUnderCursor = nullptr; BaseLayout *_itemUnderPress = nullptr; HistoryCursorState _mouseCursorState = HistoryDefaultCursorState; - uint16 _mouseTextSymbol = 0; +// uint16 _mouseTextSymbol = 0; bool _pressWasInactive = false; using SelectedItems = std::map< UniversalMsgId, @@ -199,7 +199,7 @@ private: style::cursor _cursor = style::cur_default; BaseLayout *_dragSelFrom = nullptr; BaseLayout *_dragSelTo = nullptr; - bool _dragSelecting = false; +// bool _dragSelecting = false; bool _wasSelectedText = false; // was some text selected in current drag action Ui::PopupMenu *_contextMenu = nullptr; ClickHandlerPtr _contextMenuLink; diff --git a/Telegram/SourceFiles/overview/overview_layout.cpp b/Telegram/SourceFiles/overview/overview_layout.cpp index 50b037be48..14aa294a8b 100644 --- a/Telegram/SourceFiles/overview/overview_layout.cpp +++ b/Telegram/SourceFiles/overview/overview_layout.cpp @@ -332,6 +332,8 @@ void Photo::invalidateCache() { } } +Photo::~Photo() = default; + Video::Video( not_null parent, not_null video) @@ -537,6 +539,8 @@ void Video::updateStatusText() { } } +Video::~Video() = default; + Voice::Voice( not_null parent, not_null voice, diff --git a/Telegram/SourceFiles/overview/overview_layout.h b/Telegram/SourceFiles/overview/overview_layout.h index 441d8514e9..68424d6e1e 100644 --- a/Telegram/SourceFiles/overview/overview_layout.h +++ b/Telegram/SourceFiles/overview/overview_layout.h @@ -90,7 +90,7 @@ public: void clickHandlerPressedChanged(const ClickHandlerPtr &action, bool pressed) override; protected: - not_null _parent = nullptr; + not_null _parent; int _position = 0; }; @@ -196,6 +196,8 @@ public: void invalidateCache() override; + ~Photo(); + private: void ensureCheckboxCreated(); @@ -225,6 +227,8 @@ public: void invalidateCache() override; + ~Video(); + protected: float64 dataProgress() const override; bool dataFinished() const override; diff --git a/Telegram/SourceFiles/ui/wrap/fade_wrap.cpp b/Telegram/SourceFiles/ui/wrap/fade_wrap.cpp index 063d9bfcbf..c100817e0a 100644 --- a/Telegram/SourceFiles/ui/wrap/fade_wrap.cpp +++ b/Telegram/SourceFiles/ui/wrap/fade_wrap.cpp @@ -29,8 +29,8 @@ FadeWrap::FadeWrap( object_ptr &&child, bool scaled) : Parent(parent, std::move(child)) -, _duration(st::fadeWrapDuration) -, _animation(this, scaled) { +, _animation(this, scaled) +, _duration(st::fadeWrapDuration) { if (auto weak = wrapped()) { weak->show(); }