Remove QRegExpValidator usages

This also means the RegExpValidator QML type will be gone. Use
QRegularExpressionValidator instead.

[ChangeLog][QtQuick][RegExpValidator] The RegExpValidator QML type has
been removed. Use RegularExpressionValidator instead.

Change-Id: If25fc5a258a669dfd28e705271757caa252ce05c
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>

5 files changed, 4 insertions, 112 deletions

diff --git a/src/quick/doc/snippets/qml/regexp.qml b/src/quick/doc/snippets/qml/regexp.qml
deleted file mode 100644
index 10b451d60a..0000000000
--- a/src/quick/doc/snippets/qml/regexp.qml
+++ /dev/null
@@ -1,56 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2017 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the documentation of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** BSD License Usage
-** Alternatively, you may use this file under the terms of the BSD license
-** as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of The Qt Company Ltd nor the names of its
-**     contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-import QtQuick 2.0
-//![0]
-TextInput {
-    id: hexNumber
-    validator: RegExpValidator { regExp: /[0-9A-F]+/ }
-}
-//![0]
diff --git a/src/quick/items/qquicktextinput.cpp b/src/quick/items/qquicktextinput.cpp
index 304f96e93a..6b941f3114 100644
--- a/src/quick/items/qquicktextinput.cpp
+++ b/src/quick/items/qquicktextinput.cpp
@@ -1008,10 +1008,10 @@ void QQuickTextInput::setAutoScroll(bool b)
     an acceptable or intermediate state. The accepted signal will only be sent
     if the text is in an acceptable state when enter is pressed.
 
-    Currently supported validators are IntValidator, DoubleValidator,
-    RegExpValidator and RegularExpressionValidator. An example of using
-    validators is shown below, which allows input of integers between 11 and 31
-    into the text input:
+    Currently supported validators are IntValidator, DoubleValidator
+    and RegularExpressionValidator. An example of using validators is shown
+    below, which allows input of integers between 11 and 31 into the
+    text input:
 
     \code
     import QtQuick 2.0
diff --git a/src/quick/util/qquickforeignutils_p.h b/src/quick/util/qquickforeignutils_p.h
index 9802420780..5db1197abe 100644
--- a/src/quick/util/qquickforeignutils_p.h
+++ b/src/quick/util/qquickforeignutils_p.h
@@ -76,14 +76,6 @@ struct QValidatorForeign
     QML_ADDED_IN_VERSION(2, 0)
 };
 
-struct QRegExpValidatorForeign
-{
-    Q_GADGET
-    QML_FOREIGN(QRegExpValidator)
-    QML_NAMED_ELEMENT(RegExpValidator)
-    QML_ADDED_IN_VERSION(2, 0)
-};
-
 #if QT_CONFIG(regularexpression)
 struct QRegularExpressionValidatorForeign
 {
diff --git a/src/quick/util/qquickvalidator.cpp b/src/quick/util/qquickvalidator.cpp
index 4709b3dda3..c309460263 100644
--- a/src/quick/util/qquickvalidator.cpp
+++ b/src/quick/util/qquickvalidator.cpp
@@ -201,49 +201,6 @@ void QQuickDoubleValidator::resetLocaleName()
 */
 
 /*!
-    \qmltype RegExpValidator
-    \instantiates QRegExpValidator
-    \inqmlmodule QtQuick
-    \ingroup qtquick-text-utility
-    \brief Provides a string validator.
-    \deprecated
-
-    The RegExpValidator type provides a validator, which counts as valid any string which
-    matches a specified regular expression.
-
-    RegExpValidator is deprecated since it is based on the deprecated \l {QRegExp}. Use
-    \l RegularExpressionValidator instead.
-*/
-/*!
-   \qmlproperty regExp QtQuick::RegExpValidator::regExp
-
-   This property holds the regular expression used for validation.
-
-   Note that this property should be a regular expression in JS syntax, e.g /a/ for the regular expression
-   matching "a".
-
-   By default, this property contains a regular expression with the pattern .* that matches any string.
-
-   Below you can find an example of a \l TextInput object with a RegExpValidator specified:
-
-   \snippet qml/regexp.qml 0
-
-   Some more examples of regular expressions:
-
-   \list
-   \li A list of numbers with one to three positions separated by a comma:
-       \badcode
-       /\d{1,3}(?:,\d{1,3})+$/
-       \endcode
-
-   \li An amount consisting of up to 3 numbers before the decimal point, and
-       1 to 2 after the decimal point:
-       \badcode
-       /(\d{1,3})([.,]\d{1,2})?$/
-       \endcode
-   \endlist
-*/
-/*!
     \qmltype RegularExpressionValidator
     \instantiates QRegularExpressionValidator
     \inqmlmodule QtQuick
diff --git a/src/quick/util/qquickvalidator_p.h b/src/quick/util/qquickvalidator_p.h
index 029737e10b..d0e3c9d784 100644
--- a/src/quick/util/qquickvalidator_p.h
+++ b/src/quick/util/qquickvalidator_p.h
@@ -98,7 +98,6 @@ QT_END_NAMESPACE
 QML_DECLARE_TYPE(QValidator)
 QML_DECLARE_TYPE(QQuickIntValidator)
 QML_DECLARE_TYPE(QQuickDoubleValidator)
-QML_DECLARE_TYPE(QRegExpValidator)
 #if QT_CONFIG(regularexpression)
 QML_DECLARE_TYPE(QRegularExpressionValidator)
 #endif