Skip to content

Commit 0e33e39

Browse files
sedwards2009sedwards2009
authored
Remove most unneeded or buggy Napi:HandleScope uses (nodegui#895)
1 parent d11ed99 commit 0e33e39

131 files changed

Lines changed: 14 additions & 2164 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎src/cpp/include/nodegui/QtCore/QObject/qobject_macro.h‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -19,20 +19,17 @@
1919
\
2020
Napi::Value __id__(const Napi::CallbackInfo& info) { \
2121
Napi::Env env = info.Env(); \
22-
Napi::HandleScope scope(env); \
2322
return Napi::Value::From( \
2423
env, extrautils::hashPointerTo53bit(this->instance.data())); \
2524
} \
2625
Napi::Value inherits(const Napi::CallbackInfo& info) { \
2726
Napi::Env env = info.Env(); \
28-
Napi::HandleScope scope(env); \
2927
Napi::String className = info[0].As<Napi::String>(); \
3028
bool doesIt = this->instance->inherits(className.Utf8Value().c_str()); \
3129
return Napi::Value::From(env, doesIt); \
3230
} \
3331
Napi::Value setProperty(const Napi::CallbackInfo& info) { \
3432
Napi::Env env = info.Env(); \
35-
Napi::HandleScope scope(env); \
3633
Napi::String name = info[0].As<Napi::String>(); \
3734
Napi::Value value = info[1]; \
3835
auto variant = \
@@ -43,7 +40,6 @@
4340
} \
4441
Napi::Value property(const Napi::CallbackInfo& info) { \
4542
Napi::Env env = info.Env(); \
46-
Napi::HandleScope scope(env); \
4743
Napi::String name = info[0].As<Napi::String>(); \
4844
Napi::Value value = info[1]; \
4945
QVariant* variant = \
@@ -54,27 +50,23 @@
5450
} \
5551
Napi::Value setObjectName(const Napi::CallbackInfo& info) { \
5652
Napi::Env env = info.Env(); \
57-
Napi::HandleScope scope(env); \
5853
Napi::String objectName = info[0].As<Napi::String>(); \
5954
this->instance->setObjectName( \
6055
QString::fromStdString(objectName.Utf8Value())); \
6156
return env.Null(); \
6257
} \
6358
Napi::Value objectName(const Napi::CallbackInfo& info) { \
6459
Napi::Env env = info.Env(); \
65-
Napi::HandleScope scope(env); \
6660
QString objectName = this->instance->objectName(); \
6761
return Napi::String::New(env, objectName.toStdString()); \
6862
} \
6963
Napi::Value dumpObjectTree(const Napi::CallbackInfo& info) { \
7064
Napi::Env env = info.Env(); \
71-
Napi::HandleScope scope(env); \
7265
this->instance->dumpObjectTree(); \
7366
return env.Null(); \
7467
} \
7568
Napi::Value dumpObjectInfo(const Napi::CallbackInfo& info) { \
7669
Napi::Env env = info.Env(); \
77-
Napi::HandleScope scope(env); \
7870
this->instance->dumpObjectInfo(); \
7971
return env.Null(); \
8072
}

‎src/cpp/include/nodegui/QtWidgets/QAbstractButton/qabstractbutton_macro.h‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,20 +16,17 @@
1616
QWIDGET_WRAPPED_METHODS_DECLARATION \
1717
Napi::Value animateClick(const Napi::CallbackInfo& info) { \
1818
Napi::Env env = info.Env(); \
19-
Napi::HandleScope scope(env); \
2019
int msec = info[0].As<Napi::Number>().Int32Value(); \
2120
this->instance->animateClick(msec); \
2221
return env.Null(); \
2322
} \
2423
Napi::Value click(const Napi::CallbackInfo& info) { \
2524
Napi::Env env = info.Env(); \
26-
Napi::HandleScope scope(env); \
2725
this->instance->click(); \
2826
return env.Null(); \
2927
} \
3028
Napi::Value toggle(const Napi::CallbackInfo& info) { \
3129
Napi::Env env = info.Env(); \
32-
Napi::HandleScope scope(env); \
3330
this->instance->toggle(); \
3431
return env.Null(); \
3532
}

‎src/cpp/include/nodegui/QtWidgets/QAbstractItemView/qabstractitemview_macro.h‎

Lines changed: 0 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
QABSTRACTSCROLLAREA_WRAPPED_METHODS_DECLARATION \
2323
Napi::Value setCurrentIndex(const Napi::CallbackInfo& info) { \
2424
Napi::Env env = info.Env(); \
25-
Napi::HandleScope scope(env); \
2625
Napi::Object indexObject = info[0].As<Napi::Object>(); \
2726
QModelIndexWrap* indexWrap = \
2827
Napi::ObjectWrap<QModelIndexWrap>::Unwrap(indexObject); \
@@ -31,15 +30,13 @@
3130
} \
3231
Napi::Value currentIndex(const Napi::CallbackInfo& info) { \
3332
Napi::Env env = info.Env(); \
34-
Napi::HandleScope scope(env); \
3533
QModelIndex current = this->instance->currentIndex(); \
3634
auto instance = QModelIndexWrap::constructor.New( \
3735
{Napi::External<QModelIndex>::New(env, new QModelIndex(current))}); \
3836
return instance; \
3937
} \
4038
Napi::Value setIndexWidget(const Napi::CallbackInfo& info) { \
4139
Napi::Env env = info.Env(); \
42-
Napi::HandleScope scope(env); \
4340
Napi::Object indexObject = info[0].As<Napi::Object>(); \
4441
Napi::Object widgetObject = info[1].As<Napi::Object>(); \
4542
QModelIndexWrap* indexWrap = \
@@ -52,7 +49,6 @@
5249
} \
5350
Napi::Value indexWidget(const Napi::CallbackInfo& info) { \
5451
Napi::Env env = info.Env(); \
55-
Napi::HandleScope scope(env); \
5652
Napi::Object indexObject = info[0].As<Napi::Object>(); \
5753
QModelIndexWrap* indexWrap = \
5854
Napi::ObjectWrap<QModelIndexWrap>::Unwrap(indexObject); \
@@ -65,39 +61,33 @@
6561
} \
6662
Napi::Value resetHorizontalScrollMode(const Napi::CallbackInfo& info) { \
6763
Napi::Env env = info.Env(); \
68-
Napi::HandleScope scope(env); \
6964
this->instance->resetHorizontalScrollMode(); \
7065
return env.Null(); \
7166
} \
7267
Napi::Value resetVerticalScrollMode(const Napi::CallbackInfo& info) { \
7368
Napi::Env env = info.Env(); \
74-
Napi::HandleScope scope(env); \
7569
this->instance->resetVerticalScrollMode(); \
7670
return env.Null(); \
7771
} \
7872
Napi::Value rootIndex(const Napi::CallbackInfo& info) { \
7973
Napi::Env env = info.Env(); \
80-
Napi::HandleScope scope(env); \
8174
QModelIndex root = this->instance->rootIndex(); \
8275
auto instance = QModelIndexWrap::constructor.New( \
8376
{Napi::External<QModelIndex>::New(env, new QModelIndex(root))}); \
8477
return instance; \
8578
} \
8679
Napi::Value scrollToBottom(const Napi::CallbackInfo& info) { \
8780
Napi::Env env = info.Env(); \
88-
Napi::HandleScope scope(env); \
8981
this->instance->scrollToBottom(); \
9082
return env.Null(); \
9183
} \
9284
Napi::Value scrollToTop(const Napi::CallbackInfo& info) { \
9385
Napi::Env env = info.Env(); \
94-
Napi::HandleScope scope(env); \
9586
this->instance->scrollToTop(); \
9687
return env.Null(); \
9788
} \
9889
Napi::Value setModel(const Napi::CallbackInfo& info) { \
9990
Napi::Env env = info.Env(); \
100-
Napi::HandleScope scope(env); \
10191
Napi::Object modelObject = info[0].As<Napi::Object>(); \
10292
QAbstractItemModelWrap* modelWrap = \
10393
Napi::ObjectWrap<QAbstractItemModelWrap>::Unwrap(modelObject); \
@@ -107,7 +97,6 @@
10797
} \
10898
Napi::Value closePersistentEditor(const Napi::CallbackInfo& info) { \
10999
Napi::Env env = info.Env(); \
110-
Napi::HandleScope scope(env); \
111100
QModelIndexWrap* indexWrap = \
112101
Napi::ObjectWrap<QModelIndexWrap>::Unwrap(info[0].As<Napi::Object>()); \
113102
QModelIndex* index = indexWrap->getInternalInstance(); \
@@ -116,13 +105,11 @@
116105
} \
117106
Napi::Value clearSelection(const Napi::CallbackInfo& info) { \
118107
Napi::Env env = info.Env(); \
119-
Napi::HandleScope scope(env); \
120108
this->instance->clearSelection(); \
121109
return env.Null(); \
122110
} \
123111
Napi::Value edit(const Napi::CallbackInfo& info) { \
124112
Napi::Env env = info.Env(); \
125-
Napi::HandleScope scope(env); \
126113
QModelIndexWrap* indexWrap = \
127114
Napi::ObjectWrap<QModelIndexWrap>::Unwrap(info[0].As<Napi::Object>()); \
128115
QModelIndex* index = indexWrap->getInternalInstance(); \
@@ -131,19 +118,16 @@
131118
} \
132119
Napi::Value reset(const Napi::CallbackInfo& info) { \
133120
Napi::Env env = info.Env(); \
134-
Napi::HandleScope scope(env); \
135121
this->instance->reset(); \
136122
return env.Null(); \
137123
} \
138124
Napi::Value selectAll(const Napi::CallbackInfo& info) { \
139125
Napi::Env env = info.Env(); \
140-
Napi::HandleScope scope(env); \
141126
this->instance->selectAll(); \
142127
return env.Null(); \
143128
} \
144129
Napi::Value setRootIndex(const Napi::CallbackInfo& info) { \
145130
Napi::Env env = info.Env(); \
146-
Napi::HandleScope scope(env); \
147131
QModelIndexWrap* indexWrap = \
148132
Napi::ObjectWrap<QModelIndexWrap>::Unwrap(info[0].As<Napi::Object>()); \
149133
QModelIndex* index = indexWrap->getInternalInstance(); \
@@ -152,7 +136,6 @@
152136
} \
153137
Napi::Value update_QModelIndex(const Napi::CallbackInfo& info) { \
154138
Napi::Env env = info.Env(); \
155-
Napi::HandleScope scope(env); \
156139
QModelIndexWrap* indexWrap = \
157140
Napi::ObjectWrap<QModelIndexWrap>::Unwrap(info[0].As<Napi::Object>()); \
158141
QModelIndex* index = indexWrap->getInternalInstance(); \
@@ -161,15 +144,13 @@
161144
} \
162145
Napi::Value selectionModel(const Napi::CallbackInfo& info) { \
163146
Napi::Env env = info.Env(); \
164-
Napi::HandleScope scope(env); \
165147
QItemSelectionModel* model = this->instance->selectionModel(); \
166148
auto modelExt = Napi::External<QItemSelectionModel>::New(env, model); \
167149
auto instance = QItemSelectionModelWrap::constructor.New({modelExt}); \
168150
return instance; \
169151
} \
170152
Napi::Value isPersistentEditorOpen(const Napi::CallbackInfo& info) { \
171153
Napi::Env env = info.Env(); \
172-
Napi::HandleScope scope(env); \
173154
QModelIndexWrap* indexWrap = \
174155
Napi::ObjectWrap<QModelIndexWrap>::Unwrap(info[0].As<Napi::Object>()); \
175156
QModelIndex* index = indexWrap->getInternalInstance(); \
@@ -178,7 +159,6 @@
178159
} \
179160
Napi::Value openPersistentEditor(const Napi::CallbackInfo& info) { \
180161
Napi::Env env = info.Env(); \
181-
Napi::HandleScope scope(env); \
182162
QModelIndexWrap* indexWrap = \
183163
Napi::ObjectWrap<QModelIndexWrap>::Unwrap(info[0].As<Napi::Object>()); \
184164
QModelIndex* index = indexWrap->getInternalInstance(); \
@@ -187,7 +167,6 @@
187167
} \
188168
Napi::Value keyboardSearch(const Napi::CallbackInfo& info) { \
189169
Napi::Env env = info.Env(); \
190-
Napi::HandleScope scope(env); \
191170
std::string searchNapiText = info[0].As<Napi::String>().Utf8Value(); \
192171
QString search = QString::fromUtf8(searchNapiText.c_str()); \
193172
this->instance->keyboardSearch(search); \
@@ -198,7 +177,6 @@
198177
QABSTRACTITEMVIEW_WRAPPED_METHODS_DECLARATION_NO_QHEADERVIEW_PROTECTED \
199178
Napi::Value indexAt(const Napi::CallbackInfo& info) { \
200179
Napi::Env env = info.Env(); \
201-
Napi::HandleScope scope(env); \
202180
QPointWrap* pointWrap = \
203181
Napi::ObjectWrap<QPointWrap>::Unwrap(info[0].As<Napi::Object>()); \
204182
QPoint* point = pointWrap->getInternalInstance(); \
@@ -209,7 +187,6 @@
209187
} \
210188
Napi::Value scrollTo(const Napi::CallbackInfo& info) { \
211189
Napi::Env env = info.Env(); \
212-
Napi::HandleScope scope(env); \
213190
QModelIndexWrap* indexWrap = \
214191
Napi::ObjectWrap<QModelIndexWrap>::Unwrap(info[0].As<Napi::Object>()); \
215192
QModelIndex* index = indexWrap->getInternalInstance(); \

0 commit comments

Comments
 (0)