lint

Clément Charmet · Clément Charmet · commit b0e4cb796b39 · 2017-05-22T15:27:23.000+02:00
diff --git a/src/event/datachannelevent.cc b/src/event/datachannelevent.cc
@@ -23,8 +23,8 @@ using namespace v8;
 
 static const char kChannel[] = "channel";
 
-DataChannelEvent::DataChannelEvent(EventEmitter *eventEmitter, 
-  const rtc::scoped_refptr<webrtc::DataChannelInterface> &datachannel) 
+DataChannelEvent::DataChannelEvent(EventEmitter *eventEmitter,
+  const rtc::scoped_refptr<webrtc::DataChannelInterface> &datachannel)
   : EmitterEvent(eventEmitter), _channel(datachannel) {
 }
 
@@ -36,6 +36,6 @@ void DataChannelEvent::Handle() {
   // FIXME: move to observer ?
   Nan::Persistent<Object> channel(RTCDataChannel::Create(_channel));
   e->Set(LOCAL_STRING(kChannel), Nan::New(channel));
-  
-  _eventEmitter->EmitData(LOCAL_STRING(_type),e);
+
+  _eventEmitter->EmitData(LOCAL_STRING(_type), e);
 }
diff --git a/src/event/datachannelevent.h b/src/event/datachannelevent.h
@@ -26,14 +26,13 @@ using namespace v8;
 
 class DataChannelEvent : public EmitterEvent {
  public:
-  explicit DataChannelEvent(EventEmitter *eventEmitter, 
+  explicit DataChannelEvent(EventEmitter *eventEmitter,
     const rtc::scoped_refptr<webrtc::DataChannelInterface>& datachannel);
-  
+
   void Handle();
-  
+
  private:
   const rtc::scoped_refptr<webrtc::DataChannelInterface> _channel;
-
 };
 
 #endif  // EVENT_DATACHANNELEVENT_H_
diff --git a/src/event/emitterevent.cc b/src/event/emitterevent.cc
@@ -19,16 +19,14 @@
 
 using namespace v8;
 
-EmitterEvent::EmitterEvent( EventEmitter *eventEmitter ) : 
-  _eventEmitter(eventEmitter) {
-}
+EmitterEvent::EmitterEvent(EventEmitter *eventEmitter)
+  : _eventEmitter(eventEmitter) {}
 
 void EmitterEvent::Handle() {
   Nan::HandleScope scope;
   _eventEmitter->Emit(LOCAL_STRING(_type));
 }
 
-void EmitterEvent::SetType(
-    const std::string &type) {
+void EmitterEvent::SetType(const std::string &type) {
   _type = type;
-}
+}
diff --git a/src/event/emitterevent.h b/src/event/emitterevent.h
@@ -24,15 +24,14 @@ using namespace v8;
 
 class EmitterEvent : public Event {
  public:
-  explicit EmitterEvent( EventEmitter *eventEmitter );
-  
+  explicit EmitterEvent(EventEmitter *eventEmitter);
+
   void Handle();
   void SetType(const std::string& type);
-  
+
  protected:
   EventEmitter *_eventEmitter;
   std::string _type;
-
 };
 
 #endif  // EVENT_EMITTEREVENT_H_
diff --git a/src/event/messageevent.cc b/src/event/messageevent.cc
@@ -22,17 +22,16 @@ using namespace v8;
 
 static const char kData[] = "data";
 
-MessageEvent::MessageEvent(EventEmitter *eventEmitter) 
-  : EmitterEvent(eventEmitter){
-}
+MessageEvent::MessageEvent(EventEmitter *eventEmitter)
+  : EmitterEvent(eventEmitter) {}
 
 void MessageEvent::Handle() {
   Nan::HandleScope scope;
 
   // FIXME: make proper MessageData ?
   Local<Object> e = Nan::New<Object>();
   e->Set(LOCAL_STRING(kData), LOCAL_STRING(_data));
-  _eventEmitter->EmitData(LOCAL_STRING(_type),e);
+  _eventEmitter->EmitData(LOCAL_STRING(_type), e);
 }
 
 void MessageEvent::SetData(const std::string& data) {
diff --git a/src/event/messageevent.h b/src/event/messageevent.h
@@ -26,13 +26,12 @@ using namespace v8;
 class MessageEvent : public EmitterEvent {
  public:
   explicit MessageEvent(EventEmitter *eventEmitter);
-  
+
   void Handle();
   void SetData(const std::string& data);
- 
+
  private:
   std::string _data;
- 
 };
 
 #endif  // EVENT_MESSAGEEVENT_H_
diff --git a/src/event/peerconnectioniceevent.cc b/src/event/peerconnectioniceevent.cc
@@ -26,7 +26,7 @@ using namespace v8;
 
 static const char kCandidate[] = "candidate";
 
-PeerConnectionIceEvent::PeerConnectionIceEvent(EventEmitter *eventEmitter) 
+PeerConnectionIceEvent::PeerConnectionIceEvent(EventEmitter *eventEmitter)
   : EmitterEvent(eventEmitter) {
 }
 
@@ -35,18 +35,19 @@ void PeerConnectionIceEvent::Handle() {
 
   // FIXME: make proper PeerConnectionIceEvent ?
   Local<Object> e = Nan::New<Object>();
-  
-  if(_candidate.length() && _sdpMid.length()) {
-    e->Set(LOCAL_STRING(kCandidate), 
+
+  if (_candidate.length() && _sdpMid.length()) {
+    e->Set(LOCAL_STRING(kCandidate),
          RTCIceCandidate::Create(_sdpMid, _sdpMLineIndex, _candidate));
   } else {
     e->Set(LOCAL_STRING(kCandidate), Nan::Null());
   }
-  
-  _eventEmitter->EmitData(LOCAL_STRING(_type),e);
+
+  _eventEmitter->EmitData(LOCAL_STRING(_type), e);
 }
 
-void PeerConnectionIceEvent::SetCandidate(const webrtc::IceCandidateInterface* candidate) {
+void PeerConnectionIceEvent::SetCandidate(
+    const webrtc::IceCandidateInterface* candidate) {
   candidate->ToString(&_candidate);
   _sdpMid = candidate->sdp_mid();
   _sdpMLineIndex = candidate->sdp_mline_index();
diff --git a/src/event/peerconnectioniceevent.h b/src/event/peerconnectioniceevent.h
@@ -26,16 +26,14 @@ using namespace v8;
 class PeerConnectionIceEvent : public EmitterEvent {
  public:
   explicit PeerConnectionIceEvent(EventEmitter *eventEmitter);
-  
+
   void Handle();
   void SetCandidate(const webrtc::IceCandidateInterface* candidate);
-  
+
  private:
   std::string _candidate;
   std::string _sdpMid;
   int _sdpMLineIndex = 0;
-  //std::string _ufrag;
-
 };
 
 #endif  // EVENT_PEERCONNECTIONICEEVENT_H_
diff --git a/src/event/setsessiondescriptionevent.cc b/src/event/setsessiondescriptionevent.cc
@@ -57,7 +57,7 @@ void SetSessionDescriptionEvent::Handle() {
   if (_succeeded && _successCallback) {
     Local<Function> successCallback = Nan::New(*_successCallback);
     Nan::Callback cb(successCallback);
-    
+
     const int argc = 0;
     Local<Value> argv[0] = {};
 
diff --git a/src/event/setsessiondescriptionevent.h b/src/event/setsessiondescriptionevent.h
@@ -33,7 +33,7 @@ class SetSessionDescriptionEvent : public Event {
   void Handle();
   void SetSucceeded(bool succeeded);
   void SetErrorMessage(const std::string& errorMessage);
-  
+
  private:
   Persistent<Promise::Resolver> *_resolver;
   Persistent<Function> *_successCallback;
diff --git a/src/eventemitter.cc b/src/eventemitter.cc
@@ -21,22 +21,22 @@ using namespace v8;
 
 static const char kEmit[] = "emit";
 
-EventEmitter::EventEmitter(){};
+EventEmitter::EventEmitter() {}
 
-void EventEmitter::Wrap( Local<Object> obj ){
-    Nan::ObjectWrap::Wrap( obj );
+void EventEmitter::Wrap(Local<Object> obj) {
+    Nan::ObjectWrap::Wrap(obj);
     _emit = new Nan::Persistent<Function>(
         Local<Function>::Cast(handle()->Get(Nan::New(kEmit).ToLocalChecked())));
 }
 
-void EventEmitter::Emit( Local<String> type ){
+void EventEmitter::Emit(Local<String> type) {
     Nan::HandleScope scope;
     Local<Value> argv[] = { type };
     Local<Function> emit = Nan::New(*_emit);
     emit->Call(handle(), 1, argv);
 }
 
-void EventEmitter::EmitData( Local<String> type, Local<Value> data ){
+void EventEmitter::EmitData(Local<String> type, Local<Value> data) {
     Nan::HandleScope scope;
     Local<Value> argv[] = { type, data };
     Local<Function> emit = Nan::New(*_emit);
diff --git a/src/eventemitter.h b/src/eventemitter.h
@@ -24,13 +24,12 @@ using namespace v8;
 
 class EventEmitter : public Nan::ObjectWrap {
  public:
-  explicit EventEmitter();
+  EventEmitter();
   Persistent<Function>* _emit = nullptr;
 
-  void Wrap( Local<Object> obj );
-  void Emit( Local<String> type );
-  void EmitData( Local<String> type, Local<Value> data );
-
+  void Wrap(Local<Object> obj);
+  void Emit(Local<String> type);
+  void EmitData(Local<String> type, Local<Value> data);
 };
 
 #endif  // EVENTEMITTER_H_
diff --git a/src/module.cc b/src/module.cc
@@ -30,7 +30,7 @@ NAN_MODULE_INIT(Init) {
   }
 
   rtc::LogMessage::LogToDebug(rtc::LS_NONE);
-  //rtc::LogMessage::LogToDebug(rtc::LS_VERBOSE);
+  // rtc::LogMessage::LogToDebug(rtc::LS_VERBOSE);
 
   RTCCertificate::Init(target);
   RTCIceCandidate::Init(target);
diff --git a/src/observer/createsessiondescriptionobserver.h b/src/observer/createsessiondescriptionobserver.h
@@ -47,4 +47,4 @@ class CreateSessionDescriptionObserver :
                                       Persistent<Function> *failureCallback);
 };
 
-#endif  // OBSERVER_SETSESSIONDESCRIPTIONOBSERVER_H_
+#endif  // OBSERVER_CREATESESSIONDESCRIPTIONOBSERVER_H_
diff --git a/src/observer/datachannelobserver.cc b/src/observer/datachannelobserver.cc
@@ -31,24 +31,21 @@ DataChannelObserver::~DataChannelObserver() {
 
 void DataChannelObserver::OnStateChange() {
   std::cout << "DataChannel OnStateChange" << std::endl;
-  // TODO
 }
 
-void DataChannelObserver::OnMessage(const webrtc::DataBuffer& buffer){
+void DataChannelObserver::OnMessage(const webrtc::DataBuffer& buffer) {
   MessageEvent* _event = new MessageEvent(_eventEmitter);
   _event->SetType(kMessage);
 
   rtc::CopyOnWriteBuffer data = buffer.data;
-  std::string _data((char *)data.data(), data.size());;
+  std::string _data(reinterpret_cast<char *>(data.data()), data.size());;
 
   _event->SetData(_data);
   Globals::GetEventQueue()->PushEvent(_event);
-  // TODO
 }
 
-void DataChannelObserver::OnBufferedAmountChange(uint64_t previous_amount){
+void DataChannelObserver::OnBufferedAmountChange(uint64_t previous_amount) {
   std::cout << "DataChannel OnBufferedAmountChange" << std::endl;
-  // TODO
 }
 
 DataChannelObserver *DataChannelObserver::Create() {
diff --git a/src/observer/datachannelobserver.h b/src/observer/datachannelobserver.h
@@ -35,7 +35,7 @@ class DataChannelObserver : public rtc::RefCountInterface,
 
   //  A data buffer was successfully received.
   void OnMessage(const webrtc::DataBuffer& buffer);
-  
+
   // The data channel's buffered_amount has changed.
   void OnBufferedAmountChange(uint64_t previous_amount);
 
diff --git a/src/observer/peerconnectionobserver.cc b/src/observer/peerconnectionobserver.cc
@@ -34,7 +34,6 @@ PeerConnectionObserver::~PeerConnectionObserver() {
 
 void PeerConnectionObserver::OnSignalingChange(
   webrtc::PeerConnectionInterface::SignalingState new_state) {
-  //std::cout << "OnSignalingChange" << std::endl;
   EmitterEvent* _event = new EmitterEvent(_eventEmitter);
   _event->SetType(kSignalingStateChange);
   Globals::GetEventQueue()->PushEvent(_event);
@@ -52,30 +51,26 @@ void PeerConnectionObserver::OnRemoveStream(
 
 void PeerConnectionObserver::OnDataChannel(
     rtc::scoped_refptr<webrtc::DataChannelInterface> data_channel) {
-  //std::cout << "OnDataChannel" << std::endl;
   DataChannelEvent* _event = new DataChannelEvent(_eventEmitter, data_channel);
   _event->SetType(kDataChannel);
   Globals::GetEventQueue()->PushEvent(_event);
 }
 
 void PeerConnectionObserver::OnRenegotiationNeeded() {
-  std::cout << "OnRenegotiationNeeded" << std::endl;
   EmitterEvent* _event = new EmitterEvent(_eventEmitter);
   _event->SetType(kNegociationNeeded);
   Globals::GetEventQueue()->PushEvent(_event);
 }
 
 void PeerConnectionObserver::OnIceConnectionChange(
     webrtc::PeerConnectionInterface::IceConnectionState new_state) {
-  //std::cout << "OnIceConnectionChange" << std::endl;
   EmitterEvent* _event = new EmitterEvent(_eventEmitter);
   _event->SetType(kIceConnectionStateChange);
   Globals::GetEventQueue()->PushEvent(_event);
 }
 
 void PeerConnectionObserver::OnIceGatheringChange(
     webrtc::PeerConnectionInterface::IceGatheringState new_state) {
-  //std::cout << "OnAddStream" << std::endl;
   switch (new_state) {
     case webrtc::PeerConnectionInterface::kIceGatheringNew:
       break;
@@ -85,8 +80,10 @@ void PeerConnectionObserver::OnIceGatheringChange(
 
     case webrtc::PeerConnectionInterface::kIceGatheringComplete:
       {
-        // emit null ice candidate as per https://www.w3.org/TR/webrtc/#dom-rtcpeerconnectioniceevent
-        PeerConnectionIceEvent* _iceEvent = new PeerConnectionIceEvent(_eventEmitter);
+        // emit null ice candidate
+        // as per https://www.w3.org/TR/webrtc/#dom-rtcpeerconnectioniceevent
+        PeerConnectionIceEvent* _iceEvent
+          = new PeerConnectionIceEvent(_eventEmitter);
         _iceEvent->SetType(kIceCandidate);
         Globals::GetEventQueue()->PushEvent(_iceEvent);
         break;
@@ -103,12 +100,10 @@ void PeerConnectionObserver::OnIceGatheringChange(
 
 void PeerConnectionObserver::OnIceCandidate(
     const webrtc::IceCandidateInterface *candidate) {
-  //std::cout << "OnIceCandidate" << std::endl;
   PeerConnectionIceEvent* _event = new PeerConnectionIceEvent(_eventEmitter);
   _event->SetType(kIceCandidate);
   _event->SetCandidate(candidate);
   Globals::GetEventQueue()->PushEvent(_event);
-
 }
 
 void PeerConnectionObserver::OnIceCandidatesRemoved(
diff --git a/src/rtccertificate.h b/src/rtccertificate.h
@@ -45,7 +45,7 @@ class RTCCertificate : public Nan::ObjectWrap {
 
  private:
   explicit RTCCertificate(
-      const rtc::scoped_refptr<rtc::RTCCertificate>& certificate);
+    const rtc::scoped_refptr<rtc::RTCCertificate>& certificate);
   ~RTCCertificate();
 
   static NAN_METHOD(New);
diff --git a/src/rtcdatachannel.cc b/src/rtcdatachannel.cc
@@ -38,7 +38,7 @@ NAN_MODULE_INIT(RTCDataChannel::Init) {
   Nan::SetAccessor(prototype, LOCAL_STRING(kReadyState), GetReadyState);
 
   Nan::SetMethod(prototype, kSend, Send);
-  
+
   constructor().Reset(Nan::GetFunction(ctor).ToLocalChecked());
 
   Nan::Set(target, LOCAL_STRING(sRTCDataChannel), ctor->GetFunction());
@@ -50,7 +50,6 @@ RTCDataChannel::RTCDataChannel(
 
     _datachannelObserver = DataChannelObserver::Create();
     _datachannel->RegisterObserver(_datachannelObserver);
-  
 }
 
 RTCDataChannel::~RTCDataChannel() {
@@ -66,7 +65,7 @@ Local<Object> RTCDataChannel::Create(
   RTCDataChannel *_datachannel = new RTCDataChannel(datachannel);
   _datachannel->Wrap(instance);
   _datachannel->_datachannelObserver->SetEventEmitter(_datachannel);
-  
+
   return instance;
 }
 
@@ -85,7 +84,8 @@ NAN_GETTER(RTCDataChannel::GetOrdered) {
 
 NAN_GETTER(RTCDataChannel::GetReadyState) {
   UNWRAP_OBJECT(RTCDataChannel, object);
-  const char* readyState = webrtc::DataChannelInterface::DataStateString(object->_datachannel->state());
+  const char* readyState = webrtc::DataChannelInterface::DataStateString(
+    object->_datachannel->state());
   info.GetReturnValue().Set(LOCAL_STRING(readyState));
 }
 
diff --git a/src/rtcdatachannel.h b/src/rtcdatachannel.h
diff --git a/src/rtcicecandidate.cc b/src/rtcicecandidate.cc
diff --git a/src/rtcicecandidate.h b/src/rtcicecandidate.h
diff --git a/src/rtcpeerconnection.cc b/src/rtcpeerconnection.cc
diff --git a/src/rtcpeerconnection.h b/src/rtcpeerconnection.h
diff --git a/src/rtcsessiondescription.cc b/src/rtcsessiondescription.cc
diff --git a/src/rtcsessiondescription.h b/src/rtcsessiondescription.h
