Changes: MAbstractLayoutPolicy - Rename from setObjectName to setStyleName, to mimic MWidgetController

RevBy: Stanislav

8 files changed, 61 insertions, 47 deletions

diff --git a/demos/animatedlayout/animatedlayout.cpp b/demos/animatedlayout/animatedlayout.cpp
index c2ab4882..212654eb 100644
--- a/demos/animatedlayout/animatedlayout.cpp
+++ b/demos/animatedlayout/animatedlayout.cpp
@@ -268,7 +268,7 @@ protected:
 
     void mousePressEvent(QGraphicsSceneMouseEvent *event) {
         foreach(MAbstractLayoutPolicy * policy, s_policies) {
-            policy->setObjectName(_objectName);
+            policy->setStyleName(_objectName);
         }
         MButton::mousePressEvent(event);
     }
@@ -516,7 +516,7 @@ int main(int argc, char **argv)
     }
     name_buttons[0]->click();
     foreach(MAbstractLayoutPolicy * policy, s_policies) {
-        policy->setObjectName("spacing+margins");
+        policy->setStyleName("spacing+margins");
     }
 
     s_addItemButton = new AddItemButton();
diff --git a/examples/layout/mflowlayoutpolicy/mflowlayoutpolicy.cpp b/examples/layout/mflowlayoutpolicy/mflowlayoutpolicy.cpp
index bc6ffdcc..060c5f8f 100644
--- a/examples/layout/mflowlayoutpolicy/mflowlayoutpolicy.cpp
+++ b/examples/layout/mflowlayoutpolicy/mflowlayoutpolicy.cpp
@@ -40,7 +40,7 @@ int main(int argc, char **argv)
     MLayout *layout = new MLayout;
 
     MFlowLayoutPolicy *policy = new MFlowLayoutPolicy(layout);
-    policy->setObjectName("example");
+    policy->setStyleName("example");
     policy->setRowLimit(2); //Only show 2 rows of items
 
     /* Add 20 items to the policy */
