Changes: Fixes the ABI/API break and deprecates the default MStyleSheetSelector constructor.

RevBy: Daniel d'Andrada
Details: The constructor has been changed, but it brings an ABI/API break, so this commit
reverts the old constructor back and deprecates it first.

2 files changed, 49 insertions, 4 deletions

diff --git a/src/corelib/style/mstylesheetselector.cpp b/src/corelib/style/mstylesheetselector.cpp
index 06945a7a..5e2ef045 100644
--- a/src/corelib/style/mstylesheetselector.cpp
+++ b/src/corelib/style/mstylesheetselector.cpp
@@ -60,6 +60,28 @@ MStyleSheetSelector::MStyleSheetSelector(const QString &objectName,
         const QString &mode,
         const QString &filename,
         const QString &parentName,
+        Flags flags) :
+    d_ptr(new MStyleSheetSelectorPrivate)
+{
+    Q_D(MStyleSheetSelector);
+    d->objName = objectName;
+    d->clName = className;
+    d->clType = classType;
+    d->screenOrientation = orientation;
+    d->objectMode = mode;
+    d->filename = filename;
+    d->parentName = parentName;
+    d->parentObjectName = QString();
+    d->flags = flags;
+}
+
+MStyleSheetSelector::MStyleSheetSelector(const QString &objectName,
+        const QString &className,
+        const QString &classType,
+        const QString &orientation,
+        const QString &mode,
+        const QString &filename,
+        const QString &parentName,
         const QString &parentObjectName,
         Flags flags) :
     d_ptr(new MStyleSheetSelectorPrivate)
@@ -76,9 +98,6 @@ MStyleSheetSelector::MStyleSheetSelector(const QString &objectName,
     d->flags = flags;
 }
 
-
-
-
 MStyleSheetSelector::MStyleSheetSelector(const MStyleSheetSelector &other) :
     d_ptr(new MStyleSheetSelectorPrivate)
 {
diff --git a/src/corelib/style/mstylesheetselector.h b/src/corelib/style/mstylesheetselector.h
index 679c82e1..24ad7383 100644
--- a/src/corelib/style/mstylesheetselector.h
+++ b/src/corelib/style/mstylesheetselector.h
@@ -58,6 +58,7 @@ public:
      * \param child A flag indicating whether this selector represents a descendant or
               direct child of the parent.
      * \param subclasses A flag indicating whether the su
+     * \deprecated Please use the new constructor
      */
 
     explicit MStyleSheetSelector(const QString &objectName = "",
@@ -67,7 +68,32 @@ public:
                                    const QString &mode = "",
                                    const QString &filename = "",
                                    const QString &parentName = "",
-                                   const QString &parentObjectName = "",
+                                   Flags flags = (Flags) 0);
+
+    /*!
+     * MStyleSheetSelector constructor
+     * \param objectName target object name of this selector, can be empty
+     * \param className target class name for this selector, can be empty
+     * \param classType class type
+     * \param orientation target orientation for this selector, can be empty
+     * \param mode target mode for this selector, can be empty
+     * \param filename Name of the css file where this selector was parsed, can be empty.
+              Parameter is used for providing detailed css parsing errors.
+     * \param parentName Name of parent
+     * \param parentObjectName Parent object (style) name
+     * \param child A flag indicating whether this selector represents a descendant or
+              direct child of the parent.
+     * \param subclasses A flag indicating whether the su
+     */
+
+    explicit MStyleSheetSelector(const QString &objectName,
+                                   const QString &className,
+                                   const QString &classType,
+                                   const QString &orientation,
+                                   const QString &mode,
+                                   const QString &filename,
+                                   const QString &parentName,
+                                   const QString &parentObjectName,
                                    Flags flags = (Flags) 0);