update imports

make functions and QtQuick imports consistent
mcallegari · Apr 30, 2024 · e831f48 · e831f48
1 parent b65a03b
commit e831f48
Show file tree

Hide file tree

Showing 215 changed files with 535 additions and 714 deletions.
diff --git a/qmlui/qml/+qt5/ActionsMenu.qml b/qmlui/qml/+qt5/ActionsMenu.qml
@@ -17,10 +17,10 @@
   limitations under the License.
 */
 
-import QtQuick 2.0
-import QtQuick.Controls 2.1
-import QtQuick.Dialogs 1.2
-import QtQuick.Layouts 1.0
+import QtQuick 2.15
+import QtQuick.Controls 2.15
+import QtQuick.Dialogs 1.3
+import QtQuick.Layouts 1.15
 
 Popup
 {
@@ -131,7 +131,7 @@ Popup
 
         property string action: ""
 
-        onClicked: function (role) {
+        onClicked: (role) => {
             if (role === Dialog.Yes)
             {
                 if (qlcplus.fileName())

diff --git a/qmlui/qml/ActionsMenu.qml b/qmlui/qml/ActionsMenu.qml
@@ -17,12 +17,10 @@
   limitations under the License.
 */
 
-import QtQuick 2.0
-import QtQuick.Controls 2.1
+import QtQuick 2.15
+import QtQuick.Controls 2.15
 import QtQuick.Dialogs
-import QtQuick.Layouts 1.0
-
-import "."
+import QtQuick.Layouts 1.15
 
 Popup
 {
@@ -133,7 +131,7 @@ Popup
 
         property string action: ""
 
-        onClicked: function (role) {
+        onClicked: (role) => {
             if (role === Dialog.Yes)
             {
                 if (qlcplus.fileName())

diff --git a/qmlui/qml/BeatGeneratorsPanel.qml b/qmlui/qml/BeatGeneratorsPanel.qml
@@ -17,10 +17,9 @@
   limitations under the License.
 */
 
-import QtQuick 2.6
-import QtQuick.Controls 2.1
-import QtQuick.Layouts 1.1
-import "."
+import QtQuick 2.15
+import QtQuick.Controls 2.15
+import QtQuick.Layouts 1.15
 
 Rectangle
 {

diff --git a/qmlui/qml/ChannelToolLoader.qml b/qmlui/qml/ChannelToolLoader.qml
@@ -17,11 +17,10 @@
   limitations under the License.
 */
 
-import QtQuick 2.0
-import QtQuick.Controls 2.5
+import QtQuick 2.15
+import QtQuick.Controls 2.15
 
 import org.qlcplus.classes 1.0
-import "."
 
 Popup
 {

diff --git a/qmlui/qml/ChaserStepDelegate.qml b/qmlui/qml/ChaserStepDelegate.qml
@@ -17,10 +17,9 @@
   limitations under the License.
 */
 
-import QtQuick 2.0
-import QtQuick.Layouts 1.1
+import QtQuick 2.15
+import QtQuick.Layouts 1.15
 import org.qlcplus.classes 1.0
-import "."
 
 Rectangle
 {

diff --git a/qmlui/qml/ChaserWidget.qml b/qmlui/qml/ChaserWidget.qml
@@ -17,13 +17,12 @@
   limitations under the License.
 */
 
-import QtQuick 2.12
-import QtQuick.Layouts 1.1
-import QtQuick.Controls 2.1
+import QtQuick 2.15
+import QtQuick.Layouts 1.15
+import QtQuick.Controls 2.15
 
 import org.qlcplus.classes 1.0
 import "TimeUtils.js" as TimeUtils
-import "."
 
 Column
 {

diff --git a/qmlui/qml/ColorTool.qml b/qmlui/qml/ColorTool.qml
@@ -17,12 +17,11 @@
   limitations under the License.
 */
 
-import QtQuick 2.3
-import QtQuick.Controls 2.1
-import QtQuick.Layouts 1.1
+import QtQuick 2.15
+import QtQuick.Controls 2.15
+import QtQuick.Layouts 1.15
 
 import org.qlcplus.classes 1.0
-import "."
 
 Rectangle
 {

diff --git a/qmlui/qml/ColorToolBasic.qml b/qmlui/qml/ColorToolBasic.qml
@@ -17,8 +17,7 @@
   limitations under the License.
 */
 
-import QtQuick 2.0
-import "."
+import QtQuick 2.15
 
 Rectangle
 {

diff --git a/qmlui/qml/ColorToolFilters.qml b/qmlui/qml/ColorToolFilters.qml
@@ -17,13 +17,12 @@
   limitations under the License.
 */
 
-import QtQuick 2.0
-import QtQuick.Controls 2.0
-import QtQuick.Layouts 1.1
+import QtQuick 2.15
+import QtQuick.Controls 2.15
+import QtQuick.Layouts 1.15
 
 import org.qlcplus.classes 1.0
 import "GenericHelpers.js" as Helpers
-import "."
 
 Rectangle
 {

diff --git a/qmlui/qml/ColorToolFull.qml b/qmlui/qml/ColorToolFull.qml
@@ -17,13 +17,12 @@
   limitations under the License.
 */
 
-import QtQuick 2.0
-import QtQuick.Controls 2.0
-import QtQuick.Layouts 1.1
+import QtQuick 2.15
+import QtQuick.Controls 2.15
+import QtQuick.Layouts 1.15
 
 import org.qlcplus.classes 1.0
 import "GenericHelpers.js" as Helpers
-import "."
 
 Rectangle
 {

diff --git a/qmlui/qml/ColorToolPrimary.qml b/qmlui/qml/ColorToolPrimary.qml
@@ -17,11 +17,10 @@
   limitations under the License.
 */
 
-import QtQuick 2.0
+import QtQuick 2.15
 
 import org.qlcplus.classes 1.0
 import "GenericHelpers.js" as Helpers
-import "."
 
 Rectangle
 {

diff --git a/qmlui/qml/ContextMenuEntry.qml b/qmlui/qml/ContextMenuEntry.qml
@@ -17,9 +17,7 @@
   limitations under the License.
 */
 
-import QtQuick 2.2
-
-import "."
+import QtQuick 2.15
 
 Rectangle
 {

diff --git a/qmlui/qml/CustomCheckBox.qml b/qmlui/qml/CustomCheckBox.qml
@@ -17,10 +17,8 @@
   limitations under the License.
 */
 
-import QtQuick 2.0
-import QtQuick.Controls 2.14
-
-import "."
+import QtQuick 2.15
+import QtQuick.Controls 2.15
 
 RadioButton
 {

diff --git a/qmlui/qml/CustomComboBox.qml b/qmlui/qml/CustomComboBox.qml
@@ -17,10 +17,9 @@
   limitations under the License.
 */
 
-import QtQuick 2.9
-import QtQuick.Window 2.3
-import QtQuick.Controls 2.14
-import "."
+import QtQuick 2.15
+import QtQuick.Window 2.15
+import QtQuick.Controls 2.15
 
 ComboBox
 {

diff --git a/qmlui/qml/CustomDoubleSpinBox.qml b/qmlui/qml/CustomDoubleSpinBox.qml
@@ -17,9 +17,8 @@
   limitations under the License.
 */
 
-import QtQuick 2.3
-import QtQuick.Controls 2.14
-import "."
+import QtQuick 2.15
+import QtQuick.Controls 2.15
 
 CustomSpinBox
 {
@@ -41,11 +40,11 @@ CustomSpinBox
         top:  Math.max(controlRoot.from, controlRoot.to)
     }
 
-    textFromValue: function(value, locale) {
+    textFromValue: (value, locale) => {
         return Number(value / Math.pow(10, decimals)).toLocaleString(locale, 'f', decimals) + suffix
     }
 
-    valueFromText: function(text, locale) {
+    valueFromText: (text, locale) => {
         return Number.fromLocaleString(locale, text.replace(suffix, "")) * Math.pow(10, decimals)
     }
 

diff --git a/qmlui/qml/CustomScrollBar.qml b/qmlui/qml/CustomScrollBar.qml
@@ -17,10 +17,9 @@
   limitations under the License.
 */
 
-import QtQuick 2.6
-import QtQuick.Controls 2.1
+import QtQuick 2.15
+import QtQuick.Controls 2.15
 
-import "."
 
 ScrollBar
 {

diff --git a/qmlui/qml/CustomSlider.qml b/qmlui/qml/CustomSlider.qml
@@ -18,9 +18,8 @@
   limitations under the License.
 */
 
-import QtQuick 2.9
-import QtQuick.Controls 2.14
-import "."
+import QtQuick 2.15
+import QtQuick.Controls 2.15
 
 Slider
 {

diff --git a/qmlui/qml/CustomSpinBox.qml b/qmlui/qml/CustomSpinBox.qml
@@ -17,9 +17,8 @@
   limitations under the License.
 */
 
-import QtQuick 2.3
-import QtQuick.Controls 2.14
-import "."
+import QtQuick 2.15
+import QtQuick.Controls 2.15
 
 SpinBox
 {
@@ -49,11 +48,11 @@ SpinBox
         if (focus) contentItem.selectAll()
     }
 
-    textFromValue: function(value) {
+    textFromValue: (value) => {
         return value + suffix
     }
 
-    valueFromText: function(text) {
+    valueFromText: (text) => {
         return parseInt(text.replace(suffix, ""))
     }
 

diff --git a/qmlui/qml/CustomTextEdit.qml b/qmlui/qml/CustomTextEdit.qml
@@ -17,9 +17,8 @@
   limitations under the License.
 */
 
-import QtQuick 2.7
-import QtQuick.Controls 2.14
-import "."
+import QtQuick 2.15
+import QtQuick.Controls 2.15
 
 TextField
 {

diff --git a/qmlui/qml/CustomTextInput.qml b/qmlui/qml/CustomTextInput.qml
@@ -17,8 +17,7 @@
   limitations under the License.
 */
 
-import QtQuick 2.7
-import "."
+import QtQuick 2.15
 
 TextInput
 {

diff --git a/qmlui/qml/DMXAddressTool.qml b/qmlui/qml/DMXAddressTool.qml
@@ -17,10 +17,9 @@
   limitations under the License.
 */
 
-import QtQuick 2.0
-import QtQuick.Layouts 1.2
+import QtQuick 2.15
+import QtQuick.Layouts 1.15
 
-import "."
 
 GridLayout
 {

diff --git a/qmlui/qml/DMXAddressWidget.qml b/qmlui/qml/DMXAddressWidget.qml
@@ -17,8 +17,8 @@
   limitations under the License.
 */
 
-import QtQuick 2.0
-import QtQuick.Layouts 1.2
+import QtQuick 2.15
+import QtQuick.Layouts 1.15
 
 Rectangle
 {

diff --git a/qmlui/qml/DMXPercentageButton.qml b/qmlui/qml/DMXPercentageButton.qml
@@ -17,8 +17,7 @@
   limitations under the License.
 */
 
-import QtQuick 2.0
-import "."
+import QtQuick 2.15
 
 Rectangle
 {

diff --git a/qmlui/qml/DayTimeTool.qml b/qmlui/qml/DayTimeTool.qml
@@ -17,8 +17,8 @@
   limitations under the License.
 */
 
-import QtQuick 2.0
-import QtQuick.Layouts 1.1
+import QtQuick 2.15
+import QtQuick.Layouts 1.15
 
 Rectangle
 {

diff --git a/qmlui/qml/ExternalControlDelegate.qml b/qmlui/qml/ExternalControlDelegate.qml
@@ -17,11 +17,10 @@
   limitations under the License.
 */
 
-import QtQuick 2.0
-import QtQuick.Layouts 1.1
+import QtQuick 2.15
+import QtQuick.Layouts 1.15
 
 import org.qlcplus.classes 1.0
-import "."
 
 Column
 {

diff --git a/qmlui/qml/ExternalControls.qml b/qmlui/qml/ExternalControls.qml
@@ -17,11 +17,10 @@
   limitations under the License.
 */
 
-import QtQuick 2.0
-import QtQuick.Layouts 1.1
+import QtQuick 2.15
+import QtQuick.Layouts 1.15
 
 import org.qlcplus.classes 1.0
-import "."
 
 Column
 {