From 8e33ed85336b1f40f94f982cec969e1fa6f4cd8c Mon Sep 17 00:00:00 2001
From: SeeLook <seelook@gmail.com>
Date: Sat, 8 Feb 2025 11:03:40 +0100
Subject: [PATCH] Use proper JS syntax for Connections
---
src/qml/MainScore.qml | 6 +++---
src/qml/MainWindow.qml | 2 --
src/qml/instruments/Guitar.qml | 2 +-
src/qml/instruments/Instrument.qml | 4 ++--
src/qml/score/Clef.qml | 2 +-
src/qml/score/DelControl.qml | 10 +++-------
src/qml/score/Meter.qml | 2 +-
src/qml/score/ScoreToolbox.qml | 16 ++++------------
src/qml/score/Staff.qml | 2 +-
src/qml/shared/HeadButton.qml | 4 +---
src/qml/sound/TempoBar.qml | 2 +-
11 files changed, 18 insertions(+), 34 deletions(-)
diff --git a/src/qml/MainScore.qml b/src/qml/MainScore.qml
index ad402829..636de29a 100644
--- a/src/qml/MainScore.qml
+++ b/src/qml/MainScore.qml
@@ -170,7 +170,7 @@ Score {
Connections {
target: SOUND
- onInitialized: {
+ function onInitialized() : void {
mainObj.scoreObject = scoreObj;
singleNote = Qt.binding(function() {
return GLOB.singleNoteMode;
@@ -193,12 +193,12 @@ Score {
Connections {
target: GLOB
- onClefTypeChanged: score.clef = GLOB.clefType
+ function onClefTypeChanged() : void { score.clef = GLOB.clefType }
}
Connections {
target: GLOB.tuning
- onScordatureChanged: updateScord()
+ function onScordatureChanged() : void { updateScord() }
}
// note highlight
diff --git a/src/qml/MainWindow.qml b/src/qml/MainWindow.qml
index c5d9d452..ded6cd7d 100644
--- a/src/qml/MainWindow.qml
+++ b/src/qml/MainWindow.qml
@@ -157,12 +157,10 @@ ApplicationWindow {
height: parent.height / (GLOB.singleNoteMode && topToBott ? 2 : 1)
width: parent.width / (GLOB.singleNoteMode && !topToBott ? 2 : 1)
}
-
}
Instrument {
id: instrument
-
score: score
}
diff --git a/src/qml/instruments/Guitar.qml b/src/qml/instruments/Guitar.qml
index c51e9ea4..ec57e2ce 100644
--- a/src/qml/instruments/Guitar.qml
+++ b/src/qml/instruments/Guitar.qml
@@ -130,7 +130,7 @@ TguitarBg {
Connections {
target: instrFlick
enabled: !NOO.isAndroid()
- onMovementEnded: instrument.pressedAt(0, 0)
+ function onMovementEnded() : void { instrument.pressedAt(0, 0) }
}
MouseArea {
diff --git a/src/qml/instruments/Instrument.qml b/src/qml/instruments/Instrument.qml
index 0f529fbd..481136ea 100644
--- a/src/qml/instruments/Instrument.qml
+++ b/src/qml/instruments/Instrument.qml
@@ -52,13 +52,13 @@ Flickable {
Connections {
target: GLOB
- onInstrumentChanged: setInstrument()
+ function onInstrumentChanged() : void { setInstrument() }
}
Connections {
target: score
enabled: GLOB.instrument.piano
- onClefChanged: instrument.setAmbitus(score.scoreObj.lowestNote(), score.scoreObj.highestNote())
+ function onClefChanged() : void { instrument.setAmbitus(score.scoreObj.lowestNote(), score.scoreObj.highestNote()) }
}
}
diff --git a/src/qml/score/Clef.qml b/src/qml/score/Clef.qml
index 4f790125..5e9eacb2 100644
--- a/src/qml/score/Clef.qml
+++ b/src/qml/score/Clef.qml
@@ -91,7 +91,7 @@ Text {
Connections {
target: score
- onClefChanged: getPos()
+ function onClefChanged() : void { getPos() }
}
}
diff --git a/src/qml/score/DelControl.qml b/src/qml/score/DelControl.qml
index de1c4256..4dbc9c42 100644
--- a/src/qml/score/DelControl.qml
+++ b/src/qml/score/DelControl.qml
@@ -17,8 +17,8 @@ ControlBase {
Connections {
target: scoreObj
enabled: !scoreObj.singleNote && scoreObj.allowAdding && !scoreObj.readOnly
- onEditModeChanged: delControl.show = scoreObj.editMode && activeItem
- onActiveNoteChanged: {
+ function onEditModeChanged() : void { delControl.show = scoreObj.editMode && activeItem }
+ function onActiveNoteChanged() : void {
if (scoreObj.activeNote) {
if (!scoreObj.readOnly && activeItem != scoreObj.activeNote) {
activeItem = scoreObj.activeNote;
@@ -30,7 +30,7 @@ ControlBase {
delControl.active = false;
}
}
- onScoreWasCleared: show = false
+ function onScoreWasCleared() : void { show = false }
}
GlowRect {
@@ -94,18 +94,14 @@ ControlBase {
Component.onCompleted: {
if (scoreObj.deleteNoteAct)
statusTip = scoreObj.deleteNoteAct.text + ".<br><b>(" + scoreObj.deleteNoteAct.key() + ")</b>";
-
}
font {
family: "Nootka"
pixelSize: factor * 3
}
-
}
-
}
-
}
}
diff --git a/src/qml/score/Meter.qml b/src/qml/score/Meter.qml
index 01e18cf0..46da9238 100644
--- a/src/qml/score/Meter.qml
+++ b/src/qml/score/Meter.qml
@@ -18,7 +18,7 @@ Text {
Connections {
target: score
- onMeterChanged: text = NOO.meter(score.meter).symbol()
+ function onMeterChanged() : void { text = NOO.meter(score.meter).symbol() }
}
font {
diff --git a/src/qml/score/ScoreToolbox.qml b/src/qml/score/ScoreToolbox.qml
index a767b3a1..0346127d 100644
--- a/src/qml/score/ScoreToolbox.qml
+++ b/src/qml/score/ScoreToolbox.qml
@@ -55,8 +55,8 @@ ControlBase {
Connections {
target: scoreObj
- onScoreWasCleared: show = false
- onEditModeChanged: show = scoreObj.editMode && scoreObj.activeNote
+ function onScoreWasCleared() : void { show = false }
+ function onEditModeChanged() : void { show = scoreObj.editMode && scoreObj.activeNote }
}
component: Component {
@@ -86,11 +86,8 @@ ControlBase {
family: "scorek"
pixelSize: factor * 3
}
-
}
-
}
-
}
Rectangle {
@@ -116,20 +113,17 @@ ControlBase {
var act = rtmActions[Math.floor(index / 2)];
if (act)
item.statusTip = act.text + "<br><b>(" + act.key() + ")</b>";
-
}
}
Connections {
target: item
- onClicked: {
+ function onClicked : void {
scoreObj.workRtmValue = item.rhythm;
scoreObj.workRtmRest = item.rest;
}
}
-
}
-
}
// triplet
@@ -165,7 +159,6 @@ ControlBase {
item.text = ".";
if (scoreObj.dotNoteAct)
item.statusTip = scoreObj.dotNoteAct.text + "<br><b>(" + scoreObj.dotNoteAct.key() + ")</b>";
-
}
Binding {
@@ -182,9 +175,8 @@ ControlBase {
Connections {
target: dotLoad.item
- onClicked: scoreObj.workRtmDot = !scoreObj.workRtmDot
+ function onClicked() : void { scoreObj.workRtmDot = !scoreObj.workRtmDot }
}
-
}
}
diff --git a/src/qml/score/Staff.qml b/src/qml/score/Staff.qml
index 5aae6a06..7cd8298a 100644
--- a/src/qml/score/Staff.qml
+++ b/src/qml/score/Staff.qml
@@ -94,7 +94,7 @@ TstaffItem {
Connections {
target: score
- onEnableKeySignChanged: checkIsKeyEnabled()
+ function onEnableKeySignChanged() : void { checkIsKeyEnabled() }
}
// measure number
diff --git a/src/qml/shared/HeadButton.qml b/src/qml/shared/HeadButton.qml
index d2b3f954..d771b167 100644
--- a/src/qml/shared/HeadButton.qml
+++ b/src/qml/shared/HeadButton.qml
@@ -84,7 +84,7 @@ ToolButton {
Connections {
target: taction
- onShakeButton: shakeAnim.running = true
+ function onShakeButton() : void { shakeAnim.running = true }
}
SequentialAnimation {
@@ -116,10 +116,8 @@ ToolButton {
to: 0
duration: 50
}
-
}
background: Item {
}
-
}
diff --git a/src/qml/sound/TempoBar.qml b/src/qml/sound/TempoBar.qml
index 276abf65..0b1b0371 100644
--- a/src/qml/sound/TempoBar.qml
+++ b/src/qml/sound/TempoBar.qml
@@ -210,7 +210,7 @@ Item {
Connections {
target: SOUND
- onCountdownPrepare: {
+ function onCountdownPrepare() : void {
if (SOUND.tickBeforePlay && !GLOB.singleNoteMode) {
if (!preCountItem) {
var d = Qt.createComponent("qrc:/sound/CountdownItem.qml");
--
GitLab