diff --git a/src/corelib/layout/mabstractlayoutpolicy.cpp b/src/corelib/layout/mabstractlayoutpolicy.cpp
index 8b1c0bdd..c5246df6 100644
--- a/src/corelib/layout/mabstractlayoutpolicy.cpp
+++ b/src/corelib/layout/mabstractlayoutpolicy.cpp
@@ -139,7 +139,7 @@ void MAbstractLayoutPolicy::updateStyle()
 
     const MAbstractLayoutPolicyStyle *style =
         static_cast<const MAbstractLayoutPolicyStyle *>(MTheme::style(
-                    "MAbstractLayoutPolicyStyle", d->objectName, "", "",
+                    "MAbstractLayoutPolicyStyle", d->styleName, "", "",
                     orientation));
 
     if (d->style != style) {
@@ -190,16 +190,24 @@ void MAbstractLayoutPolicy::applyStyle()
 
 void MAbstractLayoutPolicy::setObjectName(const QString &name)
 {
+    setStyleName(name);
+}
+void MAbstractLayoutPolicy::setStyleName(const QString &name)
+{
     Q_D(MAbstractLayoutPolicy);
-    if (name == d->objectName)
+    if (name == d->styleName)
         return;
-    d->objectName = name;
+    d->styleName = name;
     updateStyle();
 }
 QString MAbstractLayoutPolicy::objectName() const
 {
+    return styleName();
+}
+QString MAbstractLayoutPolicy::styleName() const
+{
     Q_D(const MAbstractLayoutPolicy);
-    return d->objectName;
+    return d->styleName;
 }
 
 const MAbstractLayoutPolicyStyle *MAbstractLayoutPolicy::style() const
diff --git a/src/corelib/layout/mabstractlayoutpolicy.h b/src/corelib/layout/mabstractlayoutpolicy.h
index d7ce6b73..1fccd3eb 100644
--- a/src/corelib/layout/mabstractlayoutpolicy.h
+++ b/src/corelib/layout/mabstractlayoutpolicy.h
@@ -58,14 +58,14 @@ class QGraphicsLayoutItem;
  * \section styling_policy CSS Styling of Policies
  *
  * Policies can be styled in the CSS stylesheet files, however the class name is always
- * MAbstractLayoutPolicy.  Their object name can be set with setObjectName() and they
+ * MAbstractLayoutPolicy.  Their object name can be set with setStyleName() and they
  * can be styled different depending on the current device orientation.
  *
  * For example:
  *
  * \code
  *  MLinearLayoutPolicy mypolicy(mylayout);
- *  mypolicy.setObjectName("address");
+ *  mypolicy.setStyleName("address");
  * \endcode
  *  could then be styled in the .css file with
  * \code
@@ -260,12 +260,12 @@ public:
 
     /*! \brief Sets the name of this policy, for CSS styling.
      *
-     * This is similar to QObject::setObjectName() and is used as
+     * This is similar to MWidgetController::setStyleName() and is used as
      * the object name for the MStyle object name.
      * For example:
      * \code
      *  MLinearLayoutPolicy mypolicy(mylayout);
-     *  mypolicy.setObjectName("address");
+     *  mypolicy.setStyleName("address");
      * \endcode
      *  could then be styled in the .css file with
      * \code
@@ -278,15 +278,21 @@ public:
      *
      * \param name object name
      */
-    void setObjectName(const QString &name);
+    void setStyleName(const QString &name);
 
-    /*! \brief Return the name of this policy, for CSS styling
+    /*! \brief Return the name of this policy, for CSS styling.
      *
-     * This is similar in functionality and usage to QObject::objectName()
+     * This is similar in functionality and usage to MWidgetController::styleName()
      *
-     * \sa setObjectName(const QString &)
+     * \sa setStyleName(const QString &)
      */
-    QString objectName() const;
+    QString styleName() const;
+
+    /*! \internal
+     *  For backwards compatibility - these just call setStyleName and styleName */
+    void Q_DECL_DEPRECATED setObjectName(const QString &name);
+    QString Q_DECL_DEPRECATED objectName() const;
+    /*! \internal_end */
 
     /*!
      * \brief Set the horizontal spacing.
diff --git a/src/corelib/layout/mabstractlayoutpolicy_p.h b/src/corelib/layout/mabstractlayoutpolicy_p.h
index f3006e0c..11196e13 100644
--- a/src/corelib/layout/mabstractlayoutpolicy_p.h
+++ b/src/corelib/layout/mabstractlayoutpolicy_p.h
@@ -72,8 +72,8 @@ public:
     /** Style for the abstract policy, but can be also used for inheriting policies */
     const MAbstractLayoutPolicyStyle *style;
 
-    /** Name for this policy for MStyle.  Similar to the QObject::objectName() property */
-    QString objectName;
+    /** Name for this policy for MStyle.  Similar to the MWidgetController::styleName() property */
+    QString styleName;
 
     /** List of items in this policy, as an index of layout */
     QList<int> items;
diff --git a/src/extensions/mashup/mashup/mappletinventoryview.cpp b/src/extensions/mashup/mashup/mappletinventoryview.cpp
index 89472279..31e85fe2 100644
--- a/src/extensions/mashup/mashup/mappletinventoryview.cpp
+++ b/src/extensions/mashup/mashup/mappletinventoryview.cpp
@@ -61,12 +61,12 @@ void MAppletInventoryViewPrivate::init(MAppletInventory *controller)
     appletContainer->setObjectName("MAppletInventoryAppletContainer");
     appletContainer->centralWidget()->setLayout(appletLayout);
     appletLayout->setContentsMargins(0, 0, 0, 0);
-    appletLayoutPolicy->setObjectName("MAppletInventoryFlowLayoutPolicy");
+    appletLayoutPolicy->setStyleName("MAppletInventoryFlowLayoutPolicy");
 
     // Define layout properties
     controller->setLayout(layout);
     layout->setContentsMargins(0, 0, 0, 0);
-    layoutPolicy->setObjectName("MAppletInventoryLinearLayoutPolicy");
+    layoutPolicy->setStyleName("MAppletInventoryLinearLayoutPolicy");
     layoutPolicy->addItem(appletContainer);
 
     // Set close button properties
diff --git a/src/views/mapplicationmenuview.cpp b/src/views/mapplicationmenuview.cpp
index 273a3a1d..9167c172 100644
--- a/src/views/mapplicationmenuview.cpp
+++ b/src/views/mapplicationmenuview.cpp
@@ -104,11 +104,11 @@ void MApplicationMenuViewPrivate::createPolicy(M::Orientation orientation)
     if (orientation == M::Landscape) {
         landscapePolicy = new MGridLayoutPolicy(actionCommandLayout);
         actionCommandLayout->setLandscapePolicy(landscapePolicy);
-        landscapePolicy->setObjectName("menulandscape");
+        landscapePolicy->setStyleName("menulandscape");
     } else {
         portraitPolicy = new MLinearLayoutPolicy(actionCommandLayout, Qt::Vertical);
         actionCommandLayout->setPortraitPolicy(portraitPolicy);
-        portraitPolicy->setObjectName("menuportrait");
+        portraitPolicy->setStyleName("menuportrait");
     }
 }
 
