mirror of https://github.com/procxx/kepka.git
Fixed build for Xcode and GCC.
This commit is contained in:
parent
ff2d959abd
commit
abd755d7fc
|
@ -62,20 +62,7 @@ private:
|
||||||
};
|
};
|
||||||
|
|
||||||
template <typename Widget>
|
template <typename Widget>
|
||||||
class WidgetFadeWrap : public WidgetFadeWrap<TWidget> {
|
class WidgetFadeWrap;
|
||||||
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());
|
|
||||||
}
|
|
||||||
|
|
||||||
};
|
|
||||||
|
|
||||||
template <>
|
template <>
|
||||||
class WidgetFadeWrap<TWidget> : public TWidget {
|
class WidgetFadeWrap<TWidget> : public TWidget {
|
||||||
|
@ -124,4 +111,20 @@ private:
|
||||||
|
|
||||||
};
|
};
|
||||||
|
|
||||||
|
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
|
} // namespace Ui
|
||||||
|
|
|
@ -25,21 +25,7 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org
|
||||||
namespace Ui {
|
namespace Ui {
|
||||||
|
|
||||||
template <typename Widget>
|
template <typename Widget>
|
||||||
class WidgetSlideWrap : public WidgetSlideWrap<TWidget> {
|
class WidgetSlideWrap;
|
||||||
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());
|
|
||||||
}
|
|
||||||
|
|
||||||
};
|
|
||||||
|
|
||||||
template <>
|
template <>
|
||||||
class WidgetSlideWrap<TWidget> : public TWidget {
|
class WidgetSlideWrap<TWidget> : public TWidget {
|
||||||
|
@ -85,4 +71,21 @@ private:
|
||||||
|
|
||||||
};
|
};
|
||||||
|
|
||||||
|
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
|
} // namespace Ui
|
||||||
|
|
Loading…
Reference in New Issue