From dc41583279d3e59ed624117864a5a7115fa56bed Mon Sep 17 00:00:00 2001
From: Peter Hartmann <peter@edelhirsch.io>
Date: Thu, 17 Dec 2020 09:28:54 +0100
Subject: [PATCH] fix build with new QSkinny version

---
 examples/iot-dashboard/Box.cpp               | 2 +-
 examples/iot-dashboard/Diagram.cpp           | 2 +-
 examples/iot-dashboard/Humidity.cpp          | 2 +-
 examples/iot-dashboard/IndoorTemperature.cpp | 3 ++-
 examples/iot-dashboard/MainContent.cpp       | 8 ++++----
 examples/iot-dashboard/MainContent.h         | 2 +-
 6 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/examples/iot-dashboard/Box.cpp b/examples/iot-dashboard/Box.cpp
index 7948bea8..92c7d35c 100644
--- a/examples/iot-dashboard/Box.cpp
+++ b/examples/iot-dashboard/Box.cpp
@@ -45,7 +45,7 @@ Box::Box( const QString& title, QQuickItem* parent )
     setAutoLayoutChildren( true );
     setBackgroundColor( Qt::white );
 
-    setMarginsHint( Panel | QskAspect::Padding, 15 );
+    setMarginHint( Panel | QskAspect::Padding, 15 );
     setPanel( true );
     setBoxShapeHint( QskBox::Panel, 6 );
 //    setBoxBorderMetricsHint( QskBox::Panel, 2 );
diff --git a/examples/iot-dashboard/Diagram.cpp b/examples/iot-dashboard/Diagram.cpp
index 7b1faa67..6481e796 100644
--- a/examples/iot-dashboard/Diagram.cpp
+++ b/examples/iot-dashboard/Diagram.cpp
@@ -132,7 +132,7 @@ Diagram::Diagram( QQuickItem* parent )
     , m_weekdays( new QskGridBox( this ) )
     , m_content( new DiagramContent( this ) )
 {
-    setMarginsHint( Panel | QskAspect::Padding, 0 );
+    setMarginHint( Panel | QskAspect::Padding, 0 );
 
     setAutoAddChildren( false );
     setAutoLayoutChildren( true );
diff --git a/examples/iot-dashboard/Humidity.cpp b/examples/iot-dashboard/Humidity.cpp
index bb39a30b..72738a30 100644
--- a/examples/iot-dashboard/Humidity.cpp
+++ b/examples/iot-dashboard/Humidity.cpp
@@ -15,7 +15,7 @@ Humidity::Humidity( QQuickItem* parent )
     : Box( "", parent )
 {
     setPanel( true );
-    setMarginsHint( Panel | QskAspect::Padding, 8 );
+    setMarginHint( Panel | QskAspect::Padding, 8 );
     setSizePolicy( Qt::Vertical, QskSizePolicy::Maximum );
 
     auto* layout = new QskLinearBox( Qt::Horizontal, this );
diff --git a/examples/iot-dashboard/IndoorTemperature.cpp b/examples/iot-dashboard/IndoorTemperature.cpp
index 3a8d5e9c..ceb596e1 100644
--- a/examples/iot-dashboard/IndoorTemperature.cpp
+++ b/examples/iot-dashboard/IndoorTemperature.cpp
@@ -15,7 +15,7 @@ IndoorTemperature::IndoorTemperature( QQuickItem* parent )
     : Box( "", parent )
 {
     setPanel( true );
-    setMarginsHint( Panel | QskAspect::Padding, 8 );
+    setMarginHint( Panel | QskAspect::Padding, 8 );
     setSizePolicy( Qt::Vertical, QskSizePolicy::Maximum );
 
     auto* layout = new QskLinearBox( Qt::Horizontal, this );
@@ -37,4 +37,5 @@ IndoorTemperature::IndoorTemperature( QQuickItem* parent )
     value->setTextColor( "#929CB2" );
 
     auto* buttons = new UpAndDownButton( layout );
+    Q_UNUSED( buttons );
 }
diff --git a/examples/iot-dashboard/MainContent.cpp b/examples/iot-dashboard/MainContent.cpp
index c1e6e642..a4eceed3 100644
--- a/examples/iot-dashboard/MainContent.cpp
+++ b/examples/iot-dashboard/MainContent.cpp
@@ -30,9 +30,9 @@ ShadowPositioner::ShadowPositioner( QQuickItem* parent ) : QskControl( parent )
 void ShadowPositioner::setGridBox( QskGridBox* gridBox )
 {
     m_gridBox = gridBox;
-    m_rectangles.reserve( m_gridBox->count() );
+    m_rectangles.reserve( m_gridBox->elementCount() );
 
-    for( int i = 0; i < m_gridBox->count(); ++i )
+    for( int i = 0; i < m_gridBox->elementCount(); ++i )
     {
         auto* r = new ShadowedRectangle( this );
         r->setZ( 5 );
@@ -115,8 +115,8 @@ QskAspect::Subcontrol MainContent::effectiveSubcontrol( QskAspect::Subcontrol su
     return subControl;
 }
 
-void MainContent::geometryChanged( const QRectF& newGeometry, const QRectF& oldGeometry )
+void MainContent::geometryChangeEvent( QskGeometryChangeEvent* event )
 {
-    QskLinearBox::geometryChanged( newGeometry, oldGeometry );
+    QskLinearBox::geometryChangeEvent( event );
     m_shadowPositioner->polish();
 }
diff --git a/examples/iot-dashboard/MainContent.h b/examples/iot-dashboard/MainContent.h
index 9acf4fd6..6e977a79 100644
--- a/examples/iot-dashboard/MainContent.h
+++ b/examples/iot-dashboard/MainContent.h
@@ -34,7 +34,7 @@ class MainContent : public QskLinearBox
             QskAspect::Subcontrol subControl ) const override final;
 
     protected:
-        void geometryChanged( const QRectF&, const QRectF& ) override;
+        void geometryChangeEvent( QskGeometryChangeEvent* ) override;
 
     private:
         QList< QskLinearBox* > m_columns;