Removes trailing spaces. Removes tabs.

[vlc] / activex / viewobject.h

diff --git a/activex/viewobject.h b/activex/viewobject.h
index 1b2b24a3281f81e2e1a1c0ba0864cc8aefb57470..0b860c2af60ff9c579b5c9b55feebbd243474570 100644 (file)
--- a/activex/viewobject.h
+++ b/activex/viewobject.h
@@ -37,11 +37,12 @@ public:
     // IUnknown methods
     STDMETHODIMP QueryInterface(REFIID riid, void **ppv)
     {
-        if( (NULL != ppv)
-         && (IID_IUnknown == riid) 
-         && (IID_IPersist == riid) 
-         && (IID_IViewObject == riid) 
-         && (IID_IViewObject2 == riid) ) {
+        if( NULL == ppv )
+            return E_POINTER;
+        if( (IID_IUnknown == riid)
+         || (IID_IViewObject == riid)
+         || (IID_IViewObject2 == riid) )
+        {
             AddRef();
             *ppv = reinterpret_cast<LPVOID>(this);
             return NOERROR;