--- a/javauis/eswt_qt/org.eclipse.swt/Eclipse_SWT_PI/qt/library/graphics/qt/graphicscontextimpl.cpp Fri Jun 11 13:33:44 2010 +0300
+++ b/javauis/eswt_qt/org.eclipse.swt/Eclipse_SWT_PI/qt/library/graphics/qt/graphicscontextimpl.cpp Tue Jul 06 20:36:19 2010 +0300
@@ -305,12 +305,12 @@
}
else
{
- Q_ASSERT(false && "CopyArea image type not recognized");
+ Q_ASSERT_X(false, "Graphics", "CopyArea image type not recognized");
}
break;
}
default:
- Q_ASSERT(false && "Surface type not recognized");
+ Q_ASSERT_X(false, "Graphics", "Surface type not recognized");
break;
}
}
@@ -446,13 +446,13 @@
}
else
{
- Q_ASSERT(false && "CopyArea image type not recognized");
+ Q_ASSERT_X(false, "Graphics", "CopyArea image type not recognized");
}
break;
}
default:
{
- Q_ASSERT(false && "Surface type not recognized");
+ Q_ASSERT_X(false, "Graphics", "Surface type not recognized");
}
}
}
@@ -489,7 +489,7 @@
mPainter->drawPixmap(x, y, *(aImage->getPixmap()));
break;
default:
- Q_ASSERT(false && "Image type not recognized");
+ Q_ASSERT_X(false, "Graphics", "Image type not recognized");
break;
}
}
@@ -513,7 +513,7 @@
mPainter->drawPixmap(QRect(aTx ,aTy, aTw, aTh), *(aImage->getPixmap()), QRect(aSx, aSy, aSw, aSh));
break;
default:
- Q_ASSERT(false && "Image type not recognized");
+ Q_ASSERT_X(false, "Graphics", "Image type not recognized");
break;
}
}
@@ -1074,7 +1074,7 @@
case QPainter::CompositionMode_Xor:
return EXor;
default:
- Q_ASSERT(false && "Blendingmode not recognized");
+ Q_ASSERT_X(false, "Graphics", "Blendingmode not recognized");
return 0;
}
}
@@ -1162,7 +1162,7 @@
case Qt::DashDotDotLine:
return EStrokeDashDotDot;
default:
- Q_ASSERT(false && "The stroke style is not recognized");
+ Q_ASSERT_X(false, "Graphics", "The stroke style is not recognized");
return 0;
}
}
@@ -1218,7 +1218,7 @@
mPainter->setCompositionMode(QPainter::CompositionMode_Xor);
break;
default:
- Q_ASSERT(false && "Blendingmode not recognized");
+ Q_ASSERT_X(false, "Graphics", "Blendingmode not recognized");
return;
}
}
@@ -1300,7 +1300,7 @@
mPen->setStyle(Qt::DashDotDotLine);
break;
default:
- Q_ASSERT(false && "The stroke style is not recognized");
+ Q_ASSERT_X(false, "Graphics", "The stroke style is not recognized");
return;
}
mPainter->setPen(*mPen);