yukijoou/kwin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Second 'unbreak kwin build' of the day ...

Browse source 
Port from kFatal to qFatal - kFatal is still in kde4support,
but lacking debug area support arguably isn't that big a
deal since fatals can't be turned off anyway.

CCMAIL:mgraesslin@kde.org
This commit is contained in:
Eike Hein 2013-09-02 18:42:20 +02:00
parent 57905c0cc2
commit fbc957c048
2 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
libkwineffects/kwineffects.cpp
View file

@ -879,7 +879,7 @@ WindowQuad WindowQuad::makeSubQuad(double x1, double y1, double x2, double y2) c
assert(x1 < x2 && y1 < y2 && x1 >= left() && x2 <= right() && y1 >= top() && y2 <= bottom());
#ifndef NDEBUG
if (isTransformed())
kFatal(1212) << "Splitting quads is allowed only in pre-paint calls!" ;
qFatal("Splitting quads is allowed only in pre-paint calls!");
#endif
WindowQuad ret(*this);
// vertices are clockwise starting from topleft
@ -938,7 +938,7 @@ WindowQuadList WindowQuadList::splitAtX(double x) const
foreach (const WindowQuad & quad, *this) {
#ifndef NDEBUG
if (quad.isTransformed())
kFatal(1212) << "Splitting quads is allowed only in pre-paint calls!" ;
qFatal("Splitting quads is allowed only in pre-paint calls!");
#endif
bool wholeleft = true;
bool wholeright = true;
@ -970,7 +970,7 @@ WindowQuadList WindowQuadList::splitAtY(double y) const
foreach (const WindowQuad & quad, *this) {
#ifndef NDEBUG
if (quad.isTransformed())
kFatal(1212) << "Splitting quads is allowed only in pre-paint calls!" ;
qFatal("Splitting quads is allowed only in pre-paint calls!");
#endif
bool wholetop = true;
bool wholebottom = true;
@ -1008,7 +1008,7 @@ WindowQuadList WindowQuadList::makeGrid(int maxquadsize) const
foreach (const WindowQuad & quad, *this) {
#ifndef NDEBUG
if (quad.isTransformed())
kFatal(1212) << "Splitting quads is allowed only in pre-paint calls!" ;
qFatal("Splitting quads is allowed only in pre-paint calls!");
#endif
left = qMin(left, quad.left());
right = qMax(right, quad.right());
@ -1046,7 +1046,7 @@ WindowQuadList WindowQuadList::makeRegularGrid(int xSubdivisions, int ySubdivisi
foreach (const WindowQuad & quad, *this) {
#ifndef NDEBUG
if (quad.isTransformed())
kFatal(1212) << "Splitting quads is allowed only in pre-paint calls!" ;
qFatal("Splitting quads is allowed only in pre-paint calls!");
#endif
left = qMin(left, quad.left());
right = qMax(right, quad.right());

4
scene.cpp
View file

@ -207,7 +207,7 @@ void Scene::paintGenericScreen(int orig_mask, ScreenPaintData)
effects->prePaintWindow(effectWindow(w), data, time_diff);
#ifndef NDEBUG
if (data.quads.isTransformed()) {
kFatal(1212) << "Pre-paint calls are not allowed to transform quads!" ;
qFatal("Pre-paint calls are not allowed to transform quads!");
}
#endif
if (!w->isPaintingEnabled()) {
@ -283,7 +283,7 @@ void Scene::paintSimpleScreen(int orig_mask, QRegion region)
effects->prePaintWindow(effectWindow(w), data, time_diff);
#ifndef NDEBUG
if (data.quads.isTransformed()) {
kFatal(1212) << "Pre-paint calls are not allowed to transform quads!" ;
qFatal("Pre-paint calls are not allowed to transform quads!");
}
#endif
if (!w->isPaintingEnabled()) {