Skip to content

Commit b34896c

Browse files
Indrajit TapadarFriedemann Kleint
Indrajit Tapadar
authored and
Friedemann Kleint
committed
Fix compile errors for qtpropertybrowser.
The compilation of QPropertybrowser as a DLL failed on linux for Qt5, because of a couple of deprecated API's, QRect::intersect() is replaced with QRect::intersected() and qVariantValue() macro replaced with Qvariant::Value(). Change-Id: I24acefe8ec9c288691ae807f27d2bdab385629f7 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
1 parent eec6ad9 commit b34896c

File tree

4 files changed

+24
-24
lines changed

4 files changed

+24
-24
lines changed

‎qtpropertybrowser/examples/canvas_typed/qtcanvas.cpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1010,7 +1010,7 @@ void QtCanvas::setAllChanged()
10101010
*/
10111011
void QtCanvas::setChanged(const QRect& area)
10121012
{
1013-
QRect thearea = area.intersect(QRect(0, 0, width(), height()));
1013+
QRect thearea = area.intersected(QRect(0, 0, width(), height()));
10141014

10151015
int mx = (thearea.x()+thearea.width()+chunksize)/chunksize;
10161016
int my = (thearea.y()+thearea.height()+chunksize)/chunksize;
@@ -1037,7 +1037,7 @@ void QtCanvas::setChanged(const QRect& area)
10371037
*/
10381038
void QtCanvas::setUnchanged(const QRect& area)
10391039
{
1040-
QRect thearea = area.intersect(QRect(0, 0, width(), height()));
1040+
QRect thearea = area.intersected(QRect(0, 0, width(), height()));
10411041

10421042
int mx = (thearea.x()+thearea.width()+chunksize)/chunksize;
10431043
int my = (thearea.y()+thearea.height()+chunksize)/chunksize;
@@ -1114,7 +1114,7 @@ void QtCanvas::drawArea(const QRect& clip, QPainter* painter, bool dbuf)
11141114
*/
11151115
void QtCanvas::drawCanvasArea(const QRect& inarea, QPainter* p, bool /*double_buffer*/)
11161116
{
1117-
QRect area = inarea.intersect(QRect(0, 0, width(), height()));
1117+
QRect area = inarea.intersected(QRect(0, 0, width(), height()));
11181118

11191119
if (!p) return; // Nothing to do.
11201120

@@ -1996,7 +1996,7 @@ bool qt_testCollision(const QtCanvasSprite* s1, const QtCanvasSprite* s2)
19961996

19971997
QRect s1area = s1->boundingRectAdvanced();
19981998

1999-
QRect ourarea = s1area.intersect(cyourarea);
1999+
QRect ourarea = s1area.intersected(cyourarea);
20002000

20012001
if (ourarea.isEmpty())
20022002
return false;
@@ -3567,7 +3567,7 @@ class QPolygonalProcessor {
35673567
{
35683568
QRect pixelbounds = pa.boundingRect();
35693569
int cs = canvas->chunkSize();
3570-
QRect canvasbounds = pixelbounds.intersect(canvas->rect());
3570+
QRect canvasbounds = pixelbounds.intersected(canvas->rect());
35713571
bounds.setLeft(canvasbounds.left()/cs);
35723572
bounds.setRight(canvasbounds.right()/cs);
35733573
bounds.setTop(canvasbounds.top()/cs);

‎qtpropertybrowser/examples/canvas_variant/mainwindow.cpp

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -385,48 +385,48 @@ void MainWindow::valueChanged(QtProperty *property, const QVariant &value)
385385
} else if (id == QLatin1String("text")) {
386386
if (currentItem->rtti() == QtCanvasItem::Rtti_Text) {
387387
QtCanvasText *i = (QtCanvasText *)currentItem;
388-
i->setText(qVariantValue<QString>(value));
388+
i->setText(value.value<QString>());
389389
}
390390
} else if (id == QLatin1String("color")) {
391391
if (currentItem->rtti() == QtCanvasItem::Rtti_Text) {
392392
QtCanvasText *i = (QtCanvasText *)currentItem;
393-
i->setColor(qVariantValue<QColor>(value));
393+
i->setColor(value.value<QColor>());
394394
}
395395
} else if (id == QLatin1String("brush")) {
396396
if (currentItem->rtti() == QtCanvasItem::Rtti_Rectangle ||
397397
currentItem->rtti() == QtCanvasItem::Rtti_Ellipse) {
398398
QtCanvasPolygonalItem *i = (QtCanvasPolygonalItem *)currentItem;
399399
QBrush b = i->brush();
400-
b.setColor(qVariantValue<QColor>(value));
400+
b.setColor(value.value<QColor>());
401401
i->setBrush(b);
402402
}
403403
} else if (id == QLatin1String("pen")) {
404404
if (currentItem->rtti() == QtCanvasItem::Rtti_Rectangle ||
405405
currentItem->rtti() == QtCanvasItem::Rtti_Line) {
406406
QtCanvasPolygonalItem *i = (QtCanvasPolygonalItem *)currentItem;
407407
QPen p = i->pen();
408-
p.setColor(qVariantValue<QColor>(value));
408+
p.setColor(value.value<QColor>());
409409
i->setPen(p);
410410
}
411411
} else if (id == QLatin1String("font")) {
412412
if (currentItem->rtti() == QtCanvasItem::Rtti_Text) {
413413
QtCanvasText *i = (QtCanvasText *)currentItem;
414-
i->setFont(qVariantValue<QFont>(value));
414+
i->setFont(value.value<QFont>());
415415
}
416416
} else if (id == QLatin1String("endpoint")) {
417417
if (currentItem->rtti() == QtCanvasItem::Rtti_Line) {
418418
QtCanvasLine *i = (QtCanvasLine *)currentItem;
419-
QPoint p = qVariantValue<QPoint>(value);
419+
QPoint p = value.value<QPoint>();
420420
i->setPoints(i->startPoint().x(), i->startPoint().y(), p.x(), p.y());
421421
}
422422
} else if (id == QLatin1String("size")) {
423423
if (currentItem->rtti() == QtCanvasItem::Rtti_Rectangle) {
424424
QtCanvasRectangle *i = (QtCanvasRectangle *)currentItem;
425-
QSize s = qVariantValue<QSize>(value);
425+
QSize s = value.value<QSize>();
426426
i->setSize(s.width(), s.height());
427427
} else if (currentItem->rtti() == QtCanvasItem::Rtti_Ellipse) {
428428
QtCanvasEllipse *i = (QtCanvasEllipse *)currentItem;
429-
QSize s = qVariantValue<QSize>(value);
429+
QSize s = value.value<QSize>();
430430
i->setSize(s.width(), s.height());
431431
}
432432
}

‎qtpropertybrowser/examples/canvas_variant/qtcanvas.cpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1010,7 +1010,7 @@ void QtCanvas::setAllChanged()
10101010
*/
10111011
void QtCanvas::setChanged(const QRect& area)
10121012
{
1013-
QRect thearea = area.intersect(QRect(0, 0, width(), height()));
1013+
QRect thearea = area.intersected(QRect(0, 0, width(), height()));
10141014

10151015
int mx = (thearea.x()+thearea.width()+chunksize)/chunksize;
10161016
int my = (thearea.y()+thearea.height()+chunksize)/chunksize;
@@ -1037,7 +1037,7 @@ void QtCanvas::setChanged(const QRect& area)
10371037
*/
10381038
void QtCanvas::setUnchanged(const QRect& area)
10391039
{
1040-
QRect thearea = area.intersect(QRect(0, 0, width(), height()));
1040+
QRect thearea = area.intersected(QRect(0, 0, width(), height()));
10411041

10421042
int mx = (thearea.x()+thearea.width()+chunksize)/chunksize;
10431043
int my = (thearea.y()+thearea.height()+chunksize)/chunksize;
@@ -1114,7 +1114,7 @@ void QtCanvas::drawArea(const QRect& clip, QPainter* painter, bool dbuf)
11141114
*/
11151115
void QtCanvas::drawCanvasArea(const QRect& inarea, QPainter* p, bool /*double_buffer*/)
11161116
{
1117-
QRect area = inarea.intersect(QRect(0, 0, width(), height()));
1117+
QRect area = inarea.intersected(QRect(0, 0, width(), height()));
11181118

11191119
if (!p) return; // Nothing to do.
11201120

@@ -1996,7 +1996,7 @@ bool qt_testCollision(const QtCanvasSprite* s1, const QtCanvasSprite* s2)
19961996

19971997
QRect s1area = s1->boundingRectAdvanced();
19981998

1999-
QRect ourarea = s1area.intersect(cyourarea);
1999+
QRect ourarea = s1area.intersected(cyourarea);
20002000

20012001
if (ourarea.isEmpty())
20022002
return false;
@@ -3567,7 +3567,7 @@ class QPolygonalProcessor {
35673567
{
35683568
QRect pixelbounds = pa.boundingRect();
35693569
int cs = canvas->chunkSize();
3570-
QRect canvasbounds = pixelbounds.intersect(canvas->rect());
3570+
QRect canvasbounds = pixelbounds.intersected(canvas->rect());
35713571
bounds.setLeft(canvasbounds.left()/cs);
35723572
bounds.setRight(canvasbounds.right()/cs);
35733573
bounds.setTop(canvasbounds.top()/cs);

‎qtpropertybrowser/examples/extension/main.cpp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -94,14 +94,14 @@ void VariantManager::slotValueChanged(QtProperty *property, const QVariant &valu
9494
if (xToProperty.contains(property)) {
9595
QtProperty *pointProperty = xToProperty[property];
9696
QVariant v = this->value(pointProperty);
97-
QPointF p = qVariantValue<QPointF>(v);
98-
p.setX(qVariantValue<double>(value));
97+
QPointF p = v.value<QPointF>();
98+
p.setX(value.value<double>());
9999
setValue(pointProperty, p);
100100
} else if (yToProperty.contains(property)) {
101101
QtProperty *pointProperty = yToProperty[property];
102102
QVariant v = this->value(pointProperty);
103-
QPointF p = qVariantValue<QPointF>(v);
104-
p.setY(qVariantValue<double>(value));
103+
QPointF p = v.value<QPointF>();
104+
p.setY(value.value<double>());
105105
setValue(pointProperty, p);
106106
}
107107
}
@@ -144,7 +144,7 @@ QString VariantManager::valueText(const QtProperty *property) const
144144
{
145145
if (propertyToData.contains(property)) {
146146
QVariant v = propertyToData[property].value;
147-
QPointF p = qVariantValue<QPointF>(v);
147+
QPointF p = v.value<QPointF>();
148148
return QString(tr("(%1, %2)").arg(QString::number(p.x()))
149149
.arg(QString::number(p.y())));
150150
}
@@ -156,7 +156,7 @@ void VariantManager::setValue(QtProperty *property, const QVariant &val)
156156
if (propertyToData.contains(property)) {
157157
if (val.type() != QVariant::PointF && !val.canConvert(QVariant::PointF))
158158
return;
159-
QPointF p = qVariantValue<QPointF>(val);
159+
QPointF p = val.value<QPointF>();
160160
Data d = propertyToData[property];
161161
d.value = p;
162162
if (d.x)

0 commit comments

Comments
 (0)