diff --git a/src/lib/QtWidgets/QCheckBox/index.ts b/src/lib/QtWidgets/QCheckBox/index.ts index df318da43..7662fdb05 100644 --- a/src/lib/QtWidgets/QCheckBox/index.ts +++ b/src/lib/QtWidgets/QCheckBox/index.ts @@ -18,7 +18,7 @@ export class QCheckBox extends NodeWidget { } super(native); this.native = native; - this.parent = parent; + this.nodeParent = parent; // bind member functions this.setText.bind(this); this.setChecked.bind(this); diff --git a/src/lib/QtWidgets/QDial/index.ts b/src/lib/QtWidgets/QDial/index.ts index bdfe3c3d4..808ca215d 100644 --- a/src/lib/QtWidgets/QDial/index.ts +++ b/src/lib/QtWidgets/QDial/index.ts @@ -23,7 +23,7 @@ export class QDial extends QAbstractSlider { } super(native); this.native = native; - this.parent = parent; + this.nodeParent = parent; // bind member functions this.setNotchesVisible.bind(this); this.notchesVisible.bind(this); diff --git a/src/lib/QtWidgets/QGridLayout/index.ts b/src/lib/QtWidgets/QGridLayout/index.ts index 98997e848..129096404 100644 --- a/src/lib/QtWidgets/QGridLayout/index.ts +++ b/src/lib/QtWidgets/QGridLayout/index.ts @@ -9,17 +9,17 @@ export class QGridLayout extends NodeLayout { super(); if (parent) { this.native = new addon.QGridLayout(parent.native); - this.parent = parent; + this.nodeParent = parent; } else { this.native = new addon.QGridLayout(); } } addWidget = (widget: NodeWidget) => { this.native.addWidget(widget.native); - this.children.add(widget); + this.nodeChildren.add(widget); }; removeWidget = (widget: NodeWidget) => { this.native.removeWidget(widget.native); - this.children.delete(widget); + this.nodeChildren.delete(widget); }; } diff --git a/src/lib/QtWidgets/QLabel/index.ts b/src/lib/QtWidgets/QLabel/index.ts index 0f6762c14..6ced077dd 100644 --- a/src/lib/QtWidgets/QLabel/index.ts +++ b/src/lib/QtWidgets/QLabel/index.ts @@ -19,7 +19,7 @@ export class QLabel extends NodeWidget { } super(native); this.native = native; - this.parent = parent; + this.nodeParent = parent; } setWordWrap(on: boolean) { this.native.setWordWrap(on); diff --git a/src/lib/QtWidgets/QLineEdit/index.ts b/src/lib/QtWidgets/QLineEdit/index.ts index 09449bfac..84c0ee125 100644 --- a/src/lib/QtWidgets/QLineEdit/index.ts +++ b/src/lib/QtWidgets/QLineEdit/index.ts @@ -25,7 +25,7 @@ export class QLineEdit extends NodeWidget { } super(native); this.native = native; - this.parent = parent; + this.nodeParent = parent; // bind member functions this.setText.bind(this); this.text.bind(this); diff --git a/src/lib/QtWidgets/QMainWindow/index.ts b/src/lib/QtWidgets/QMainWindow/index.ts index 992d2fc2f..1562f5598 100644 --- a/src/lib/QtWidgets/QMainWindow/index.ts +++ b/src/lib/QtWidgets/QMainWindow/index.ts @@ -22,7 +22,7 @@ export class QMainWindow extends NodeWidget { } super(native); this.native = native; - this.parent = parent; + this.nodeParent = parent; // bind member functions this.setCentralWidget.bind(this); this.setLayout = (parentLayout: NodeLayout) => { diff --git a/src/lib/QtWidgets/QMenu.ts b/src/lib/QtWidgets/QMenu.ts index ba6c6aa3e..cf32b56da 100644 --- a/src/lib/QtWidgets/QMenu.ts +++ b/src/lib/QtWidgets/QMenu.ts @@ -19,7 +19,7 @@ export class QMenu extends NodeWidget { } super(native); this.native = native; - this.parent = parent; + this.nodeParent = parent; this.actions = new Set(); } setTitle(title: string) { diff --git a/src/lib/QtWidgets/QMenuBar.ts b/src/lib/QtWidgets/QMenuBar.ts index f56ef029d..6bfa8e78b 100644 --- a/src/lib/QtWidgets/QMenuBar.ts +++ b/src/lib/QtWidgets/QMenuBar.ts @@ -26,7 +26,7 @@ export class QMenuBar extends NodeWidget { } super(native); this.native = native; - this.parent = parent; + this.nodeParent = parent; } addMenu(menu: QMenu) { diff --git a/src/lib/QtWidgets/QPlainTextEdit/index.ts b/src/lib/QtWidgets/QPlainTextEdit/index.ts index e5357713e..5a8a8f81f 100644 --- a/src/lib/QtWidgets/QPlainTextEdit/index.ts +++ b/src/lib/QtWidgets/QPlainTextEdit/index.ts @@ -33,7 +33,7 @@ export class QPlainTextEdit extends QAbstractScrollArea { } super(native); this.native = native; - this.parent = parent; + this.nodeParent = parent; // bind member functions this.setPlainText.bind(this); this.setPlaceholderText.bind(this); diff --git a/src/lib/QtWidgets/QProgressBar/index.ts b/src/lib/QtWidgets/QProgressBar/index.ts index 5687c706c..d980aa7e7 100644 --- a/src/lib/QtWidgets/QProgressBar/index.ts +++ b/src/lib/QtWidgets/QProgressBar/index.ts @@ -18,7 +18,7 @@ export class QProgressBar extends NodeWidget { } super(native); this.native = native; - this.parent = parent; + this.nodeParent = parent; // bind member functions this.setValue.bind(this); this.setMinimum.bind(this); diff --git a/src/lib/QtWidgets/QPushButton/index.ts b/src/lib/QtWidgets/QPushButton/index.ts index 5807b1842..c0032b31e 100644 --- a/src/lib/QtWidgets/QPushButton/index.ts +++ b/src/lib/QtWidgets/QPushButton/index.ts @@ -22,7 +22,7 @@ export class QPushButton extends NodeWidget { native = new addon.QPushButton(); } super(native); - this.parent = parent; + this.nodeParent = parent; this.native = native; // bind member functions this.setText.bind(this); diff --git a/src/lib/QtWidgets/QRadioButton/index.ts b/src/lib/QtWidgets/QRadioButton/index.ts index 745c5ec3d..9e0bd3bbd 100644 --- a/src/lib/QtWidgets/QRadioButton/index.ts +++ b/src/lib/QtWidgets/QRadioButton/index.ts @@ -17,7 +17,7 @@ export class QRadioButton extends NodeWidget { } super(native); this.native = native; - this.parent = parent; + this.nodeParent = parent; // bind member functions this.setText.bind(this); } diff --git a/src/lib/QtWidgets/QScrollArea/index.ts b/src/lib/QtWidgets/QScrollArea/index.ts index b4f5784bd..4917f67a9 100644 --- a/src/lib/QtWidgets/QScrollArea/index.ts +++ b/src/lib/QtWidgets/QScrollArea/index.ts @@ -19,7 +19,7 @@ export class QScrollArea extends QAbstractScrollArea { } super(native); this.native = native; - this.parent = parent; + this.nodeParent = parent; // bind member functions this.setWidget.bind(this); this.takeWidget.bind(this); diff --git a/src/lib/QtWidgets/QSpinBox/index.ts b/src/lib/QtWidgets/QSpinBox/index.ts index f47c8e9c9..0a2b347c9 100644 --- a/src/lib/QtWidgets/QSpinBox/index.ts +++ b/src/lib/QtWidgets/QSpinBox/index.ts @@ -19,7 +19,7 @@ export class QSpinBox extends NodeWidget { native = new addon.QSpinBox(); } super(native); - this.parent = parent; + this.nodeParent = parent; this.native = native; // bind member functions this.setPrefix.bind(this); diff --git a/src/lib/QtWidgets/QTabWidget/index.ts b/src/lib/QtWidgets/QTabWidget/index.ts index 0d87c01f7..97acf8320 100644 --- a/src/lib/QtWidgets/QTabWidget/index.ts +++ b/src/lib/QtWidgets/QTabWidget/index.ts @@ -23,14 +23,14 @@ export class QTabWidget extends NodeWidget { native = new addon.QTabWidget(); } super(native); - this.parent = parent; + this.nodeParent = parent; this.native = native; // bind member functions this.addTab.bind(this); } addTab(page: NodeWidget, icon: QIcon, label: string) { - this.children.add(page); + this.nodeChildren.add(page); this.native.addTab(page.native, icon.native, label); } diff --git a/src/lib/QtWidgets/QWidget/index.ts b/src/lib/QtWidgets/QWidget/index.ts index bfe377a33..e8014fdb9 100644 --- a/src/lib/QtWidgets/QWidget/index.ts +++ b/src/lib/QtWidgets/QWidget/index.ts @@ -166,7 +166,7 @@ export class QWidget extends NodeWidget { native = new addon.QWidget(); } super(native); - this.parent = parent; + this.nodeParent = parent; this.native = native; } } diff --git a/src/lib/core/Component/index.ts b/src/lib/core/Component/index.ts index 4d3683cee..e320c2c3c 100644 --- a/src/lib/core/Component/index.ts +++ b/src/lib/core/Component/index.ts @@ -1,6 +1,6 @@ export type NativeElement = { type: "native"; [key: string]: any }; export abstract class Component { - protected children = new Set(); - protected parent?: Component; + protected nodeChildren = new Set(); + protected nodeParent?: Component; abstract native: NativeElement; } diff --git a/src/lib/core/FlexLayout/index.ts b/src/lib/core/FlexLayout/index.ts index 2f28210c0..c54c57881 100644 --- a/src/lib/core/FlexLayout/index.ts +++ b/src/lib/core/FlexLayout/index.ts @@ -10,7 +10,7 @@ export class FlexLayout extends NodeLayout { addWidget = (childWidget: NodeWidget, childFlexNode?: FlexNode) => { const childYogaNode = childFlexNode || childWidget.getFlexNode(); - this.children.add(childWidget); + this.nodeChildren.add(childWidget); this.native.addWidget(childWidget.native, childYogaNode); }; @@ -23,7 +23,7 @@ export class FlexLayout extends NodeLayout { const childYogaNode = childFlexNode || childWidget.getFlexNode(); const beforeChildYogaNode = beforeChildFlexNode || beforeChildWidget.getFlexNode(); - this.children.add(childWidget); // No orderer required yet, so just inserting at the end. + this.nodeChildren.add(childWidget); // No orderer required yet, so just inserting at the end. this.native.insertChildBefore( childWidget.native, beforeChildYogaNode, @@ -32,11 +32,11 @@ export class FlexLayout extends NodeLayout { }; removeWidget = (childWidget: NodeWidget, childFlexNode?: FlexNode) => { - if (!this.children.has(childWidget)) { + if (!this.nodeChildren.has(childWidget)) { return; } const childYogaNode = childFlexNode || childWidget.getFlexNode(); - this.children.delete(childWidget); + this.nodeChildren.delete(childWidget); this.native.removeWidget(childWidget.native, childYogaNode); };