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>

4 files changed, 24 insertions, 24 deletions

diff --git a/qtpropertybrowser/examples/canvas_typed/qtcanvas.cpp b/qtpropertybrowser/examples/canvas_typed/qtcanvas.cpp
index ee50ca6..55aad15 100644
--- a/qtpropertybrowser/examples/canvas_typed/qtcanvas.cpp
+++ b/qtpropertybrowser/examples/canvas_typed/qtcanvas.cpp
@@ -1010,7 +1010,7 @@ void QtCanvas::setAllChanged()
 */
 void QtCanvas::setChanged(const QRect& area)
 {
-    QRect thearea = area.intersect(QRect(0, 0, width(), height()));
+    QRect thearea = area.intersected(QRect(0, 0, width(), height()));
 
     int mx = (thearea.x()+thearea.width()+chunksize)/chunksize;
     int my = (thearea.y()+thearea.height()+chunksize)/chunksize;
@@ -1037,7 +1037,7 @@ void QtCanvas::setChanged(const QRect& area)
 */
 void QtCanvas::setUnchanged(const QRect& area)
 {
-    QRect thearea = area.intersect(QRect(0, 0, width(), height()));
+    QRect thearea = area.intersected(QRect(0, 0, width(), height()));
 
     int mx = (thearea.x()+thearea.width()+chunksize)/chunksize;
     int my = (thearea.y()+thearea.height()+chunksize)/chunksize;
@@ -1114,7 +1114,7 @@ void QtCanvas::drawArea(const QRect& clip, QPainter* painter, bool dbuf)
 */
 void QtCanvas::drawCanvasArea(const QRect& inarea, QPainter* p, bool /*double_buffer*/)
 {
-    QRect area = inarea.intersect(QRect(0, 0, width(), height()));
+    QRect area = inarea.intersected(QRect(0, 0, width(), height()));
 
     if (!p) return; // Nothing to do.
 
@@ -1996,7 +1996,7 @@ bool qt_testCollision(const QtCanvasSprite* s1, const QtCanvasSprite* s2)
 
     QRect s1area = s1->boundingRectAdvanced();
 
-    QRect ourarea = s1area.intersect(cyourarea);
+    QRect ourarea = s1area.intersected(cyourarea);
 
     if (ourarea.isEmpty())
         return false;
@@ -3567,7 +3567,7 @@ public:
     {
         QRect pixelbounds = pa.boundingRect();
         int cs = canvas->chunkSize();
-        QRect canvasbounds = pixelbounds.intersect(canvas->rect());
+        QRect canvasbounds = pixelbounds.intersected(canvas->rect());
         bounds.setLeft(canvasbounds.left()/cs);
         bounds.setRight(canvasbounds.right()/cs);
         bounds.setTop(canvasbounds.top()/cs);
diff --git a/qtpropertybrowser/examples/canvas_variant/mainwindow.cpp b/qtpropertybrowser/examples/canvas_variant/mainwindow.cpp
index 4afd39e..e0175ab 100644
--- a/qtpropertybrowser/examples/canvas_variant/mainwindow.cpp
+++ b/qtpropertybrowser/examples/canvas_variant/mainwindow.cpp
@@ -385,19 +385,19 @@ void MainWindow::valueChanged(QtProperty *property, const QVariant &value)
     } else if (id == QLatin1String("text")) {
         if (currentItem->rtti() == QtCanvasItem::Rtti_Text) {
             QtCanvasText *i = (QtCanvasText *)currentItem;
-            i->setText(qVariantValue<QString>(value));
+            i->setText(value.value<QString>());
         }
     } else if (id == QLatin1String("color")) {
         if (currentItem->rtti() == QtCanvasItem::Rtti_Text) {
             QtCanvasText *i = (QtCanvasText *)currentItem;
-            i->setColor(qVariantValue<QColor>(value));
+            i->setColor(value.value<QColor>());
         }
     } else if (id == QLatin1String("brush")) {
         if (currentItem->rtti() == QtCanvasItem::Rtti_Rectangle ||
                 currentItem->rtti() == QtCanvasItem::Rtti_Ellipse) {
             QtCanvasPolygonalItem *i = (QtCanvasPolygonalItem *)currentItem;
             QBrush b = i->brush();
-            b.setColor(qVariantValue<QColor>(value));
+            b.setColor(value.value<QColor>());
             i->setBrush(b);
         }
     } else if (id == QLatin1String("pen")) {
@@ -405,28 +405,28 @@ void MainWindow::valueChanged(QtProperty *property, const QVariant &value)
                 currentItem->rtti() == QtCanvasItem::Rtti_Line) {
             QtCanvasPolygonalItem *i = (QtCanvasPolygonalItem *)currentItem;
             QPen p = i->pen();
-            p.setColor(qVariantValue<QColor>(value));
+            p.setColor(value.value<QColor>());
             i->setPen(p);
         }
     } else if (id == QLatin1String("font")) {
         if (currentItem->rtti() == QtCanvasItem::Rtti_Text) {
             QtCanvasText *i = (QtCanvasText *)currentItem;
-            i->setFont(qVariantValue<QFont>(value));
+            i->setFont(value.value<QFont>());
         }
     } else if (id == QLatin1String("endpoint")) {
         if (currentItem->rtti() == QtCanvasItem::Rtti_Line) {
             QtCanvasLine *i = (QtCanvasLine *)currentItem;
-            QPoint p = qVariantValue<QPoint>(value);
+            QPoint p = value.value<QPoint>();
             i->setPoints(i->startPoint().x(), i->startPoint().y(), p.x(), p.y());
         }
     } else if (id == QLatin1String("size")) {
         if (currentItem->rtti() == QtCanvasItem::Rtti_Rectangle) {
             QtCanvasRectangle *i = (QtCanvasRectangle *)currentItem;
-            QSize s = qVariantValue<QSize>(value);
+            QSize s = value.value<QSize>();
             i->setSize(s.width(), s.height());
         } else if (currentItem->rtti() == QtCanvasItem::Rtti_Ellipse) {
             QtCanvasEllipse *i = (QtCanvasEllipse *)currentItem;
-            QSize s = qVariantValue<QSize>(value);
+            QSize s = value.value<QSize>();
             i->setSize(s.width(), s.height());
         }
     }
diff --git a/qtpropertybrowser/examples/canvas_variant/qtcanvas.cpp b/qtpropertybrowser/examples/canvas_variant/qtcanvas.cpp
index ee50ca6..55aad15 100644
--- a/qtpropertybrowser/examples/canvas_variant/qtcanvas.cpp
+++ b/qtpropertybrowser/examples/canvas_variant/qtcanvas.cpp
@@ -1010,7 +1010,7 @@ void QtCanvas::setAllChanged()
 */
 void QtCanvas::setChanged(const QRect& area)
 {
-    QRect thearea = area.intersect(QRect(0, 0, width(), height()));
+    QRect thearea = area.intersected(QRect(0, 0, width(), height()));
 
     int mx = (thearea.x()+thearea.width()+chunksize)/chunksize;
     int my = (thearea.y()+thearea.height()+chunksize)/chunksize;
@@ -1037,7 +1037,7 @@ void QtCanvas::setChanged(const QRect& area)
 */
 void QtCanvas::setUnchanged(const QRect& area)
 {
-    QRect thearea = area.intersect(QRect(0, 0, width(), height()));
+    QRect thearea = area.intersected(QRect(0, 0, width(), height()));
 
     int mx = (thearea.x()+thearea.width()+chunksize)/chunksize;
     int my = (thearea.y()+thearea.height()+chunksize)/chunksize;
@@ -1114,7 +1114,7 @@ void QtCanvas::drawArea(const QRect& clip, QPainter* painter, bool dbuf)
 */
 void QtCanvas::drawCanvasArea(const QRect& inarea, QPainter* p, bool /*double_buffer*/)
 {
-    QRect area = inarea.intersect(QRect(0, 0, width(), height()));
+    QRect area = inarea.intersected(QRect(0, 0, width(), height()));
 
     if (!p) return; // Nothing to do.
 
@@ -1996,7 +1996,7 @@ bool qt_testCollision(const QtCanvasSprite* s1, const QtCanvasSprite* s2)
 
     QRect s1area = s1->boundingRectAdvanced();
 
-    QRect ourarea = s1area.intersect(cyourarea);
+    QRect ourarea = s1area.intersected(cyourarea);
 
     if (ourarea.isEmpty())
         return false;
@@ -3567,7 +3567,7 @@ public:
     {
         QRect pixelbounds = pa.boundingRect();
         int cs = canvas->chunkSize();
-        QRect canvasbounds = pixelbounds.intersect(canvas->rect());
+        QRect canvasbounds = pixelbounds.intersected(canvas->rect());
         bounds.setLeft(canvasbounds.left()/cs);
         bounds.setRight(canvasbounds.right()/cs);
         bounds.setTop(canvasbounds.top()/cs);
diff --git a/qtpropertybrowser/examples/extension/main.cpp b/qtpropertybrowser/examples/extension/main.cpp
index 9df59de..51aa9b9 100644
--- a/qtpropertybrowser/examples/extension/main.cpp
+++ b/qtpropertybrowser/examples/extension/main.cpp
@@ -94,14 +94,14 @@ void VariantManager::slotValueChanged(QtProperty *property, const QVariant &valu
     if (xToProperty.contains(property)) {
         QtProperty *pointProperty = xToProperty[property];
         QVariant v = this->value(pointProperty);
-        QPointF p = qVariantValue<QPointF>(v);
-        p.setX(qVariantValue<double>(value));
+        QPointF p = v.value<QPointF>();
+        p.setX(value.value<double>());
         setValue(pointProperty, p);
     } else if (yToProperty.contains(property)) {
         QtProperty *pointProperty = yToProperty[property];
         QVariant v = this->value(pointProperty);
-        QPointF p = qVariantValue<QPointF>(v);
-        p.setY(qVariantValue<double>(value));
+        QPointF p = v.value<QPointF>();
+        p.setY(value.value<double>());
         setValue(pointProperty, p);
     }
 }
@@ -144,7 +144,7 @@ QString VariantManager::valueText(const QtProperty *property) const
 {
     if (propertyToData.contains(property)) {
         QVariant v = propertyToData[property].value;
-        QPointF p = qVariantValue<QPointF>(v);
+        QPointF p = v.value<QPointF>();
         return QString(tr("(%1, %2)").arg(QString::number(p.x()))
                                  .arg(QString::number(p.y())));
     }
@@ -156,7 +156,7 @@ void VariantManager::setValue(QtProperty *property, const QVariant &val)
     if (propertyToData.contains(property)) {
         if (val.type() != QVariant::PointF && !val.canConvert(QVariant::PointF))
             return;
-        QPointF p = qVariantValue<QPointF>(val);
+        QPointF p = val.value<QPointF>();
         Data d = propertyToData[property];
         d.value = p;
         if (d.x)