diff --git a/src/rooms/SpaceDrawer.qml b/src/rooms/SpaceDrawer.qml index 5c0a968ef..1c1a4fd2c 100644 --- a/src/rooms/SpaceDrawer.qml +++ b/src/rooms/SpaceDrawer.qml @@ -46,7 +46,6 @@ QQC2.Control { } ColumnLayout { - id: column width: scrollView.width spacing: 0 diff --git a/src/settings/DevicesPage.qml b/src/settings/DevicesPage.qml index bc971dadd..09a0a655c 100644 --- a/src/settings/DevicesPage.qml +++ b/src/settings/DevicesPage.qml @@ -24,7 +24,6 @@ FormCard.FormCardPage { required property NeoChatConnection connection property DevicesModel devicesModel: DevicesModel { - id: devicesModel connection: root.connection } diff --git a/src/settings/EmoticonEditorPage.qml b/src/settings/EmoticonEditorPage.qml index 7a11c3ae7..ecdaea224 100644 --- a/src/settings/EmoticonEditorPage.qml +++ b/src/settings/EmoticonEditorPage.qml @@ -96,12 +96,10 @@ FormCard.FormCardPage { } } FormCard.FormTextFieldDelegate { - id: shortcode label: i18n("Shortcode:") text: root.shortcode } FormCard.FormTextFieldDelegate { - id: description label: i18n("Description:") text: root.description } @@ -109,19 +107,19 @@ FormCard.FormCardPage { id: save text: i18n("Save") icon.name: "document-save" - enabled: !root.newEmoticon || (image.source.toString().length > 0 && shortcode.text && description.text) + enabled: !root.newEmoticon || (image.source.toString().length > 0 && root.shortcode && root.description) onClicked: { if (root.newEmoticon) { - model.addEmoticon(image.source, shortcode.text, description.text, emoticonType === EmoticonFormCard.Stickers ? "sticker" : "emoticon"); + root.model.addEmoticon(image.source, root.shortcode, root.description, root.emoticonType === EmoticonFormCard.Stickers ? "sticker" : "emoticon"); } else { - if (description.text !== root.description) { - root.model.setEmoticonBody(proxyModel.mapToSource(proxyModel.index(model.index, 0)).row, description.text); + if (root.description !== root.description) { + root.model.setEmoticonBody(root.proxyModel.mapToSource(root.proxyModel.index(root.model.index, 0)).row, root.description); } - if (shortcode.text !== root.shortcode) { - root.model.setEmoticonShortcode(proxyModel.mapToSource(proxyModel.index(model.index, 0)).row, shortcode.text); + if (root.shortcode !== root.shortcode) { + root.model.setEmoticonShortcode(root.proxyModel.mapToSource(root.proxyModel.index(root.model.index, 0)).row, root.shortcode); } if (image.source + "" !== root.url) { - root.model.setEmoticonImage(proxyModel.mapToSource(proxyModel.index(model.index, 0)).row, image.source); + root.model.setEmoticonImage(root.proxyModel.mapToSource(root.proxyModel.index(root.model.index, 0)).row, image.source); } } root.closeDialog(); @@ -129,8 +127,6 @@ FormCard.FormCardPage { } } property Component openFileDialog: Component { - id: openFileDialog - OpenFileDialog { currentFolder: Core.StandardPaths.standardLocations(Core.StandardPaths.PicturesLocation)[0] parentWindow: root.Window.window diff --git a/src/settings/PushNotification.qml b/src/settings/PushNotification.qml index 4d9931c5e..bde0b8adc 100644 --- a/src/settings/PushNotification.qml +++ b/src/settings/PushNotification.qml @@ -80,16 +80,11 @@ FormCard.FormCardPage { } } - delegate: ruleDelegate - - Component { - id: ruleDelegate - NotificationRuleItem { - onDeleteRule: { - root.pushRuleModel.removeKeyword(id); - } - onNotificatonActionChanged: action => root.pushRuleModel.setPushRuleAction(id, action) + delegate: NotificationRuleItem { + onDeleteRule: { + root.pushRuleModel.removeKeyword(id); } + onNotificatonActionChanged: action => root.pushRuleModel.setPushRuleAction(id, action) } } FormCard.AbstractFormDelegate { diff --git a/src/settings/RoomSortParameterDialog.qml b/src/settings/RoomSortParameterDialog.qml index 1613df64a..b027dbd27 100644 --- a/src/settings/RoomSortParameterDialog.qml +++ b/src/settings/RoomSortParameterDialog.qml @@ -36,7 +36,6 @@ Kirigami.Dialog { clip: true ListView { - id: listView implicitHeight: contentHeight currentIndex: -1