profile-widget: remove SettingsObjectWrapper and update qPref calls

remove use of SettingsObjectWrapper::
remove include of SettingsObjectWrapper.h
use qPrefFoo:: for setters and getters
replace prefs.foo with qPrefXYZ::foo() where feasible
(this expands to the same code, but gives us more control
over the variable).

Signed-off-by: Jan Iversen <jani@apache.org>
This commit is contained in:
jan Iversen 2018-08-15 11:52:50 +02:00 committed by Dirk Hohndel
parent 50c58b4065
commit 1cc7c05170
6 changed files with 35 additions and 33 deletions

View file

@ -1,13 +1,14 @@
// SPDX-License-Identifier: GPL-2.0
#include "profile-widget/animationfunctions.h"
#include "core/pref.h"
#include "core/settings/qPrefAnimations.h"
#include <QPropertyAnimation>
namespace Animations {
void hide(QObject *obj)
{
if (prefs.animation_speed != 0) {
if (qPrefAnimations::animation_speed() != 0) {
QPropertyAnimation *animation = new QPropertyAnimation(obj, "opacity");
animation->setStartValue(1);
animation->setEndValue(0);
@ -19,7 +20,7 @@ namespace Animations {
void show(QObject *obj)
{
if (prefs.animation_speed != 0) {
if (qPrefAnimations::animation_speed() != 0) {
QPropertyAnimation *animation = new QPropertyAnimation(obj, "opacity");
animation->setStartValue(0);
animation->setEndValue(1);
@ -31,7 +32,7 @@ namespace Animations {
void animDelete(QObject *obj)
{
if (prefs.animation_speed != 0) {
if (qPrefAnimations::animation_speed() != 0) {
QPropertyAnimation *animation = new QPropertyAnimation(obj, "opacity");
obj->connect(animation, &QPropertyAnimation::finished, &QObject::deleteLater);
animation->setStartValue(1);
@ -44,7 +45,7 @@ namespace Animations {
void moveTo(QObject *obj, qreal x, qreal y)
{
if (prefs.animation_speed != 0) {
if (qPrefAnimations::animation_speed() != 0) {
QPropertyAnimation *animation = new QPropertyAnimation(obj, "pos");
animation->setDuration(prefs.animation_speed);
animation->setStartValue(obj->property("pos").toPointF());
@ -57,7 +58,7 @@ namespace Animations {
void scaleTo(QObject *obj, qreal scale)
{
if (prefs.animation_speed != 0) {
if (qPrefAnimations::animation_speed() != 0) {
QPropertyAnimation *animation = new QPropertyAnimation(obj, "scale");
animation->setDuration(prefs.animation_speed);
animation->setStartValue(obj->property("scale").toReal());