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

RevBy: Stanislav

5 files changed, 33 insertions, 19 deletions

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");
     }
 }