diff --git a/src/cpp/lib/QtWidgets/QSplitter/qsplitter_wrap.cpp b/src/cpp/lib/QtWidgets/QSplitter/qsplitter_wrap.cpp index e9e6d5002..6bdcf1ffd 100644 --- a/src/cpp/lib/QtWidgets/QSplitter/qsplitter_wrap.cpp +++ b/src/cpp/lib/QtWidgets/QSplitter/qsplitter_wrap.cpp @@ -10,7 +10,8 @@ Napi::Object QSplitterWrap::init(Napi::Env env, Napi::Object exports) { Napi::Function func = DefineClass( env, CLASSNAME, {InstanceMethod("addWidget", &QSplitterWrap::addWidget), - InstanceMethod("childrenCollapsible", &QSplitterWrap::childrenCollapsible), + InstanceMethod("childrenCollapsible", + &QSplitterWrap::childrenCollapsible), InstanceMethod("count", &QSplitterWrap::count), InstanceMethod("indexOf", &QSplitterWrap::indexOf), InstanceMethod("insertWidget", &QSplitterWrap::insertWidget), @@ -26,9 +27,7 @@ Napi::Object QSplitterWrap::init(Napi::Env env, Napi::Object exports) { NSplitter* QSplitterWrap::getInternalInstance() { return this->instance; } -QSplitterWrap::~QSplitterWrap() { - extrautils::safeDelete(this->instance); -} +QSplitterWrap::~QSplitterWrap() { extrautils::safeDelete(this->instance); } QSplitterWrap::QSplitterWrap(const Napi::CallbackInfo& info) : Napi::ObjectWrap(info) { @@ -112,7 +111,8 @@ Napi::Value QSplitterWrap::orientation(const Napi::CallbackInfo& info) { Napi::Env env = info.Env(); Napi::HandleScope scope(env); - return Napi::Number::New(env, static_cast(this->instance->orientation())); + return Napi::Number::New(env, + static_cast(this->instance->orientation())); } Napi::Value QSplitterWrap::setCollapsible(const Napi::CallbackInfo& info) { diff --git a/src/cpp/main.cpp b/src/cpp/main.cpp index bfb748bdb..823e98e15 100644 --- a/src/cpp/main.cpp +++ b/src/cpp/main.cpp @@ -92,13 +92,13 @@ #include "QtWidgets/QShortcut/qshortcut_wrap.h" #include "QtWidgets/QSlider/qslider_wrap.h" #include "QtWidgets/QSpinBox/qspinbox_wrap.h" +#include "QtWidgets/QSplitter/qsplitter_wrap.h" #include "QtWidgets/QStackedWidget/qstackedwidget_wrap.h" #include "QtWidgets/QStandardItem/qstandarditem_wrap.h" #include "QtWidgets/QStandardItemModel/qstandarditemmodel_wrap.h" #include "QtWidgets/QStatusBar/qstatusbar_wrap.h" #include "QtWidgets/QStyleFactory/qstylefactory_wrap.h" #include "QtWidgets/QSvgWidget/qsvgwidget_wrap.h" -#include "QtWidgets/QSplitter/qsplitter_wrap.h" #include "QtWidgets/QSystemTrayIcon/qsystemtrayicon_wrap.h" #include "QtWidgets/QTabBar/qtabbar_wrap.h" #include "QtWidgets/QTabWidget/qtabwidget_wrap.h" diff --git a/src/lib/QtWidgets/QSplitter.ts b/src/lib/QtWidgets/QSplitter.ts index 370c8ce10..177706c6a 100644 --- a/src/lib/QtWidgets/QSplitter.ts +++ b/src/lib/QtWidgets/QSplitter.ts @@ -35,49 +35,49 @@ splitterHorizontal.addWidget(right); */ export class QSplitter extends NodeFrame { - native: NativeElement; - constructor(); - constructor(parent: NodeWidget); - constructor(parent?: NodeWidget) { - let native; - if (parent) { - native = new addon.QSplitter(parent.native); - } else { - native = new addon.QSplitter(); + native: NativeElement; + constructor(); + constructor(parent: NodeWidget); + constructor(parent?: NodeWidget) { + let native; + if (parent) { + native = new addon.QSplitter(parent.native); + } else { + native = new addon.QSplitter(); + } + super(native); + this.native = native; + this.setNodeParent(parent); + } + addWidget(widget: NodeWidget): void { + this.native.addWidget(widget.native); + } + childrenCollapsible(): boolean { + return this.native.childrenCollapsible(); + } + count(): number { + return this.native.count(); + } + indexOf(widget: NodeWidget): number { + return this.native.indexOf(widget.native); + } + insertWidget(index: number, widget: NodeWidget): void { + this.native.insertWidget(index, widget.native); + } + isCollapsible(index: number): boolean { + return this.native.isCollapsible(index); + } + orientation(): Orientation { + return this.native.orientation(); + } + setCollapsible(index: number, collapse: boolean): void { + this.native.setCollapsible(index, collapse); + } + setOrientation(orientation: Orientation): void { + this.native.setOrientation(orientation); } - super(native); - this.native = native; - this.setNodeParent(parent); - } - addWidget(widget: NodeWidget) { - this.native.addWidget(widget.native); - } - childrenCollapsible(): boolean { - return this.native.childrenCollapsible(); - } - count(): number { - return this.native.count(); - } - indexOf(widget: NodeWidget): number { - return this.native.indexOf(widget.native); - } - insertWidget(index: number, widget: NodeWidget) { - this.native.insertWidget(index, widget.native); - } - isCollapsible(index: number): boolean { - return this.native.isCollapsible(index); - } - orientation(): Orientation { - return this.native.orientation(); - } - setCollapsible(index: number, collapse: boolean) { - this.native.setCollapsible(index, collapse); - } - setOrientation(orientation: Orientation) { - this.native.setOrientation(orientation); - } } export interface QSplitterSignals extends QFrameSignals { - splitterMoved: (pos: number, index: number) => void; + splitterMoved: (pos: number, index: number) => void; }