[vlc-commits] activex: fix warnings

Rafaël Carré git at videolan.org
Sat Nov 12 19:38:27 CET 2011


npapi-vlc | branch: master | Rafaël Carré <funman at videolan.org> | Sat Nov 12 13:38:13 2011 -0500| [0e30555e19560366d0523bae1359430cb4a15f69] | committer: Rafaël Carré

activex: fix warnings

useless const
initialization order

> http://git.videolan.org/gitweb.cgi/npapi-vlc.git/?a=commit;h=0e30555e19560366d0523bae1359430cb4a15f69
---

 activex/plugin.cpp |    4 ++--
 activex/plugin.h   |    4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/activex/plugin.cpp b/activex/plugin.cpp
index b501bc8..2d5d1c2 100644
--- a/activex/plugin.cpp
+++ b/activex/plugin.cpp
@@ -215,6 +215,7 @@ extern HMODULE DllGetModule();
 
 VLCPlugin::VLCPlugin(VLCPluginClass *p_class, LPUNKNOWN pUnkOuter) :
     _inplacewnd(NULL),
+    _WindowsManager(DllGetModule()),
     _p_class(p_class),
     _i_ref(1UL),
     _p_libvlc(NULL),
@@ -222,8 +223,7 @@ VLCPlugin::VLCPlugin(VLCPluginClass *p_class, LPUNKNOWN pUnkOuter) :
     _p_mplayer(NULL),
     _i_midx(-1),
     _i_codepage(CP_ACP),
-    _b_usermode(TRUE),
-    _WindowsManager(DllGetModule())
+    _b_usermode(TRUE)
 {
     p_class->AddRef();
 
diff --git a/activex/plugin.h b/activex/plugin.h
index 2ac5355..4a30327 100644
--- a/activex/plugin.h
+++ b/activex/plugin.h
@@ -97,7 +97,7 @@ public:
         _bstr_mrl = SysAllocStringLen(mrl, SysStringLen(mrl));
         setDirty(TRUE);
     };
-    const BSTR getMRL(void) { return _bstr_mrl; };
+    BSTR getMRL(void) { return _bstr_mrl; };
 
     inline void setAutoPlay(BOOL autoplay)
     {
@@ -146,7 +146,7 @@ public:
         _bstr_baseurl = SysAllocStringLen(url, SysStringLen(url));
         setDirty(TRUE);
     };
-    const BSTR getBaseURL(void) { return _bstr_baseurl; };
+    BSTR getBaseURL(void) { return _bstr_baseurl; };
 
     // control size in HIMETRIC
     inline void setExtent(const SIZEL& extent)



More information about the vlc-commits mailing list