* modules/gui/wxwidgets: small code cleanup.

[vlc] / activex / connectioncontainer.h

diff --git a/activex/connectioncontainer.h b/activex/connectioncontainer.h
index 3713e9ee77aea0ed8b4869ae5bbdfea980547985..0e3b65bf8843b89716bc494e0e33b22ff2a7f187 100644 (file)
--- a/activex/connectioncontainer.h
+++ b/activex/connectioncontainer.h
@@ -17,7 +17,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
 #ifndef __CONNECTIONCONTAINER_H__
@@ -26,6 +26,7 @@
 #include <ocidl.h>
 #include <vector>
 #include <queue>
+#include <map>
 
 class VLCConnectionPoint : public IConnectionPoint
 {
@@ -39,9 +40,11 @@ public:
     // IUnknown methods
     STDMETHODIMP QueryInterface(REFIID riid, void **ppv)
     {
-        if( NULL == ppv ) return E_POINTER;
+        if( NULL == ppv )
+            return E_POINTER;
         if( (IID_IUnknown == riid) 
-         && (IID_IConnectionPoint == riid) ) {
+         || (IID_IConnectionPoint == riid) )
+        {
             AddRef();
             *ppv = reinterpret_cast<LPVOID>(this);
             return NOERROR;
@@ -67,7 +70,7 @@ private:
 
     REFIID _iid;
     IConnectionPointContainer *_p_cpc;
-    std::vector<CONNECTDATA> _connections;
+    std::map<DWORD, LPUNKNOWN> _connections;
 };
 
 //////////////////////////////////////////////////////////////////////////
@@ -95,9 +98,11 @@ public:
     // IUnknown methods
     STDMETHODIMP QueryInterface(REFIID riid, void **ppv)
     {
-        if( (NULL != ppv)
-         && (IID_IUnknown == riid) 
-         && (IID_IConnectionPointContainer == riid) ) {
+        if( NULL == ppv)
+            return E_POINTER;
+        if( (IID_IUnknown == riid) 
+         || (IID_IConnectionPointContainer == riid) )
+        {
             AddRef();
             *ppv = reinterpret_cast<LPVOID>(this);
             return NOERROR;