diff --git a/tests/ut_mlayout/ut_mlayout.cpp b/tests/ut_mlayout/ut_mlayout.cpp
index 1075a697..3c2ff7b4 100644
--- a/tests/ut_mlayout/ut_mlayout.cpp
+++ b/tests/ut_mlayout/ut_mlayout.cpp
@@ -1851,55 +1851,55 @@ void Ut_MLayout::testLayoutPolicyStyling()
 
     QCOMPARE(isCurrent, policy->isActive());
 
-    // The objectName of the policy should be empty be default, make sure it is:
-    QVERIFY(policy->objectName().isEmpty());
+    // The styleName of the policy should be empty be default, make sure it is:
+    QVERIFY(policy->styleName().isEmpty());
 
     QCOMPARE(MApplication::activeWindow()->orientationAngle(), M::Angle0);
 
     // The numbers which follow here are taken from the ut_mlayout.css file
     // if you change the css file, you need to keep them in sync:
     checkPolicies(layout, policy, isCurrent, policyType, -1.0, -1.0, -1.0, -1.0, 6.0, 7.0);
-    policy->setObjectName("packed");
-    QCOMPARE(policy->objectName(), QString("packed"));
+    policy->setStyleName("packed");
+    QCOMPARE(policy->styleName(), QString("packed"));
     checkPolicies(layout, policy, isCurrent, policyType, -1, 0.0, 0.0, 0.0, 0.0, 0.0);
-    policy->setObjectName("spacing");
-    QCOMPARE(policy->objectName(), QString("spacing"));
+    policy->setStyleName("spacing");
+    QCOMPARE(policy->styleName(), QString("spacing"));
     checkPolicies(layout, policy, isCurrent, policyType, -1, 0.0, 0.0, 0.0, 10.0, 11.0);
-    policy->setObjectName("margins");
-    QCOMPARE(policy->objectName(), QString("margins"));
+    policy->setStyleName("margins");
+    QCOMPARE(policy->styleName(), QString("margins"));
     checkPolicies(layout, policy, isCurrent, policyType, 10.0, 10.0, -1.0, 10.0, 0.0, 0.0);
-    policy->setObjectName("spacing+margins");
-    QCOMPARE(policy->objectName(), QString("spacing+margins"));
+    policy->setStyleName("spacing+margins");
+    QCOMPARE(policy->styleName(), QString("spacing+margins"));
     checkPolicies(layout, policy, isCurrent, policyType, 10.0, -1.0, 10.0, 10.0, 10.0, 11.0);
