Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-07 15:34:05 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

fixed deprecated qml implicitly defined onFoo properties in connections

Browse source
This commit is contained in:
steve hocktail 2022-02-28 22:09:43 -05:00
parent afafd0e874
commit 35194b0f44
33 changed files with 73 additions and 70 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
interface/resources/qml/+android_interface/Stats.qml
View file

@ -412,7 +412,7 @@ Item {
Connections {
target: root.parent
onWidthChanged: {
function onWidthChanged() {
root.x = root.parent.width - root.width;
}
}

2
interface/resources/qml/AnimStats.qml
View file

@ -174,7 +174,7 @@ Item {
Connections {
target: root.parent
onWidthChanged: {
function onWidthChanged() {
root.x = root.parent.width - root.width;
}
}

4
interface/resources/qml/AudioScopeUI.qml
View file

@ -614,7 +614,7 @@ Item {
Connections {
target: AudioScope
onPauseChanged: {
function onPauseChanged() {
if (!AudioScope.getPause()) {
pauseButton.text = "Pause";
pauseButton.color = hifi.buttons.black;
@ -625,7 +625,7 @@ Item {
pauseButton.color = hifi.buttons.blue;
}
}
onTriggered: {
function onTriggered() {
_triggered = true;
collectTriggerData();
AudioScope.setPause(true);

8
interface/resources/qml/LoginDialog/+android_interface/LinkAccountBody.qml
View file

@ -247,7 +247,7 @@ Item {
Connections {
target: loginDialog
onHandleLoginCompleted: {
function onHandleLoginCompleted() {
console.log("Login Succeeded, linking steam account")
if (loginDialog.isSteamRunning()) {
@ -258,19 +258,19 @@ Item {
bodyLoader.item.height = root.pane.height
}
}
onHandleLoginFailed: {
function onHandleLoginFailed() {
console.log("Login Failed")
mainTextContainer.visible = true
toggleLoading(false)
}
onHandleLinkCompleted: {
function onHandleLinkCompleted() {
console.log("Link Succeeded")
bodyLoader.setSource("../WelcomeBody.qml", { "welcomeBack" : true })
bodyLoader.item.width = root.pane.width
bodyLoader.item.height = root.pane.height
}
onHandleLinkFailed: {
function onHandleLinkFailed() {
console.log("Link Failed")
toggleLoading(false)
}

8
interface/resources/qml/LoginDialog/+android_interface/SignUpBody.qml
View file

@ -253,13 +253,13 @@ Item {
Connections {
target: loginDialog
onHandleSignupCompleted: {
function onHandleSignupCompleted() {
console.log("Sign Up Succeeded");
// now that we have an account, login with that username and password
loginDialog.login(usernameField.text, passwordField.text)
}
onHandleSignupFailed: {
function onHandleSignupFailed() {
console.log("Sign Up Failed")
toggleLoading(false)
@ -268,12 +268,12 @@ Item {
d.resize();
}
onHandleLoginCompleted: {
function onHandleLoginCompleted() {
bodyLoader.setSource("../WelcomeBody.qml", { "welcomeBack": false })
bodyLoader.item.width = root.pane.width
bodyLoader.item.height = root.pane.height
}
onHandleLoginFailed: {
function onHandleLoginFailed() {
// we failed to login, show the LoginDialog so the user will try again
bodyLoader.setSource("LinkAccountBody.qml", { "failAfterSignUp": true })
bodyLoader.item.width = root.pane.width

4
interface/resources/qml/LoginDialog/CompleteProfileBody.qml
View file

@ -492,7 +492,7 @@ Item {
Connections {
target: loginDialog
onHandleCreateCompleted: {
function onHandleCreateCompleted90 {
console.log("Create Succeeded");
if (completeProfileBody.withSteam) {
if (completeProfileBody.loginDialogPoppedUp) {
@ -506,7 +506,7 @@ Item {
bodyLoader.setSource("LoggingInBody.qml", { "loginDialog": loginDialog, "root": root, "bodyLoader": bodyLoader, "withSteam": completeProfileBody.withSteam, "linkSteam": false,
"withOculus": completeProfileBody.withOculus, "linkOculus": false });
}
onHandleCreateFailed: {
function onHandleCreateFailed() {
console.log("Create Failed: " + error);
if (completeProfileBody.withSteam || completeProfileBody.withOculus) {
if (completeProfileBody.loginDialogPoppedUp) {

4
interface/resources/qml/LoginDialog/LinkAccountBody.qml
View file

@ -724,14 +724,14 @@ Item {
Connections {
target: loginDialog
onFocusEnabled: {
function onFocusEnabled() {
if (!linkAccountBody.lostFocus) {
Qt.callLater(function() {
displayNameField.forceActiveFocus();
});
}
}
onFocusDisabled: {
function onFocusDisabled() {
linkAccountBody.lostFocus = !root.isTablet && !root.isOverlay;
if (linkAccountBody.lostFocus) {
Qt.callLater(function() {

12
interface/resources/qml/LoginDialog/LoggingInBody.qml
View file

@ -303,7 +303,7 @@ Item {
Connections {
target: loginDialog
onHandleCreateCompleted: {
function onHandleCreateCompleted() {
console.log("Create Succeeded")
if (loggingInBody.withOculus) {
if (loggingInBody.loginDialogPoppedUp) {
@ -318,7 +318,7 @@ Item {
oculusSuccessTimer.start();
}
}
onHandleCreateFailed: {
function onHandleCreateFailed() {
console.log("Create Failed: " + error);
if (loggingInBody.withOculus) {
if (loggingInBody.loginDialogPoppedUp) {
@ -331,7 +331,7 @@ Item {
"withOculus": loggingInBody.withOculus, "errorString": error });
}
}
onHandleLinkCompleted: {
function onHandleLinkCompleted() {
console.log("Link Succeeded");
if (loggingInBody.linkSteam) {
loggingInBody.linkSteam = false;
@ -352,7 +352,7 @@ Item {
}
loggingInBody.loadingSuccess();
}
onHandleLinkFailed: {
function onHandleLinkFailed() {
console.log("Link Failed: " + error);
loggingInSpinner.visible = false;
if (loggingInBody.linkOculus) {
@ -377,12 +377,12 @@ Item {
}
}
onHandleLoginCompleted: {
function onHandleLoginCompleted(): {
console.log("Login Succeeded");
loggingInBody.loadingSuccess();
}
onHandleLoginFailed: {
function onHandleLoginFailed() {
console.log("Login Failed")
loggingInSpinner.visible = false;
loggingInGlyph.visible = false;

8
interface/resources/qml/LoginDialog/SignUpBody.qml
View file

@ -455,7 +455,7 @@ Item {
}
Connections {
target: loginDialog
onHandleSignupCompleted: {
function onHandleSignupCompleted() {
console.log("Sign Up Completed");
if (signUpBody.loginDialogPoppedUp) {
@ -468,7 +468,7 @@ Item {
loginDialog.login(usernameField.text, passwordField.text);
bodyLoader.setSource("LoggingInBody.qml", { "loginDialog": loginDialog, "root": root, "bodyLoader": bodyLoader, "withSteam": false, "linkSteam": false });
}
onHandleSignupFailed: {
function onHandleSignupFailed() {
console.log("Sign Up Failed")
if (signUpBody.loginDialogPoppedUp) {
@ -495,14 +495,14 @@ Item {
errorContainer.anchors.left = usernameField.left;
}
}
onFocusEnabled: {
function onFocusEnabled() {
if (!signUpBody.lostFocus) {
Qt.callLater(function() {
emailField.forceActiveFocus();
});
}
}
onFocusDisabled: {
function onFocusDisabled() {
signUpBody.lostFocus = !root.isTablet && !root.isOverlay;
if (signUpBody.lostFocus) {
Qt.callLater(function() {

12
interface/resources/qml/LoginDialog/UsernameCollisionBody.qml
View file

@ -262,7 +262,7 @@ Item {
Connections {
target: loginDialog
onHandleCreateCompleted: {
function onHandleCreateCompleted() {
console.log("Create Succeeded");
if (usernameCollisionBody.withOculus) {
if (usernameCollisionBody.loginDialogPoppedUp) {
@ -284,7 +284,7 @@ Item {
bodyLoader.setSource("LoggingInBody.qml", { "loginDialog": loginDialog, "root": root, "bodyLoader": bodyLoader, "withSteam": usernameCollisionBody.withSteam,
"withOculus": usernameCollisionBody.withOculus, "linkSteam": false, "linkOculus": false })
}
onHandleCreateFailed: {
function onHandleCreateFailed() {
console.log("Create Failed: " + error)
if (usernameCollisionBody.loginDialogPoppedUp) {
var data = {
@ -297,7 +297,7 @@ Item {
mainTextContainer.visible = true
mainTextContainer.text = "\"" + textField.text + qsTr("\" is invalid or already taken.");
}
onHandleLoginCompleted: {
function onHandleLoginCompleted() {
console.log("Login Succeeded");
if (usernameCollisionBody.loginDialogPoppedUp) {
var data = {
@ -310,7 +310,7 @@ Item {
root.tryDestroy();
}
onHandleLoginFailed: {
function onHandleLoginFailed() {
console.log("Login Failed")
if (usernameCollisionBody.loginDialogPoppedUp) {
var data = {
@ -323,14 +323,14 @@ Item {
}
onFocusEnabled: {
function onFocusEnabled() {
if (!usernameCollisionBody.lostFocus) {
Qt.callLater(function() {
textField.forceActiveFocus();
});
}
}
onFocusDisabled: {
function onFocusDisabled() {
usernameCollisionBody.lostFocus = !root.isTablet && !root.isOverlay;
if (nusernameCollisionBody.lostFocus) {
Qt.callLater(function() {

2
interface/resources/qml/Stats.qml
View file

@ -463,7 +463,7 @@ Item {
Connections {
target: root.parent
onWidthChanged: {
function onWidthChanged() {
root.x = root.parent.width - root.width;
}
}

2
interface/resources/qml/controls/ButtonAwesome.qml
View file

@ -30,7 +30,7 @@ Original.Button {
Connections {
target: control
onActiveFocusChanged: {
function onActiveFocusChanged() {
if (control.activeFocus) {
pulseAnimation.restart();
} else {

4
interface/resources/qml/dialogs/FileDialog.qml
View file

@ -264,8 +264,8 @@ ModalWindow {
readonly property string currentSelectionPath: helper.urlToPath(currentSelectionUrl);
property bool currentSelectionIsFolder;
property var backStack: []
property var tableViewConnection: Connections { target: fileTableView; onCurrentRowChanged: d.update(); }
property var modelConnection: Connections { target: fileTableModel; onFolderChanged: d.update(); }
property var tableViewConnection: Connections { target: fileTableView; function onCurrentRowChanged() { d.update(); } }
property var modelConnection: Connections { target: fileTableModel; function onFolderChanged() { d.update(); } }
property var homeDestination: helper.home();
function capitalizeDrive(path) {

4
interface/resources/qml/dialogs/TabletFileDialog.qml
View file

@ -229,8 +229,8 @@ TabletModalWindow {
readonly property string currentSelectionPath: helper.urlToPath(currentSelectionUrl);
property bool currentSelectionIsFolder;
property var backStack: []
property var tableViewConnection: Connections { target: fileTableView; onCurrentRowChanged: d.update(); }
property var modelConnection: Connections { target: fileTableModel; onFolderChanged: d.update(); }
property var tableViewConnection: Connections { target: fileTableView; function onCurrentRowChanged() { d.update(); } }
property var modelConnection: Connections { target: fileTableModel; function onFolderChanged() { d.update(); } }
property var homeDestination: helper.home();
function capitalizeDrive(path) {

2
interface/resources/qml/dialogs/assetDialog/AssetDialogContent.qml
View file

@ -151,7 +151,7 @@ Item {
property string currentSelectionPath
property bool currentSelectionIsFolder
property var tableViewConnection: Connections { target: assetTableView; onCurrentRowChanged: d.update(); }
property var tableViewConnection: Connections { target: assetTableView; function onCurrentRowChanged() { d.update(); } }
function update() {
var row = assetTableView.currentRow;

6
interface/resources/qml/hifi/Pal.qml
View file

@ -84,7 +84,7 @@ Rectangle {
}
Connections {
target: GlobalServices
onMyUsernameChanged: {
function onMyUsernameChanged() {
myData.userName = Account.username;
myDataChanged(); // Setting a property within an object isn't enough to update dependencies. This will do it.
}
@ -696,7 +696,7 @@ Rectangle {
Connections {
target: nearbyTable
onTitlePaintedPosSignal: {
function onTitlePaintedPosSignal(column) {
if (column === 1) { // name column
questionRect.anchors.leftMargin = actionButtonWidth + nearbyTable.titlePaintedPos[column]
}
@ -1395,6 +1395,6 @@ Rectangle {
}
Connections {
target: nearbyTable.selection;
onSelectionChanged: pal.noticeSelection();
function onSelectionChanged() { pal.noticeSelection(); }
}
}

2
interface/resources/qml/hifi/avatarPackager/AvatarProject.qml
View file

@ -191,7 +191,7 @@ Item {
Connections {
target: root.uploader
onStateChanged: {
function onStateChanged(newState) {
root.hasSuccessfullyUploaded = newState >= 4;
}
}

4
interface/resources/qml/hifi/dialogs/RunningScripts.qml
View file

@ -89,7 +89,7 @@ Windows.ScrollingWindow {
Connections {
target: ScriptDiscoveryService
onScriptCountChanged: {
function onScriptCountChanged() {
runningScriptsModel = listModelBuilder.createObject(root);
refreshTimer.restart();
}
@ -397,7 +397,7 @@ Windows.ScrollingWindow {
Connections {
target: treeView.selection
onCurrentIndexChanged: {
function onCurrentIndexChanged() {
var path = scriptsModel.data(treeView.selection.currentIndex, 0x100)
if (path) {
selectedScript.text = path

8
interface/resources/qml/hifi/dialogs/TabletDebugWindow.qml
View file

@ -59,10 +59,10 @@ Rectangle {
Connections {
target: ScriptDiscoveryService
onPrintedMessage: sendToLogWindow("", message, engineName);
onWarningMessage: sendToLogWindow("WARNING", message, engineName);
onErrorMessage: sendToLogWindow("ERROR", message, engineName);
onInfoMessage: sendToLogWindow("INFO", message, engineName);
function onPrintedMessage(message, engineName) { sendToLogWindow("", message, engineName); }
function onWarningMessage(message, engineName) { sendToLogWindow("WARNING", message, engineName); }
function onErrorMessage(message, engineName) { sendToLogWindow("ERROR", message, engineName); }
function onInfoMessage(message, engineName) { sendToLogWindow("INFO", message, engineName); }
}
TextArea {

4
interface/resources/qml/hifi/dialogs/TabletRunningScripts.qml
View file

@ -75,7 +75,7 @@ Rectangle {
Connections {
target: ScriptDiscoveryService
onScriptCountChanged: {
function onScriptCountChanged() {
runningScriptsModel = listModelBuilder.createObject(root);
refreshTimer.restart();
}
@ -430,7 +430,7 @@ Rectangle {
Connections {
target: treeView.selection
onCurrentIndexChanged: {
function onCurrentIndexChanged() {
var path = scriptsModel.data(treeView.selection.currentIndex, 0x100)
if (path) {
selectedScript.text = path

2
interface/resources/qml/hifi/simplifiedUI/avatarApp/AvatarApp.qml
View file

@ -49,7 +49,7 @@ Rectangle {
Connections {
target: MyAvatar
onSkeletonModelURLChanged: {
function onSkeletonModelURLChanged() {
root.updatePreviewUrl();
}
}

4
interface/resources/qml/hifi/simplifiedUI/inputDeviceButton/InputDeviceButton.qml
View file

@ -41,11 +41,11 @@ Rectangle {
Connections {
target: AudioScriptingInterface
onNoiseGateOpened: {
function onNoiseGateOpened() {
gated = false;
}
onNoiseGateClosed: {
function onNoiseGateClosed() {
gated = false;
}
}

6
interface/resources/qml/hifi/simplifiedUI/settingsApp/general/General.qml
View file

@ -145,7 +145,7 @@ Flickable {
Connections {
target: Settings
onValueChanged: {
function onValueChanged(setting, value) {
if (setting === "simplifiedUI/allowEmoteDrawerExpansion") {
emoteSwitch.checked = value;
}
@ -262,7 +262,7 @@ Flickable {
Connections {
target: Camera
onModeUpdated: {
function onModeUpdated() {
if (Camera.mode === "first person look at") {
firstPerson.checked = true
} else if (Camera.mode === "look at") {
@ -276,7 +276,7 @@ Flickable {
Connections {
target: HMD
onDisplayModeChanged: {
function onDisplayModeChanged() {
selfie.visible = isHMDMode ? false : true
}
}

2
interface/resources/qml/hifi/simplifiedUI/topBar/SimplifiedTopBar.qml
View file

@ -49,7 +49,7 @@ Rectangle {
Connections {
target: MyAvatar
onSkeletonModelURLChanged: {
function onSkeletonModelURLChanged() {
root.updatePreviewUrl();
if ((MyAvatar.skeletonModelURL.indexOf("defaultAvatar") > -1 || MyAvatar.skeletonModelURL.indexOf("fst") === -1) &&

2
interface/resources/qml/hifi/tablet/TabletButton.qml
View file

@ -38,7 +38,7 @@ Item {
Connections {
target: flickable
onMovingChanged: {
function onMovingChanged() {
//when flick/move started, and hover is on, clean hove state
if (flickable.moving && tabletButton.state.indexOf("hover") !== -1) {
tabletButton.state = (tabletButton.isActive) ? "active state" : "base state";

2
interface/resources/qml/hifi/tablet/TabletRoot.qml
View file

@ -199,7 +199,7 @@ Rectangle {
Connections {
id: eventBridgeConnection
target: eventBridge
onWebEventReceived: {
function onWebEventReceived(message) {
if (typeof message === "string" && message.slice(0, 17) === "CLARA.IO DOWNLOAD") {
ApplicationInterface.addAssetToWorldFromURL(message.slice(18));
}

2
interface/resources/qml/hifi/tablet/WindowRoot.qml
View file

@ -117,7 +117,7 @@ Windows.ScrollingWindow {
Connections {
id: eventBridgeConnection
target: eventBridge
onWebEventReceived: {
function onWebEventReceived(message) {
if (typeof message === "string" && message.slice(0, 17) === "CLARA.IO DOWNLOAD") {
ApplicationInterface.addAssetToWorldFromURL(message.slice(18));
}

4
interface/resources/qml/hifi/tablet/tabletWindows/TabletFileDialog.qml
View file

@ -223,8 +223,8 @@ Rectangle {
readonly property string currentSelectionPath: helper.urlToPath(currentSelectionUrl);
property bool currentSelectionIsFolder;
property var backStack: []
property var tableViewConnection: Connections { target: fileTableView; onCurrentRowChanged: d.update(); }
property var modelConnection: Connections { target: fileTableModel; onFolderChanged: d.update(); }
property var tableViewConnection: Connections { target: fileTableView; function onCurrentRowChanged() { d.update(); } }
property var modelConnection: Connections { target: fileTableModel; function onFolderChanged() { d.update(); } }
property var homeDestination: helper.home();
function capitalizeDrive(path) {

4
interface/resources/qml/hifi/toolbars/Toolbar.qml
View file

@ -53,7 +53,9 @@ Window {
Connections {
target: proxy;
onPropertiesChanged: updateProperties();
function onPropertiesChanged() {
updateProperties();
}
}
function updateProperties() {

6
interface/resources/qml/windows/Decoration.qml
View file

@ -68,18 +68,18 @@ Rectangle {
}
Connections {
target: window
onMouseEntered: {
function onMouseEntered() {
if (desktop.hmdHandMouseActive) {
root.inflateDecorations()
}
}
onMouseExited: {
function onMouseExited() {
root.deflateDecorations();
}
}
Connections {
target: desktop
onHmdHandMouseActiveChanged: {
function onHmdHandMouseActiveChanged() {
if (desktop.hmdHandMouseActive) {
if (decorationMouseArea.containsMouse) {
root.inflateDecorations();

2
interface/resources/qml/windows/Window.qml
View file

@ -269,7 +269,7 @@ Fadable {
}
// When the desktop pinned state changes, automatically handle the current windows
Connections { target: desktop; onPinnedChanged: d.updateVisibility() }
Connections { target: desktop; function onPinnedChanged() { d.updateVisibility(); } }
function raise() {

3
scripts/communityScripts/chat/FloofChat.qml
View file

@ -144,8 +144,9 @@ Rectangle {
Connections {
target: button
onClicked:
function onClicked() {
sendMessage(JSON.stringify({type:"CMD",cmd:"Clicked"}));
}
}
}

2
scripts/simplifiedUI/simplifiedEmote/ui/qml/SimplifiedEmoteIndicator.qml
View file

@ -53,7 +53,7 @@ Rectangle {
Connections {
target: Settings
onValueChanged: {
function onValueChanged(setting, value) {
if (setting === "simplifiedUI/allowEmoteDrawerExpansion") {
root.allowEmoteDrawerExpansion = value;
}