src,doc: refactor to replace typedefs with usings

nodejs · Mar 8, 2021 · 77083ea · 77083ea
1 parent 12c548b
commit 77083ea
Show file tree

Hide file tree

Showing 7 changed files with 152 additions and 134 deletions.
diff --git a/doc/function.md b/doc/function.md
@@ -60,7 +60,7 @@ This is the type describing a callback returning `void` that will be invoked
 from JavaScript.
 
 ```cpp
-typedef void (*VoidCallback)(const Napi::CallbackInfo& info);
+using VoidCallback = void (*)(const Napi::CallbackInfo& info);
 ```
 
 ### Napi::Function::Callback
@@ -70,7 +70,7 @@ from JavaScript.
 
 
 ```cpp
-typedef Value (*Callback)(const Napi::CallbackInfo& info);
+using Callback = Value (*)(const Napi::CallbackInfo& info);
 ```
 
 ## Methods

diff --git a/doc/property_descriptor.md b/doc/property_descriptor.md
@@ -50,7 +50,7 @@ Void Init(Env env) {
 ### PropertyDescriptor::GetterCallback
 
 ```cpp
-typedef Napi::Value (*GetterCallback)(const Napi::CallbackInfo& info);
+using GetterCallback = Napi::Value (*)(const Napi::CallbackInfo& info);
 ```
 
 This is the signature of a getter function to be passed as a template parameter
@@ -59,7 +59,7 @@ to `PropertyDescriptor::Accessor`.
 ### PropertyDescriptor::SetterCallback
 
 ```cpp
-typedef void (*SetterCallback)(const Napi::CallbackInfo& info);
+using SetterCallback = void (*)(const Napi::CallbackInfo& info);
 ```
 
 This is the signature of a setter function to be passed as a template parameter

diff --git a/doc/typed_array_of.md b/doc/typed_array_of.md
@@ -11,14 +11,14 @@ classes.
 The common JavaScript `TypedArray` types are pre-defined for each of use:
 
 ```cpp
-typedef Napi::TypedArrayOf<int8_t> Int8Array;
-typedef Napi::TypedArrayOf<uint8_t> Uint8Array;
-typedef Napi::TypedArrayOf<int16_t> Int16Array;
-typedef Napi::TypedArrayOf<uint16_t> Uint16Array;
-typedef Napi::TypedArrayOf<int32_t> Int32Array;
-typedef Napi::TypedArrayOf<uint32_t> Uint32Array;
-typedef Napi::TypedArrayOf<float> Float32Array;
-typedef Napi::TypedArrayOf<double> Float64Array;
+using Int8Array = Napi::TypedArrayOf<int8_t>;
+using Uint8Array = Napi::TypedArrayOf<uint8_t>;
+using Int16Array = Napi::TypedArrayOf<int16_t>;
+using Uint16Array = Napi::TypedArrayOf<uint16_t>;
+using Int32Array = Napi::TypedArrayOf<int32_t>;
+using Uint32Array = Napi::TypedArrayOf<uint32_t>;
+using Float32Array = Napi::TypedArrayOf<float>;
+using Float64Array = Napi::TypedArrayOf<double>;
 ```
 
 The one exception is the `Uint8ClampedArray` which requires explicit

diff --git a/doc/version_management.md b/doc/version_management.md
@@ -25,7 +25,8 @@ information is stored in the `napi_node_version` structure that is defined as
 shown below:
 
 ```cpp
-typedef struct {
+using napi_node_version =
+struct {
   uint32_t major;
   uint32_t minor;
   uint32_t patch;

diff --git a/napi-inl.deprecated.h b/napi-inl.deprecated.h
@@ -11,7 +11,7 @@ PropertyDescriptor::Accessor(const char* utf8name,
                              Getter getter,
                              napi_property_attributes attributes,
                              void* /*data*/) {
-  typedef details::CallbackData<Getter, Napi::Value> CbData;
+  using CbData = details::CallbackData<Getter, Napi::Value>;
   // TODO: Delete when the function is destroyed
   auto callbackData = new CbData({ getter, nullptr });
 
@@ -40,7 +40,7 @@ inline PropertyDescriptor PropertyDescriptor::Accessor(napi_value name,
                                                        Getter getter,
                                                        napi_property_attributes attributes,
                                                        void* /*data*/) {
-  typedef details::CallbackData<Getter, Napi::Value> CbData;
+  using CbData = details::CallbackData<Getter, Napi::Value>;
   // TODO: Delete when the function is destroyed
   auto callbackData = new CbData({ getter, nullptr });
 
@@ -71,7 +71,7 @@ inline PropertyDescriptor PropertyDescriptor::Accessor(const char* utf8name,
                                                        Setter setter,
                                                        napi_property_attributes attributes,
                                                        void* /*data*/) {
-  typedef details::AccessorCallbackData<Getter, Setter> CbData;
+  using CbData = details::AccessorCallbackData<Getter, Setter>;
   // TODO: Delete when the function is destroyed
   auto callbackData = new CbData({ getter, setter, nullptr });
 
@@ -102,7 +102,7 @@ inline PropertyDescriptor PropertyDescriptor::Accessor(napi_value name,
                                                        Setter setter,
                                                        napi_property_attributes attributes,
                                                        void* /*data*/) {
-  typedef details::AccessorCallbackData<Getter, Setter> CbData;
+  using CbData = details::AccessorCallbackData<Getter, Setter>;
   // TODO: Delete when the function is destroyed
   auto callbackData = new CbData({ getter, setter, nullptr });
 
@@ -133,8 +133,8 @@ inline PropertyDescriptor PropertyDescriptor::Function(const char* utf8name,
                                                        Callable cb,
                                                        napi_property_attributes attributes,
                                                        void* /*data*/) {
-  typedef decltype(cb(CallbackInfo(nullptr, nullptr))) ReturnType;
-  typedef details::CallbackData<Callable, ReturnType> CbData;
+  using ReturnType = decltype(cb(CallbackInfo(nullptr, nullptr)));
+  using CbData = details::CallbackData<Callable, ReturnType>;
   // TODO: Delete when the function is destroyed
   auto callbackData = new CbData({ cb, nullptr });
 
@@ -163,8 +163,8 @@ inline PropertyDescriptor PropertyDescriptor::Function(napi_value name,
                                                        Callable cb,
                                                        napi_property_attributes attributes,
                                                        void* /*data*/) {
-  typedef decltype(cb(CallbackInfo(nullptr, nullptr))) ReturnType;
-  typedef details::CallbackData<Callable, ReturnType> CbData;
+  using ReturnType = decltype(cb(CallbackInfo(nullptr, nullptr)));
+  using CbData = details::CallbackData<Callable, ReturnType>;
   // TODO: Delete when the function is destroyed
   auto callbackData = new CbData({ cb, nullptr });
 

diff --git a/napi-inl.h b/napi-inl.h
@@ -1983,8 +1983,8 @@ inline Function Function::New(napi_env env,
                               Callable cb,
                               const char* utf8name,
                               void* data) {
-  typedef decltype(cb(CallbackInfo(nullptr, nullptr))) ReturnType;
-  typedef details::CallbackData<Callable, ReturnType> CbData;
+  using ReturnType = decltype(cb(CallbackInfo(nullptr, nullptr)));
+  using CbData = details::CallbackData<Callable, ReturnType>;
   auto callbackData = new CbData({ cb, data });
 
   napi_value value;
@@ -3035,7 +3035,7 @@ PropertyDescriptor::Accessor(Napi::Env env,
                              Getter getter,
                              napi_property_attributes attributes,
                              void* data) {
-  typedef details::CallbackData<Getter, Napi::Value> CbData;
+  using CbData = details::CallbackData<Getter, Napi::Value>;
   auto callbackData = new CbData({ getter, data });
 
   napi_status status = AttachData(env, object, callbackData);
@@ -3073,7 +3073,7 @@ inline PropertyDescriptor PropertyDescriptor::Accessor(Napi::Env env,
                                                        Getter getter,
                                                        napi_property_attributes attributes,
                                                        void* data) {
-  typedef details::CallbackData<Getter, Napi::Value> CbData;
+  using CbData = details::CallbackData<Getter, Napi::Value>;
   auto callbackData = new CbData({ getter, data });
 
   napi_status status = AttachData(env, object, callbackData);
@@ -3102,7 +3102,7 @@ inline PropertyDescriptor PropertyDescriptor::Accessor(Napi::Env env,
                                                        Setter setter,
                                                        napi_property_attributes attributes,
                                                        void* data) {
-  typedef details::AccessorCallbackData<Getter, Setter> CbData;
+  using CbData = details::AccessorCallbackData<Getter, Setter>;
   auto callbackData = new CbData({ getter, setter, data });
 
   napi_status status = AttachData(env, object, callbackData);
@@ -3142,7 +3142,7 @@ inline PropertyDescriptor PropertyDescriptor::Accessor(Napi::Env env,
                                                        Setter setter,
                                                        napi_property_attributes attributes,
                                                        void* data) {
-  typedef details::AccessorCallbackData<Getter, Setter> CbData;
+  using CbData = details::AccessorCallbackData<Getter, Setter>;
   auto callbackData = new CbData({ getter, setter, data });
 
   napi_status status = AttachData(env, object, callbackData);