-    policy->setObjectName(QString::null);
-    QVERIFY(policy->objectName().isEmpty());
+    policy->setStyleName(QString::null);
+    QVERIFY(policy->styleName().isEmpty());
     checkPolicies(layout, policy, isCurrent, policyType, -1.0, -1.0, -1.0, -1.0, 6.0, 7.0);
 
     // Now rotate to portrait
     MApplication::activeWindow()->setOrientationAngle(M::Angle90);
     checkPolicies(layout, policy, isCurrent, policyType, 4.0, 5.0, 2.0, 6.0, 2.0, 3.0);
-    policy->setObjectName("packed");
-    QCOMPARE(policy->objectName(), QString("packed"));
+    policy->setStyleName("packed");
+    QCOMPARE(policy->styleName(), QString("packed"));
     checkPolicies(layout, policy, isCurrent, policyType, 1, 2.0, 3.0, 4.0, 5.0, 6.0);
 
     MApplication::activeWindow()->setOrientationAngle(M::Angle180);
-    QCOMPARE(policy->objectName(), QString("packed"));
+    QCOMPARE(policy->styleName(), QString("packed"));
     checkPolicies(layout, policy, isCurrent, policyType, -1, 0.0, 0.0, 0.0, 0.0, 0.0);
-    policy->setObjectName("spacing");
-    QCOMPARE(policy->objectName(), QString("spacing"));
+    policy->setStyleName("spacing");
+    QCOMPARE(policy->styleName(), QString("spacing"));
     checkPolicies(layout, policy, isCurrent, policyType, -1, 0.0, 0.0, 0.0, 10.0, 11.0);
 
     MApplication::activeWindow()->setOrientationAngle(M::Angle270);
-    QCOMPARE(policy->objectName(), QString("spacing"));
+    QCOMPARE(policy->styleName(), QString("spacing"));
     checkPolicies(layout, policy, isCurrent, policyType, -1, 0.0, 0.0, 0.0, 10.0, 11.0);
 
-    policy->setObjectName("packed");
-    QCOMPARE(policy->objectName(), QString("packed"));
+    policy->setStyleName("packed");
+    QCOMPARE(policy->styleName(), QString("packed"));
     checkPolicies(layout, policy, isCurrent, policyType, 1, 2.0, 3.0, 4.0, 5.0, 6.0);
 
     MApplication::activeWindow()->setOrientationAngle(M::Angle0);
-    policy->setObjectName(QString::null);
-    QVERIFY(policy->objectName().isEmpty());
+    policy->setStyleName(QString::null);
+    QVERIFY(policy->styleName().isEmpty());
     checkPolicies(layout, policy, isCurrent, policyType, -1.0, -1.0, -1.0, -1.0, 6.0, 7.0);
 }
 
@@ -2926,13 +2926,13 @@ void Ut_MLayout::testUserChangingValues()
     QCOMPARE(policy->horizontalSpacing(), 7.0);
     QCOMPARE(policy->verticalSpacing(), 6.0); //From CSS
 
-    policy->setObjectName("packed"); //This should not change the margins since we, the, user specified them manually
+    policy->setStyleName("packed"); //This should not change the margins since we, the, user specified them manually
     compareContentsMargins(policy, 12, 12, 12, 12);
     compareContentsMargins(layout, 12, 12, 12, 12);
     QCOMPARE(policy->horizontalSpacing(), 7.0);
     QCOMPARE(policy->verticalSpacing(), 0.0); // From CSS
 
-    policy->setObjectName("");
+    policy->setStyleName("");
     compareContentsMargins(policy, 12, 12, 12, 12);
     compareContentsMargins(layout, 12, 12, 12, 12);
     QCOMPARE(policy->horizontalSpacing(), 7.0);
@@ -2940,7 +2940,7 @@ void Ut_MLayout::testUserChangingValues()
 
     policy->setVerticalSpacing(6);
     QCOMPARE(policy->verticalSpacing(), 6.0); // Now manually set
-    policy->setObjectName("packed");
+    policy->setStyleName("packed");
     QCOMPARE(policy->verticalSpacing(), 6.0);
 }
 void Ut_MLayout::testAddingAndRemovingWithSpacing()