aboutsummaryrefslogtreecommitdiffstats
path: root/src/quicktemplates2/qquicktabbar.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/quicktemplates2/qquicktabbar.cpp')
-rw-r--r--src/quicktemplates2/qquicktabbar.cpp24
1 files changed, 5 insertions, 19 deletions
diff --git a/src/quicktemplates2/qquicktabbar.cpp b/src/quicktemplates2/qquicktabbar.cpp
index 3873ecfa..1db04ba0 100644
--- a/src/quicktemplates2/qquicktabbar.cpp
+++ b/src/quicktemplates2/qquicktabbar.cpp
@@ -100,8 +100,6 @@ class QQuickTabBarPrivate : public QQuickContainerPrivate
Q_DECLARE_PUBLIC(QQuickTabBar)
public:
- QQuickTabBarPrivate();
-
void updateCurrentItem();
void updateCurrentIndex();
void updateLayout();
@@ -113,8 +111,8 @@ public:
void itemImplicitWidthChanged(QQuickItem *item) override;
void itemImplicitHeightChanged(QQuickItem *item) override;
- bool updatingLayout;
- QQuickTabBar::Position position;
+ bool updatingLayout = false;
+ QQuickTabBar::Position position = QQuickTabBar::Header;
};
class QQuickTabBarAttachedPrivate : public QObjectPrivate
@@ -122,12 +120,6 @@ class QQuickTabBarAttachedPrivate : public QObjectPrivate
Q_DECLARE_PUBLIC(QQuickTabBarAttached)
public:
- QQuickTabBarAttachedPrivate()
- : index(-1),
- tabBar(nullptr)
- {
- }
-
static QQuickTabBarAttachedPrivate *get(QQuickTabBarAttached *attached)
{
return attached->d_func();
@@ -135,17 +127,10 @@ public:
void update(QQuickTabBar *tabBar, int index);
- int index;
- QQuickTabBar *tabBar;
+ int index = -1;
+ QQuickTabBar *tabBar = nullptr;
};
-QQuickTabBarPrivate::QQuickTabBarPrivate()
- : updatingLayout(false),
- position(QQuickTabBar::Header)
-{
- changeTypes |= Geometry | ImplicitWidth | ImplicitHeight;
-}
-
void QQuickTabBarPrivate::updateCurrentItem()
{
QQuickTabButton *button = qobject_cast<QQuickTabButton *>(contentModel->get(currentIndex));
@@ -265,6 +250,7 @@ QQuickTabBar::QQuickTabBar(QQuickItem *parent)
: QQuickContainer(*(new QQuickTabBarPrivate), parent)
{
Q_D(QQuickTabBar);
+ d->changeTypes |= QQuickItemPrivate::Geometry | QQuickItemPrivate::ImplicitWidth | QQuickItemPrivate::ImplicitHeight;
setFlag(ItemIsFocusScope);
QObjectPrivate::connect(this, &QQuickTabBar::currentIndexChanged, d, &QQuickTabBarPrivate::updateCurrentItem);
}