diff --git a/examples/iotdashboard/BoxWithButtons.cpp b/examples/iotdashboard/BoxWithButtons.cpp index cfed81ba..c9eb01bb 100644 --- a/examples/iotdashboard/BoxWithButtons.cpp +++ b/examples/iotdashboard/BoxWithButtons.cpp @@ -28,10 +28,10 @@ namespace setSizePolicy( Qt::Horizontal, QskSizePolicy::Fixed ); setSpacing( 0 ); - auto* const topButton = new RoundButton( QskAspect::Top, this ); + auto* const topButton = new RoundButton( Qt::TopEdge, this ); connect( topButton, &QskPushButton::clicked, this, &UpAndDownBox::increase ); - auto* const bottomButton = new RoundButton( QskAspect::Bottom, this ); + auto* const bottomButton = new RoundButton( Qt::BottomEdge, this ); connect( bottomButton, &QskPushButton::clicked, this, &UpAndDownBox::decrease ); } diff --git a/examples/iotdashboard/RoundButton.cpp b/examples/iotdashboard/RoundButton.cpp index d75b661c..8f825a1f 100644 --- a/examples/iotdashboard/RoundButton.cpp +++ b/examples/iotdashboard/RoundButton.cpp @@ -4,23 +4,19 @@ *****************************************************************************/ #include "RoundButton.h" - #include -#include - -#include QSK_SUBCONTROL( RoundButton, Panel ) QSK_STATE( RoundButton, Top, ( QskAspect::FirstUserState << 1 ) ) -RoundButton::RoundButton( QskAspect::Placement placement, QQuickItem* parent ) +RoundButton::RoundButton( Qt::Edge edge, QQuickItem* parent ) : QskPushButton( parent ) { setSubcontrolProxy( QskPushButton::Panel, RoundButton::Panel ); setSizePolicy( QskSizePolicy::Fixed, QskSizePolicy::Expanding ); - if( placement == QskAspect::Top ) + if( edge == Qt::TopEdge ) { setSkinStateFlag( Top ); setGraphicSource( "up" ); diff --git a/examples/iotdashboard/RoundButton.h b/examples/iotdashboard/RoundButton.h index 6806575a..d221f324 100644 --- a/examples/iotdashboard/RoundButton.h +++ b/examples/iotdashboard/RoundButton.h @@ -6,6 +6,7 @@ #pragma once #include +#include class RoundButton : public QskPushButton { @@ -15,5 +16,5 @@ class RoundButton : public QskPushButton QSK_SUBCONTROLS( Panel ) QSK_STATES( Top ) - RoundButton( QskAspect::Placement, QQuickItem* parent ); + RoundButton( Qt::Edge, QQuickItem* parent ); };