Merge lp:~loic.molinari/ubuntu-ui-toolkit/ubuntu-ui-toolkit-use-set-implicit-size into lp:ubuntu-ui-toolkit/staging

[Loïc Molinari]

[UbuntuShape] Code clean up.

Made use of a single QQuickItem::setImplicitSize() call instead of two QQuickItem::setImplicitWidth() and QQuickItem::setImplicitHeight() calls.

[UbuntuShape] Code clean up.

Made use of a single QQuickItem::setImplicitSize() call instead of two QQuickItem::setImplicitWidth() and QQuickItem::setImplicitHeight() calls.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1341
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/1521/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/1661/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-amd64-ci/248/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/251/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-i386-ci/248/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1659/console

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

review: Needs Fixing (continuous-integration)

Unmerged revisions

1341. By Loïc Molinari on 2015-03-05

Made use of setImplicitSize instead of setImplicit[Width,Height].

=== modified file 'modules/Ubuntu/Components/plugin/ucubuntushape.cpp'
--- modules/Ubuntu/Components/plugin/ucubuntushape.cpp	2015-03-05 10:25:20 +0000
+++ modules/Ubuntu/Components/plugin/ucubuntushape.cpp	2015-03-05 10:25:21 +0000
@@ -291,8 +291,7 @@
     QObject::connect(&UCUnits::instance(), SIGNAL(gridUnitChanged()), this,
                      SLOT(_q_gridUnitChanged()));
     const float gridUnit = UCUnits::instance().gridUnit();
-    setImplicitWidth(implicitWidthGU * gridUnit);
-    setImplicitHeight(implicitHeightGU * gridUnit);
+    setImplicitSize(implicitWidthGU * gridUnit, implicitHeightGU * gridUnit);
     update();
 }
 
@@ -976,8 +975,7 @@
 void UCUbuntuShape::_q_gridUnitChanged()
 {
     const float gridUnit = UCUnits::instance().gridUnit();
-    setImplicitWidth(implicitWidthGU * gridUnit);
-    setImplicitHeight(implicitHeightGU * gridUnit);
+    setImplicitSize(implicitWidthGU * gridUnit, implicitHeightGU * gridUnit);
     update();
 }