Removes trailing spaces. Removes tabs.

[vlc] / mozilla / control / npolibvlc.h

diff --git a/mozilla/control/npolibvlc.h b/mozilla/control/npolibvlc.h
index 96be10302e1c6df249306db82dabdd1146fad52c..034c0847ce3781ffea3210c0236e824d153140f1 100755 (executable)
--- a/mozilla/control/npolibvlc.h
+++ b/mozilla/control/npolibvlc.h
@@ -32,7 +32,14 @@ class LibvlcRootNPObject: public RuntimeNPObject
 protected:\r
     friend class RuntimeNPClass<LibvlcRootNPObject>;\r
 \r
-    LibvlcRootNPObject(NPP instance, const NPClass *aClass);\r
+    LibvlcRootNPObject(NPP instance, const NPClass *aClass) :\r
+        RuntimeNPObject(instance, aClass),\r
+    audioObj(NULL),\r
+    inputObj(NULL),\r
+    logObj(NULL),\r
+    playlistObj(NULL),\r
+    videoObj(NULL) {};\r
+\r
     virtual ~LibvlcRootNPObject();\r
 \r
     static const int propertyCount;\r
@@ -45,6 +52,7 @@ protected:
 \r
     InvokeResult invoke(int index, const NPVariant *args, uint32_t argCount, NPVariant &result);\r
 \r
+private:\r
     NPObject *audioObj;\r
     NPObject *inputObj;\r
     NPObject *logObj;\r
@@ -171,7 +179,10 @@ class LibvlcLogNPObject: public RuntimeNPObject
 protected:\r
     friend class RuntimeNPClass<LibvlcLogNPObject>;\r
 \r
-    LibvlcLogNPObject(NPP instance, const NPClass *aClass);\r
+    LibvlcLogNPObject(NPP instance, const NPClass *aClass) :\r
+    RuntimeNPObject(instance, aClass),\r
+    messagesObj(NULL) {};\r
+\r
     virtual ~LibvlcLogNPObject();\r
 \r
     static const int propertyCount;\r
@@ -184,7 +195,7 @@ protected:
     static const NPUTF8 * const methodNames[];\r
 \r
 private:\r
-    LibvlcMessagesNPObject* _p_vlcmessages;\r
+    NPObject* messagesObj;\r
 };\r
 \r
 class LibvlcPlaylistItemsNPObject: public RuntimeNPObject\r
@@ -212,7 +223,10 @@ class LibvlcPlaylistNPObject: public RuntimeNPObject
 protected:\r
     friend class RuntimeNPClass<LibvlcPlaylistNPObject>;\r
 \r
-    LibvlcPlaylistNPObject(NPP instance, const NPClass *aClass);\r
+    LibvlcPlaylistNPObject(NPP instance, const NPClass *aClass) :\r
+    RuntimeNPObject(instance, aClass),\r
+    playlistItemsObj(NULL) {};\r
+    \r
     virtual ~LibvlcPlaylistNPObject();\r
 \r
     static const int propertyCount;\r
@@ -229,7 +243,7 @@ protected:
     void parseOptions(NPObject *obj, int *i_options, char*** ppsz_options);\r
 \r
 private:\r
-    LibvlcPlaylistItemsNPObject* _p_vlcplaylistitems;\r
+    NPObject*  playlistItemsObj;\r
 };\r
 \r
 class LibvlcVideoNPObject: public RuntimeNPObject\r