Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/Ultimaker/Cura.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorc.lamboo <casperlamboo@gmail.com>2022-03-30 16:10:37 +0300
committerc.lamboo <casperlamboo@gmail.com>2022-03-30 16:10:37 +0300
commit3c9e2a1b08ff48e80439ce5cf7a36103ebb39af5 (patch)
treeb15daab4984a69ba0b4844b21738c9656b0d1324 /plugins
parent99a3a8d11d16ca1b6ee94e3a6cf54a329bbf100f (diff)
Update RegExpValidator to RegularExpressionValidator
Due to Qt6 API change CURA-8640
Diffstat (limited to 'plugins')
-rw-r--r--plugins/DigitalLibrary/resources/qml/CreateNewProjectPopup.qml4
-rw-r--r--plugins/DigitalLibrary/resources/qml/SaveProjectFilesPage.qml4
-rw-r--r--plugins/ImageReader/ConfigUI.qml10
-rw-r--r--plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml2
4 files changed, 10 insertions, 10 deletions
diff --git a/plugins/DigitalLibrary/resources/qml/CreateNewProjectPopup.qml b/plugins/DigitalLibrary/resources/qml/CreateNewProjectPopup.qml
index 74bc52b69e..242144205e 100644
--- a/plugins/DigitalLibrary/resources/qml/CreateNewProjectPopup.qml
+++ b/plugins/DigitalLibrary/resources/qml/CreateNewProjectPopup.qml
@@ -90,9 +90,9 @@ Popup
left: parent.left
right: parent.right
}
- validator: RegExpValidator
+ validator: RegularExpressionValidator
{
- regExp: /^[^\\\/\*\?\|\[\]]{0,99}$/
+ regularExpression: /^[^\\\/\*\?\|\[\]]{0,99}$/
}
text: PrintInformation.jobName
diff --git a/plugins/DigitalLibrary/resources/qml/SaveProjectFilesPage.qml b/plugins/DigitalLibrary/resources/qml/SaveProjectFilesPage.qml
index fa648d8bc2..73e6e42d80 100644
--- a/plugins/DigitalLibrary/resources/qml/SaveProjectFilesPage.qml
+++ b/plugins/DigitalLibrary/resources/qml/SaveProjectFilesPage.qml
@@ -61,9 +61,9 @@ Item
anchors.left: parent.left
anchors.top: fileNameLabel.bottom
anchors.topMargin: UM.Theme.getSize("thin_margin").height
- validator: RegExpValidator
+ validator: RegularExpressionValidator
{
- regExp: /^[\w\-\. ()]{0,255}$/
+ regularExpression: /^[\w\-\. ()]{0,255}$/
}
text: PrintInformation.jobName
diff --git a/plugins/ImageReader/ConfigUI.qml b/plugins/ImageReader/ConfigUI.qml
index 4c05efe7fa..f076f64501 100644
--- a/plugins/ImageReader/ConfigUI.qml
+++ b/plugins/ImageReader/ConfigUI.qml
@@ -47,7 +47,7 @@ UM.Dialog
Layout.minimumWidth: UM.Theme.getSize("setting_control").width
selectByMouse: true
objectName: "Peak_Height"
- validator: RegExpValidator { regExp: /^\d{0,3}([\,|\.]\d*)?$/ }
+ validator: RegularExpressionValidator { regularExpression: /^\d{0,3}([\,|\.]\d*)?$/ }
onTextChanged: manager.onPeakHeightChanged(text)
}
@@ -81,7 +81,7 @@ UM.Dialog
Layout.fillWidth: true
Layout.minimumWidth: UM.Theme.getSize("setting_control").width
objectName: "Base_Height"
- validator: RegExpValidator { regExp: /^\d{0,3}([\,|\.]\d*)?$/ }
+ validator: RegularExpressionValidator { regularExpression: /^\d{0,3}([\,|\.]\d*)?$/ }
onTextChanged: manager.onBaseHeightChanged(text)
}
@@ -115,7 +115,7 @@ UM.Dialog
Layout.fillWidth: true
Layout.minimumWidth: UM.Theme.getSize("setting_control").width
focus: true
- validator: RegExpValidator { regExp: /^[1-9]\d{0,2}([\,|\.]\d*)?$/ }
+ validator: RegularExpressionValidator { regularExpression: /^[1-9]\d{0,2}([\,|\.]\d*)?$/ }
onTextChanged: manager.onWidthChanged(text)
}
@@ -149,7 +149,7 @@ UM.Dialog
selectByMouse: true
objectName: "Depth"
focus: true
- validator: RegExpValidator { regExp: /^[1-9]\d{0,2}([\,|\.]\d*)?$/ }
+ validator: RegularExpressionValidator { regularExpression: /^[1-9]\d{0,2}([\,|\.]\d*)?$/ }
onTextChanged: manager.onDepthChanged(text)
}
@@ -255,7 +255,7 @@ UM.Dialog
Layout.minimumWidth: UM.Theme.getSize("setting_control").width
selectByMouse: true
objectName: "Transmittance"
- validator: RegExpValidator { regExp: /^[1-9]\d{0,2}([\,|\.]\d*)?$/ }
+ validator: RegularExpressionValidator { regularExpression: /^[1-9]\d{0,2}([\,|\.]\d*)?$/ }
onTextChanged: manager.onTransmittanceChanged(text)
UM.ToolTip
diff --git a/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml b/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml
index e68f552f7b..c7dbc16bce 100644
--- a/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml
+++ b/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml
@@ -302,7 +302,7 @@ Cura.MachineAction
{
id: addressField
width: parent.width
- validator: RegExpValidator { regExp: /[a-zA-Z0-9\.\-\_]*/ }
+ validator: RegularExpressionValidator { regularExpression: /[a-zA-Z0-9\.\-\_]*/ }
}
}