From dd21babbe8c6301d7a68809894e33c91a0892f84 Mon Sep 17 00:00:00 2001 From: Simon Edwards Date: Sat, 11 Dec 2021 11:31:34 +0100 Subject: [PATCH] Apply code formatting --- .../nodegui/QtCore/QObject/qobject_macro.h | 28 +- .../nodegui/QtWidgets/QWidget/qwidget_macro.h | 962 +++++++++--------- .../nodegui/core/Integration/qode-api.h | 6 +- .../lib/QtCore/QDateTime/qdatetime_wrap.cpp | 8 +- src/cpp/lib/QtCore/QPoint/qpoint_wrap.cpp | 12 +- .../lib/QtGui/QClipboard/qclipboard_wrap.cpp | 1 - .../QEvent/QResizeEvent/qresizeevent_wrap.cpp | 14 +- .../QtWidgets/QComboBox/qcombobox_wrap.cpp | 2 +- .../lib/QtWidgets/QLayout/qlayout_wrap.cpp | 3 +- .../QTableWidget/qtablewidget_wrap.cpp | 4 +- 10 files changed, 520 insertions(+), 520 deletions(-) diff --git a/src/cpp/include/nodegui/QtCore/QObject/qobject_macro.h b/src/cpp/include/nodegui/QtCore/QObject/qobject_macro.h index 298c8da05..e50a3b687 100644 --- a/src/cpp/include/nodegui/QtCore/QObject/qobject_macro.h +++ b/src/cpp/include/nodegui/QtCore/QObject/qobject_macro.h @@ -72,29 +72,30 @@ } \ Napi::Value __external_qobject__(const Napi::CallbackInfo& info) { \ Napi::Env env = info.Env(); \ - return Napi::External::New(env, static_cast(this->instance)); \ + return Napi::External::New( \ + env, static_cast(this->instance)); \ } // Ideally this macro below should go in // QOBJECT_WRAPPED_METHODS_DECLARATION_WITH_EVENT_SOURCE but some wrappers // need their own setParent()` implementation which handles different // arguments. -#define QOBJECT_SET_PARENT_IMPL \ - Napi::Value setParent(const Napi::CallbackInfo& info) { \ - Napi::Env env = info.Env(); \ - if (info[0].IsNull()) { \ - this->instance->setParent(nullptr); \ - } else { \ - QObject* parentObject = info[0].As>().Data(); \ - this->instance->setParent(parentObject); \ - } \ - return env.Null(); \ +#define QOBJECT_SET_PARENT_IMPL \ + Napi::Value setParent(const Napi::CallbackInfo& info) { \ + Napi::Env env = info.Env(); \ + if (info[0].IsNull()) { \ + this->instance->setParent(nullptr); \ + } else { \ + QObject* parentObject = info[0].As>().Data(); \ + this->instance->setParent(parentObject); \ + } \ + return env.Null(); \ } #endif // QOBJECT_WRAPPED_METHODS_DECLARATION_WITH_EVENT_SOURCE #ifndef QOBJECT_WRAPPED_METHODS_DECLARATION -#define QOBJECT_WRAPPED_METHODS_DECLARATION \ +#define QOBJECT_WRAPPED_METHODS_DECLARATION \ QOBJECT_WRAPPED_METHODS_DECLARATION_WITH_EVENT_SOURCE(this->instance.data()) \ QOBJECT_SET_PARENT_IMPL #endif // QOBJECT_WRAPPED_METHODS_DECLARATION @@ -105,7 +106,8 @@ EVENTWIDGET_WRAPPED_METHODS_EXPORT_DEFINE(ComponentWrapName) \ \ InstanceMethod("__id__", &ComponentWrapName::__id__), \ - InstanceMethod("__external_qobject__", &ComponentWrapName::__external_qobject__), \ + InstanceMethod("__external_qobject__", \ + &ComponentWrapName::__external_qobject__), \ InstanceMethod("inherits", &ComponentWrapName::inherits), \ InstanceMethod("setProperty", &ComponentWrapName::setProperty), \ InstanceMethod("property", &ComponentWrapName::property), \ diff --git a/src/cpp/include/nodegui/QtWidgets/QWidget/qwidget_macro.h b/src/cpp/include/nodegui/QtWidgets/QWidget/qwidget_macro.h index b9be8035d..85b44cdb4 100644 --- a/src/cpp/include/nodegui/QtWidgets/QWidget/qwidget_macro.h +++ b/src/cpp/include/nodegui/QtWidgets/QWidget/qwidget_macro.h @@ -23,488 +23,488 @@ */ #ifndef QWIDGET_WRAPPED_METHODS_DECLARATION -#define QWIDGET_WRAPPED_METHODS_DECLARATION \ - \ +#define QWIDGET_WRAPPED_METHODS_DECLARATION \ + \ QOBJECT_WRAPPED_METHODS_DECLARATION_WITH_EVENT_SOURCE(this->instance.data()) \ - YOGAWIDGET_WRAPPED_METHODS_DECLARATION \ - \ - Napi::Value setParent(const Napi::CallbackInfo& info) { \ - Napi::Env env = info.Env(); \ - if (info[0].IsNull()) { \ - this->instance->setParent(nullptr); \ - } else { \ - QObject* parentObject = info[0].As>().Data(); \ - QWidget* parentWidget = qobject_cast(parentObject); \ - if (parentWidget) { \ - this->instance->setParent(parentWidget); \ - } \ - } \ - return env.Null(); \ - } \ - Napi::Value show(const Napi::CallbackInfo& info) { \ - Napi::Env env = info.Env(); \ - this->instance->show(); \ - return env.Null(); \ - } \ - Napi::Value resize(const Napi::CallbackInfo& info) { \ - Napi::Env env = info.Env(); \ - Napi::Number width = info[0].As(); \ - Napi::Number height = info[1].As(); \ - this->instance->resize(width.Int32Value(), height.Int32Value()); \ - return env.Null(); \ - } \ - Napi::Value close(const Napi::CallbackInfo& info) { \ - Napi::Env env = info.Env(); \ - bool hasClosed = this->instance->close(); \ - return Napi::Boolean::New(env, hasClosed); \ - } \ - Napi::Value mapFromGlobal(const Napi::CallbackInfo& info) { \ - Napi::Env env = info.Env(); \ - Napi::Object posObject = info[0].As(); \ - QPointWrap* posWrap = Napi::ObjectWrap::Unwrap(posObject); \ - QPoint pt = \ - this->instance->mapFromGlobal(*posWrap->getInternalInstance()); \ - auto instance = QPointWrap::constructor.New( \ - {Napi::External::New(env, new QPoint(pt.x(), pt.y()))}); \ - return instance; \ - } \ - Napi::Value mapFromParent(const Napi::CallbackInfo& info) { \ - Napi::Env env = info.Env(); \ - Napi::Object posObject = info[0].As(); \ - QPointWrap* posWrap = Napi::ObjectWrap::Unwrap(posObject); \ - QPoint pt = \ - this->instance->mapFromParent(*posWrap->getInternalInstance()); \ - auto instance = QPointWrap::constructor.New( \ - {Napi::External::New(env, new QPoint(pt.x(), pt.y()))}); \ - return instance; \ - } \ - Napi::Value mapToGlobal(const Napi::CallbackInfo& info) { \ - Napi::Env env = info.Env(); \ - Napi::Object posObject = info[0].As(); \ - QPointWrap* posWrap = Napi::ObjectWrap::Unwrap(posObject); \ - QPoint pt = this->instance->mapToGlobal(*posWrap->getInternalInstance()); \ - auto instance = QPointWrap::constructor.New( \ - {Napi::External::New(env, new QPoint(pt.x(), pt.y()))}); \ - return instance; \ - } \ - Napi::Value mapToParent(const Napi::CallbackInfo& info) { \ - Napi::Env env = info.Env(); \ - Napi::Object posObject = info[0].As(); \ - QPointWrap* posWrap = Napi::ObjectWrap::Unwrap(posObject); \ - QPoint pt = this->instance->mapToParent(*posWrap->getInternalInstance()); \ - auto instance = QPointWrap::constructor.New( \ - {Napi::External::New(env, new QPoint(pt.x(), pt.y()))}); \ - return instance; \ - } \ - Napi::Value isVisible(const Napi::CallbackInfo& info) { \ - Napi::Env env = info.Env(); \ - bool isVisible = this->instance->isVisible(); \ - return Napi::Boolean::New(env, isVisible); \ - } \ - \ - Napi::Value setLayout(const Napi::CallbackInfo& info) { \ - Napi::Env env = info.Env(); \ - Napi::Object layoutObject = info[0].As(); \ - QLayoutWrap* layoutWrap = \ - Napi::ObjectWrap::Unwrap(layoutObject); \ - this->instance->setLayout(layoutWrap->getInternalInstance()); \ - return env.Null(); \ - } \ - \ - Napi::Value setStyleSheet(const Napi::CallbackInfo& info) { \ - Napi::Env env = info.Env(); \ - Napi::String text = info[0].As(); \ - std::string style = text.Utf8Value(); \ - QString newStyle = QString::fromStdString(style); \ - QString currentStyleSheet = this->instance->styleSheet(); \ - if (newStyle != currentStyleSheet) { \ - this->instance->setStyleSheet(newStyle); \ - } \ - return env.Null(); \ - } \ - Napi::Value setCursor(const Napi::CallbackInfo& info) { \ - Napi::Env env = info.Env(); \ - if (info[0].IsNumber()) { \ - Napi::Number cursor = info[0].As(); \ - this->instance->setCursor( \ - static_cast(cursor.Int32Value())); \ - } else { \ - Napi::Object obj = info[0].As(); \ - QCursorWrap* wrap = Napi::ObjectWrap::Unwrap(obj); \ - this->instance->setCursor(*wrap->getInternalInstance()); \ - } \ - return env.Null(); \ - } \ - Napi::Value setWindowIcon(const Napi::CallbackInfo& info) { \ - Napi::Env env = info.Env(); \ - Napi::Object iconObject = info[0].As(); \ - QIconWrap* iconWrap = Napi::ObjectWrap::Unwrap(iconObject); \ - this->instance->setWindowIcon(*iconWrap->getInternalInstance()); \ - return env.Null(); \ - } \ - Napi::Value setWindowState(const Napi::CallbackInfo& info) { \ - Napi::Env env = info.Env(); \ - Napi::Number state = info[0].As(); \ - this->instance->setWindowState( \ - static_cast(state.Int32Value())); \ - return env.Null(); \ - } \ - Napi::Value windowState(const Napi::CallbackInfo& info) { \ - Napi::Env env = info.Env(); \ - int state = static_cast(this->instance->windowState()); \ - return Napi::Value::From(env, state); \ - } \ - Napi::Value setWindowTitle(const Napi::CallbackInfo& info) { \ - Napi::Env env = info.Env(); \ - Napi::String napiTitle = info[0].As(); \ - std::string title = napiTitle.Utf8Value(); \ - this->instance->setWindowTitle(title.c_str()); \ - return env.Null(); \ - } \ - Napi::Value windowTitle(const Napi::CallbackInfo& info) { \ - Napi::Env env = info.Env(); \ - QString title = this->instance->windowTitle(); \ - return Napi::String::New(env, title.toStdString()); \ - } \ - Napi::Value styleSheet(const Napi::CallbackInfo& info) { \ - Napi::Env env = info.Env(); \ - QString stylesheet = this->instance->styleSheet(); \ - return Napi::String::New(env, stylesheet.toStdString()); \ - } \ - Napi::Value hide(const Napi::CallbackInfo& info) { \ - Napi::Env env = info.Env(); \ - this->instance->hide(); \ - return env.Null(); \ - } \ - Napi::Value move(const Napi::CallbackInfo& info) { \ - Napi::Env env = info.Env(); \ - int x = info[0].As().Int32Value(); \ - int y = info[1].As().Int32Value(); \ - this->instance->move(x, y); \ - return env.Null(); \ - } \ - \ - Napi::Value setMouseTracking(const Napi::CallbackInfo& info) { \ - Napi::Env env = info.Env(); \ - Napi::Boolean isMouseTracked = info[0].As(); \ - this->instance->setMouseTracking(isMouseTracked.Value()); \ - return env.Null(); \ - } \ - Napi::Value hasMouseTracking(const Napi::CallbackInfo& info) { \ - Napi::Env env = info.Env(); \ - bool isMouseTracked = this->instance->hasMouseTracking(); \ - return Napi::Value::From(env, isMouseTracked); \ - } \ - Napi::Value setEnabled(const Napi::CallbackInfo& info) { \ - Napi::Env env = info.Env(); \ - Napi::Boolean enabled = info[0].As(); \ - this->instance->setEnabled(enabled.Value()); \ - return env.Null(); \ - } \ - Napi::Value isEnabled(const Napi::CallbackInfo& info) { \ - Napi::Env env = info.Env(); \ - bool enabled = this->instance->isEnabled(); \ - return Napi::Value::From(env, enabled); \ - } \ - Napi::Value setFixedSize(const Napi::CallbackInfo& info) { \ - Napi::Env env = info.Env(); \ - int width = info[0].As().Int32Value(); \ - int height = info[1].As().Int32Value(); \ - this->instance->setFixedSize(width, height); \ - return env.Null(); \ - } \ - Napi::Value setGeometry(const Napi::CallbackInfo& info) { \ - Napi::Env env = info.Env(); \ - int x = info[0].As().Int32Value(); \ - int y = info[1].As().Int32Value(); \ - int width = info[2].As().Int32Value(); \ - int height = info[3].As().Int32Value(); \ - this->instance->setGeometry(x, y, width, height); \ - return env.Null(); \ - } \ - Napi::Value setMaximumSize(const Napi::CallbackInfo& info) { \ - Napi::Env env = info.Env(); \ - int width = info[0].As().Int32Value(); \ - int height = info[1].As().Int32Value(); \ - this->instance->setMaximumSize(width, height); \ - return env.Null(); \ - } \ - Napi::Value maximumSize(const Napi::CallbackInfo& info) { \ - Napi::Env env = info.Env(); \ - QSize size = this->instance->maximumSize(); \ - auto sizeWrap = QSizeWrap::constructor.New({Napi::External::New( \ - env, new QSize(size.width(), size.height()))}); \ - return sizeWrap; \ - } \ - Napi::Value setMinimumSize(const Napi::CallbackInfo& info) { \ - Napi::Env env = info.Env(); \ - int width = info[0].As().Int32Value(); \ - int height = info[1].As().Int32Value(); \ - this->instance->setMinimumSize(width, height); \ - return env.Null(); \ - } \ - Napi::Value minimumSize(const Napi::CallbackInfo& info) { \ - Napi::Env env = info.Env(); \ - QSize size = this->instance->minimumSize(); \ - auto sizeWrap = QSizeWrap::constructor.New({Napi::External::New( \ - env, new QSize(size.width(), size.height()))}); \ - return sizeWrap; \ - } \ - Napi::Value repaint(const Napi::CallbackInfo& info) { \ - Napi::Env env = info.Env(); \ - this->instance->repaint(); \ - return env.Null(); \ - } \ - Napi::Value update(const Napi::CallbackInfo& info) { \ - Napi::Env env = info.Env(); \ - this->instance->update(); \ - return env.Null(); \ - } \ - Napi::Value updateGeometry(const Napi::CallbackInfo& info) { \ - Napi::Env env = info.Env(); \ - this->instance->updateGeometry(); \ - return env.Null(); \ - } \ - Napi::Value pos(const Napi::CallbackInfo& info) { \ - Napi::Env env = info.Env(); \ - QPoint pos = this->instance->pos(); \ - Napi::Object posObj = Napi::Object::New(env); \ - posObj.Set("x", pos.x()); \ - posObj.Set("y", pos.y()); \ - return posObj; \ - } \ - Napi::Value size(const Napi::CallbackInfo& info) { \ - Napi::Env env = info.Env(); \ - QSize size = this->instance->size(); \ - auto sizeWrap = QSizeWrap::constructor.New({Napi::External::New( \ - env, new QSize(size.width(), size.height()))}); \ - return sizeWrap; \ - } \ - Napi::Value setAttribute(const Napi::CallbackInfo& info) { \ - Napi::Env env = info.Env(); \ - int attributeId = info[0].As().Int32Value(); \ - bool switchOn = info[1].As().Value(); \ - this->instance->setAttribute( \ - static_cast(attributeId), switchOn); \ - return env.Null(); \ - } \ - Napi::Value testAttribute(const Napi::CallbackInfo& info) { \ - Napi::Env env = info.Env(); \ - int attributeId = info[0].As().Int32Value(); \ - bool isOn = this->instance->testAttribute( \ - static_cast(attributeId)); \ - return Napi::Boolean::New(env, isOn); \ - } \ - Napi::Value setWindowOpacity(const Napi::CallbackInfo& info) { \ - Napi::Env env = info.Env(); \ - float opacity = info[0].As().FloatValue(); \ - this->instance->setWindowOpacity(opacity); \ - return env.Null(); \ - } \ - Napi::Value windowOpacity(const Napi::CallbackInfo& info) { \ - Napi::Env env = info.Env(); \ - float opacity = this->instance->windowOpacity(); \ - return Napi::Value::From(env, opacity); \ - } \ - Napi::Value setWindowFlag(const Napi::CallbackInfo& info) { \ - Napi::Env env = info.Env(); \ - int windowType = info[0].As().Int32Value(); \ - bool switchOn = info[1].As().Value(); \ - this->instance->setWindowFlag(static_cast(windowType), \ - switchOn); \ - return env.Null(); \ - } \ - Napi::Value adjustSize(const Napi::CallbackInfo& info) { \ - Napi::Env env = info.Env(); \ - this->instance->adjustSize(); \ - return env.Null(); \ - } \ - Napi::Value activateWindow(const Napi::CallbackInfo& info) { \ - Napi::Env env = info.Env(); \ - this->instance->activateWindow(); \ - return env.Null(); \ - } \ - Napi::Value raise(const Napi::CallbackInfo& info) { \ - Napi::Env env = info.Env(); \ - this->instance->raise(); \ - return env.Null(); \ - } \ - Napi::Value lower(const Napi::CallbackInfo& info) { \ - Napi::Env env = info.Env(); \ - this->instance->lower(); \ - return env.Null(); \ - } \ - Napi::Value showFullScreen(const Napi::CallbackInfo& info) { \ - Napi::Env env = info.Env(); \ - this->instance->showFullScreen(); \ - return env.Null(); \ - } \ - Napi::Value showMaximized(const Napi::CallbackInfo& info) { \ - Napi::Env env = info.Env(); \ - this->instance->showMaximized(); \ - return env.Null(); \ - } \ - Napi::Value showMinimized(const Napi::CallbackInfo& info) { \ - Napi::Env env = info.Env(); \ - this->instance->showMinimized(); \ - return env.Null(); \ - } \ - Napi::Value showNormal(const Napi::CallbackInfo& info) { \ - Napi::Env env = info.Env(); \ - this->instance->showNormal(); \ - return env.Null(); \ - } \ - Napi::Value addAction(const Napi::CallbackInfo& info) { \ - Napi::Env env = info.Env(); \ - Napi::Object actionObject = info[0].As(); \ - QActionWrap* actionWrap = \ - Napi::ObjectWrap::Unwrap(actionObject); \ - this->instance->addAction(actionWrap->getInternalInstance()); \ - return env.Null(); \ - } \ - Napi::Value removeAction(const Napi::CallbackInfo& info) { \ - Napi::Env env = info.Env(); \ - Napi::Object actionObject = info[0].As(); \ - QActionWrap* actionWrap = \ - Napi::ObjectWrap::Unwrap(actionObject); \ - this->instance->removeAction(actionWrap->getInternalInstance()); \ - return env.Null(); \ - } \ - Napi::Value repolish(const Napi::CallbackInfo& info) { \ - Napi::Env env = info.Env(); \ - this->instance->style()->unpolish(this->instance); \ - this->instance->style()->polish(this->instance); \ - return env.Null(); \ - } \ - Napi::Value setGraphicsEffect(const Napi::CallbackInfo& info) { \ - Napi::Env env = info.Env(); \ - Napi::Object effectObject = info[0].As(); \ - QObjectWrap* effectWrap = \ - Napi::ObjectWrap::Unwrap(effectObject); \ - QGraphicsEffect* effect = \ - qobject_cast(effectWrap->getInternalInstance()); \ - this->instance->setGraphicsEffect(effect); \ - return env.Null(); \ - } \ - Napi::Value acceptDrops(const Napi::CallbackInfo& info) { \ - Napi::Env env = info.Env(); \ - return Napi::Boolean::From(env, this->instance->acceptDrops()); \ - } \ - Napi::Value setAcceptDrops(const Napi::CallbackInfo& info) { \ - Napi::Env env = info.Env(); \ - bool v = info[0].As().Value(); \ - this->instance->setAcceptDrops(v); \ - return env.Null(); \ - } \ - Napi::Value setFocus(const Napi::CallbackInfo& info) { \ - Napi::Env env = info.Env(); \ - int reason = info[0].As().Int32Value(); \ - this->instance->setFocus(static_cast(reason)); \ - return env.Null(); \ - } \ - Napi::Value clearFocus(const Napi::CallbackInfo& info) { \ - Napi::Env env = info.Env(); \ - this->instance->clearFocus(); \ - return env.Null(); \ - } \ - Napi::Value setSizePolicy(const Napi::CallbackInfo& info) { \ - Napi::Env env = info.Env(); \ - QSizePolicy::Policy horizontal = static_cast( \ - info[0].As().Int32Value()); \ - QSizePolicy::Policy vertical = static_cast( \ - info[1].As().Int32Value()); \ - this->instance->setSizePolicy(horizontal, vertical); \ - return env.Null(); \ - } \ - Napi::Value setMaximumHeight(const Napi::CallbackInfo& info) { \ - Napi::Env env = info.Env(); \ - int maxh = info[0].As().Int32Value(); \ - this->instance->setMaximumHeight(maxh); \ - return env.Null(); \ - } \ - Napi::Value setMinimumWidth(const Napi::CallbackInfo& info) { \ - Napi::Env env = info.Env(); \ - int minw = info[0].As().Int32Value(); \ - this->instance->setMinimumWidth(minw); \ - return env.Null(); \ - } \ - Napi::Value setMaximumWidth(const Napi::CallbackInfo& info) { \ - Napi::Env env = info.Env(); \ - int maxw = info[0].As().Int32Value(); \ - this->instance->setMaximumWidth(maxw); \ - return env.Null(); \ - } \ - Napi::Value setMinimumHeight(const Napi::CallbackInfo& info) { \ - Napi::Env env = info.Env(); \ - int minh = info[0].As().Int32Value(); \ - this->instance->setMinimumHeight(minh); \ - return env.Null(); \ - } \ - Napi::Value style(const Napi::CallbackInfo& info) { \ - Napi::Env env = info.Env(); \ - QStyle* style = this->instance->style(); \ - return QStyleWrap::constructor.New( \ - {Napi::External::New(env, style)}); \ - } \ - Napi::Value isWindow(const Napi::CallbackInfo& info) { \ - Napi::Env env = info.Env(); \ - bool result = this->instance->isWindow(); \ - return Napi::Boolean::New(env, result); \ - } \ - Napi::Value isWindowModified(const Napi::CallbackInfo& info) { \ - Napi::Env env = info.Env(); \ - bool result = this->instance->isWindowModified(); \ - return Napi::Boolean::New(env, result); \ - } \ - Napi::Value isHidden(const Napi::CallbackInfo& info) { \ - Napi::Env env = info.Env(); \ - bool result = this->instance->isHidden(); \ - return Napi::Boolean::New(env, result); \ - } \ - Napi::Value setDisabled(const Napi::CallbackInfo& info) { \ - Napi::Env env = info.Env(); \ - bool disable = info[0].As().Value(); \ - this->instance->setDisabled(disable); \ - return env.Null(); \ - } \ - Napi::Value setHidden(const Napi::CallbackInfo& info) { \ - Napi::Env env = info.Env(); \ - bool hidden = info[0].As().Value(); \ - this->instance->setHidden(hidden); \ - return env.Null(); \ - } \ - Napi::Value setVisible(const Napi::CallbackInfo& info) { \ - Napi::Env env = info.Env(); \ - bool visible = info[0].As().Value(); \ - this->instance->setVisible(visible); \ - return env.Null(); \ - } \ - Napi::Value setWindowModified(const Napi::CallbackInfo& info) { \ - Napi::Env env = info.Env(); \ - bool modified = info[0].As().Value(); \ - this->instance->setWindowModified(modified); \ - return env.Null(); \ - } \ - Napi::Value windowHandle(const Napi::CallbackInfo& info) { \ - Napi::Env env = info.Env(); \ - QWindow* window = this->instance->windowHandle(); \ - if (window) { \ - return WrapperCache::instance.get(env, window); \ - } else { \ - return env.Null(); \ - } \ - } \ - Napi::Value setFixedHeight(const Napi::CallbackInfo& info) { \ - Napi::Env env = info.Env(); \ - int h = info[0].As().Int32Value(); \ - this->instance->setFixedHeight(h); \ - return env.Null(); \ - } \ - Napi::Value setFixedWidth(const Napi::CallbackInfo& info) { \ - Napi::Env env = info.Env(); \ - int w = info[0].As().Int32Value(); \ - this->instance->setFixedWidth(w); \ - return env.Null(); \ + YOGAWIDGET_WRAPPED_METHODS_DECLARATION \ + \ + Napi::Value setParent(const Napi::CallbackInfo& info) { \ + Napi::Env env = info.Env(); \ + if (info[0].IsNull()) { \ + this->instance->setParent(nullptr); \ + } else { \ + QObject* parentObject = info[0].As>().Data(); \ + QWidget* parentWidget = qobject_cast(parentObject); \ + if (parentWidget) { \ + this->instance->setParent(parentWidget); \ + } \ + } \ + return env.Null(); \ + } \ + Napi::Value show(const Napi::CallbackInfo& info) { \ + Napi::Env env = info.Env(); \ + this->instance->show(); \ + return env.Null(); \ + } \ + Napi::Value resize(const Napi::CallbackInfo& info) { \ + Napi::Env env = info.Env(); \ + Napi::Number width = info[0].As(); \ + Napi::Number height = info[1].As(); \ + this->instance->resize(width.Int32Value(), height.Int32Value()); \ + return env.Null(); \ + } \ + Napi::Value close(const Napi::CallbackInfo& info) { \ + Napi::Env env = info.Env(); \ + bool hasClosed = this->instance->close(); \ + return Napi::Boolean::New(env, hasClosed); \ + } \ + Napi::Value mapFromGlobal(const Napi::CallbackInfo& info) { \ + Napi::Env env = info.Env(); \ + Napi::Object posObject = info[0].As(); \ + QPointWrap* posWrap = Napi::ObjectWrap::Unwrap(posObject); \ + QPoint pt = \ + this->instance->mapFromGlobal(*posWrap->getInternalInstance()); \ + auto instance = QPointWrap::constructor.New( \ + {Napi::External::New(env, new QPoint(pt.x(), pt.y()))}); \ + return instance; \ + } \ + Napi::Value mapFromParent(const Napi::CallbackInfo& info) { \ + Napi::Env env = info.Env(); \ + Napi::Object posObject = info[0].As(); \ + QPointWrap* posWrap = Napi::ObjectWrap::Unwrap(posObject); \ + QPoint pt = \ + this->instance->mapFromParent(*posWrap->getInternalInstance()); \ + auto instance = QPointWrap::constructor.New( \ + {Napi::External::New(env, new QPoint(pt.x(), pt.y()))}); \ + return instance; \ + } \ + Napi::Value mapToGlobal(const Napi::CallbackInfo& info) { \ + Napi::Env env = info.Env(); \ + Napi::Object posObject = info[0].As(); \ + QPointWrap* posWrap = Napi::ObjectWrap::Unwrap(posObject); \ + QPoint pt = this->instance->mapToGlobal(*posWrap->getInternalInstance()); \ + auto instance = QPointWrap::constructor.New( \ + {Napi::External::New(env, new QPoint(pt.x(), pt.y()))}); \ + return instance; \ + } \ + Napi::Value mapToParent(const Napi::CallbackInfo& info) { \ + Napi::Env env = info.Env(); \ + Napi::Object posObject = info[0].As(); \ + QPointWrap* posWrap = Napi::ObjectWrap::Unwrap(posObject); \ + QPoint pt = this->instance->mapToParent(*posWrap->getInternalInstance()); \ + auto instance = QPointWrap::constructor.New( \ + {Napi::External::New(env, new QPoint(pt.x(), pt.y()))}); \ + return instance; \ + } \ + Napi::Value isVisible(const Napi::CallbackInfo& info) { \ + Napi::Env env = info.Env(); \ + bool isVisible = this->instance->isVisible(); \ + return Napi::Boolean::New(env, isVisible); \ + } \ + \ + Napi::Value setLayout(const Napi::CallbackInfo& info) { \ + Napi::Env env = info.Env(); \ + Napi::Object layoutObject = info[0].As(); \ + QLayoutWrap* layoutWrap = \ + Napi::ObjectWrap::Unwrap(layoutObject); \ + this->instance->setLayout(layoutWrap->getInternalInstance()); \ + return env.Null(); \ + } \ + \ + Napi::Value setStyleSheet(const Napi::CallbackInfo& info) { \ + Napi::Env env = info.Env(); \ + Napi::String text = info[0].As(); \ + std::string style = text.Utf8Value(); \ + QString newStyle = QString::fromStdString(style); \ + QString currentStyleSheet = this->instance->styleSheet(); \ + if (newStyle != currentStyleSheet) { \ + this->instance->setStyleSheet(newStyle); \ + } \ + return env.Null(); \ + } \ + Napi::Value setCursor(const Napi::CallbackInfo& info) { \ + Napi::Env env = info.Env(); \ + if (info[0].IsNumber()) { \ + Napi::Number cursor = info[0].As(); \ + this->instance->setCursor( \ + static_cast(cursor.Int32Value())); \ + } else { \ + Napi::Object obj = info[0].As(); \ + QCursorWrap* wrap = Napi::ObjectWrap::Unwrap(obj); \ + this->instance->setCursor(*wrap->getInternalInstance()); \ + } \ + return env.Null(); \ + } \ + Napi::Value setWindowIcon(const Napi::CallbackInfo& info) { \ + Napi::Env env = info.Env(); \ + Napi::Object iconObject = info[0].As(); \ + QIconWrap* iconWrap = Napi::ObjectWrap::Unwrap(iconObject); \ + this->instance->setWindowIcon(*iconWrap->getInternalInstance()); \ + return env.Null(); \ + } \ + Napi::Value setWindowState(const Napi::CallbackInfo& info) { \ + Napi::Env env = info.Env(); \ + Napi::Number state = info[0].As(); \ + this->instance->setWindowState( \ + static_cast(state.Int32Value())); \ + return env.Null(); \ + } \ + Napi::Value windowState(const Napi::CallbackInfo& info) { \ + Napi::Env env = info.Env(); \ + int state = static_cast(this->instance->windowState()); \ + return Napi::Value::From(env, state); \ + } \ + Napi::Value setWindowTitle(const Napi::CallbackInfo& info) { \ + Napi::Env env = info.Env(); \ + Napi::String napiTitle = info[0].As(); \ + std::string title = napiTitle.Utf8Value(); \ + this->instance->setWindowTitle(title.c_str()); \ + return env.Null(); \ + } \ + Napi::Value windowTitle(const Napi::CallbackInfo& info) { \ + Napi::Env env = info.Env(); \ + QString title = this->instance->windowTitle(); \ + return Napi::String::New(env, title.toStdString()); \ + } \ + Napi::Value styleSheet(const Napi::CallbackInfo& info) { \ + Napi::Env env = info.Env(); \ + QString stylesheet = this->instance->styleSheet(); \ + return Napi::String::New(env, stylesheet.toStdString()); \ + } \ + Napi::Value hide(const Napi::CallbackInfo& info) { \ + Napi::Env env = info.Env(); \ + this->instance->hide(); \ + return env.Null(); \ + } \ + Napi::Value move(const Napi::CallbackInfo& info) { \ + Napi::Env env = info.Env(); \ + int x = info[0].As().Int32Value(); \ + int y = info[1].As().Int32Value(); \ + this->instance->move(x, y); \ + return env.Null(); \ + } \ + \ + Napi::Value setMouseTracking(const Napi::CallbackInfo& info) { \ + Napi::Env env = info.Env(); \ + Napi::Boolean isMouseTracked = info[0].As(); \ + this->instance->setMouseTracking(isMouseTracked.Value()); \ + return env.Null(); \ + } \ + Napi::Value hasMouseTracking(const Napi::CallbackInfo& info) { \ + Napi::Env env = info.Env(); \ + bool isMouseTracked = this->instance->hasMouseTracking(); \ + return Napi::Value::From(env, isMouseTracked); \ + } \ + Napi::Value setEnabled(const Napi::CallbackInfo& info) { \ + Napi::Env env = info.Env(); \ + Napi::Boolean enabled = info[0].As(); \ + this->instance->setEnabled(enabled.Value()); \ + return env.Null(); \ + } \ + Napi::Value isEnabled(const Napi::CallbackInfo& info) { \ + Napi::Env env = info.Env(); \ + bool enabled = this->instance->isEnabled(); \ + return Napi::Value::From(env, enabled); \ + } \ + Napi::Value setFixedSize(const Napi::CallbackInfo& info) { \ + Napi::Env env = info.Env(); \ + int width = info[0].As().Int32Value(); \ + int height = info[1].As().Int32Value(); \ + this->instance->setFixedSize(width, height); \ + return env.Null(); \ + } \ + Napi::Value setGeometry(const Napi::CallbackInfo& info) { \ + Napi::Env env = info.Env(); \ + int x = info[0].As().Int32Value(); \ + int y = info[1].As().Int32Value(); \ + int width = info[2].As().Int32Value(); \ + int height = info[3].As().Int32Value(); \ + this->instance->setGeometry(x, y, width, height); \ + return env.Null(); \ + } \ + Napi::Value setMaximumSize(const Napi::CallbackInfo& info) { \ + Napi::Env env = info.Env(); \ + int width = info[0].As().Int32Value(); \ + int height = info[1].As().Int32Value(); \ + this->instance->setMaximumSize(width, height); \ + return env.Null(); \ + } \ + Napi::Value maximumSize(const Napi::CallbackInfo& info) { \ + Napi::Env env = info.Env(); \ + QSize size = this->instance->maximumSize(); \ + auto sizeWrap = QSizeWrap::constructor.New({Napi::External::New( \ + env, new QSize(size.width(), size.height()))}); \ + return sizeWrap; \ + } \ + Napi::Value setMinimumSize(const Napi::CallbackInfo& info) { \ + Napi::Env env = info.Env(); \ + int width = info[0].As().Int32Value(); \ + int height = info[1].As().Int32Value(); \ + this->instance->setMinimumSize(width, height); \ + return env.Null(); \ + } \ + Napi::Value minimumSize(const Napi::CallbackInfo& info) { \ + Napi::Env env = info.Env(); \ + QSize size = this->instance->minimumSize(); \ + auto sizeWrap = QSizeWrap::constructor.New({Napi::External::New( \ + env, new QSize(size.width(), size.height()))}); \ + return sizeWrap; \ + } \ + Napi::Value repaint(const Napi::CallbackInfo& info) { \ + Napi::Env env = info.Env(); \ + this->instance->repaint(); \ + return env.Null(); \ + } \ + Napi::Value update(const Napi::CallbackInfo& info) { \ + Napi::Env env = info.Env(); \ + this->instance->update(); \ + return env.Null(); \ + } \ + Napi::Value updateGeometry(const Napi::CallbackInfo& info) { \ + Napi::Env env = info.Env(); \ + this->instance->updateGeometry(); \ + return env.Null(); \ + } \ + Napi::Value pos(const Napi::CallbackInfo& info) { \ + Napi::Env env = info.Env(); \ + QPoint pos = this->instance->pos(); \ + Napi::Object posObj = Napi::Object::New(env); \ + posObj.Set("x", pos.x()); \ + posObj.Set("y", pos.y()); \ + return posObj; \ + } \ + Napi::Value size(const Napi::CallbackInfo& info) { \ + Napi::Env env = info.Env(); \ + QSize size = this->instance->size(); \ + auto sizeWrap = QSizeWrap::constructor.New({Napi::External::New( \ + env, new QSize(size.width(), size.height()))}); \ + return sizeWrap; \ + } \ + Napi::Value setAttribute(const Napi::CallbackInfo& info) { \ + Napi::Env env = info.Env(); \ + int attributeId = info[0].As().Int32Value(); \ + bool switchOn = info[1].As().Value(); \ + this->instance->setAttribute( \ + static_cast(attributeId), switchOn); \ + return env.Null(); \ + } \ + Napi::Value testAttribute(const Napi::CallbackInfo& info) { \ + Napi::Env env = info.Env(); \ + int attributeId = info[0].As().Int32Value(); \ + bool isOn = this->instance->testAttribute( \ + static_cast(attributeId)); \ + return Napi::Boolean::New(env, isOn); \ + } \ + Napi::Value setWindowOpacity(const Napi::CallbackInfo& info) { \ + Napi::Env env = info.Env(); \ + float opacity = info[0].As().FloatValue(); \ + this->instance->setWindowOpacity(opacity); \ + return env.Null(); \ + } \ + Napi::Value windowOpacity(const Napi::CallbackInfo& info) { \ + Napi::Env env = info.Env(); \ + float opacity = this->instance->windowOpacity(); \ + return Napi::Value::From(env, opacity); \ + } \ + Napi::Value setWindowFlag(const Napi::CallbackInfo& info) { \ + Napi::Env env = info.Env(); \ + int windowType = info[0].As().Int32Value(); \ + bool switchOn = info[1].As().Value(); \ + this->instance->setWindowFlag(static_cast(windowType), \ + switchOn); \ + return env.Null(); \ + } \ + Napi::Value adjustSize(const Napi::CallbackInfo& info) { \ + Napi::Env env = info.Env(); \ + this->instance->adjustSize(); \ + return env.Null(); \ + } \ + Napi::Value activateWindow(const Napi::CallbackInfo& info) { \ + Napi::Env env = info.Env(); \ + this->instance->activateWindow(); \ + return env.Null(); \ + } \ + Napi::Value raise(const Napi::CallbackInfo& info) { \ + Napi::Env env = info.Env(); \ + this->instance->raise(); \ + return env.Null(); \ + } \ + Napi::Value lower(const Napi::CallbackInfo& info) { \ + Napi::Env env = info.Env(); \ + this->instance->lower(); \ + return env.Null(); \ + } \ + Napi::Value showFullScreen(const Napi::CallbackInfo& info) { \ + Napi::Env env = info.Env(); \ + this->instance->showFullScreen(); \ + return env.Null(); \ + } \ + Napi::Value showMaximized(const Napi::CallbackInfo& info) { \ + Napi::Env env = info.Env(); \ + this->instance->showMaximized(); \ + return env.Null(); \ + } \ + Napi::Value showMinimized(const Napi::CallbackInfo& info) { \ + Napi::Env env = info.Env(); \ + this->instance->showMinimized(); \ + return env.Null(); \ + } \ + Napi::Value showNormal(const Napi::CallbackInfo& info) { \ + Napi::Env env = info.Env(); \ + this->instance->showNormal(); \ + return env.Null(); \ + } \ + Napi::Value addAction(const Napi::CallbackInfo& info) { \ + Napi::Env env = info.Env(); \ + Napi::Object actionObject = info[0].As(); \ + QActionWrap* actionWrap = \ + Napi::ObjectWrap::Unwrap(actionObject); \ + this->instance->addAction(actionWrap->getInternalInstance()); \ + return env.Null(); \ + } \ + Napi::Value removeAction(const Napi::CallbackInfo& info) { \ + Napi::Env env = info.Env(); \ + Napi::Object actionObject = info[0].As(); \ + QActionWrap* actionWrap = \ + Napi::ObjectWrap::Unwrap(actionObject); \ + this->instance->removeAction(actionWrap->getInternalInstance()); \ + return env.Null(); \ + } \ + Napi::Value repolish(const Napi::CallbackInfo& info) { \ + Napi::Env env = info.Env(); \ + this->instance->style()->unpolish(this->instance); \ + this->instance->style()->polish(this->instance); \ + return env.Null(); \ + } \ + Napi::Value setGraphicsEffect(const Napi::CallbackInfo& info) { \ + Napi::Env env = info.Env(); \ + Napi::Object effectObject = info[0].As(); \ + QObjectWrap* effectWrap = \ + Napi::ObjectWrap::Unwrap(effectObject); \ + QGraphicsEffect* effect = \ + qobject_cast(effectWrap->getInternalInstance()); \ + this->instance->setGraphicsEffect(effect); \ + return env.Null(); \ + } \ + Napi::Value acceptDrops(const Napi::CallbackInfo& info) { \ + Napi::Env env = info.Env(); \ + return Napi::Boolean::From(env, this->instance->acceptDrops()); \ + } \ + Napi::Value setAcceptDrops(const Napi::CallbackInfo& info) { \ + Napi::Env env = info.Env(); \ + bool v = info[0].As().Value(); \ + this->instance->setAcceptDrops(v); \ + return env.Null(); \ + } \ + Napi::Value setFocus(const Napi::CallbackInfo& info) { \ + Napi::Env env = info.Env(); \ + int reason = info[0].As().Int32Value(); \ + this->instance->setFocus(static_cast(reason)); \ + return env.Null(); \ + } \ + Napi::Value clearFocus(const Napi::CallbackInfo& info) { \ + Napi::Env env = info.Env(); \ + this->instance->clearFocus(); \ + return env.Null(); \ + } \ + Napi::Value setSizePolicy(const Napi::CallbackInfo& info) { \ + Napi::Env env = info.Env(); \ + QSizePolicy::Policy horizontal = static_cast( \ + info[0].As().Int32Value()); \ + QSizePolicy::Policy vertical = static_cast( \ + info[1].As().Int32Value()); \ + this->instance->setSizePolicy(horizontal, vertical); \ + return env.Null(); \ + } \ + Napi::Value setMaximumHeight(const Napi::CallbackInfo& info) { \ + Napi::Env env = info.Env(); \ + int maxh = info[0].As().Int32Value(); \ + this->instance->setMaximumHeight(maxh); \ + return env.Null(); \ + } \ + Napi::Value setMinimumWidth(const Napi::CallbackInfo& info) { \ + Napi::Env env = info.Env(); \ + int minw = info[0].As().Int32Value(); \ + this->instance->setMinimumWidth(minw); \ + return env.Null(); \ + } \ + Napi::Value setMaximumWidth(const Napi::CallbackInfo& info) { \ + Napi::Env env = info.Env(); \ + int maxw = info[0].As().Int32Value(); \ + this->instance->setMaximumWidth(maxw); \ + return env.Null(); \ + } \ + Napi::Value setMinimumHeight(const Napi::CallbackInfo& info) { \ + Napi::Env env = info.Env(); \ + int minh = info[0].As().Int32Value(); \ + this->instance->setMinimumHeight(minh); \ + return env.Null(); \ + } \ + Napi::Value style(const Napi::CallbackInfo& info) { \ + Napi::Env env = info.Env(); \ + QStyle* style = this->instance->style(); \ + return QStyleWrap::constructor.New( \ + {Napi::External::New(env, style)}); \ + } \ + Napi::Value isWindow(const Napi::CallbackInfo& info) { \ + Napi::Env env = info.Env(); \ + bool result = this->instance->isWindow(); \ + return Napi::Boolean::New(env, result); \ + } \ + Napi::Value isWindowModified(const Napi::CallbackInfo& info) { \ + Napi::Env env = info.Env(); \ + bool result = this->instance->isWindowModified(); \ + return Napi::Boolean::New(env, result); \ + } \ + Napi::Value isHidden(const Napi::CallbackInfo& info) { \ + Napi::Env env = info.Env(); \ + bool result = this->instance->isHidden(); \ + return Napi::Boolean::New(env, result); \ + } \ + Napi::Value setDisabled(const Napi::CallbackInfo& info) { \ + Napi::Env env = info.Env(); \ + bool disable = info[0].As().Value(); \ + this->instance->setDisabled(disable); \ + return env.Null(); \ + } \ + Napi::Value setHidden(const Napi::CallbackInfo& info) { \ + Napi::Env env = info.Env(); \ + bool hidden = info[0].As().Value(); \ + this->instance->setHidden(hidden); \ + return env.Null(); \ + } \ + Napi::Value setVisible(const Napi::CallbackInfo& info) { \ + Napi::Env env = info.Env(); \ + bool visible = info[0].As().Value(); \ + this->instance->setVisible(visible); \ + return env.Null(); \ + } \ + Napi::Value setWindowModified(const Napi::CallbackInfo& info) { \ + Napi::Env env = info.Env(); \ + bool modified = info[0].As().Value(); \ + this->instance->setWindowModified(modified); \ + return env.Null(); \ + } \ + Napi::Value windowHandle(const Napi::CallbackInfo& info) { \ + Napi::Env env = info.Env(); \ + QWindow* window = this->instance->windowHandle(); \ + if (window) { \ + return WrapperCache::instance.get(env, window); \ + } else { \ + return env.Null(); \ + } \ + } \ + Napi::Value setFixedHeight(const Napi::CallbackInfo& info) { \ + Napi::Env env = info.Env(); \ + int h = info[0].As().Int32Value(); \ + this->instance->setFixedHeight(h); \ + return env.Null(); \ + } \ + Napi::Value setFixedWidth(const Napi::CallbackInfo& info) { \ + Napi::Env env = info.Env(); \ + int w = info[0].As().Int32Value(); \ + this->instance->setFixedWidth(w); \ + return env.Null(); \ } #endif // QWIDGET_WRAPPED_METHODS_DECLARATION diff --git a/src/cpp/include/nodegui/core/Integration/qode-api.h b/src/cpp/include/nodegui/core/Integration/qode-api.h index 0415d898d..3794c5fbe 100644 --- a/src/cpp/include/nodegui/core/Integration/qode-api.h +++ b/src/cpp/include/nodegui/core/Integration/qode-api.h @@ -1,4 +1,5 @@ -// Temporary fix till we figure out how to get this working without exe symbol exports +// Temporary fix till we figure out how to get this working without exe symbol +// exports #ifdef _WIN32 #define QODE_FIX static #else @@ -11,6 +12,5 @@ namespace qode { QODE_FIX int qode_argc; QODE_FIX char **qode_argv; typedef int (*QodeCustomRunLoopFunc)(); -extern void InjectCustomRunLoop( - QodeCustomRunLoopFunc customRunLoop); +extern void InjectCustomRunLoop(QodeCustomRunLoopFunc customRunLoop); } // namespace qode \ No newline at end of file diff --git a/src/cpp/lib/QtCore/QDateTime/qdatetime_wrap.cpp b/src/cpp/lib/QtCore/QDateTime/qdatetime_wrap.cpp index 6c89c9eed..bfeda91f9 100644 --- a/src/cpp/lib/QtCore/QDateTime/qdatetime_wrap.cpp +++ b/src/cpp/lib/QtCore/QDateTime/qdatetime_wrap.cpp @@ -146,17 +146,17 @@ Napi::Value QDateTimeWrap::daysTo(const Napi::CallbackInfo& info) { Napi::Value QDateTimeWrap::isDaylightTime(const Napi::CallbackInfo& info) { Napi::Env env = info.Env(); - return Napi::Value::From(env, this->instance->isDaylightTime()); + return Napi::Value::From(env, this->instance->isDaylightTime()); } Napi::Value QDateTimeWrap::isNull(const Napi::CallbackInfo& info) { Napi::Env env = info.Env(); - return Napi::Value::From(env, this->instance->isNull()); + return Napi::Value::From(env, this->instance->isNull()); } Napi::Value QDateTimeWrap::isValid(const Napi::CallbackInfo& info) { Napi::Env env = info.Env(); - return Napi::Value::From(env, this->instance->isValid()); + return Napi::Value::From(env, this->instance->isValid()); } Napi::Value QDateTimeWrap::msecsTo(const Napi::CallbackInfo& info) { @@ -170,7 +170,7 @@ Napi::Value QDateTimeWrap::msecsTo(const Napi::CallbackInfo& info) { Napi::Value QDateTimeWrap::offsetFromUtc(const Napi::CallbackInfo& info) { Napi::Env env = info.Env(); - return Napi::Value::From(env, this->instance->offsetFromUtc()); + return Napi::Value::From(env, this->instance->offsetFromUtc()); } Napi::Value QDateTimeWrap::secsTo(const Napi::CallbackInfo& info) { diff --git a/src/cpp/lib/QtCore/QPoint/qpoint_wrap.cpp b/src/cpp/lib/QtCore/QPoint/qpoint_wrap.cpp index bd4576f5a..f13f82eec 100644 --- a/src/cpp/lib/QtCore/QPoint/qpoint_wrap.cpp +++ b/src/cpp/lib/QtCore/QPoint/qpoint_wrap.cpp @@ -49,29 +49,29 @@ QPoint* QPointWrap::getInternalInstance() { return this->instance.get(); } Napi::Value QPointWrap::setX(const Napi::CallbackInfo& info) { Napi::Env env = info.Env(); - int x = info[0].As().Int32Value(); + int x = info[0].As().Int32Value(); this->instance->setX(x); return env.Null(); } Napi::Value QPointWrap::setY(const Napi::CallbackInfo& info) { Napi::Env env = info.Env(); - int y = info[0].As().Int32Value(); + int y = info[0].As().Int32Value(); this->instance->setY(y); return env.Null(); } Napi::Value QPointWrap::x(const Napi::CallbackInfo& info) { Napi::Env env = info.Env(); - return Napi::Value::From(env, this->instance->x()); + return Napi::Value::From(env, this->instance->x()); } Napi::Value QPointWrap::y(const Napi::CallbackInfo& info) { Napi::Env env = info.Env(); - return Napi::Value::From(env, this->instance->y()); + return Napi::Value::From(env, this->instance->y()); } Napi::Value StaticQPointWrapMethods::fromQVariant( const Napi::CallbackInfo& info) { Napi::Env env = info.Env(); - Napi::Object variantObject = info[0].As(); + Napi::Object variantObject = info[0].As(); QVariantWrap* variantWrap = Napi::ObjectWrap::Unwrap(variantObject); QVariant* variant = variantWrap->getInternalInstance(); @@ -93,7 +93,7 @@ Napi::Value QPointWrap::manhattanLength(const Napi::CallbackInfo& info) { Napi::Value QPointWrap::transposed(const Napi::CallbackInfo& info) { Napi::Env env = info.Env(); - QPoint ret = this->instance->transposed(); + QPoint ret = this->instance->transposed(); auto instance = QPointWrap::constructor.New( {Napi::External::New(env, new QPoint(ret))}); return instance; diff --git a/src/cpp/lib/QtGui/QClipboard/qclipboard_wrap.cpp b/src/cpp/lib/QtGui/QClipboard/qclipboard_wrap.cpp index 5e17702f8..68d00e6d1 100644 --- a/src/cpp/lib/QtGui/QClipboard/qclipboard_wrap.cpp +++ b/src/cpp/lib/QtGui/QClipboard/qclipboard_wrap.cpp @@ -41,7 +41,6 @@ void QClipboardWrap::connectSignalsToEventEmitter() { QObject::connect(this->instance.data(), &QClipboard::changed, [=](const QClipboard::Mode mode) { - Napi::Env env = this->emitOnNode.Env(); Napi::HandleScope scope(env); this->emitOnNode.Call( diff --git a/src/cpp/lib/QtGui/QEvent/QResizeEvent/qresizeevent_wrap.cpp b/src/cpp/lib/QtGui/QEvent/QResizeEvent/qresizeevent_wrap.cpp index 27fe96f1a..a9940a4ce 100644 --- a/src/cpp/lib/QtGui/QEvent/QResizeEvent/qresizeevent_wrap.cpp +++ b/src/cpp/lib/QtGui/QEvent/QResizeEvent/qresizeevent_wrap.cpp @@ -1,19 +1,19 @@ -#include "QtCore/QSize/qsize_wrap.h" #include "QtGui/QEvent/QResizeEvent/qresizeevent_wrap.h" #include "Extras/Utils/nutils.h" +#include "QtCore/QSize/qsize_wrap.h" Napi::FunctionReference QResizeEventWrap::constructor; Napi::Object QResizeEventWrap::init(Napi::Env env, Napi::Object exports) { Napi::HandleScope scope(env); char CLASSNAME[] = "QResizeEvent"; - Napi::Function func = DefineClass( - env, CLASSNAME, - {InstanceMethod("oldSize", &QResizeEventWrap::oldSize), - InstanceMethod("size", &QResizeEventWrap::size), - COMPONENT_WRAPPED_METHODS_EXPORT_DEFINE(QResizeEventWrap) - QEVENT_WRAPPED_METHODS_EXPORT_DEFINE(QResizeEventWrap)}); + Napi::Function func = + DefineClass(env, CLASSNAME, + {InstanceMethod("oldSize", &QResizeEventWrap::oldSize), + InstanceMethod("size", &QResizeEventWrap::size), + COMPONENT_WRAPPED_METHODS_EXPORT_DEFINE(QResizeEventWrap) + QEVENT_WRAPPED_METHODS_EXPORT_DEFINE(QResizeEventWrap)}); constructor = Napi::Persistent(func); exports.Set(CLASSNAME, func); return exports; diff --git a/src/cpp/lib/QtWidgets/QComboBox/qcombobox_wrap.cpp b/src/cpp/lib/QtWidgets/QComboBox/qcombobox_wrap.cpp index cfc1c251d..714e7402e 100644 --- a/src/cpp/lib/QtWidgets/QComboBox/qcombobox_wrap.cpp +++ b/src/cpp/lib/QtWidgets/QComboBox/qcombobox_wrap.cpp @@ -202,7 +202,7 @@ Napi::Value QComboBoxWrap::sizeAdjustPolicy(const Napi::CallbackInfo& info) { } Napi::Value QComboBoxWrap::setSizeAdjustPolicy(const Napi::CallbackInfo& info) { Napi::Env env = info.Env(); - QComboBox::SizeAdjustPolicy policy = static_cast( + QComboBox::SizeAdjustPolicy policy = static_cast( info[0].As().Int32Value()); this->instance->setSizeAdjustPolicy(policy); return env.Null(); diff --git a/src/cpp/lib/QtWidgets/QLayout/qlayout_wrap.cpp b/src/cpp/lib/QtWidgets/QLayout/qlayout_wrap.cpp index 075ab79a8..8d616e135 100644 --- a/src/cpp/lib/QtWidgets/QLayout/qlayout_wrap.cpp +++ b/src/cpp/lib/QtWidgets/QLayout/qlayout_wrap.cpp @@ -13,7 +13,6 @@ void QLayoutWrap::init(Napi::Env env) { NLayout* QLayoutWrap::getInternalInstance() { return this->instance; } QLayoutWrap::QLayoutWrap(const Napi::CallbackInfo& info) - : Napi::ObjectWrap(info) { -} + : Napi::ObjectWrap(info) {} QLayoutWrap::~QLayoutWrap() { extrautils::safeDelete(this->instance); } diff --git a/src/cpp/lib/QtWidgets/QTableWidget/qtablewidget_wrap.cpp b/src/cpp/lib/QtWidgets/QTableWidget/qtablewidget_wrap.cpp index 832ebd0d0..090089512 100644 --- a/src/cpp/lib/QtWidgets/QTableWidget/qtablewidget_wrap.cpp +++ b/src/cpp/lib/QtWidgets/QTableWidget/qtablewidget_wrap.cpp @@ -254,13 +254,13 @@ Napi::Value QTableWidgetWrap::setVerticalHeaderLabels( Napi::Value QTableWidgetWrap::clear(const Napi::CallbackInfo& info) { Napi::Env env = info.Env(); - this->instance->clear(); + this->instance->clear(); return env.Null(); } Napi::Value QTableWidgetWrap::clearContents(const Napi::CallbackInfo& info) { Napi::Env env = info.Env(); - this->instance->clearContents(); + this->instance->clearContents(); return env.Null(); }