Merge lp:~zsombi/ubuntu-ui-toolkit/iseeprivates into lp:ubuntu-ui-toolkit/staging

[Zsombor Egri]

Add private implementations to ActionItem, AbstractButton, BottomEdgeHint and BottomEdge.

Prerequisite work for proper action triggering, required by AbstractButton and BottomEdgeHint especially.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1759
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/2616/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-amd64-ci/1344
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/1347
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/1347/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-i386-ci/1343

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/2616/rebuild

review: Approve (continuous-integration)

[Cris Dywan (kalikiana)]

The changes look sensible. No change in functionality expected and so the existing unit tests should already cover it. Looks good.

review: Approve

=== modified file 'src/Ubuntu/Components/plugin/plugin.pri'
--- src/Ubuntu/Components/plugin/plugin.pri	2015-12-07 17:02:28 +0000
+++ src/Ubuntu/Components/plugin/plugin.pri	2015-12-11 12:19:41 +0000
@@ -86,8 +86,10 @@
     $$PWD/livetimer_p.h \
     $$PWD/timeutils_p.h \
     $$PWD/ucactionitem.h \
+    $$PWD/ucactionitem_p.h \
     $$PWD/uchaptics.h \
     $$PWD/ucabstractbutton.h \
+    $$PWD/ucabstractbutton_p.h \
     $$PWD/ucthemingextension.h \
     $$PWD/ucheader.h \
     $$PWD/uclabel.h \
@@ -95,6 +97,7 @@
     $$PWD/privates/threelabelsslot_p.h \
     $$PWD/ucimportversionchecker_p.h \
     $$PWD/ucbottomedgehint.h \
+    $$PWD/ucbottomedgehint_p.h \
     $$PWD/gestures/ucswipearea.h \
     $$PWD/gestures/ucswipearea_p.h \
     $$PWD/gestures/damper.h \

=== modified file 'src/Ubuntu/Components/plugin/ucabstractbutton.cpp'
--- src/Ubuntu/Components/plugin/ucabstractbutton.cpp	2015-12-05 05:59:07 +0000
+++ src/Ubuntu/Components/plugin/ucabstractbutton.cpp	2015-12-11 12:19:41 +0000
@@ -15,11 +15,26 @@
  */
 
 #include "ucabstractbutton.h"
+#include "ucabstractbutton_p.h"
 #include "uchaptics.h"
 #include <QtQuick/private/qquickitem_p.h>
 #include <QtQuick/private/qquickmousearea_p.h>
 #include <QtQml/private/qqmlglobal_p.h>
 
+UCAbstractButtonPrivate::UCAbstractButtonPrivate()
+    : UCActionItemPrivate()
+    , mouseArea(new QQuickMouseArea)
+    , acceptEvents(true)
+    , pressAndHoldConnected(false)
+{
+}
+void UCAbstractButtonPrivate::init()
+{
+    Q_Q(UCAbstractButton);
+    q->setActiveFocusOnPress(true);
+    q->setActiveFocusOnTab(true);
+}
+
 /*!
     \qmltype AbstractButton
     \instantiates UCAbstractButton
@@ -49,18 +64,20 @@
  */
 
 UCAbstractButton::UCAbstractButton(QQuickItem *parent)
-    : UCActionItem(parent)
-    , m_mouseArea(new QQuickMouseArea)
-    , m_acceptEvents(true)
-    , m_pressAndHoldConnected(false)
-{
-    setActiveFocusOnPress(true);
-    setActiveFocusOnTab(true);
+    : UCActionItem(*(new UCAbstractButtonPrivate), parent)
+{
+    d_func()->init();
+}
+UCAbstractButton::UCAbstractButton(UCAbstractButtonPrivate &&dd, QQuickItem *parent)
+    : UCActionItem(dd, parent)
+{
+    d_func()->init();
 }
 
-bool UCAbstractButton::isPressAndHoldConnected()
+bool UCAbstractButtonPrivate::isPressAndHoldConnected()
 {
-    IS_SIGNAL_CONNECTED(this, UCAbstractButton, pressAndHold, ());
+    Q_Q(UCAbstractButton);
+    IS_SIGNAL_CONNECTED(q, UCAbstractButton, pressAndHold, ());
 }
 
 void UCAbstractButton::classBegin()
@@ -71,63 +88,68 @@
     HapticsProxy::instance().initialize();
 
     // set up mouse area
-    QQml_setParent_noEvent(m_mouseArea, this);
-    m_mouseArea->setParentItem(this);
-    QQuickAnchors *anchors = QQuickItemPrivate::get(m_mouseArea)->anchors();
+    Q_D(UCAbstractButton);
+    QQml_setParent_noEvent(d->mouseArea, this);
+    d->mouseArea->setParentItem(this);
+    QQuickAnchors *anchors = QQuickItemPrivate::get(d->mouseArea)->anchors();
     anchors->setFill(this);
-    m_mouseArea->setHoverEnabled(true);
+    d->mouseArea->setHoverEnabled(true);
 }
 
-void UCAbstractButton::componentComplete()
+void UCAbstractButtonPrivate::completeComponentInitialization()
 {
-    UCActionItem::componentComplete();
+    UCActionItemPrivate::completeComponentInitialization();
+    Q_Q(UCAbstractButton);
     // connect to the right slot, using macros so we get the proper slot
-    connect(m_mouseArea, SIGNAL(clicked(QQuickMouseEvent*)), this, SLOT(trigger()));
+    QObject::connect(mouseArea, SIGNAL(clicked(QQuickMouseEvent*)), q, SLOT(trigger()));
 
     // bind mouse area
-    connect(m_mouseArea, &QQuickMouseArea::pressedChanged, this, &UCAbstractButton::pressedChanged);
-    connect(m_mouseArea, &QQuickMouseArea::hoveredChanged, this, &UCAbstractButton::hoveredChanged);
-    connect(m_mouseArea, SIGNAL(clicked(QQuickMouseEvent*)), this, SLOT(_q_mouseAreaClicked()));
-    connect(m_mouseArea, SIGNAL(pressed(QQuickMouseEvent*)), this, SLOT(_q_mouseAreaPressed()));
+    QObject::connect(mouseArea, &QQuickMouseArea::pressedChanged, q, &UCAbstractButton::pressedChanged);
+    QObject::connect(mouseArea, &QQuickMouseArea::hoveredChanged, q, &UCAbstractButton::hoveredChanged);
+    QObject::connect(mouseArea, SIGNAL(clicked(QQuickMouseEvent*)), q, SLOT(_q_mouseAreaClicked()));
+    QObject::connect(mouseArea, SIGNAL(pressed(QQuickMouseEvent*)), q, SLOT(_q_mouseAreaPressed()));
 }
 
 // check the pressAndHold connection on runtime, as Connections
 // may not be available on compoennt completion
