diff --git a/qtlockedfile/doc/html/qtlockedfile-members.html b/qtlockedfile/doc/html/qtlockedfile-members.html
index ef33d29c..adf7479c 100644
--- a/qtlockedfile/doc/html/qtlockedfile-members.html
+++ b/qtlockedfile/doc/html/qtlockedfile-members.html
@@ -67,7 +67,7 @@
-
+
diff --git a/qtpropertybrowser/doc/html/qtabstracteditorfactory-members.html b/qtpropertybrowser/doc/html/qtabstracteditorfactory-members.html
index 204d8b11..c602a5be 100644
--- a/qtpropertybrowser/doc/html/qtabstracteditorfactory-members.html
+++ b/qtpropertybrowser/doc/html/qtabstracteditorfactory-members.html
@@ -44,7 +44,7 @@
-
+
diff --git a/qtpropertybrowser/doc/html/qtabstracteditorfactorybase-members.html b/qtpropertybrowser/doc/html/qtabstracteditorfactorybase-members.html
index 973a10e2..98f4db8e 100644
--- a/qtpropertybrowser/doc/html/qtabstracteditorfactorybase-members.html
+++ b/qtpropertybrowser/doc/html/qtabstracteditorfactorybase-members.html
@@ -39,7 +39,7 @@
-
+
|
diff --git a/qtpropertybrowser/doc/html/qtabstractpropertybrowser-members.html b/qtpropertybrowser/doc/html/qtabstractpropertybrowser-members.html
index d3fcbe74..7d2febae 100644
--- a/qtpropertybrowser/doc/html/qtabstractpropertybrowser-members.html
+++ b/qtpropertybrowser/doc/html/qtabstractpropertybrowser-members.html
@@ -86,7 +86,7 @@
-
+
diff --git a/qtpropertybrowser/doc/html/qtabstractpropertymanager-members.html b/qtpropertybrowser/doc/html/qtabstractpropertymanager-members.html
index 760f91da..eb1c2ecd 100644
--- a/qtpropertybrowser/doc/html/qtabstractpropertymanager-members.html
+++ b/qtpropertybrowser/doc/html/qtabstractpropertymanager-members.html
@@ -42,7 +42,7 @@
-
+
hasValue ( const QtProperty * ) const : bool
diff --git a/qtpropertybrowser/doc/html/qtboolpropertymanager-members.html b/qtpropertybrowser/doc/html/qtboolpropertymanager-members.html
index f32b2e7c..c0651887 100644
--- a/qtpropertybrowser/doc/html/qtboolpropertymanager-members.html
+++ b/qtpropertybrowser/doc/html/qtboolpropertymanager-members.html
@@ -42,7 +42,7 @@
-
+
hasValue ( const QtProperty * ) const : bool
diff --git a/qtpropertybrowser/doc/html/qtbuttonpropertybrowser-members.html b/qtpropertybrowser/doc/html/qtbuttonpropertybrowser-members.html
index 2630e2c4..1b2a5950 100644
--- a/qtpropertybrowser/doc/html/qtbuttonpropertybrowser-members.html
+++ b/qtpropertybrowser/doc/html/qtbuttonpropertybrowser-members.html
@@ -88,7 +88,7 @@
-
+
diff --git a/qtpropertybrowser/doc/html/qtchareditorfactory-members.html b/qtpropertybrowser/doc/html/qtchareditorfactory-members.html
index 2999d660..576311b2 100644
--- a/qtpropertybrowser/doc/html/qtchareditorfactory-members.html
+++ b/qtpropertybrowser/doc/html/qtchareditorfactory-members.html
@@ -45,7 +45,7 @@
|
-
+
diff --git a/qtpropertybrowser/doc/html/qtcharpropertymanager-members.html b/qtpropertybrowser/doc/html/qtcharpropertymanager-members.html
index 6a5c45e6..c90577e7 100644
--- a/qtpropertybrowser/doc/html/qtcharpropertymanager-members.html
+++ b/qtpropertybrowser/doc/html/qtcharpropertymanager-members.html
@@ -42,7 +42,7 @@
-
+
hasValue ( const QtProperty * ) const : bool
diff --git a/qtpropertybrowser/doc/html/qtcheckboxfactory-members.html b/qtpropertybrowser/doc/html/qtcheckboxfactory-members.html
index 70b8219d..8b7f4cf1 100644
--- a/qtpropertybrowser/doc/html/qtcheckboxfactory-members.html
+++ b/qtpropertybrowser/doc/html/qtcheckboxfactory-members.html
@@ -45,7 +45,7 @@
|
-
+
diff --git a/qtpropertybrowser/doc/html/qtcoloreditorfactory-members.html b/qtpropertybrowser/doc/html/qtcoloreditorfactory-members.html
index 5ad22f08..6753c0a1 100644
--- a/qtpropertybrowser/doc/html/qtcoloreditorfactory-members.html
+++ b/qtpropertybrowser/doc/html/qtcoloreditorfactory-members.html
@@ -45,7 +45,7 @@
|
-
+
diff --git a/qtpropertybrowser/doc/html/qtcolorpropertymanager-members.html b/qtpropertybrowser/doc/html/qtcolorpropertymanager-members.html
index c365c638..d1be7892 100644
--- a/qtpropertybrowser/doc/html/qtcolorpropertymanager-members.html
+++ b/qtpropertybrowser/doc/html/qtcolorpropertymanager-members.html
@@ -42,7 +42,7 @@
-
+
hasValue ( const QtProperty * ) const : bool
diff --git a/qtpropertybrowser/doc/html/qtcursoreditorfactory-members.html b/qtpropertybrowser/doc/html/qtcursoreditorfactory-members.html
index b8d1a003..617c776e 100644
--- a/qtpropertybrowser/doc/html/qtcursoreditorfactory-members.html
+++ b/qtpropertybrowser/doc/html/qtcursoreditorfactory-members.html
@@ -45,7 +45,7 @@
|
-
+
diff --git a/qtpropertybrowser/doc/html/qtcursorpropertymanager-members.html b/qtpropertybrowser/doc/html/qtcursorpropertymanager-members.html
index 37413fa6..f03f1299 100644
--- a/qtpropertybrowser/doc/html/qtcursorpropertymanager-members.html
+++ b/qtpropertybrowser/doc/html/qtcursorpropertymanager-members.html
@@ -42,7 +42,7 @@
-
+
hasValue ( const QtProperty * ) const : bool
diff --git a/qtpropertybrowser/doc/html/qtdateeditfactory-members.html b/qtpropertybrowser/doc/html/qtdateeditfactory-members.html
index e5398ab2..57fb0db4 100644
--- a/qtpropertybrowser/doc/html/qtdateeditfactory-members.html
+++ b/qtpropertybrowser/doc/html/qtdateeditfactory-members.html
@@ -45,7 +45,7 @@
|
-
+
diff --git a/qtpropertybrowser/doc/html/qtdatepropertymanager-members.html b/qtpropertybrowser/doc/html/qtdatepropertymanager-members.html
index c7aa6ed4..2609df15 100644
--- a/qtpropertybrowser/doc/html/qtdatepropertymanager-members.html
+++ b/qtpropertybrowser/doc/html/qtdatepropertymanager-members.html
@@ -42,7 +42,7 @@
-
+
hasValue ( const QtProperty * ) const : bool
diff --git a/qtpropertybrowser/doc/html/qtdatetimeeditfactory-members.html b/qtpropertybrowser/doc/html/qtdatetimeeditfactory-members.html
index 604e8a87..99d03e2e 100644
--- a/qtpropertybrowser/doc/html/qtdatetimeeditfactory-members.html
+++ b/qtpropertybrowser/doc/html/qtdatetimeeditfactory-members.html
@@ -45,7 +45,7 @@
|
-
+
diff --git a/qtpropertybrowser/doc/html/qtdatetimepropertymanager-members.html b/qtpropertybrowser/doc/html/qtdatetimepropertymanager-members.html
index 2929cf42..a8f0ba2a 100644
--- a/qtpropertybrowser/doc/html/qtdatetimepropertymanager-members.html
+++ b/qtpropertybrowser/doc/html/qtdatetimepropertymanager-members.html
@@ -42,7 +42,7 @@
-
+
hasValue ( const QtProperty * ) const : bool
diff --git a/qtpropertybrowser/doc/html/qtdoublepropertymanager-members.html b/qtpropertybrowser/doc/html/qtdoublepropertymanager-members.html
index 2ea6b0b7..007b300e 100644
--- a/qtpropertybrowser/doc/html/qtdoublepropertymanager-members.html
+++ b/qtpropertybrowser/doc/html/qtdoublepropertymanager-members.html
@@ -44,7 +44,7 @@
-
+
hasValue ( const QtProperty * ) const : bool
diff --git a/qtpropertybrowser/doc/html/qtdoublespinboxfactory-members.html b/qtpropertybrowser/doc/html/qtdoublespinboxfactory-members.html
index 92ea83a5..2755e2e1 100644
--- a/qtpropertybrowser/doc/html/qtdoublespinboxfactory-members.html
+++ b/qtpropertybrowser/doc/html/qtdoublespinboxfactory-members.html
@@ -45,7 +45,7 @@
|
-
+
diff --git a/qtpropertybrowser/doc/html/qtenumeditorfactory-members.html b/qtpropertybrowser/doc/html/qtenumeditorfactory-members.html
index c6615b25..6e316f4d 100644
--- a/qtpropertybrowser/doc/html/qtenumeditorfactory-members.html
+++ b/qtpropertybrowser/doc/html/qtenumeditorfactory-members.html
@@ -45,7 +45,7 @@
|
-
+
diff --git a/qtpropertybrowser/doc/html/qtenumpropertymanager-members.html b/qtpropertybrowser/doc/html/qtenumpropertymanager-members.html
index 4884a075..7b03a4e4 100644
--- a/qtpropertybrowser/doc/html/qtenumpropertymanager-members.html
+++ b/qtpropertybrowser/doc/html/qtenumpropertymanager-members.html
@@ -46,7 +46,7 @@
-
+
hasValue ( const QtProperty * ) const : bool
diff --git a/qtpropertybrowser/doc/html/qtflagpropertymanager-members.html b/qtpropertybrowser/doc/html/qtflagpropertymanager-members.html
index 3ed3cd25..8bea175d 100644
--- a/qtpropertybrowser/doc/html/qtflagpropertymanager-members.html
+++ b/qtpropertybrowser/doc/html/qtflagpropertymanager-members.html
@@ -42,7 +42,7 @@
-
+
flagNames ( const QtProperty * ) const : QStringList
hasValue ( const QtProperty * ) const : bool
diff --git a/qtpropertybrowser/doc/html/qtfonteditorfactory-members.html b/qtpropertybrowser/doc/html/qtfonteditorfactory-members.html
index 849cb2c6..bf5826ac 100644
--- a/qtpropertybrowser/doc/html/qtfonteditorfactory-members.html
+++ b/qtpropertybrowser/doc/html/qtfonteditorfactory-members.html
@@ -45,7 +45,7 @@
|
-
+
diff --git a/qtpropertybrowser/doc/html/qtfontpropertymanager-members.html b/qtpropertybrowser/doc/html/qtfontpropertymanager-members.html
index d3b76bcb..dd178112 100644
--- a/qtpropertybrowser/doc/html/qtfontpropertymanager-members.html
+++ b/qtpropertybrowser/doc/html/qtfontpropertymanager-members.html
@@ -42,7 +42,7 @@
-
+
hasValue ( const QtProperty * ) const : bool
diff --git a/qtpropertybrowser/doc/html/qtgroupboxpropertybrowser-members.html b/qtpropertybrowser/doc/html/qtgroupboxpropertybrowser-members.html
index 7ce0783a..44a74f5e 100644
--- a/qtpropertybrowser/doc/html/qtgroupboxpropertybrowser-members.html
+++ b/qtpropertybrowser/doc/html/qtgroupboxpropertybrowser-members.html
@@ -86,7 +86,7 @@
-
+
diff --git a/qtpropertybrowser/doc/html/qtgrouppropertymanager-members.html b/qtpropertybrowser/doc/html/qtgrouppropertymanager-members.html
index fc17939e..0a305ce4 100644
--- a/qtpropertybrowser/doc/html/qtgrouppropertymanager-members.html
+++ b/qtpropertybrowser/doc/html/qtgrouppropertymanager-members.html
@@ -42,7 +42,7 @@
-
+
hasValue ( const QtProperty * ) const : bool
diff --git a/qtpropertybrowser/doc/html/qtintpropertymanager-members.html b/qtpropertybrowser/doc/html/qtintpropertymanager-members.html
index 23411b18..233939af 100644
--- a/qtpropertybrowser/doc/html/qtintpropertymanager-members.html
+++ b/qtpropertybrowser/doc/html/qtintpropertymanager-members.html
@@ -42,7 +42,7 @@
-
+
hasValue ( const QtProperty * ) const : bool
diff --git a/qtpropertybrowser/doc/html/qtkeysequenceeditorfactory-members.html b/qtpropertybrowser/doc/html/qtkeysequenceeditorfactory-members.html
index c7422e45..f83f9891 100644
--- a/qtpropertybrowser/doc/html/qtkeysequenceeditorfactory-members.html
+++ b/qtpropertybrowser/doc/html/qtkeysequenceeditorfactory-members.html
@@ -45,7 +45,7 @@
|
-
+
diff --git a/qtpropertybrowser/doc/html/qtkeysequencepropertymanager-members.html b/qtpropertybrowser/doc/html/qtkeysequencepropertymanager-members.html
index 729bd9c7..cb5a067c 100644
--- a/qtpropertybrowser/doc/html/qtkeysequencepropertymanager-members.html
+++ b/qtpropertybrowser/doc/html/qtkeysequencepropertymanager-members.html
@@ -42,7 +42,7 @@
-
+
hasValue ( const QtProperty * ) const : bool
diff --git a/qtpropertybrowser/doc/html/qtlineeditfactory-members.html b/qtpropertybrowser/doc/html/qtlineeditfactory-members.html
index b61d7355..f7a14984 100644
--- a/qtpropertybrowser/doc/html/qtlineeditfactory-members.html
+++ b/qtpropertybrowser/doc/html/qtlineeditfactory-members.html
@@ -45,7 +45,7 @@
|
-
+
diff --git a/qtpropertybrowser/doc/html/qtlocalepropertymanager-members.html b/qtpropertybrowser/doc/html/qtlocalepropertymanager-members.html
index 63b36c38..e6df7ca4 100644
--- a/qtpropertybrowser/doc/html/qtlocalepropertymanager-members.html
+++ b/qtpropertybrowser/doc/html/qtlocalepropertymanager-members.html
@@ -42,7 +42,7 @@
-
+
hasValue ( const QtProperty * ) const : bool
diff --git a/qtpropertybrowser/doc/html/qtpointfpropertymanager-members.html b/qtpropertybrowser/doc/html/qtpointfpropertymanager-members.html
index d71dc42d..446dfcab 100644
--- a/qtpropertybrowser/doc/html/qtpointfpropertymanager-members.html
+++ b/qtpropertybrowser/doc/html/qtpointfpropertymanager-members.html
@@ -44,7 +44,7 @@
-
+
hasValue ( const QtProperty * ) const : bool
diff --git a/qtpropertybrowser/doc/html/qtpointpropertymanager-members.html b/qtpropertybrowser/doc/html/qtpointpropertymanager-members.html
index 109c4278..6a22277f 100644
--- a/qtpropertybrowser/doc/html/qtpointpropertymanager-members.html
+++ b/qtpropertybrowser/doc/html/qtpointpropertymanager-members.html
@@ -42,7 +42,7 @@
-
+
hasValue ( const QtProperty * ) const : bool
diff --git a/qtpropertybrowser/doc/html/qtpropertybrowser.index b/qtpropertybrowser/doc/html/qtpropertybrowser.index
index 5fc52844..312f9b85 100644
--- a/qtpropertybrowser/doc/html/qtpropertybrowser.index
+++ b/qtpropertybrowser/doc/html/qtpropertybrowser.index
@@ -187,24 +187,24 @@
-
+
-
+
-
+
-
+
-
+
diff --git a/qtpropertybrowser/doc/html/qtrectfpropertymanager-members.html b/qtpropertybrowser/doc/html/qtrectfpropertymanager-members.html
index 4589e59e..b4da35a2 100644
--- a/qtpropertybrowser/doc/html/qtrectfpropertymanager-members.html
+++ b/qtpropertybrowser/doc/html/qtrectfpropertymanager-members.html
@@ -46,7 +46,7 @@
-
+
hasValue ( const QtProperty * ) const : bool
diff --git a/qtpropertybrowser/doc/html/qtrectpropertymanager-members.html b/qtpropertybrowser/doc/html/qtrectpropertymanager-members.html
index 8018a763..1560db19 100644
--- a/qtpropertybrowser/doc/html/qtrectpropertymanager-members.html
+++ b/qtpropertybrowser/doc/html/qtrectpropertymanager-members.html
@@ -44,7 +44,7 @@
-
+
hasValue ( const QtProperty * ) const : bool
diff --git a/qtpropertybrowser/doc/html/qtscrollbarfactory-members.html b/qtpropertybrowser/doc/html/qtscrollbarfactory-members.html
index 32d9dd2c..5d755ead 100644
--- a/qtpropertybrowser/doc/html/qtscrollbarfactory-members.html
+++ b/qtpropertybrowser/doc/html/qtscrollbarfactory-members.html
@@ -45,7 +45,7 @@
|
-
+
diff --git a/qtpropertybrowser/doc/html/qtsizefpropertymanager-members.html b/qtpropertybrowser/doc/html/qtsizefpropertymanager-members.html
index eb7235e2..d3bb04cb 100644
--- a/qtpropertybrowser/doc/html/qtsizefpropertymanager-members.html
+++ b/qtpropertybrowser/doc/html/qtsizefpropertymanager-members.html
@@ -44,7 +44,7 @@
-
+
hasValue ( const QtProperty * ) const : bool
diff --git a/qtpropertybrowser/doc/html/qtsizepolicypropertymanager-members.html b/qtpropertybrowser/doc/html/qtsizepolicypropertymanager-members.html
index ec47a57a..9edcb973 100644
--- a/qtpropertybrowser/doc/html/qtsizepolicypropertymanager-members.html
+++ b/qtpropertybrowser/doc/html/qtsizepolicypropertymanager-members.html
@@ -42,7 +42,7 @@
-
+
hasValue ( const QtProperty * ) const : bool
diff --git a/qtpropertybrowser/doc/html/qtsizepropertymanager-members.html b/qtpropertybrowser/doc/html/qtsizepropertymanager-members.html
index 35cf20d3..be930226 100644
--- a/qtpropertybrowser/doc/html/qtsizepropertymanager-members.html
+++ b/qtpropertybrowser/doc/html/qtsizepropertymanager-members.html
@@ -42,7 +42,7 @@
-
+
hasValue ( const QtProperty * ) const : bool
diff --git a/qtpropertybrowser/doc/html/qtsliderfactory-members.html b/qtpropertybrowser/doc/html/qtsliderfactory-members.html
index fb2e26a4..8091878e 100644
--- a/qtpropertybrowser/doc/html/qtsliderfactory-members.html
+++ b/qtpropertybrowser/doc/html/qtsliderfactory-members.html
@@ -45,7 +45,7 @@
|
-
+
diff --git a/qtpropertybrowser/doc/html/qtspinboxfactory-members.html b/qtpropertybrowser/doc/html/qtspinboxfactory-members.html
index 535a6aeb..91c23f39 100644
--- a/qtpropertybrowser/doc/html/qtspinboxfactory-members.html
+++ b/qtpropertybrowser/doc/html/qtspinboxfactory-members.html
@@ -45,7 +45,7 @@
|
-
+
diff --git a/qtpropertybrowser/doc/html/qtstringpropertymanager-members.html b/qtpropertybrowser/doc/html/qtstringpropertymanager-members.html
index eb88f591..02561e10 100644
--- a/qtpropertybrowser/doc/html/qtstringpropertymanager-members.html
+++ b/qtpropertybrowser/doc/html/qtstringpropertymanager-members.html
@@ -42,7 +42,7 @@
-
+
hasValue ( const QtProperty * ) const : bool
@@ -61,14 +61,14 @@
-regExp ( const QtProperty * ) const : QRegExp
-
+regExp ( const QtProperty * ) const : QRegularExpression
+
-
+setRegExp ( QtProperty *, const QRegularExpression & )
setValue ( QtProperty *, const QString & )
diff --git a/qtpropertybrowser/doc/html/qtstringpropertymanager.html b/qtpropertybrowser/doc/html/qtstringpropertymanager.html
index c346d7bb..3ddc58ad 100644
--- a/qtpropertybrowser/doc/html/qtstringpropertymanager.html
+++ b/qtpropertybrowser/doc/html/qtstringpropertymanager.html
@@ -24,7 +24,7 @@ Public Functions
@@ -35,7 +35,7 @@ Public Functions
Public Slots
-void | setRegExp ( QtProperty * property, const QRegExp & regExp ) |
+void | setRegExp ( QtProperty * property, const QRegularExpression & regExp ) |
void | setValue ( QtProperty * property, const QString & value ) |
@@ -45,7 +45,7 @@ Public Slots
Signals
-void | regExpChanged ( QtProperty * property, const QRegExp & regExp ) |
+void | regExpChanged ( QtProperty * property, const QRegularExpression & regExp ) |
void | valueChanged ( QtProperty * property, const QString & value ) |
@@ -89,14 +89,14 @@ QtStringPropertyManage
Destroys this manager, and all the properties it has created.
void QtStringPropertyManager::initializeProperty ( QtProperty * property ) [virtual protected]
Reimplemented from QtAbstractPropertyManager::initializeProperty().
-QRegExp QtStringPropertyManager::regExp ( const QtProperty * property ) const
+QRegularExpression QtStringPropertyManager::regExp ( const QtProperty * property ) const
Returns the given property's currently set regular expression.
If the given property is not managed by this manager, this function returns an empty expression.
See also setRegExp().
-void QtStringPropertyManager::regExpChanged ( QtProperty * property, const QRegExp & regExp ) [signal]
+void QtStringPropertyManager::regExpChanged ( QtProperty * property, const QRegularExpression & regExp ) [signal]
This signal is emitted whenever a property created by this manager changes its currenlty set regular expression, passing a pointer to the property and the new regExp as parameters.
See also setRegExp().
-void QtStringPropertyManager::setRegExp ( QtProperty * property, const QRegExp & regExp ) [slot]
+void QtStringPropertyManager::setRegExp ( QtProperty * property, const QRegularExpression & regExp ) [slot]
Sets the regular expression of the given property to regExp.
See also regExp(), setValue(), and regExpChanged().
void QtStringPropertyManager::setValue ( QtProperty * property, const QString & value ) [slot]
diff --git a/qtpropertybrowser/doc/html/qttimeeditfactory-members.html b/qtpropertybrowser/doc/html/qttimeeditfactory-members.html
index 510764da..98cd7300 100644
--- a/qtpropertybrowser/doc/html/qttimeeditfactory-members.html
+++ b/qtpropertybrowser/doc/html/qttimeeditfactory-members.html
@@ -45,7 +45,7 @@
|
-
+
diff --git a/qtpropertybrowser/doc/html/qttimepropertymanager-members.html b/qtpropertybrowser/doc/html/qttimepropertymanager-members.html
index 9b2e0bcb..e4f5f796 100644
--- a/qtpropertybrowser/doc/html/qttimepropertymanager-members.html
+++ b/qtpropertybrowser/doc/html/qttimepropertymanager-members.html
@@ -42,7 +42,7 @@
-
+
hasValue ( const QtProperty * ) const : bool
diff --git a/qtpropertybrowser/doc/html/qttreepropertybrowser-members.html b/qtpropertybrowser/doc/html/qttreepropertybrowser-members.html
index 8d3e67d3..c826a020 100644
--- a/qtpropertybrowser/doc/html/qttreepropertybrowser-members.html
+++ b/qtpropertybrowser/doc/html/qttreepropertybrowser-members.html
@@ -93,7 +93,7 @@
-
+
diff --git a/qtpropertybrowser/doc/html/qtvarianteditorfactory-members.html b/qtpropertybrowser/doc/html/qtvarianteditorfactory-members.html
index ab327798..62091121 100644
--- a/qtpropertybrowser/doc/html/qtvarianteditorfactory-members.html
+++ b/qtpropertybrowser/doc/html/qtvarianteditorfactory-members.html
@@ -45,7 +45,7 @@
|
-
+
diff --git a/qtpropertybrowser/doc/html/qtvariantpropertymanager-members.html b/qtpropertybrowser/doc/html/qtvariantpropertymanager-members.html
index 9e1ce208..cd74b8bf 100644
--- a/qtpropertybrowser/doc/html/qtvariantpropertymanager-members.html
+++ b/qtpropertybrowser/doc/html/qtvariantpropertymanager-members.html
@@ -47,7 +47,7 @@
-
+
hasValue ( const QtProperty * ) const : bool
diff --git a/qtpropertybrowser/src/qteditorfactory.cpp b/qtpropertybrowser/src/qteditorfactory.cpp
index d1f7d145..8df7502e 100644
--- a/qtpropertybrowser/src/qteditorfactory.cpp
+++ b/qtpropertybrowser/src/qteditorfactory.cpp
@@ -22,6 +22,7 @@
#include
#include
#include
+#include
#if defined(Q_CC_MSVC)
# pragma warning(disable: 4786) /* MS VS 6: truncating debug info after 255 characters */
@@ -938,7 +939,7 @@ class QtLineEditFactoryPrivate : public EditorFactoryPrivate
public:
void slotPropertyChanged(QtProperty *property, const QString &value);
- void slotRegExpChanged(QtProperty *property, const QRegExp ®Exp);
+ void slotRegExpChanged(QtProperty *property, const QRegularExpression ®Exp);
void slotSetValue(const QString &value);
void slotEchoModeChanged(QtProperty *, int);
void slotReadOnlyChanged(QtProperty *, bool);
@@ -962,7 +963,7 @@ void QtLineEditFactoryPrivate::slotPropertyChanged(QtProperty *property,
}
void QtLineEditFactoryPrivate::slotRegExpChanged(QtProperty *property,
- const QRegExp ®Exp)
+ const QRegularExpression ®Exp)
{
if (!m_createdEditors.contains(property))
return;
@@ -978,7 +979,7 @@ void QtLineEditFactoryPrivate::slotRegExpChanged(QtProperty *property,
const QValidator *oldValidator = editor->validator();
QValidator *newValidator = 0;
if (regExp.isValid()) {
- newValidator = new QRegExpValidator(regExp, editor);
+ newValidator = new QRegularExpressionValidator(regExp, editor);
}
editor->setValidator(newValidator);
if (oldValidator)
@@ -1078,8 +1079,8 @@ void QtLineEditFactory::connectPropertyManager(QtStringPropertyManager *manager)
{
connect(manager, SIGNAL(valueChanged(QtProperty *, const QString &)),
this, SLOT(slotPropertyChanged(QtProperty *, const QString &)));
- connect(manager, SIGNAL(regExpChanged(QtProperty *, const QRegExp &)),
- this, SLOT(slotRegExpChanged(QtProperty *, const QRegExp &)));
+ connect(manager, SIGNAL(regExpChanged(QtProperty *, const QRegularExpression &)),
+ this, SLOT(slotRegExpChanged(QtProperty *, const QRegularExpression &)));
connect(manager, SIGNAL(echoModeChanged(QtProperty*, int)),
this, SLOT(slotEchoModeChanged(QtProperty *, int)));
connect(manager, SIGNAL(readOnlyChanged(QtProperty*, bool)),
@@ -1098,9 +1099,9 @@ QWidget *QtLineEditFactory::createEditor(QtStringPropertyManager *manager,
QLineEdit *editor = d_ptr->createEditor(property, parent);
editor->setEchoMode((EchoMode)manager->echoMode(property));
editor->setReadOnly(manager->isReadOnly(property));
- QRegExp regExp = manager->regExp(property);
+ QRegularExpression regExp = manager->regExp(property);
if (regExp.isValid()) {
- QValidator *validator = new QRegExpValidator(regExp, editor);
+ QValidator *validator = new QRegularExpressionValidator (regExp, editor);
editor->setValidator(validator);
}
editor->setText(manager->value(property));
@@ -1121,8 +1122,8 @@ void QtLineEditFactory::disconnectPropertyManager(QtStringPropertyManager *manag
{
disconnect(manager, SIGNAL(valueChanged(QtProperty *, const QString &)),
this, SLOT(slotPropertyChanged(QtProperty *, const QString &)));
- disconnect(manager, SIGNAL(regExpChanged(QtProperty *, const QRegExp &)),
- this, SLOT(slotRegExpChanged(QtProperty *, const QRegExp &)));
+ disconnect(manager, SIGNAL(regExpChanged(QtProperty *, const QRegularExpression &)),
+ this, SLOT(slotRegExpChanged(QtProperty *, const QRegularExpression &)));
disconnect(manager, SIGNAL(echoModeChanged(QtProperty*,int)),
this, SLOT(slotEchoModeChanged(QtProperty *, int)));
disconnect(manager, SIGNAL(readOnlyChanged(QtProperty*, bool)),
@@ -1633,7 +1634,7 @@ QtCharEdit::QtCharEdit(QWidget *parent)
{
QHBoxLayout *layout = new QHBoxLayout(this);
layout->addWidget(m_lineEdit);
- layout->setMargin(0);
+ layout->setContentsMargins(0,0,0,0);
m_lineEdit->installEventFilter(this);
m_lineEdit->setReadOnly(true);
m_lineEdit->setFocusProxy(this);
@@ -1757,7 +1758,7 @@ void QtCharEdit::keyReleaseEvent(QKeyEvent *e)
void QtCharEdit::paintEvent(QPaintEvent *)
{
QStyleOption opt;
- opt.init(this);
+ opt.initFrom(this);
QPainter p(this);
style()->drawPrimitive(QStyle::PE_Widget, &opt, &p, this);
}
@@ -2293,11 +2294,9 @@ void QtColorEditWidget::setValue(const QColor &c)
void QtColorEditWidget::buttonClicked()
{
- bool ok = false;
- QRgb oldRgba = m_color.rgba();
- QRgb newRgba = QColorDialog::getRgba(oldRgba, &ok, this);
- if (ok && newRgba != oldRgba) {
- setValue(QColor::fromRgba(newRgba));
+ auto newRgba = QColorDialog::getColor(m_color, this, "", QColorDialog::ShowAlphaChannel);
+ if (newRgba != m_color) {
+ setValue(newRgba);
emit valueChanged(m_color);
}
}
@@ -2329,7 +2328,7 @@ bool QtColorEditWidget::eventFilter(QObject *obj, QEvent *ev)
void QtColorEditWidget::paintEvent(QPaintEvent *)
{
QStyleOption opt;
- opt.init(this);
+ opt.initFrom(this);
QPainter p(this);
style()->drawPrimitive(QStyle::PE_Widget, &opt, &p, this);
}
@@ -2551,7 +2550,7 @@ bool QtFontEditWidget::eventFilter(QObject *obj, QEvent *ev)
void QtFontEditWidget::paintEvent(QPaintEvent *)
{
QStyleOption opt;
- opt.init(this);
+ opt.initFrom(this);
QPainter p(this);
style()->drawPrimitive(QStyle::PE_Widget, &opt, &p, this);
}
diff --git a/qtpropertybrowser/src/qteditorfactory.h b/qtpropertybrowser/src/qteditorfactory.h
index 27bd4bc7..36c707aa 100644
--- a/qtpropertybrowser/src/qteditorfactory.h
+++ b/qtpropertybrowser/src/qteditorfactory.h
@@ -151,7 +151,7 @@ class QT_QTPROPERTYBROWSER_EXPORT QtLineEditFactory : public QtAbstractEditorFac
Q_DECLARE_PRIVATE(QtLineEditFactory)
Q_DISABLE_COPY(QtLineEditFactory)
Q_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, const QString &))
- Q_PRIVATE_SLOT(d_func(), void slotRegExpChanged(QtProperty *, const QRegExp &))
+ Q_PRIVATE_SLOT(d_func(), void slotRegExpChanged(QtProperty *, const QRegularExpression &))
Q_PRIVATE_SLOT(d_func(), void slotEchoModeChanged(QtProperty *, int))
Q_PRIVATE_SLOT(d_func(), void slotReadOnlyChanged(QtProperty *, bool))
Q_PRIVATE_SLOT(d_func(), void slotSetValue(const QString &))
diff --git a/qtpropertybrowser/src/qtpropertybrowserutils.cpp b/qtpropertybrowser/src/qtpropertybrowserutils.cpp
index 54400eee..464221c4 100644
--- a/qtpropertybrowser/src/qtpropertybrowserutils.cpp
+++ b/qtpropertybrowser/src/qtpropertybrowserutils.cpp
@@ -249,7 +249,7 @@ void QtBoolEdit::mousePressEvent(QMouseEvent *event)
void QtBoolEdit::paintEvent(QPaintEvent *)
{
QStyleOption opt;
- opt.init(this);
+ opt.initFrom(this);
QPainter p(this);
style()->drawPrimitive(QStyle::PE_Widget, &opt, &p, this);
}
@@ -261,7 +261,7 @@ QtKeySequenceEdit::QtKeySequenceEdit(QWidget *parent)
{
QHBoxLayout *layout = new QHBoxLayout(this);
layout->addWidget(m_lineEdit);
- layout->setMargin(0);
+ layout->setContentsMargins(0,0,0,0);
m_lineEdit->installEventFilter(this);
m_lineEdit->setReadOnly(true);
m_lineEdit->setFocusProxy(this);
@@ -395,7 +395,7 @@ void QtKeySequenceEdit::keyReleaseEvent(QKeyEvent *e)
void QtKeySequenceEdit::paintEvent(QPaintEvent *)
{
QStyleOption opt;
- opt.init(this);
+ opt.initFrom(this);
QPainter p(this);
style()->drawPrimitive(QStyle::PE_Widget, &opt, &p, this);
}
diff --git a/qtpropertybrowser/src/qtpropertymanager.cpp b/qtpropertybrowser/src/qtpropertymanager.cpp
index 3b5f295e..85607ab3 100644
--- a/qtpropertybrowser/src/qtpropertymanager.cpp
+++ b/qtpropertybrowser/src/qtpropertymanager.cpp
@@ -1266,12 +1266,12 @@ class QtStringPropertyManagerPrivate
struct Data
{
- Data() : regExp(QString(QLatin1Char('*')), Qt::CaseSensitive, QRegExp::Wildcard),
+ Data() : regExp(".*"),
echoMode(QLineEdit::Normal), readOnly(false)
{
}
QString val;
- QRegExp regExp;
+ QRegularExpression regExp;
int echoMode;
bool readOnly;
};
@@ -1311,7 +1311,7 @@ class QtStringPropertyManagerPrivate
*/
/*!
- \fn void QtStringPropertyManager::regExpChanged(QtProperty *property, const QRegExp ®Exp)
+ \fn void QtStringPropertyManager::regExpChanged(QtProperty *property, const QRegularExpression ®Exp)
This signal is emitted whenever a property created by this manager
changes its currenlty set regular expression, passing a pointer to
@@ -1360,9 +1360,9 @@ QString QtStringPropertyManager::value(const QtProperty *property) const
\sa setRegExp()
*/
-QRegExp QtStringPropertyManager::regExp(const QtProperty *property) const
+QRegularExpression QtStringPropertyManager::regExp(const QtProperty *property) const
{
- return getData(d_ptr->m_values, &QtStringPropertyManagerPrivate::Data::regExp, property, QRegExp());
+ return getData(d_ptr->m_values, &QtStringPropertyManagerPrivate::Data::regExp, property, QRegularExpression());
}
/*!
@@ -1433,7 +1433,7 @@ void QtStringPropertyManager::setValue(QtProperty *property, const QString &val)
if (data.val == val)
return;
- if (data.regExp.isValid() && !data.regExp.exactMatch(val))
+ if (data.regExp.isValid() && !data.regExp.match(val).hasMatch())
return;
data.val = val;
@@ -1449,7 +1449,7 @@ void QtStringPropertyManager::setValue(QtProperty *property, const QString &val)
\sa regExp(), setValue(), regExpChanged()
*/
-void QtStringPropertyManager::setRegExp(QtProperty *property, const QRegExp ®Exp)
+void QtStringPropertyManager::setRegExp(QtProperty *property, const QRegularExpression ®Exp)
{
const QtStringPropertyManagerPrivate::PropertyValueMap::iterator it = d_ptr->m_values.find(property);
if (it == d_ptr->m_values.end())
@@ -6023,7 +6023,7 @@ void QtFontPropertyManager::setValue(QtProperty *property, const QFont &val)
return;
const QFont oldVal = it.value();
- if (oldVal == val && oldVal.resolve() == val.resolve())
+ if (oldVal == val)
return;
it.value() = val;
diff --git a/qtpropertybrowser/src/qtpropertymanager.h b/qtpropertybrowser/src/qtpropertymanager.h
index 7072c25b..d101bc7a 100644
--- a/qtpropertybrowser/src/qtpropertymanager.h
+++ b/qtpropertybrowser/src/qtpropertymanager.h
@@ -7,6 +7,7 @@
#include "qtpropertybrowser.h"
#include
+#include
#if QT_VERSION >= 0x040400
QT_BEGIN_NAMESPACE
@@ -147,19 +148,19 @@ class QT_QTPROPERTYBROWSER_EXPORT QtStringPropertyManager : public QtAbstractPro
~QtStringPropertyManager();
QString value(const QtProperty *property) const;
- QRegExp regExp(const QtProperty *property) const;
+ QRegularExpression regExp(const QtProperty *property) const;
EchoMode echoMode(const QtProperty *property) const;
bool isReadOnly(const QtProperty *property) const;
public Q_SLOTS:
void setValue(QtProperty *property, const QString &val);
- void setRegExp(QtProperty *property, const QRegExp ®Exp);
+ void setRegExp(QtProperty *property, const QRegularExpression ®Exp);
void setEchoMode(QtProperty *property, EchoMode echoMode);
void setReadOnly(QtProperty *property, bool readOnly);
Q_SIGNALS:
void valueChanged(QtProperty *property, const QString &val);
- void regExpChanged(QtProperty *property, const QRegExp ®Exp);
+ void regExpChanged(QtProperty *property, const QRegularExpression ®Exp);
void echoModeChanged(QtProperty *property, const int);
void readOnlyChanged(QtProperty *property, bool);
diff --git a/qtpropertybrowser/src/qttreepropertybrowser.cpp b/qtpropertybrowser/src/qttreepropertybrowser.cpp
index 45a24913..707552d7 100644
--- a/qtpropertybrowser/src/qttreepropertybrowser.cpp
+++ b/qtpropertybrowser/src/qttreepropertybrowser.cpp
@@ -109,7 +109,7 @@ QtPropertyEditorView::QtPropertyEditorView(QWidget *parent) :
void QtPropertyEditorView::drawRow(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const
{
- QStyleOptionViewItemV3 opt = option;
+ QStyleOptionViewItem opt = option;
bool hasValue = true;
if (m_editorPrivate) {
QtProperty *property = m_editorPrivate->indexToProperty(index);
@@ -311,7 +311,7 @@ void QtPropertyEditorDelegate::paint(QPainter *painter, const QStyleOptionViewIt
if (property)
hasValue = property->hasValue();
}
- QStyleOptionViewItemV3 opt = option;
+ QStyleOptionViewItem opt = option;
if ((m_editorPrivate && index.column() == 0) || !hasValue) {
QtProperty *property = m_editorPrivate->indexToProperty(index);
if (property && property->isModified()) {
@@ -325,7 +325,7 @@ void QtPropertyEditorDelegate::paint(QPainter *painter, const QStyleOptionViewIt
opt.palette.setColor(QPalette::Text, opt.palette.color(QPalette::BrightText));
} else {
c = m_editorPrivate->calculatedBackgroundColor(m_editorPrivate->indexToBrowserItem(index));
- if (c.isValid() && (opt.features & QStyleOptionViewItemV2::Alternate))
+ if (c.isValid() && (opt.features & QStyleOptionViewItem::Alternate))
c = c.lighter(112);
}
if (c.isValid())
@@ -429,7 +429,7 @@ static QIcon drawIndicatorIcon(const QPalette &palette, QStyle *style)
void QtTreePropertyBrowserPrivate::init(QWidget *parent)
{
QHBoxLayout *layout = new QHBoxLayout(parent);
- layout->setMargin(0);
+ layout->setContentsMargins(0,0,0,0);
m_treeWidget = new QtPropertyEditorView(parent);
m_treeWidget->setEditorPrivate(this);
m_treeWidget->setIconSize(QSize(18, 18));
@@ -446,8 +446,8 @@ void QtTreePropertyBrowserPrivate::init(QWidget *parent)
m_delegate = new QtPropertyEditorDelegate(parent);
m_delegate->setEditorPrivate(this);
m_treeWidget->setItemDelegate(m_delegate);
- m_treeWidget->header()->setMovable(false);
- m_treeWidget->header()->setResizeMode(QHeaderView::Stretch);
+ m_treeWidget->header()-> setSectionsMovable(false);
+ m_treeWidget->header()->setSectionResizeMode(QHeaderView::Stretch);
m_expandIcon = drawIndicatorIcon(q_ptr->palette(), q_ptr->style());
@@ -552,7 +552,7 @@ void QtTreePropertyBrowserPrivate::propertyInserted(QtBrowserItem *index, QtBrow
m_indexToItem[index] = newItem;
newItem->setFlags(newItem->flags() | Qt::ItemIsEditable);
- m_treeWidget->setItemExpanded(newItem, true);
+ m_treeWidget->expandItem(newItem);
updateItem(newItem);
}
@@ -859,7 +859,7 @@ void QtTreePropertyBrowser::setResizeMode(QtTreePropertyBrowser::ResizeMode mode
case QtTreePropertyBrowser::Stretch:
default: m = QHeaderView::Stretch; break;
}
- d_ptr->m_treeWidget->header()->setResizeMode(m);
+ d_ptr->m_treeWidget->header()->setSectionResizeMode(m);
}
/*!
diff --git a/qtpropertybrowser/src/qtvariantproperty.cpp b/qtpropertybrowser/src/qtvariantproperty.cpp
index bea4b5dd..52f1766d 100644
--- a/qtpropertybrowser/src/qtvariantproperty.cpp
+++ b/qtpropertybrowser/src/qtvariantproperty.cpp
@@ -278,7 +278,7 @@ class QtVariantPropertyManagerPrivate
void slotDecimalsChanged(QtProperty *property, int prec);
void slotValueChanged(QtProperty *property, bool val);
void slotValueChanged(QtProperty *property, const QString &val);
- void slotRegExpChanged(QtProperty *property, const QRegExp ®Exp);
+ void slotRegExpChanged(QtProperty *property, const QRegularExpression ®Exp);
void slotEchoModeChanged(QtProperty *property, int);
void slotValueChanged(QtProperty *property, const QDate &val);
void slotRangeChanged(QtProperty *property, const QDate &min, const QDate &max);
@@ -504,7 +504,7 @@ void QtVariantPropertyManagerPrivate::slotValueChanged(QtProperty *property, con
valueChanged(property, QVariant(val));
}
-void QtVariantPropertyManagerPrivate::slotRegExpChanged(QtProperty *property, const QRegExp ®Exp)
+void QtVariantPropertyManagerPrivate::slotRegExpChanged(QtProperty *property, const QRegularExpression ®Exp)
{
if (QtVariantProperty *varProp = m_internalToProperty.value(property, 0))
emit q_ptr->attributeChanged(varProp, m_regExpAttribute, QVariant(regExp));
@@ -554,7 +554,7 @@ void QtVariantPropertyManagerPrivate::slotValueChanged(QtProperty *property, con
void QtVariantPropertyManagerPrivate::slotValueChanged(QtProperty *property, const QKeySequence &val)
{
QVariant v;
- qVariantSetValue(v, val);
+ v.setValue(val);
valueChanged(property, v);
}
@@ -641,7 +641,7 @@ void QtVariantPropertyManagerPrivate::slotEnumIconsChanged(QtProperty *property,
{
if (QtVariantProperty *varProp = m_internalToProperty.value(property, 0)) {
QVariant v;
- qVariantSetValue(v, enumIcons);
+ v.setValue(enumIcons);
emit q_ptr->attributeChanged(varProp, m_enumIconsAttribute, v);
}
}
@@ -980,7 +980,7 @@ QtVariantPropertyManager::QtVariantPropertyManager(QObject *parent)
d_ptr->m_typeToPropertyManager[QVariant::String] = stringPropertyManager;
d_ptr->m_typeToValueType[QVariant::String] = QVariant::String;
d_ptr->m_typeToAttributeToAttributeType[QVariant::String][d_ptr->m_regExpAttribute] =
- QVariant::RegExp;
+ QVariant::RegularExpression;
d_ptr->m_typeToAttributeToAttributeType[QVariant::String][d_ptr->m_echoModeAttribute] =
QVariant::Int;
d_ptr->m_typeToAttributeToAttributeType[QVariant::String][d_ptr->m_readOnlyAttribute] =
@@ -988,8 +988,8 @@ QtVariantPropertyManager::QtVariantPropertyManager(QObject *parent)
connect(stringPropertyManager, SIGNAL(valueChanged(QtProperty *, const QString &)),
this, SLOT(slotValueChanged(QtProperty *, const QString &)));
- connect(stringPropertyManager, SIGNAL(regExpChanged(QtProperty *, const QRegExp &)),
- this, SLOT(slotRegExpChanged(QtProperty *, const QRegExp &)));
+ connect(stringPropertyManager, SIGNAL(regExpChanged(QtProperty *, const QRegularExpression &)),
+ this, SLOT(slotRegExpChanged(QtProperty *, const QRegularExpression &)));
connect(stringPropertyManager, SIGNAL(echoModeChanged(QtProperty*,int)),
this, SLOT(slotEchoModeChanged(QtProperty*, int)));
connect(stringPropertyManager, SIGNAL(readOnlyChanged(QtProperty*, bool)),
@@ -1532,7 +1532,7 @@ QVariant QtVariantPropertyManager::attributeValue(const QtProperty *property, co
return enumManager->enumNames(internProp);
if (attribute == d_ptr->m_enumIconsAttribute) {
QVariant v;
- qVariantSetValue(v, enumManager->enumIcons(internProp));
+ v.setValue(enumManager->enumIcons(internProp));
return v;
}
return QVariant();
@@ -1612,73 +1612,73 @@ void QtVariantPropertyManager::setValue(QtProperty *property, const QVariant &va
QtAbstractPropertyManager *manager = internProp->propertyManager();
if (QtIntPropertyManager *intManager = qobject_cast(manager)) {
- intManager->setValue(internProp, qVariantValue(val));
+ intManager->setValue(internProp, val.value());
return;
} else if (QtDoublePropertyManager *doubleManager = qobject_cast(manager)) {
- doubleManager->setValue(internProp, qVariantValue(val));
+ doubleManager->setValue(internProp, val.value());
return;
} else if (QtBoolPropertyManager *boolManager = qobject_cast(manager)) {
- boolManager->setValue(internProp, qVariantValue(val));
+ boolManager->setValue(internProp, val.value());
return;
} else if (QtStringPropertyManager *stringManager = qobject_cast(manager)) {
- stringManager->setValue(internProp, qVariantValue(val));
+ stringManager->setValue(internProp, val.value());
return;
} else if (QtDatePropertyManager *dateManager = qobject_cast(manager)) {
- dateManager->setValue(internProp, qVariantValue(val));
+ dateManager->setValue(internProp, val.value());
return;
} else if (QtTimePropertyManager *timeManager = qobject_cast(manager)) {
- timeManager->setValue(internProp, qVariantValue(val));
+ timeManager->setValue(internProp, val.value());
return;
} else if (QtDateTimePropertyManager *dateTimeManager = qobject_cast(manager)) {
- dateTimeManager->setValue(internProp, qVariantValue(val));
+ dateTimeManager->setValue(internProp, val.value());
return;
} else if (QtKeySequencePropertyManager *keySequenceManager = qobject_cast(manager)) {
- keySequenceManager->setValue(internProp, qVariantValue(val));
+ keySequenceManager->setValue(internProp, val.value());
return;
} else if (QtCharPropertyManager *charManager = qobject_cast(manager)) {
- charManager->setValue(internProp, qVariantValue(val));
+ charManager->setValue(internProp, val.value());
return;
} else if (QtLocalePropertyManager *localeManager = qobject_cast(manager)) {
- localeManager->setValue(internProp, qVariantValue(val));
+ localeManager->setValue(internProp, val.value());
return;
} else if (QtPointPropertyManager *pointManager = qobject_cast(manager)) {
- pointManager->setValue(internProp, qVariantValue(val));
+ pointManager->setValue(internProp, val.value());
return;
} else if (QtPointFPropertyManager *pointFManager = qobject_cast(manager)) {
- pointFManager->setValue(internProp, qVariantValue(val));
+ pointFManager->setValue(internProp, val.value());
return;
} else if (QtSizePropertyManager *sizeManager = qobject_cast(manager)) {
- sizeManager->setValue(internProp, qVariantValue(val));
+ sizeManager->setValue(internProp, val.value());
return;
} else if (QtSizeFPropertyManager *sizeFManager = qobject_cast(manager)) {
- sizeFManager->setValue(internProp, qVariantValue(val));
+ sizeFManager->setValue(internProp, val.value());
return;
} else if (QtRectPropertyManager *rectManager = qobject_cast(manager)) {
- rectManager->setValue(internProp, qVariantValue(val));
+ rectManager->setValue(internProp, val.value());
return;
} else if (QtRectFPropertyManager *rectFManager = qobject_cast(manager)) {
- rectFManager->setValue(internProp, qVariantValue(val));
+ rectFManager->setValue(internProp, val.value());
return;
} else if (QtColorPropertyManager *colorManager = qobject_cast(manager)) {
- colorManager->setValue(internProp, qVariantValue(val));
+ colorManager->setValue(internProp, val.value());
return;
} else if (QtEnumPropertyManager *enumManager = qobject_cast(manager)) {
- enumManager->setValue(internProp, qVariantValue(val));
+ enumManager->setValue(internProp, val.value());
return;
} else if (QtSizePolicyPropertyManager *sizePolicyManager =
qobject_cast(manager)) {
- sizePolicyManager->setValue(internProp, qVariantValue(val));
+ sizePolicyManager->setValue(internProp, val.value());
return;
} else if (QtFontPropertyManager *fontManager = qobject_cast(manager)) {
- fontManager->setValue(internProp, qVariantValue(val));
+ fontManager->setValue(internProp, val.value());
return;
#ifndef QT_NO_CURSOR
} else if (QtCursorPropertyManager *cursorManager = qobject_cast(manager)) {
- cursorManager->setValue(internProp, qVariantValue(val));
+ cursorManager->setValue(internProp, val.value());
return;
#endif
} else if (QtFlagPropertyManager *flagManager = qobject_cast(manager)) {
- flagManager->setValue(internProp, qVariantValue(val));
+ flagManager->setValue(internProp, val.value());
return;
}
}
@@ -1716,81 +1716,81 @@ void QtVariantPropertyManager::setAttribute(QtProperty *property,
QtAbstractPropertyManager *manager = internProp->propertyManager();
if (QtIntPropertyManager *intManager = qobject_cast(manager)) {
if (attribute == d_ptr->m_maximumAttribute)
- intManager->setMaximum(internProp, qVariantValue(value));
+ intManager->setMaximum(internProp, value.value());
else if (attribute == d_ptr->m_minimumAttribute)
- intManager->setMinimum(internProp, qVariantValue(value));
+ intManager->setMinimum(internProp, value.value());
else if (attribute == d_ptr->m_singleStepAttribute)
- intManager->setSingleStep(internProp, qVariantValue(value));
+ intManager->setSingleStep(internProp, value.value());
else if (attribute == d_ptr->m_readOnlyAttribute)
- intManager->setReadOnly(internProp, qVariantValue(value));
+ intManager->setReadOnly(internProp, value.value());
return;
} else if (QtDoublePropertyManager *doubleManager = qobject_cast(manager)) {
if (attribute == d_ptr->m_maximumAttribute)
- doubleManager->setMaximum(internProp, qVariantValue(value));
+ doubleManager->setMaximum(internProp, value.value());
if (attribute == d_ptr->m_minimumAttribute)
- doubleManager->setMinimum(internProp, qVariantValue(value));
+ doubleManager->setMinimum(internProp, value.value());
if (attribute == d_ptr->m_singleStepAttribute)
- doubleManager->setSingleStep(internProp, qVariantValue(value));
+ doubleManager->setSingleStep(internProp, value.value());
if (attribute == d_ptr->m_decimalsAttribute)
- doubleManager->setDecimals(internProp, qVariantValue(value));
+ doubleManager->setDecimals(internProp, value.value());
if (attribute == d_ptr->m_readOnlyAttribute)
- doubleManager->setReadOnly(internProp, qVariantValue(value));
+ doubleManager->setReadOnly(internProp, value.value());
return;
} else if (QtBoolPropertyManager *boolManager = qobject_cast(manager)) {
if (attribute == d_ptr->m_textVisibleAttribute)
- boolManager->setTextVisible(internProp, qVariantValue(value));
+ boolManager->setTextVisible(internProp, value.value());
return;
} else if (QtStringPropertyManager *stringManager = qobject_cast(manager)) {
if (attribute == d_ptr->m_regExpAttribute)
- stringManager->setRegExp(internProp, qVariantValue(value));
+ stringManager->setRegExp(internProp, value.value());
if (attribute == d_ptr->m_echoModeAttribute)
- stringManager->setEchoMode(internProp, (EchoMode)qVariantValue(value));
+ stringManager->setEchoMode(internProp, (EchoMode)value.value());
if (attribute == d_ptr->m_readOnlyAttribute)
- stringManager->setReadOnly(internProp, (EchoMode)qVariantValue(value));
+ stringManager->setReadOnly(internProp, (EchoMode)value.value());
return;
} else if (QtDatePropertyManager *dateManager = qobject_cast(manager)) {
if (attribute == d_ptr->m_maximumAttribute)
- dateManager->setMaximum(internProp, qVariantValue(value));
+ dateManager->setMaximum(internProp, value.value());
if (attribute == d_ptr->m_minimumAttribute)
- dateManager->setMinimum(internProp, qVariantValue(value));
+ dateManager->setMinimum(internProp, value.value());
return;
} else if (QtPointFPropertyManager *pointFManager = qobject_cast(manager)) {
if (attribute == d_ptr->m_decimalsAttribute)
- pointFManager->setDecimals(internProp, qVariantValue(value));
+ pointFManager->setDecimals(internProp, value.value());
return;
} else if (QtSizePropertyManager *sizeManager = qobject_cast(manager)) {
if (attribute == d_ptr->m_maximumAttribute)
- sizeManager->setMaximum(internProp, qVariantValue(value));
+ sizeManager->setMaximum(internProp, value.value());
if (attribute == d_ptr->m_minimumAttribute)
- sizeManager->setMinimum(internProp, qVariantValue(value));
+ sizeManager->setMinimum(internProp, value.value());
return;
} else if (QtSizeFPropertyManager *sizeFManager = qobject_cast(manager)) {
if (attribute == d_ptr->m_maximumAttribute)
- sizeFManager->setMaximum(internProp, qVariantValue(value));
+ sizeFManager->setMaximum(internProp, value.value());
if (attribute == d_ptr->m_minimumAttribute)
- sizeFManager->setMinimum(internProp, qVariantValue(value));
+ sizeFManager->setMinimum(internProp, value.value());
if (attribute == d_ptr->m_decimalsAttribute)
- sizeFManager->setDecimals(internProp, qVariantValue(value));
+ sizeFManager->setDecimals(internProp, value.value());
return;
} else if (QtRectPropertyManager *rectManager = qobject_cast(manager)) {
if (attribute == d_ptr->m_constraintAttribute)
- rectManager->setConstraint(internProp, qVariantValue(value));
+ rectManager->setConstraint(internProp, value.value());
return;
} else if (QtRectFPropertyManager *rectFManager = qobject_cast(manager)) {
if (attribute == d_ptr->m_constraintAttribute)
- rectFManager->setConstraint(internProp, qVariantValue(value));
+ rectFManager->setConstraint(internProp, value.value());
if (attribute == d_ptr->m_decimalsAttribute)
- rectFManager->setDecimals(internProp, qVariantValue(value));
+ rectFManager->setDecimals(internProp, value.value());
return;
} else if (QtEnumPropertyManager *enumManager = qobject_cast(manager)) {
if (attribute == d_ptr->m_enumNamesAttribute)
- enumManager->setEnumNames(internProp, qVariantValue(value));
+ enumManager->setEnumNames(internProp, value.value());
if (attribute == d_ptr->m_enumIconsAttribute)
- enumManager->setEnumIcons(internProp, qVariantValue(value));
+ enumManager->setEnumIcons(internProp, value.value());
return;
} else if (QtFlagPropertyManager *flagManager = qobject_cast(manager)) {
if (attribute == d_ptr->m_flagNamesAttribute)
- flagManager->setFlagNames(internProp, qVariantValue(value));
+ flagManager->setFlagNames(internProp, value.value());
return;
}
}
@@ -2052,87 +2052,87 @@ QtVariantEditorFactory::~QtVariantEditorFactory()
*/
void QtVariantEditorFactory::connectPropertyManager(QtVariantPropertyManager *manager)
{
- QList intPropertyManagers = qFindChildren(manager);
+ QList intPropertyManagers = manager->findChildren();
QListIterator itInt(intPropertyManagers);
while (itInt.hasNext())
d_ptr->m_spinBoxFactory->addPropertyManager(itInt.next());
- QList doublePropertyManagers = qFindChildren(manager);
+ QList doublePropertyManagers = manager->findChildren();
QListIterator itDouble(doublePropertyManagers);
while (itDouble.hasNext())
d_ptr->m_doubleSpinBoxFactory->addPropertyManager(itDouble.next());
- QList boolPropertyManagers = qFindChildren(manager);
+ QList boolPropertyManagers = manager->findChildren();
QListIterator itBool(boolPropertyManagers);
while (itBool.hasNext())
d_ptr->m_checkBoxFactory->addPropertyManager(itBool.next());
- QList stringPropertyManagers = qFindChildren(manager);
+ QList stringPropertyManagers = manager->findChildren();
QListIterator itString(stringPropertyManagers);
while (itString.hasNext())
d_ptr->m_lineEditFactory->addPropertyManager(itString.next());
- QList datePropertyManagers = qFindChildren(manager);
+ QList datePropertyManagers = manager->findChildren();
QListIterator itDate(datePropertyManagers);
while (itDate.hasNext())
d_ptr->m_dateEditFactory->addPropertyManager(itDate.next());
- QList timePropertyManagers = qFindChildren(manager);
+ QList timePropertyManagers = manager->findChildren();
QListIterator itTime(timePropertyManagers);
while (itTime.hasNext())
d_ptr->m_timeEditFactory->addPropertyManager(itTime.next());
- QList dateTimePropertyManagers = qFindChildren(manager);
+ QList dateTimePropertyManagers = manager->findChildren();
QListIterator itDateTime(dateTimePropertyManagers);
while (itDateTime.hasNext())
d_ptr->m_dateTimeEditFactory->addPropertyManager(itDateTime.next());
- QList keySequencePropertyManagers = qFindChildren(manager);
+ QList keySequencePropertyManagers = manager->findChildren();
QListIterator itKeySequence(keySequencePropertyManagers);
while (itKeySequence.hasNext())
d_ptr->m_keySequenceEditorFactory->addPropertyManager(itKeySequence.next());
- QList charPropertyManagers = qFindChildren(manager);
+ QList charPropertyManagers = manager->findChildren();
QListIterator itChar(charPropertyManagers);
while (itChar.hasNext())
d_ptr->m_charEditorFactory->addPropertyManager(itChar.next());
- QList localePropertyManagers = qFindChildren(manager);
+ QList localePropertyManagers = manager->findChildren();
QListIterator itLocale(localePropertyManagers);
while (itLocale.hasNext())
d_ptr->m_comboBoxFactory->addPropertyManager(itLocale.next()->subEnumPropertyManager());
- QList pointPropertyManagers = qFindChildren(manager);
+ QList pointPropertyManagers = manager->findChildren();
QListIterator itPoint(pointPropertyManagers);
while (itPoint.hasNext())
d_ptr->m_spinBoxFactory->addPropertyManager(itPoint.next()->subIntPropertyManager());
- QList pointFPropertyManagers = qFindChildren(manager);
+ QList pointFPropertyManagers = manager->findChildren();
QListIterator itPointF(pointFPropertyManagers);
while (itPointF.hasNext())
d_ptr->m_doubleSpinBoxFactory->addPropertyManager(itPointF.next()->subDoublePropertyManager());
- QList sizePropertyManagers = qFindChildren(manager);
+ QList sizePropertyManagers = manager->findChildren();
QListIterator itSize(sizePropertyManagers);
while (itSize.hasNext())
d_ptr->m_spinBoxFactory->addPropertyManager(itSize.next()->subIntPropertyManager());
- QList sizeFPropertyManagers = qFindChildren(manager);
+ QList sizeFPropertyManagers = manager->findChildren();
QListIterator itSizeF(sizeFPropertyManagers);
while (itSizeF.hasNext())
d_ptr->m_doubleSpinBoxFactory->addPropertyManager(itSizeF.next()->subDoublePropertyManager());
- QList rectPropertyManagers = qFindChildren(manager);
+ QList rectPropertyManagers = manager->findChildren();
QListIterator itRect(rectPropertyManagers);
while (itRect.hasNext())
d_ptr->m_spinBoxFactory->addPropertyManager(itRect.next()->subIntPropertyManager());
- QList rectFPropertyManagers = qFindChildren(manager);
+ QList rectFPropertyManagers = manager->findChildren();
QListIterator itRectF(rectFPropertyManagers);
while (itRectF.hasNext())
d_ptr->m_doubleSpinBoxFactory->addPropertyManager(itRectF.next()->subDoublePropertyManager());
- QList colorPropertyManagers = qFindChildren(manager);
+ QList colorPropertyManagers = manager->findChildren();
QListIterator itColor(colorPropertyManagers);
while (itColor.hasNext()) {
QtColorPropertyManager *manager = itColor.next();
@@ -2140,12 +2140,12 @@ void QtVariantEditorFactory::connectPropertyManager(QtVariantPropertyManager *ma
d_ptr->m_spinBoxFactory->addPropertyManager(manager->subIntPropertyManager());
}
- QList enumPropertyManagers = qFindChildren(manager);
+ QList enumPropertyManagers = manager->findChildren();
QListIterator itEnum(enumPropertyManagers);
while (itEnum.hasNext())
d_ptr->m_comboBoxFactory->addPropertyManager(itEnum.next());
- QList sizePolicyPropertyManagers = qFindChildren(manager);
+ QList sizePolicyPropertyManagers = manager->findChildren();
QListIterator itSizePolicy(sizePolicyPropertyManagers);
while (itSizePolicy.hasNext()) {
QtSizePolicyPropertyManager *manager = itSizePolicy.next();
@@ -2153,7 +2153,7 @@ void QtVariantEditorFactory::connectPropertyManager(QtVariantPropertyManager *ma
d_ptr->m_comboBoxFactory->addPropertyManager(manager->subEnumPropertyManager());
}
- QList fontPropertyManagers = qFindChildren(manager);
+ QList fontPropertyManagers = manager->findChildren();
QListIterator itFont(fontPropertyManagers);
while (itFont.hasNext()) {
QtFontPropertyManager *manager = itFont.next();
@@ -2163,12 +2163,12 @@ void QtVariantEditorFactory::connectPropertyManager(QtVariantPropertyManager *ma
d_ptr->m_checkBoxFactory->addPropertyManager(manager->subBoolPropertyManager());
}
- QList cursorPropertyManagers = qFindChildren(manager);
+ QList cursorPropertyManagers = manager->findChildren();
QListIterator itCursor(cursorPropertyManagers);
while (itCursor.hasNext())
d_ptr->m_cursorEditorFactory->addPropertyManager(itCursor.next());
- QList flagPropertyManagers = qFindChildren(manager);
+ QList flagPropertyManagers = manager->findChildren();
QListIterator itFlag(flagPropertyManagers);
while (itFlag.hasNext())
d_ptr->m_checkBoxFactory->addPropertyManager(itFlag.next()->subBoolPropertyManager());
@@ -2196,87 +2196,87 @@ QWidget *QtVariantEditorFactory::createEditor(QtVariantPropertyManager *manager,
*/
void QtVariantEditorFactory::disconnectPropertyManager(QtVariantPropertyManager *manager)
{
- QList |