Merge branch 'dev' of https://github.com/telegramdesktop/tdesktop int…

…o dev
trifonnt · Oct 26, 2016 · 140e6d6 · 140e6d6
2 parents ec6e46d + abd755d
commit 140e6d6
Show file tree

Hide file tree

Showing 2 changed files with 35 additions and 29 deletions.
diff --git a/Telegram/SourceFiles/ui/effects/widget_fade_wrap.h b/Telegram/SourceFiles/ui/effects/widget_fade_wrap.h
@@ -62,20 +62,7 @@ class FadeAnimation {
 };
 
 template <typename Widget>
-class WidgetFadeWrap : public WidgetFadeWrap<TWidget> {
-public:
-	WidgetFadeWrap(QWidget *parent, Widget *entity
-		, base::lambda_unique<void()> updateCallback
-		, int duration = st::widgetFadeDuration) : WidgetFadeWrap<TWidget>(parent, entity, std_::move(updateCallback), duration) {
-	}
-	Widget *entity() {
-		return static_cast<Widget*>(WidgetFadeWrap<TWidget>::entity());
-	}
-	const Widget *entity() const {
-		return static_cast<const Widget*>(WidgetFadeWrap<TWidget>::entity());
-	}
-
-};
+class WidgetFadeWrap;
 
 template <>
 class WidgetFadeWrap<TWidget> : public TWidget {
@@ -124,4 +111,20 @@ class WidgetFadeWrap<TWidget> : public TWidget {
 
 };
 
+template <typename Widget>
+class WidgetFadeWrap : public WidgetFadeWrap<TWidget> {
+public:
+	WidgetFadeWrap(QWidget *parent, Widget *entity
+		, base::lambda_unique<void()> updateCallback
+		, int duration = st::widgetFadeDuration) : WidgetFadeWrap<TWidget>(parent, entity, std_::move(updateCallback), duration) {
+	}
+	Widget *entity() {
+		return static_cast<Widget*>(WidgetFadeWrap<TWidget>::entity());
+	}
+	const Widget *entity() const {
+		return static_cast<const Widget*>(WidgetFadeWrap<TWidget>::entity());
+	}
+
+};
+
 } // namespace Ui
diff --git a/Telegram/SourceFiles/ui/effects/widget_slide_wrap.h b/Telegram/SourceFiles/ui/effects/widget_slide_wrap.h
@@ -25,21 +25,7 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org
 namespace Ui {
 
 template <typename Widget>
-class WidgetSlideWrap : public WidgetSlideWrap<TWidget> {
-public:
-	WidgetSlideWrap(QWidget *parent, Widget *entity
-		, style::margins entityPadding
-		, base::lambda_unique<void()> updateCallback
-		, int duration = st::widgetSlideDuration) : WidgetSlideWrap<TWidget>(parent, entity, entityPadding, std_::move(updateCallback), duration) {
-	}
-	Widget *entity() {
-		return static_cast<Widget*>(WidgetSlideWrap<TWidget>::entity());
-	}
-	const Widget *entity() const {
-		return static_cast<const Widget*>(WidgetSlideWrap<TWidget>::entity());
-	}
-
-};
+class WidgetSlideWrap;
 
 template <>
 class WidgetSlideWrap<TWidget> : public TWidget {
@@ -85,4 +71,21 @@ class WidgetSlideWrap<TWidget> : public TWidget {
 
 };
 
+template <typename Widget>
+class WidgetSlideWrap : public WidgetSlideWrap<TWidget> {
+public:
+	WidgetSlideWrap(QWidget *parent, Widget *entity
+		, style::margins entityPadding
+		, base::lambda_unique<void()> updateCallback
+		, int duration = st::widgetSlideDuration) : WidgetSlideWrap<TWidget>(parent, entity, entityPadding, std_::move(updateCallback), duration) {
+	}
+	Widget *entity() {
+		return static_cast<Widget*>(WidgetSlideWrap<TWidget>::entity());
+	}
+	const Widget *entity() const {
+		return static_cast<const Widget*>(WidgetSlideWrap<TWidget>::entity());
+	}
+
+};
+
 } // namespace Ui