-void UCAbstractButton::_q_mouseAreaPressed()
+void UCAbstractButtonPrivate::_q_mouseAreaPressed()
 {
     bool longPressConnected = isPressAndHoldConnected();
-    if (longPressConnected && !m_pressAndHoldConnected) {
+    Q_Q(UCAbstractButton);
+    if (longPressConnected && !pressAndHoldConnected) {
         // do not use UniqueConnection as that has huge impact on performance
-        connect(m_mouseArea, SIGNAL(pressAndHold(QQuickMouseEvent*)),
-                this, SLOT(_q_mouseAreaPressAndHold()));
-        m_pressAndHoldConnected = true;
-    } else if (!longPressConnected && m_pressAndHoldConnected) {
-        disconnect(m_mouseArea, SIGNAL(pressAndHold(QQuickMouseEvent*)),
-                   this, SLOT(_q_mouseAreaPressAndHold()));
-        m_pressAndHoldConnected = false;
+        QObject::connect(mouseArea, SIGNAL(pressAndHold(QQuickMouseEvent*)),
+                q, SLOT(_q_mouseAreaPressAndHold()));
+        pressAndHoldConnected = true;
+    } else if (!longPressConnected && pressAndHoldConnected) {
+        QObject::disconnect(mouseArea, SIGNAL(pressAndHold(QQuickMouseEvent*)),
+                   q, SLOT(_q_mouseAreaPressAndHold()));
+        pressAndHoldConnected = false;
     }
 }
 
 // handle mouseClicked with Haptics
-void UCAbstractButton::_q_mouseAreaClicked()
+void UCAbstractButtonPrivate::_q_mouseAreaClicked()
 {
     // required by the deprecated ListItem module
-    if (!m_acceptEvents) {
+    Q_Q(UCAbstractButton);
+    if (!acceptEvents) {
         return;
     }
     // play haptics
     HapticsProxy::instance().play(QVariant());
-    Q_EMIT clicked();
+    Q_EMIT q->clicked();
 }
 
 // handle pressAndHold
-void UCAbstractButton::_q_mouseAreaPressAndHold()
+void UCAbstractButtonPrivate::_q_mouseAreaPressAndHold()
 {
     // required by the deprecated ListItem module
-    if (!m_acceptEvents) {
+    Q_Q(UCAbstractButton);
+    if (!acceptEvents) {
         return;
     }
-    Q_EMIT pressAndHold();
+    Q_EMIT q->pressAndHold();
 }
 
 // emit clicked when Enter/Return is pressed
@@ -153,7 +175,8 @@
  */
 bool UCAbstractButton::pressed() const
 {
-    return m_mouseArea ? m_mouseArea->pressed() : false;
+    Q_D(const UCAbstractButton);
+    return d->mouseArea ? d->mouseArea->pressed() : false;
 }
 
 /*!
@@ -162,10 +185,25 @@
  */
 bool UCAbstractButton::hovered() const
 {
-    return m_mouseArea ? m_mouseArea->hovered() : false;
+    Q_D(const UCAbstractButton);
+    return d->mouseArea ? d->mouseArea->hovered() : false;
+}
+
+bool UCAbstractButton::acceptEvents() const
+{
+    Q_D(const UCAbstractButton);
+    return d->acceptEvents;
+}
+void UCAbstractButton::setAcceptEvents(bool value)
+{
+    Q_D(UCAbstractButton);
+    d->acceptEvents = value;
 }
 
 QQuickMouseArea *UCAbstractButton::privateMouseArea() const
 {
-    return m_mouseArea;
+    Q_D(const UCAbstractButton);
+    return d->mouseArea;
 }
+
+#include "moc_ucabstractbutton.cpp"

=== modified file 'src/Ubuntu/Components/plugin/ucabstractbutton.h'
--- src/Ubuntu/Components/plugin/ucabstractbutton.h	2015-09-30 18:55:20 +0000
+++ src/Ubuntu/Components/plugin/ucabstractbutton.h	2015-12-11 12:19:41 +0000
@@ -21,6 +21,7 @@
 
 class QQuickMouseArea;
 class QQuickMouseEvent;
+class UCAbstractButtonPrivate;
 class UCAbstractButton : public UCActionItem
 {
     Q_OBJECT
@@ -28,7 +29,7 @@
     Q_PROPERTY(bool hovered READ hovered NOTIFY hoveredChanged)
 
     // internal, declared to support the deprecated ListItem module
-    Q_PROPERTY(bool __acceptEvents MEMBER m_acceptEvents)
+    Q_PROPERTY(bool __acceptEvents READ acceptEvents WRITE setAcceptEvents)
     Q_PROPERTY(QQuickMouseArea *__mouseArea READ privateMouseArea CONSTANT)
 public:
     explicit UCAbstractButton(QQuickItem *parent = 0);
@@ -38,11 +39,12 @@
 
     bool privateAcceptEvents() const;
     void setPrivateAcceptEvents(bool accept);
+    bool acceptEvents() const;
+    void setAcceptEvents(bool value);
     QQuickMouseArea *privateMouseArea() const;
 
 protected:
     void classBegin();
-    void componentComplete();
     void keyPressEvent(QKeyEvent *key);
 
 Q_SIGNALS:
@@ -51,17 +53,13 @@
     void clicked();
     void pressAndHold();
 
-protected Q_SLOTS:
-    void _q_mouseAreaPressed();
-    void _q_mouseAreaClicked();
-    void _q_mouseAreaPressAndHold();
-
 protected:
-    QQuickMouseArea *m_mouseArea;
-    bool m_acceptEvents:1;
-    bool m_pressAndHoldConnected:1;
+    UCAbstractButton(UCAbstractButtonPrivate &&, QQuickItem *parent = 0);
 
-    bool isPressAndHoldConnected();
+    Q_DECLARE_PRIVATE(UCAbstractButton)
+    Q_PRIVATE_SLOT(d_func(), void _q_mouseAreaPressed())
+    Q_PRIVATE_SLOT(d_func(), void _q_mouseAreaClicked())
+    Q_PRIVATE_SLOT(d_func(), void _q_mouseAreaPressAndHold())
 };
 
 #endif // UCABSTRACTBUTTON_H

=== added file 'src/Ubuntu/Components/plugin/ucabstractbutton_p.h'
--- src/Ubuntu/Components/plugin/ucabstractbutton_p.h	1970-01-01 00:00:00 +0000
+++ src/Ubuntu/Components/plugin/ucabstractbutton_p.h	2015-12-11 12:19:41 +0000
@@ -0,0 +1,50 @@
+/*
+ * Copyright 2015 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef UCABSTRACTBUTTON_P
+#define UCABSTRACTBUTTON_P
+
+#include "ucabstractbutton.h"
+#include "ucactionitem_p.h"
+
+class UCAbstractButtonPrivate : public UCActionItemPrivate
+{
+    Q_DECLARE_PUBLIC(UCAbstractButton)
+public:
+    static UCAbstractButtonPrivate *get(UCAbstractButton *item)
+    {
+        return item->d_func();
+    }
+
+    UCAbstractButtonPrivate();
+    void init();
+
+    void completeComponentInitialization() override;
+
+    bool isPressAndHoldConnected();
+
+    // private slots
+    void _q_mouseAreaPressed();
+    void _q_mouseAreaClicked();
+    void _q_mouseAreaPressAndHold();
+
+    QQuickMouseArea *mouseArea;
+    bool acceptEvents:1;
+    bool pressAndHoldConnected:1;
+};
+
+#endif // UCABSTRACTBUTTON_P
+

=== modified file 'src/Ubuntu/Components/plugin/ucaction.h'
--- src/Ubuntu/Components/plugin/ucaction.h	2015-12-08 15:13:49 +0000
+++ src/Ubuntu/Components/plugin/ucaction.h	2015-12-11 12:19:41 +0000
@@ -101,6 +101,7 @@
 
     friend class UCActionContext;
     friend class UCActionItem;
+    friend class UCActionItemPrivate;
     friend class UCListItemPrivate;
     friend class UCListItemAttached;
     friend class UCListItemActionsPrivate;

=== modified file 'src/Ubuntu/Components/plugin/ucactionitem.cpp'
--- src/Ubuntu/Components/plugin/ucactionitem.cpp	2015-09-16 05:26:36 +0000
+++ src/Ubuntu/Components/plugin/ucactionitem.cpp	2015-12-11 12:19:41 +0000
@@ -15,12 +15,26 @@
  */
 
 #include "ucactionitem.h"
+#include "ucactionitem_p.h"
 #include "ucaction.h"
 #include "ucstyleditembase_p.h"
 #define foreach Q_FOREACH
 #include <QtQml/private/qqmlbinding_p.h>
 #undef foreach
 
+UCActionItemPrivate::UCActionItemPrivate()
+    : action(Q_NULLPTR)
+    , flags(0)
+{
+}
+
+void UCActionItemPrivate::init()
+{
+    Q_Q(UCActionItem);
+    QObject::connect(q, &UCActionItem::enabledChanged, q, &UCActionItem::enabledChanged2);
+    QObject::connect(q, &UCActionItem::visibleChanged, q, &UCActionItem::visibleChanged2);
+}
+
 /*!
  * \qmltype ActionItem
  * \instantiates UCActionItem
@@ -40,57 +54,61 @@
  * Called when the actionItem is triggered.
  */
 UCActionItem::UCActionItem(QQuickItem *parent)
-    : UCStyledItemBase(parent)
-    , m_action(Q_NULLPTR)
-    , m_flags(0)
-{
-    connect(this, &UCActionItem::enabledChanged, this, &UCActionItem::enabledChanged2);
-    connect(this, &UCActionItem::visibleChanged, this, &UCActionItem::visibleChanged2);
-}
-
-bool UCActionItem::hasBindingOnProperty(const QString &name)
-{
-    QQmlProperty property(this, name, qmlContext(this));
+    : UCStyledItemBase(*(new UCActionItemPrivate), parent)
+{
+    d_func()->init();
+}
+
+UCActionItem::UCActionItem(UCActionItemPrivate &dd, QQuickItem *parent)
+    : UCStyledItemBase(dd, parent)
+{
+    d_func()->init();
+}
+
+bool UCActionItemPrivate::hasBindingOnProperty(const QString &name)
+{
+    Q_Q(UCActionItem);
+    QQmlProperty property(q, name, qmlContext(q));
     return QQmlPropertyPrivate::binding(property) != Q_NULLPTR;
 }
 
-void UCActionItem::componentComplete()
+void UCActionItemPrivate::completeComponentInitialization()
 {
-    UCStyledItemBase::componentComplete();
+    UCStyledItemBasePrivate::completeComponentInitialization();
     // make sure we connect to the right signals, so we detach and re-attach actions
     // to make sure the SLOT macro picks up the custom trigger() slot
-    if (m_action) {
+    if (action) {
         attachAction(false);
         attachAction(true);
     }
 }
 
 // update visible property
-void UCActionItem::_q_visibleBinding()
+void UCActionItemPrivate::_q_visibleBinding()
 {
-    if (m_flags & CustomVisible) {
+    if (flags & CustomVisible) {
         return;
     }
     if (hasBindingOnProperty(QStringLiteral("visible"))) {
-        m_flags |= CustomEnabled;
+        flags |= CustomEnabled;
         return;
     }
-    bool visible = m_action ? m_action->m_visible : true;
-    setVisible(visible);
+    bool visible = action ? action->m_visible : true;
+    q_func()->setVisible(visible);
 }
 
 // update enabled property
-void UCActionItem::_q_enabledBinding()
+void UCActionItemPrivate::_q_enabledBinding()
 {
-    if (m_flags & CustomEnabled) {
+    if (flags & CustomEnabled) {
         return;
     }
     if (hasBindingOnProperty(QStringLiteral("enabled"))) {
-        m_flags |= CustomEnabled;
+        flags |= CustomEnabled;
         return;
     }
-    bool enabled = m_action ? m_action->m_enabled : true;
-    setEnabled(enabled);
+    bool enabled = action ? action->m_enabled : true;
+    q_func()->setEnabled(enabled);
 }
 
 // setter called when bindings from QML set the value. Internal functions will
@@ -99,75 +117,77 @@
 void UCActionItem::setVisible2(bool visible)
 {
     // set the custom flag and forward the value to the original proepry setter
-    m_flags |= CustomVisible;
+    d_func()->flags |= UCActionItemPrivate::CustomVisible;
     setVisible(visible);
 }
 void UCActionItem::setEnabled2(bool enabled)
 {
-    m_flags |= CustomEnabled;
+    d_func()->flags |= UCActionItemPrivate::CustomEnabled;
     setEnabled(enabled);
 }
 
-void UCActionItem::updateProperties()
+void UCActionItemPrivate::updateProperties()
 {
-    if (!(m_flags & CustomText)) {
-        Q_EMIT textChanged();
-    }
-    if (!(m_flags & CustomIconSource)) {
-        Q_EMIT iconSourceChanged();
-    }
-    if (!(m_flags & CustomIconName)) {
-        Q_EMIT iconNameChanged();
+    Q_Q(UCActionItem);
+    if (!(flags & CustomText)) {
+        Q_EMIT q->textChanged();
+    }
+    if (!(flags & CustomIconSource)) {
+        Q_EMIT q->iconSourceChanged();
+    }
+    if (!(flags & CustomIconName)) {
+        Q_EMIT q->iconNameChanged();
     }
 }
 
-void UCActionItem::attachAction(bool attach)
+void UCActionItemPrivate::attachAction(bool attach)
 {
+    Q_Q(UCActionItem);
     if (attach) {
-        connect(this, SIGNAL(triggered(QVariant)),
-                m_action, SLOT(trigger(QVariant)), Qt::DirectConnection);
-        if (!(m_flags & CustomVisible)) {
-            connect(m_action, &UCAction::visibleChanged,
-                    this, &UCActionItem::_q_visibleBinding, Qt::DirectConnection);
-        }
-        if (!(m_flags & CustomEnabled)) {
-            connect(m_action, &UCAction::enabledChanged,
-                    this, &UCActionItem::_q_enabledBinding, Qt::DirectConnection);
-        }
-        if (!(m_flags & CustomText)) {
-            connect(m_action, &UCAction::textChanged,
-                    this, &UCActionItem::textChanged, Qt::DirectConnection);
-        }
-        if (!(m_flags & CustomIconSource)) {
-            connect(m_action, &UCAction::iconSourceChanged,
-                    this, &UCActionItem::iconSourceChanged, Qt::DirectConnection);
-        }
-        if (!(m_flags & CustomIconName)) {
-            connect(m_action, &UCAction::iconNameChanged,
-                    this, &UCActionItem::iconNameChanged, Qt::DirectConnection);
+        QObject::connect(q, SIGNAL(triggered(QVariant)),
+                action, SLOT(trigger(QVariant)), Qt::DirectConnection);
+        if (!(flags & CustomVisible)) {
+            QObject::connect(action, SIGNAL(visibleChanged()),
+                    q, SLOT(_q_visibleBinding()), Qt::DirectConnection);
+        }
+        if (!(flags & CustomEnabled)) {
+            QObject::connect(action, SIGNAL(enabledChanged()),
+                    q, SLOT(_q_enabledBinding()), Qt::DirectConnection);
+        }
+        if (!(flags & CustomText)) {
+            QObject::connect(action, &UCAction::textChanged,
+                    q, &UCActionItem::textChanged, Qt::DirectConnection);
+        }
+        if (!(flags & CustomIconSource)) {
+            QObject::connect(action, &UCAction::iconSourceChanged,
+                    q, &UCActionItem::iconSourceChanged, Qt::DirectConnection);
+        }
+        if (!(flags & CustomIconName)) {
+            QObject::connect(action, &UCAction::iconNameChanged,
+                    q, &UCActionItem::iconNameChanged, Qt::DirectConnection);
         }
     } else {
-        disconnect(this, SIGNAL(triggered(QVariant)),
-                   m_action, SLOT(trigger(QVariant)));
-        if (!(m_flags & CustomVisible)) {
-            disconnect(m_action, &UCAction::visibleChanged,
-                       this, &UCActionItem::_q_visibleBinding);
-        }
-        if (!(m_flags & CustomEnabled)) {
-            disconnect(m_action, &UCAction::enabledChanged,
-                       this, &UCActionItem::_q_enabledBinding);
-        }
-        if (!(m_flags & CustomText)) {
-            disconnect(m_action, &UCAction::textChanged,
-                       this, &UCActionItem::textChanged);
-        }
-        if (!(m_flags & CustomIconSource)) {
-            disconnect(m_action, &UCAction::iconSourceChanged,
-                       this, &UCActionItem::iconSourceChanged);
-        }
-        if (!(m_flags & CustomIconName)) {
-            disconnect(m_action, &UCAction::iconNameChanged,
-                       this, &UCActionItem::iconNameChanged);
+        QObject::disconnect(q, SIGNAL(triggered(QVariant)),
+                   action, SLOT(trigger(QVariant)));
+        if (!(flags & CustomVisible)) {
+            QObject::disconnect(action, SIGNAL(visibleChanged()),
+                       q, SLOT(_q_visibleBinding()));
+        }
+        if (!(flags & CustomEnabled)) {
+            QObject::disconnect(action, SIGNAL(enabledChanged()),
+                       q, SLOT(_q_enabledBinding()));
+        }
+        if (!(flags & CustomText)) {
+            QObject::disconnect(action, &UCAction::textChanged,
+                       q, &UCActionItem::textChanged);
+        }
+        if (!(flags & CustomIconSource)) {
+            QObject::disconnect(action, &UCAction::iconSourceChanged,
+                       q, &UCActionItem::iconSourceChanged);
+        }
+        if (!(flags & CustomIconName)) {
+            QObject::disconnect(action, &UCAction::iconNameChanged,
+                       q, &UCActionItem::iconNameChanged);
         }
     }
 }
@@ -178,23 +198,29 @@
  * of the \l Action properties are copied to the values of the ActionItem
  * properties, unless those were previously overridden.
  */
+UCAction* UCActionItem::action() const
+{
+    Q_D(const UCActionItem);
+    return d->action;
+}
 void UCActionItem::setAction(UCAction *action)
 {
-    if (m_action == action) {
+    Q_D(UCActionItem);
+    if (d->action == action) {
         return;
     }
-    if (m_action) {
-        attachAction(false);
+    if (d->action) {
+        d->attachAction(false);
     }
-    m_action = action;
+    d->action = action;
     Q_EMIT actionChanged();
 
-    if (m_action) {
-        attachAction(true);
+    if (d->action) {
+        d->attachAction(true);
     }
-    _q_visibleBinding();
-    _q_enabledBinding();
-    updateProperties();
+    d->_q_visibleBinding();
+    d->_q_enabledBinding();
+    d->updateProperties();
 }
 
 /*!
@@ -203,32 +229,35 @@
  */
 QString UCActionItem::text()
 {
-    if (m_flags & CustomText) {
-        return m_text;
+    Q_D(UCActionItem);
+    if (d->flags & UCActionItemPrivate::CustomText) {
+        return d->text;
     }
-    return m_action ? m_action->m_text : QString();
+    return d->action ? d->action->m_text : QString();
 }
 void UCActionItem::setText(const QString &text)
 {
-    if (m_text == text) {
+    Q_D(UCActionItem);
+    if (d->text == text) {
         return;
     }
-    m_text = text;
-    if (m_action && !(m_flags & CustomText)) {
+    d->text = text;
+    if (d->action && !(d->flags & UCActionItemPrivate::CustomText)) {
         // disconnect change signal from Action
-        disconnect(m_action, &UCAction::textChanged,
+        disconnect(d->action, &UCAction::textChanged,
                    this, &UCActionItem::textChanged);
     }
-    m_flags |= CustomText;
+    d->flags |= UCActionItemPrivate::CustomText;
     Q_EMIT textChanged();
 }
 void UCActionItem::resetText()
 {
-    m_text.clear();
-    m_flags &= ~CustomText;
-    if (m_action) {
+    Q_D(UCActionItem);
+    d->text.clear();
+    d->flags &= ~UCActionItemPrivate::CustomText;
+    if (d->action) {
         // re-connect change signal from Action
-        connect(m_action, &UCAction::textChanged,
+        connect(d->action, &UCAction::textChanged,
                 this, &UCActionItem::textChanged, Qt::DirectConnection);
     }
     Q_EMIT textChanged();
@@ -243,35 +272,38 @@
  */
 QUrl UCActionItem::iconSource()
 {
-    if (m_flags & CustomIconSource) {
-        return m_iconSource;
+    Q_D(UCActionItem);
+    if (d->flags & UCActionItemPrivate::CustomIconSource) {
+        return d->iconSource;
     }
-    if (m_action) {
-        return m_action->m_iconSource;
+    if (d->action) {
+        return d->action->m_iconSource;
     }
     return !iconName().isEmpty() ? QUrl(QString("image://theme/%1").arg(iconName())) : QUrl();
 }
 void UCActionItem::setIconSource(const QUrl &iconSource)
 {
-    if (m_iconSource == iconSource) {
+    Q_D(UCActionItem);
+    if (d->iconSource == iconSource) {
         return;
     }
-    m_iconSource = iconSource;
-    if (m_action && !(m_flags & CustomIconSource)) {
+    d->iconSource = iconSource;
+    if (d->action && !(d->flags & UCActionItemPrivate::CustomIconSource)) {
         // disconnect change signal from Action
-        disconnect(m_action, &UCAction::iconSourceChanged,
+        disconnect(d->action, &UCAction::iconSourceChanged,
                    this, &UCActionItem::iconSourceChanged);
     }
-    m_flags |= CustomIconSource;
+    d->flags |= UCActionItemPrivate::CustomIconSource;
     Q_EMIT iconSourceChanged();
 }
 void UCActionItem::resetIconSource()
 {
-    m_iconSource.clear();
-    m_flags &= ~CustomIconSource;
-    if (m_action) {
+    Q_D(UCActionItem);
+    d->iconSource.clear();
+    d->flags &= ~UCActionItemPrivate::CustomIconSource;
+    if (d->action) {
         // re-connect change signal from Action
-        connect(m_action, &UCAction::iconSourceChanged,
+        connect(d->action, &UCAction::iconSourceChanged,
                 this, &UCActionItem::iconSourceChanged, Qt::DirectConnection);
     }
     Q_EMIT iconSourceChanged();
@@ -294,36 +326,39 @@
  */
 QString UCActionItem::iconName()
 {
-    if (m_flags & CustomIconName) {
-        return m_iconName;
+    Q_D(UCActionItem);
+    if (d->flags & UCActionItemPrivate::CustomIconName) {
+        return d->iconName;
     }
-    return m_action ? m_action->m_iconName : QString();
+    return d->action ? d->action->m_iconName : QString();
 }
 void UCActionItem::setIconName(const QString &iconName)
 {
-    if (m_iconName == iconName) {
+    Q_D(UCActionItem);
+    if (d->iconName == iconName) {
         return;
     }
-    m_iconName = iconName;
-    if (m_action && !(m_flags & CustomIconName)) {
+    d->iconName = iconName;
+    if (d->action && !(d->flags & UCActionItemPrivate::CustomIconName)) {
         // disconnect change signal from Action
-        disconnect(m_action, &UCAction::iconNameChanged,
+        disconnect(d->action, &UCAction::iconNameChanged,
                    this, &UCActionItem::iconNameChanged);
     }
-    m_flags |= CustomIconName;
+    d->flags |= UCActionItemPrivate::CustomIconName;
     Q_EMIT iconNameChanged();
     // also sync iconSource if that is not a custom one or taken from action
-    if (!m_action || (m_flags & CustomIconSource)) {
+    if (!d->action || (d->flags & UCActionItemPrivate::CustomIconSource)) {
         Q_EMIT iconSourceChanged();
     }
 }
 void UCActionItem::resetIconName()
 {
-    m_iconName.clear();
-    m_flags &= ~CustomIconName;
-    if (m_action) {
+    Q_D(UCActionItem);
+    d->iconName.clear();
+    d->flags &= ~UCActionItemPrivate::CustomIconName;
+    if (d->action) {
         // re-connect change signal from Action
-        connect(m_action, &UCAction::iconNameChanged,
+        connect(d->action, &UCAction::iconNameChanged,
                 this, &UCActionItem::iconNameChanged, Qt::DirectConnection);
     }
     Q_EMIT iconNameChanged();
@@ -339,3 +374,5 @@
         Q_EMIT triggered(value);
     }
 }
+
+#include "moc_ucactionitem.cpp"

=== modified file 'src/Ubuntu/Components/plugin/ucactionitem.h'
--- src/Ubuntu/Components/plugin/ucactionitem.h	2015-09-16 05:26:36 +0000
+++ src/Ubuntu/Components/plugin/ucactionitem.h	2015-12-11 12:19:41 +0000
@@ -19,10 +19,11 @@
 #include "ucstyleditembase.h"
 
 class UCAction;
+class UCActionItemPrivate;
 class UCActionItem : public UCStyledItemBase
 {
     Q_OBJECT
-    Q_PROPERTY(UCAction *action MEMBER m_action WRITE setAction NOTIFY actionChanged FINAL)
+    Q_PROPERTY(UCAction *action READ action WRITE setAction NOTIFY actionChanged FINAL)
     Q_PROPERTY(QString text READ text WRITE setText RESET resetText NOTIFY textChanged)
     Q_PROPERTY(QUrl iconSource READ iconSource WRITE setIconSource RESET resetIconSource NOTIFY iconSourceChanged)
     Q_PROPERTY(QString iconName READ iconName WRITE setIconName RESET resetIconName NOTIFY iconNameChanged)
@@ -33,6 +34,7 @@
 public:
     explicit UCActionItem(QQuickItem *parent = 0);
 
+    UCAction *action() const;
     void setAction(UCAction *action);
     QString text();
     void setText(const QString &text);
@@ -60,29 +62,12 @@
 public Q_SLOTS:
     void trigger(const QVariant &value = QVariant());
 
-protected Q_SLOTS:
-    void _q_visibleBinding();
-    void _q_enabledBinding();
-
 protected:
-    enum {
-        CustomText = 0x01,
-        CustomIconSource = 0x02,
-        CustomIconName = 0x04,
-        CustomVisible = 0x40,
-        CustomEnabled = 0x80
-    };
-    QString m_text;
-    QString m_iconName;
-    QUrl m_iconSource;
-    UCAction *m_action;
-    quint8 m_flags;
-
-    void componentComplete();
-
-    bool hasBindingOnProperty(const QString &name);
-    void updateProperties();
-    void attachAction(bool attach);
+    UCActionItem(UCActionItemPrivate &, QQuickItem *parent);
+
+    Q_DECLARE_PRIVATE(UCActionItem)
+    Q_PRIVATE_SLOT(d_func(), void _q_visibleBinding())
+    Q_PRIVATE_SLOT(d_func(), void _q_enabledBinding())
 };
 
 #endif // UCACTIONITEM_H

=== added file 'src/Ubuntu/Components/plugin/ucactionitem_p.h'
--- src/Ubuntu/Components/plugin/ucactionitem_p.h	1970-01-01 00:00:00 +0000
+++ src/Ubuntu/Components/plugin/ucactionitem_p.h	2015-12-11 12:19:41 +0000
@@ -0,0 +1,63 @@
+/*
+ * Copyright 2015 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Author: Zsombor Egri <[e-mail]>
+ */
+
+#ifndef UCACTIONITEM_P
+#define UCACTIONITEM_P
+
+#include "ucactionitem.h"
+#include "ucstyleditembase_p.h"
+
+class UCActionItemPrivate : public UCStyledItemBasePrivate
+{
+    Q_DECLARE_PUBLIC(UCActionItem)
+public:
+    static UCActionItemPrivate* get(UCActionItem *item)
+    {
+        return item->d_func();
+    }
+
+    UCActionItemPrivate();
+    void init();
+
+    bool hasBindingOnProperty(const QString &name);
+    void updateProperties();
+    void attachAction(bool attach);
+
+    // overrides
+    void completeComponentInitialization() override;
+
+    // private slots
+    void _q_visibleBinding();
+    void _q_enabledBinding();
+
+    enum {
+        CustomText = 0x01,
+        CustomIconSource = 0x02,
+        CustomIconName = 0x04,
+        CustomVisible = 0x40,
+        CustomEnabled = 0x80
+    };
+    QString text;
+    QString iconName;
+    QUrl iconSource;
+    UCAction *action;
+    quint8 flags;
+};
+
+#endif // UCACTIONITEM_P
+

=== modified file 'src/Ubuntu/Components/plugin/ucbottomedge.cpp'
--- src/Ubuntu/Components/plugin/ucbottomedge.cpp	2015-12-02 15:31:53 +0000
+++ src/Ubuntu/Components/plugin/ucbottomedge.cpp	2015-12-11 12:19:41 +0000
@@ -19,7 +19,7 @@
 #include "ucbottomedge_p.h"
 #include "ucbottomedgestyle.h"
 #include "ucbottomedgeregion.h"
-#include "ucbottomedgehint.h"
+#include "ucbottomedgehint_p.h"
 #include "ucstyleditembase_p.h"
 #include <QtQml/QQmlEngine>
 #include <QtGui/QScreen>
@@ -737,26 +737,26 @@
     initializeComponent();
 }
 
-void UCBottomEdge::componentComplete()
+void UCBottomEdgePrivate::completeComponentInitialization()
 {
-    UCStyledItemBase::componentComplete();
-    Q_D(UCBottomEdge);
+    UCStyledItemBasePrivate::completeComponentInitialization();
+    Q_Q(UCBottomEdge);
     // fix the hint's style version as that has no qmlContext of its own
     // and thus import version check will fail; setting the context for
     // the hint using this component's hint won't work either as this
     // component's context does not contain the properties from the hint.
-    UCStyledItemBasePrivate *hintPrivate = UCStyledItemBasePrivate::get(d->hint);
-    hintPrivate->styleVersion = d->styleVersion;
-    // also set the qml data as hitn does not have that either
-    QQmlData::get(d->hint, true);
-    QQmlEngine::setContextForObject(d->hint, new QQmlContext(qmlContext(this), d->hint));
+    UCBottomEdgeHintPrivate *hintPrivate = UCBottomEdgeHintPrivate::get(hint);
+    hintPrivate->styleVersion = styleVersion;
+    // also set the qml data as hint does not have that either
+    QQmlData::get(hint, true);
+    QQmlEngine::setContextForObject(hint, new QQmlContext(qmlContext(q), hint));
     // finally complete hint creation
-    hintPrivate->completeStyledItem();
+    hintPrivate->completeComponentInitialization();
     // and validate regions, leave out the first one as that supposed to be added first
     // mimic the top limit of the regions list like we would add them one by one
-    for (int i = 1; i < d->regions.size(); ++i) {
-        UCBottomEdgeRegion *region = d->regions[i];
-        d->validateRegion(region, i);
+    for (int i = 1; i < regions.size(); ++i) {
+        UCBottomEdgeRegion *region = regions[i];
+        validateRegion(region, i);
     }
 }
 

=== modified file 'src/Ubuntu/Components/plugin/ucbottomedge.h'
--- src/Ubuntu/Components/plugin/ucbottomedge.h	2015-11-24 13:41:47 +0000
+++ src/Ubuntu/Components/plugin/ucbottomedge.h	2015-12-11 12:19:41 +0000
@@ -101,7 +101,6 @@
 
     void initializeComponent();
     void classBegin();
-    void componentComplete();
     void itemChange(ItemChange change, const ItemChangeData &data);
     bool eventFilter(QObject *target, QEvent *event) override;
 

=== modified file 'src/Ubuntu/Components/plugin/ucbottomedge_p.h'
--- src/Ubuntu/Components/plugin/ucbottomedge_p.h	2015-12-01 20:34:50 +0000
+++ src/Ubuntu/Components/plugin/ucbottomedge_p.h	2015-12-11 12:19:41 +0000
@@ -37,6 +37,8 @@
     }
     void init();
 
+    void completeComponentInitialization() override;
+
     // data property
     QQmlListProperty<QObject> data();
     static void overload_data_append(QQmlListProperty<QObject> *, QObject *);

=== modified file 'src/Ubuntu/Components/plugin/ucbottomedgehint.cpp'
--- src/Ubuntu/Components/plugin/ucbottomedgehint.cpp	2015-12-03 11:50:40 +0000
+++ src/Ubuntu/Components/plugin/ucbottomedgehint.cpp	2015-12-11 12:19:41 +0000
@@ -17,6 +17,7 @@
  */
 
 #include "ucbottomedgehint.h"
+#include "ucbottomedgehint_p.h"
 #include "ucstyleditembase_p.h"
 #include "quickutils.h"
 #include "ucunits.h"
@@ -27,6 +28,45 @@
 
 #define SWIPE_AREA_HEIGHT_GU    3
 
+UCBottomEdgeHintPrivate::UCBottomEdgeHintPrivate()
+    : UCActionItemPrivate()
+    , swipeArea(new UCSwipeArea)
+    , flickable(Q_NULLPTR)
+    , flickableBottomMargin(Q_NULLPTR)
+    , deactivateTimeout(800)
+    // FIXME: we need QInputDeviceInfo to be complete with the locked!!
+    // https://bugs.launchpad.net/ubuntu/+source/ubuntu-ui-toolkit/+bug/1276808
+    , status(QuickUtils::instance().mouseAttached() ? UCBottomEdgeHint::Locked : UCBottomEdgeHint::Inactive)
+    , pressed(false)
+{
+}
+
+void UCBottomEdgeHintPrivate::init()
+{
+    Q_Q(UCBottomEdgeHint);
+    QObject::connect(q, &UCBottomEdgeHint::clicked, [=]() {
+        // make sure the overloaded trigger is called!
+        q->metaObject()->invokeMethod(q, "trigger", Q_ARG(QVariant, QVariant()));
+    });
+    /*
+     * we cannot use setStyleName as that will trigger style loading
+     * and the qmlEngine is not known at this phase of the of the initialization
+     * Therefore we simply set the style name default. Style loading will
+     * happen during component completion.
+     */
+    styleDocument = "BottomEdgeHintStyle";
+
+    // connect old stateChanged
+    QObject::connect(q, &QQuickItem::stateChanged, q, &UCBottomEdgeHint::stateChanged);
+
+    // FIXME: use QInputDeviceInfo once available
+    // https://bugs.launchpad.net/ubuntu/+source/ubuntu-ui-toolkit/+bug/1276808
+    QObject::connect(&QuickUtils::instance(), &QuickUtils::mouseAttachedChanged, q, &UCBottomEdgeHint::onMouseAttached);
+
+    // accept mouse events
+    q->setAcceptedMouseButtons(Qt::LeftButton);
+}
+
 /*!
     \qmltype BottomEdgeHint
     \inqmlmodule Ubuntu.Components 1.3
@@ -54,36 +94,15 @@
     The component is styled through \b BottomEdgeHintStyle.
 */
 UCBottomEdgeHint::UCBottomEdgeHint(QQuickItem *parent)
-    : UCActionItem(parent)
-    , m_swipeArea(new UCSwipeArea)
-    , m_flickable(Q_NULLPTR)
-    , m_deactivateTimeout(800)
-    // FIXME: we need QInputDeviceInfo to be complete with the locked!!
-    // https://bugs.launchpad.net/ubuntu/+source/ubuntu-ui-toolkit/+bug/1276808
-    , m_status(QuickUtils::instance().mouseAttached() ? Locked : Inactive)
-    , m_pressed(false)
-{
-    connect(this, &UCBottomEdgeHint::clicked, [=]() {
-        // make sure the overloaded trigger is called!
-        metaObject()->invokeMethod(this, "trigger", Q_ARG(QVariant, QVariant()));
-    });
-    /*
-     * we cannot use setStyleName as that will trigger style loading
-     * and the qmlEngine is not known at this phase of the of the initialization
-     * Therefore we simply set the style name default. Style loading will
-     * happen during component completion.
-     */
-    UCStyledItemBasePrivate::get(this)->styleDocument = "BottomEdgeHintStyle";
-
-    // connect old stateChanged
-    connect(this, &QQuickItem::stateChanged, this, &UCBottomEdgeHint::stateChanged);
-
-    // FIXME: use QInputDeviceInfo once available
-    // https://bugs.launchpad.net/ubuntu/+source/ubuntu-ui-toolkit/+bug/1276808
-    connect(&QuickUtils::instance(), &QuickUtils::mouseAttachedChanged, this, &UCBottomEdgeHint::onMouseAttached);
-
-    // accept mouse events
-    setAcceptedMouseButtons(Qt::LeftButton);
+    : UCActionItem(*(new UCBottomEdgeHintPrivate), parent)
+{
+    d_func()->init();
+}
+
+UCBottomEdgeHint::UCBottomEdgeHint(UCBottomEdgeHintPrivate &&dd, QQuickItem *parent)
+    : UCActionItem(dd, parent)
+{
+    d_func()->init();
 }
 
 void UCBottomEdgeHint::classBegin()
@@ -94,57 +113,61 @@
 
 void UCBottomEdgeHint::init()
 {
-    QQml_setParent_noEvent(m_swipeArea, this);
-    m_swipeArea->setParentItem(this);
+    Q_D(UCBottomEdgeHint);
+    QQml_setParent_noEvent(d->swipeArea, this);
+    d->swipeArea->setParentItem(this);
 
     // set context
-    QQmlEngine::setContextForObject(m_swipeArea, qmlContext(this));
+    QQmlEngine::setContextForObject(d->swipeArea, qmlContext(this));
 
     // initialize swipe area size
-    QQuickAnchors *anchors = QQuickItemPrivate::get(m_swipeArea)->anchors();
+    QQuickAnchors *anchors = QQuickItemPrivate::get(d->swipeArea)->anchors();
     QQuickItemPrivate *thisPrivate = QQuickItemPrivate::get(this);
     anchors->setLeft(thisPrivate->left());
     anchors->setBottom(thisPrivate->bottom());
     anchors->setRight(thisPrivate->right());
-    m_swipeArea->setImplicitHeight(UCUnits::instance().gu(SWIPE_AREA_HEIGHT_GU));
+    d->swipeArea->setImplicitHeight(UCUnits::instance().gu(SWIPE_AREA_HEIGHT_GU));
 
     // direction
-    m_swipeArea->setDirection(UCSwipeArea::Upwards);
+    d->swipeArea->setDirection(UCSwipeArea::Upwards);
 
     // grid unit sync
     connect(&UCUnits::instance(), &UCUnits::gridUnitChanged, this, &UCBottomEdgeHint::onGridUnitChanged);
 
     // connect to gesture detection
-    connect(m_swipeArea, &UCSwipeArea::draggingChanged,
+    connect(d->swipeArea, &UCSwipeArea::draggingChanged,
             this, &UCBottomEdgeHint::onDraggingChanged, Qt::DirectConnection);
 }
 
 void UCBottomEdgeHint::onMouseAttached()
 {
+    Q_D(UCBottomEdgeHint);
     setStatus(QuickUtils::instance().mouseAttached() ? Locked : Active);
-    if (m_status == Active) {
-        m_deactivationTimer.start(m_deactivateTimeout, this);
-        if (m_flickableBottomMargin) {
-            delete m_flickableBottomMargin;
-            m_flickableBottomMargin = Q_NULLPTR;
+    if (d->status == Active) {
+        d->deactivationTimer.start(d->deactivateTimeout, this);
+        if (d->flickableBottomMargin) {
+            delete d->flickableBottomMargin;
+            d->flickableBottomMargin = Q_NULLPTR;
         }
-    } else if (m_flickable) {
+    } else if (d->flickable) {
         adjustFlickableBottomMargin();
     }
 }
 
 void UCBottomEdgeHint::adjustFlickableBottomMargin()
 {
-    if (!m_flickableBottomMargin) {
-        m_flickableBottomMargin = new PropertyChange(m_flickable, "bottomMargin");
+    Q_D(UCBottomEdgeHint);
+    if (!d->flickableBottomMargin) {
+        d->flickableBottomMargin = new PropertyChange(d->flickable, "bottomMargin");
     }
-    PropertyChange::setValue(m_flickableBottomMargin, height());
-    m_flickable->setContentY(m_flickable->contentY() + height());
+    PropertyChange::setValue(d->flickableBottomMargin, height());
+    d->flickable->setContentY(d->flickable->contentY() + height());
 }
 
 void UCBottomEdgeHint::onGridUnitChanged()
 {
-    m_swipeArea->setImplicitHeight(UCUnits::instance().gu(SWIPE_AREA_HEIGHT_GU));
+    Q_D(UCBottomEdgeHint);
+    d->swipeArea->setImplicitHeight(UCUnits::instance().gu(SWIPE_AREA_HEIGHT_GU));
 }
 
 void UCBottomEdgeHint::itemChange(ItemChange change, const ItemChangeData &data)
@@ -161,10 +184,11 @@
 
 void UCBottomEdgeHint::timerEvent(QTimerEvent *event)
 {
+    Q_D(UCBottomEdgeHint);
     UCActionItem::timerEvent(event);
-    if (event->timerId() == m_deactivationTimer.timerId()) {
+    if (event->timerId() == d->deactivationTimer.timerId()) {
         setStatus(Inactive);
-        m_deactivationTimer.stop();
+        d->deactivationTimer.stop();
     }
 }
 
@@ -180,8 +204,9 @@
 // handle click event
 void UCBottomEdgeHint::mousePressEvent(QMouseEvent *event)
 {
-    if (contains(event->localPos()) && (m_status >= Active)) {
-        m_pressed = true;
+    Q_D(UCBottomEdgeHint);
+    if (contains(event->localPos()) && (d->status >= Active)) {
+        d->pressed = true;
         event->accept();
         // also call requestFocus
         requestFocus(Qt::MouseFocusReason);
@@ -191,7 +216,8 @@
 }
 void UCBottomEdgeHint::mouseReleaseEvent(QMouseEvent *event)
 {
-    if (m_pressed && (m_status >= Active) && contains(event->localPos())) {
+    Q_D(UCBottomEdgeHint);
+    if (d->pressed && (d->status >= Active) && contains(event->localPos())) {
         Q_EMIT clicked();
         event->accept();
     } else {
@@ -202,11 +228,12 @@
 // watch gesture detection status changes
 void UCBottomEdgeHint::onDraggingChanged(bool dragging)
 {
+    Q_D(UCBottomEdgeHint);
     if (dragging) {
-        m_deactivationTimer.stop();
+        d->deactivationTimer.stop();
         setStatus(Active);
-    } else if (m_status == Active) {
-        m_deactivationTimer.start(m_deactivateTimeout, this);
+    } else if (d->status == Active) {
+        d->deactivationTimer.start(d->deactivateTimeout, this);
     }
 }
 
@@ -243,22 +270,28 @@
   which is flicking or moving. It is recommended to set the property
   when the hint is placed above a flickable content. Defaults to null.
   */
+QQuickFlickable *UCBottomEdgeHint::flickable() const
+{
+    Q_D(const UCBottomEdgeHint);
+    return d->flickable;
+}
 void UCBottomEdgeHint::setFlickable(QQuickFlickable *flickable)
 {
-    if (flickable == m_flickable) {
+    Q_D(UCBottomEdgeHint);
+    if (flickable == d->flickable) {
         return;
     }
-    if (m_flickable) {
-        disconnect(m_flickable, &QQuickFlickable::flickingChanged,
+    if (d->flickable) {
+        disconnect(d->flickable, &QQuickFlickable::flickingChanged,
                    this, &UCBottomEdgeHint::handleFlickableActivation);
-        disconnect(m_flickable, &QQuickFlickable::movingChanged,
+        disconnect(d->flickable, &QQuickFlickable::movingChanged,
                    this, &UCBottomEdgeHint::handleFlickableActivation);
     }
-    m_flickable = flickable;
-    if (m_flickable) {
-        connect(m_flickable, &QQuickFlickable::flickingChanged,
+    d->flickable = flickable;
+    if (d->flickable) {
+        connect(d->flickable, &QQuickFlickable::flickingChanged,
                 this, &UCBottomEdgeHint::handleFlickableActivation, Qt::DirectConnection);
-        connect(m_flickable, &QQuickFlickable::movingChanged,
+        connect(d->flickable, &QQuickFlickable::movingChanged,
                 this, &UCBottomEdgeHint::handleFlickableActivation, Qt::DirectConnection);
     }
     Q_EMIT flickableChanged();
@@ -267,11 +300,12 @@
 // flickable moves hide the hint only if the current status is not Locked
 void UCBottomEdgeHint::handleFlickableActivation()
 {
-    if (m_status < Locked && !m_swipeArea->dragging() && !m_deactivationTimer.isActive()) {
-        bool moving = m_flickable->isFlicking() || m_flickable->isMoving();
+    Q_D(UCBottomEdgeHint);
+    if (d->status < Locked && !d->swipeArea->dragging() && !d->deactivationTimer.isActive()) {
+        bool moving = d->flickable->isFlicking() || d->flickable->isMoving();
         if (moving) {
             setStatus(Hidden);
-        } else if (m_status == Hidden) {
+        } else if (d->status == Hidden) {
             setStatus(Inactive);
         }
     }
@@ -305,7 +339,8 @@
     QQuickItem::setState(state);
 
     qmlInfo(this) << "Overloaded 'state' property deprecated, will be removed from 1.3 release. Use 'status' instead.";
-    QQuickItem *style = UCStyledItemBasePrivate::get(this)->styleItem;
+    Q_D(UCBottomEdgeHint);
+    QQuickItem *style = d->styleItem;
     if (!style) {
         return;
     }
@@ -356,10 +391,11 @@
 {
     // FIXME: we won't need this once we get the QInputDeviceInfo reporting mouse attach/detach
     // https://bugs.launchpad.net/ubuntu/+source/ubuntu-ui-toolkit/+bug/1276808
+    Q_D(UCBottomEdgeHint);
     if (QuickUtils::instance().mouseAttached()) {
-        m_status = Locked;
+        d->status = Locked;
     }
-    return m_status;
+    return d->status;
 }
 
 void UCBottomEdgeHint::setStatus(Status status)
@@ -367,17 +403,18 @@
     // FIXME: we need QInputDeviceInfo to complete this!
     // https://bugs.launchpad.net/ubuntu/+source/ubuntu-ui-toolkit/+bug/1276808
     // cannot unlock if mouse is attached or we don't have touch screen available
-    if (status == m_status || (status != Locked && QuickUtils::instance().mouseAttached())) {
+    Q_D(UCBottomEdgeHint);
+    if (status == d->status || (status != Locked && QuickUtils::instance().mouseAttached())) {
         return;
     }
     // if the previous state was Locked and the new one is Active, start deactivation timer
-    if (m_status == Locked && status == Active && !m_deactivationTimer.isActive()) {
-        m_deactivationTimer.start(m_deactivateTimeout, this);
-    } else if (status != Active && m_deactivationTimer.isActive()) {
+    if (d->status == Locked && status == Active && !d->deactivationTimer.isActive()) {
+        d->deactivationTimer.start(d->deactivateTimeout, this);
+    } else if (status != Active && d->deactivationTimer.isActive()) {
         // make sure we stop the deactivation timer if Inactive or Locked
-        m_deactivationTimer.stop();
+        d->deactivationTimer.stop();
     }
-    m_status = status;
+    d->status = status;
     Q_EMIT statusChanged();
 }
 
@@ -388,16 +425,21 @@
  * is only possible when mouse is not attached to the device. Defaults to 800
  * milliseconds.
  */
-
+int UCBottomEdgeHint::deactivateTimeout() const
+{
+    Q_D(const UCBottomEdgeHint);
+    return d->deactivateTimeout;
+}
 void UCBottomEdgeHint::setDeactivateTimeout(int timeout)
 {
-    if (timeout == m_deactivateTimeout || timeout < 0) {
+    Q_D(UCBottomEdgeHint);
+    if (timeout == d->deactivateTimeout || timeout < 0) {
         return;
     }
-    m_deactivateTimeout = timeout;
-    if (m_deactivationTimer.isActive()) {
-        m_deactivationTimer.stop();
-        m_deactivationTimer.start(m_deactivateTimeout, this);
+    d->deactivateTimeout = timeout;
+    if (d->deactivationTimer.isActive()) {
+        d->deactivationTimer.stop();
+        d->deactivationTimer.start(d->deactivateTimeout, this);
     }
     Q_EMIT deactivateTimeoutChanged();
 }
@@ -408,3 +450,9 @@
  * The property specifies the SwipeArea attached to the component driving its
  * behavior.
  */
+UCSwipeArea *UCBottomEdgeHint::swipeArea() const
+{
+    return d_func()->swipeArea;
+}
+
+#include "moc_ucbottomedgehint.cpp"

=== modified file 'src/Ubuntu/Components/plugin/ucbottomedgehint.h'
--- src/Ubuntu/Components/plugin/ucbottomedgehint.h	2015-12-03 11:50:40 +0000
+++ src/Ubuntu/Components/plugin/ucbottomedgehint.h	2015-12-11 12:19:41 +0000
@@ -24,13 +24,14 @@
 class QQuickFlickable;
 class UCSwipeArea;
 class PropertyChange;
+class UCBottomEdgeHintPrivate;
 class UCBottomEdgeHint : public UCActionItem
 {
     Q_OBJECT
     Q_ENUMS(Status)
-    Q_PROPERTY(QQuickFlickable *flickable MEMBER m_flickable WRITE setFlickable NOTIFY flickableChanged FINAL)
-    Q_PROPERTY(Status status MEMBER m_status WRITE setStatus NOTIFY statusChanged FINAL)
-    Q_PROPERTY(int deactivateTimeout MEMBER m_deactivateTimeout WRITE setDeactivateTimeout NOTIFY deactivateTimeoutChanged FINAL)
+    Q_PROPERTY(QQuickFlickable *flickable READ flickable WRITE setFlickable NOTIFY flickableChanged FINAL)
+    Q_PROPERTY(Status status READ status WRITE setStatus NOTIFY statusChanged FINAL)
+    Q_PROPERTY(int deactivateTimeout READ deactivateTimeout WRITE setDeactivateTimeout NOTIFY deactivateTimeoutChanged FINAL)
     Q_PROPERTY(UCSwipeArea* swipeArea READ swipeArea CONSTANT FINAL)
     // deprecated
     Q_PROPERTY(QString state READ state WRITE setState NOTIFY stateChanged)
@@ -43,14 +44,13 @@
     };
     explicit UCBottomEdgeHint(QQuickItem *parent = 0);
 
+    QQuickFlickable *flickable() const;
     void setFlickable(QQuickFlickable *flickable);
     Status status();
     void setStatus(Status status);
+    int deactivateTimeout() const;
     void setDeactivateTimeout(int timeout);
-    UCSwipeArea *swipeArea() const
-    {
-        return m_swipeArea;
-    }
+    UCSwipeArea *swipeArea() const;
 
     // deprecated
     QString state() const;
@@ -69,6 +69,7 @@
     // deprecated
     void stateChanged();
 protected:
+    UCBottomEdgeHint(UCBottomEdgeHintPrivate &&, QQuickItem *parent);
     void classBegin();
     void itemChange(ItemChange change, const ItemChangeData &data);
     void timerEvent(QTimerEvent *event);
@@ -84,13 +85,7 @@
     void onGridUnitChanged();
 
 private:
-    QBasicTimer m_deactivationTimer;
-    UCSwipeArea *m_swipeArea;
-    QQuickFlickable *m_flickable;
-    PropertyChange *m_flickableBottomMargin = nullptr;
-    int m_deactivateTimeout;
-    Status m_status;
-    bool m_pressed:1;
+    Q_DECLARE_PRIVATE(UCBottomEdgeHint)
 
     friend class UCBottomEdge;
 

=== added file 'src/Ubuntu/Components/plugin/ucbottomedgehint_p.h'
--- src/Ubuntu/Components/plugin/ucbottomedgehint_p.h	1970-01-01 00:00:00 +0000
+++ src/Ubuntu/Components/plugin/ucbottomedgehint_p.h	2015-12-11 12:19:41 +0000
@@ -0,0 +1,46 @@
+/*
+ * Copyright 2015 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authors: Zsombor Egri <[e-mail]>
+ */
+
+#ifndef UCBOTTOMEDGEHINT_P
+#define UCBOTTOMEDGEHINT_P
+
+#include "ucbottomedgehint.h"
+#include "ucactionitem_p.h"
+
+class UCBottomEdgeHintPrivate : public UCActionItemPrivate
+{
+    Q_DECLARE_PUBLIC(UCBottomEdgeHint)
+public:
+    static UCBottomEdgeHintPrivate *get(UCBottomEdgeHint *item)
+    {
+        return item->d_func();
+    }
+    UCBottomEdgeHintPrivate();
+    void init();
+
+    QBasicTimer deactivationTimer;
+    UCSwipeArea *swipeArea;
+    QQuickFlickable *flickable;
+    PropertyChange *flickableBottomMargin;
+    int deactivateTimeout;
+    UCBottomEdgeHint::Status status;
+    bool pressed:1;
+};
+
+#endif // UCBOTTOMEDGEHINT_P
+

=== modified file 'src/Ubuntu/Components/plugin/ucstyleditembase.cpp'
--- src/Ubuntu/Components/plugin/ucstyleditembase.cpp	2015-12-01 00:44:21 +0000
+++ src/Ubuntu/Components/plugin/ucstyleditembase.cpp	2015-12-11 12:19:41 +0000
@@ -479,7 +479,12 @@
     }
 }
 
-void UCStyledItemBasePrivate::completeStyledItem()
+/*
+ * The method is called on component completion, separated for the cases when
+ * the component is embedded in another CPP component and functionality depends
+ * on this initialization.
+ */
+void UCStyledItemBasePrivate::completeComponentInitialization()
 {
     // no animation at this time
     // prepare style context if not been done yet
@@ -494,7 +499,7 @@
     // make sure the theme version is up to date
     d->styleVersion = d->importVersion(this);
     UCTheme::checkMixedVersionImports(this, d->styleVersion);
-    d->completeStyledItem();
+    d->completeComponentInitialization();
 }
 
 void UCStyledItemBase::itemChange(ItemChange change, const ItemChangeData &data)

=== modified file 'src/Ubuntu/Components/plugin/ucstyleditembase_p.h'
--- src/Ubuntu/Components/plugin/ucstyleditembase_p.h	2015-11-23 20:03:32 +0000
+++ src/Ubuntu/Components/plugin/ucstyleditembase_p.h	2015-12-11 12:19:41 +0000
@@ -56,7 +56,7 @@
     virtual void preStyleChanged();
     virtual void postStyleChanged() {}
     virtual bool loadStyleItem(bool animated = true);
-    virtual void completeStyledItem();
+    virtual void completeComponentInitialization();
 
     // from UCImportVersionChecker
     virtual QString propertyForVersion(quint16 version) const;