Merge branch 'cmakeAndPreferences'

1 files changed, 0 insertions, 75 deletions

diff --git a/qt-ui/profile/animationfunctions.cpp b/qt-ui/profile/animationfunctions.cpp
deleted file mode 100644
index a19d50c9d..000000000
--- a/qt-ui/profile/animationfunctions.cpp
+++ /dev/null
@@ -1,75 +0,0 @@
-#include "animationfunctions.h"
-#include "pref.h"
-#include <QPropertyAnimation>
-
-namespace Animations {
-
-	void hide(QObject *obj)
-	{
-		if (prefs.animation_speed != 0) {
-			QPropertyAnimation *animation = new QPropertyAnimation(obj, "opacity");
-			animation->setStartValue(1);
-			animation->setEndValue(0);
-			animation->start(QAbstractAnimation::DeleteWhenStopped);
-		} else {
-			obj->setProperty("opacity", 0);
-		}
-	}
-
-	void show(QObject *obj)
-	{
-		if (prefs.animation_speed != 0) {
-			QPropertyAnimation *animation = new QPropertyAnimation(obj, "opacity");
-			animation->setStartValue(0);
-			animation->setEndValue(1);
-			animation->start(QAbstractAnimation::DeleteWhenStopped);
-		} else {
-			obj->setProperty("opacity", 1);
-		}
-	}
-
-	void animDelete(QObject *obj)
-	{
-		if (prefs.animation_speed != 0) {
-			QPropertyAnimation *animation = new QPropertyAnimation(obj, "opacity");
-			obj->connect(animation, SIGNAL(finished()), SLOT(deleteLater()));
-			animation->setStartValue(1);
-			animation->setEndValue(0);
-			animation->start(QAbstractAnimation::DeleteWhenStopped);
-		} else {
-			obj->setProperty("opacity", 0);
-		}
-	}
-
-	void moveTo(QObject *obj, qreal x, qreal y)
-	{
-		if (prefs.animation_speed != 0) {
-			QPropertyAnimation *animation = new QPropertyAnimation(obj, "pos");
-			animation->setDuration(prefs.animation_speed);
-			animation->setStartValue(obj->property("pos").toPointF());
-			animation->setEndValue(QPointF(x, y));
-			animation->start(QAbstractAnimation::DeleteWhenStopped);
-		} else {
-			obj->setProperty("pos", QPointF(x, y));
-		}
-	}
-
-	void scaleTo(QObject *obj, qreal scale)
-	{
-		if (prefs.animation_speed != 0) {
-			QPropertyAnimation *animation = new QPropertyAnimation(obj, "scale");
-			animation->setDuration(prefs.animation_speed);
-			animation->setStartValue(obj->property("scale").toReal());
-			animation->setEndValue(QVariant::fromValue(scale));
-			animation->setEasingCurve(QEasingCurve::InCubic);
-			animation->start(QAbstractAnimation::DeleteWhenStopped);
-		} else {
-			obj->setProperty("scale", QVariant::fromValue(scale));
-		}
-	}
-
-	void moveTo(QObject *obj, const QPointF &pos)
-	{
-		moveTo(obj, pos.x(), pos.y());
-	}
-}