From 10ebd00cde164d1566a1a87dc4919c4fd84d3213 Mon Sep 17 00:00:00 2001 From: Simon Edwards Date: Fri, 29 Apr 2022 20:29:29 +0200 Subject: [PATCH] Remove `NodeListView`, use `QListView` --- src/lib/QtWidgets/QListView.ts | 25 +++++++++++-------------- src/lib/QtWidgets/QListWidget.ts | 4 ++-- 2 files changed, 13 insertions(+), 16 deletions(-) diff --git a/src/lib/QtWidgets/QListView.ts b/src/lib/QtWidgets/QListView.ts index 618d36848..745d131c7 100644 --- a/src/lib/QtWidgets/QListView.ts +++ b/src/lib/QtWidgets/QListView.ts @@ -20,7 +20,17 @@ const listview = new QListView(); ``` */ -export abstract class NodeListView extends QAbstractItemView { +export class QListView extends QAbstractItemView { + constructor(parent?: QWidget) { + let native: NativeElement; + if (parent) { + native = new addon.QListView(parent.native); + } else { + native = new addon.QListView(); + } + super(native); + parent && this.setNodeParent(parent); + } setBatchSize(batchSize: number): void { this.setProperty('batchSize', batchSize); } @@ -143,17 +153,4 @@ export enum ListViewMode { IconMode, } -export class QListView extends NodeListView { - constructor(parent?: QWidget) { - let native: NativeElement; - if (parent) { - native = new addon.QListView(parent.native); - } else { - native = new addon.QListView(); - } - super(native); - parent && this.setNodeParent(parent); - } -} - export type QListViewSignals = QAbstractItemViewSignals; diff --git a/src/lib/QtWidgets/QListWidget.ts b/src/lib/QtWidgets/QListWidget.ts index 858e299b5..a74b300ef 100644 --- a/src/lib/QtWidgets/QListWidget.ts +++ b/src/lib/QtWidgets/QListWidget.ts @@ -2,7 +2,7 @@ import addon from '../utils/addon'; import { QWidget } from './QWidget'; import { NativeElement, Component } from '../core/Component'; import { QListWidgetItem } from './QListWidgetItem'; -import { NodeListView, QListViewSignals } from './QListView'; +import { QListView, QListViewSignals } from './QListView'; import { QRect } from '../QtCore/QRect'; import { SortOrder, ScrollHint, MatchFlag } from '../QtEnums'; import { QModelIndex } from '../QtCore/QModelIndex'; @@ -32,7 +32,7 @@ for (let i = 0; i < 30; i++) { } ``` */ -export class QListWidget extends NodeListView { +export class QListWidget extends QListView { items: Set; constructor(parent?: QWidget) {