From 0269911b2ecd2f4fd4a7925096da86e0f3d89677 Mon Sep 17 00:00:00 2001 From: laserpants Date: Tue, 21 Jun 2016 15:29:26 +0300 Subject: [PATCH] move object construction to initialization list --- components/tabs.cpp | 6 ++---- components/tabs_p.h | 16 ++++++++-------- 2 files changed, 10 insertions(+), 12 deletions(-) diff --git a/components/tabs.cpp b/components/tabs.cpp index 12fb7d1..784c67c 100644 --- a/components/tabs.cpp +++ b/components/tabs.cpp @@ -2,13 +2,14 @@ #include "tabs_p.h" #include #include -#include #include "tabs_internal.h" #include "lib/ripple.h" #include "lib/style.h" TabsPrivate::TabsPrivate(Tabs *q) : q_ptr(q), + inkBar(new TabsInkBar(q)), + tabLayout(new QHBoxLayout), tab(-1), useThemeColors(true), showHalo(false), @@ -20,9 +21,6 @@ void TabsPrivate::init() { Q_Q(Tabs); - inkBar = new TabsInkBar(q); - - tabLayout = new QHBoxLayout; q->setLayout(tabLayout); tabLayout->setSpacing(0); tabLayout->setMargin(0); diff --git a/components/tabs_p.h b/components/tabs_p.h index 3cf8f33..d12c8dc 100644 --- a/components/tabs_p.h +++ b/components/tabs_p.h @@ -20,14 +20,14 @@ public: void init(); Tabs *const q_ptr; - TabsInkBar *inkBar; - QHBoxLayout *tabLayout; - QColor inkColor; - QColor backgroundColor; - QColor textColor; - int tab; - bool useThemeColors; - bool showHalo; + TabsInkBar *const inkBar; + QHBoxLayout *const tabLayout; + QColor inkColor; + QColor backgroundColor; + QColor textColor; + int tab; + bool useThemeColors; + bool showHalo; Material::RippleStyle rippleStyle; };