From 8c99bd59db774b7d8df1287127f7fa1565f0626c Mon Sep 17 00:00:00 2001
From: Uwe Rathmann <Uwe.Rathmann@tigertal.de>
Date: Tue, 2 Feb 2021 10:13:39 +0100
Subject: [PATCH] position renamed to tabPosition to avoid shadowing the
 QQuickItem::position

---
 src/controls/QskTabBar.cpp  |  6 +++---
 src/controls/QskTabBar.h    | 10 +++++-----
 src/controls/QskTabView.cpp |  6 +++---
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/controls/QskTabBar.cpp b/src/controls/QskTabBar.cpp
index c0c9239a..cfd363d1 100644
--- a/src/controls/QskTabBar.cpp
+++ b/src/controls/QskTabBar.cpp
@@ -310,7 +310,7 @@ QskTabBar::~QskTabBar()
 {
 }
 
-void QskTabBar::setPosition( Qsk::Position position )
+void QskTabBar::setTabPosition( Qsk::Position position )
 {
     if ( position == m_data->position )
         return;
@@ -334,10 +334,10 @@ void QskTabBar::setPosition( Qsk::Position position )
     for ( int i = 0; i < count(); i++ )
         buttonAt( i )->update();
 
-    Q_EMIT positionChanged( position );
+    Q_EMIT tabPositionChanged( position );
 }
 
-Qsk::Position QskTabBar::position() const
+Qsk::Position QskTabBar::tabPosition() const
 {
     return static_cast< Qsk::Position >( m_data->position );
 }
diff --git a/src/controls/QskTabBar.h b/src/controls/QskTabBar.h
index a54921d4..a93dc53a 100644
--- a/src/controls/QskTabBar.h
+++ b/src/controls/QskTabBar.h
@@ -16,8 +16,8 @@ class QSK_EXPORT QskTabBar : public QskBox
 {
     Q_OBJECT
 
-    Q_PROPERTY( Qsk::Position position READ position
-        WRITE setPosition NOTIFY positionChanged FINAL )
+    Q_PROPERTY( Qsk::Position tabPosition READ tabPosition
+        WRITE setTabPosition NOTIFY tabPositionChanged FINAL )
 
     Q_PROPERTY( Qt::Orientation orientation READ orientation )
 
@@ -45,8 +45,8 @@ class QSK_EXPORT QskTabBar : public QskBox
 
     ~QskTabBar() override;
 
-    void setPosition( Qsk::Position );
-    Qsk::Position position() const;
+    void setTabPosition( Qsk::Position );
+    Qsk::Position tabPosition() const;
 
     Qt::Orientation orientation() const;
 
@@ -100,7 +100,7 @@ class QSK_EXPORT QskTabBar : public QskBox
     void currentIndexChanged( int index );
     void countChanged( int );
     void textOptionsChanged( const QskTextOptions& );
-    void positionChanged( Qsk::Position );
+    void tabPositionChanged( Qsk::Position );
     void autoScrollFocusedButtonChanged( bool );
     void autoFitTabsChanged( bool );
 
diff --git a/src/controls/QskTabView.cpp b/src/controls/QskTabView.cpp
index 52cc5329..567586c6 100644
--- a/src/controls/QskTabView.cpp
+++ b/src/controls/QskTabView.cpp
@@ -67,7 +67,7 @@ QskTabView::QskTabView( Qsk::Position tabPosition, QQuickItem* parent )
     connect( m_data->tabBar, &QskTabBar::countChanged,
         this, &QskTabView::countChanged );
 
-    connect( m_data->tabBar, &QskTabBar::positionChanged,
+    connect( m_data->tabBar, &QskTabBar::tabPositionChanged,
         this, &QskTabView::tabPositionChanged );
 
     connect( m_data->tabBar, &QskTabBar::autoFitTabsChanged,
@@ -93,7 +93,7 @@ void QskTabView::setTabPosition( Qsk::Position position )
     if ( position == tabPosition() )
         return;
 
-    m_data->tabBar->setPosition( position );
+    m_data->tabBar->setTabPosition( position );
 
     polish();
     update();
@@ -101,7 +101,7 @@ void QskTabView::setTabPosition( Qsk::Position position )
 
 Qsk::Position QskTabView::tabPosition() const
 {
-    return m_data->tabBar->position();
+    return m_data->tabBar->tabPosition();
 }
 
 void QskTabView::setAutoFitTabs( bool on )