← Back to branch summary

~ubuntu-branches/ubuntu/wily/kwin/wily-proposed

« back to all changes in this revision

Viewing changes to libkwineffects/anidata.cpp

  • Committer: Package Import Robot
  • Author(s): Jonathan Riddell
  • Date: 2015-08-10 23:16:37 UTC
  • mfrom: (1.1.10)
  • Revision ID: package-import@ubuntu.com-20150810231637-5zb2tstjkez93hml
Tags: 4:5.3.95-0ubuntu1
new upstream beta release

Show diffs side-by-side

added added

removed removed

Lines of Context:
libkwineffects/anidata.cpp
20
20
 
21
21
#include "anidata_p.h"
22
22
 
23
 
#include <QDebug>
 
23
#include "logging_p.h"
24
24
 
25
25
QDebug operator<<(QDebug dbg, const KWin::AniData &a)
26
26
{
80
80
                                a == AnimationEffect::Size ||
81
81
                                a == AnimationEffect::Rotation)) ) {
82
82
        if (ok)
83
 
            qDebug() << "Invalid value (must not be negative)" << s;
 
83
            qCDebug(LIBKWINEFFECTS) << "Invalid value (must not be negative)" << s;
84
84
        return FPx2();
85
85
    }
86
86
 
96
96
            f2 = f1;
97
97
    }
98
98
    if ( forced_align && a >= AnimationEffect::NonFloatBase )
99
 
        qDebug() << "Generic Animations, WARNING: had to align second dimension of non-onedimensional attribute" << a;
 
99
        qCDebug(LIBKWINEFFECTS) << "Generic Animations, WARNING: had to align second dimension of non-onedimensional attribute" << a;
100
100
    return FPx2(f1, f2);
101
101
}
102
102
 
122
122
    else if (animation.at(1) == QStringLiteral("Size"))         attribute = AnimationEffect::Size;
123
123
    else if (animation.at(1) == QStringLiteral("Clip"))         attribute = AnimationEffect::Clip;
124
124
    else {
125
 
        qDebug() << "Invalid attribute" << animation.at(1);
 
125
        qCDebug(LIBKWINEFFECTS) << "Invalid attribute" << animation.at(1);
126
126
        return;
127
127
    }
128
128
 
131
131
    bool ok;
132
132
    duration = animation.at(3).toInt(&ok);
133
133
    if (!ok || duration < 0) {
134
 
        qDebug() << "Invalid duration" << animation.at(3);
 
134
        qCDebug(LIBKWINEFFECTS) << "Invalid duration" << animation.at(3);
135
135
        duration = 0;
136
136
        return;
137
137
    }
145
145
        else if (customCurve == Gaussian)
146
146
            curve.setCustomType(AnimationEffect::qecGaussian);
147
147
        else
148
 
            qDebug() << "Unknown curve type" << customCurve; // remains default, ie. linear
 
148
            qCDebug(LIBKWINEFFECTS) << "Unknown curve type" << customCurve; // remains default, ie. linear
149
149
 
150
150
        if (animation.count() > 6) {
151
151
            int t = animation.at(6).toInt();
152
152
            if (t < 0)
153
 
                qDebug() << "Delay can not be negative" << animation.at(6);
 
153
                qCDebug(LIBKWINEFFECTS) << "Delay can not be negative" << animation.at(6);
154
154
            else
155
155
                time = t;
156
156