Removes trailing spaces. Removes tabs.

[vlc] / activex / oleinplaceactiveobject.h

diff --git a/activex/oleinplaceactiveobject.h b/activex/oleinplaceactiveobject.h
index 267e9d27e4410811f3f22988bd907ce0d7eddceb..6b7406f582f5c8514a6d695190c45fbc224ec2a7 100644 (file)
--- a/activex/oleinplaceactiveobject.h
+++ b/activex/oleinplaceactiveobject.h
@@ -1,71 +1,72 @@
-/*****************************************************************************\r
- * oleinplaceactiveobject.h: ActiveX control for VLC\r
- *****************************************************************************\r
- * Copyright (C) 2005 VideoLAN\r
- *\r
- * Authors: Damien Fouilleul <Damien.Fouilleul@laposte.net>\r
- *\r
- * This program is free software; you can redistribute it and/or modify\r
- * it under the terms of the GNU General Public License as published by\r
- * the Free Software Foundation; either version 2 of the License, or\r
- * (at your option) any later version.\r
- *\r
- * This program is distributed in the hope that it will be useful,\r
- * but WITHOUT ANY WARRANTY; without even the implied warranty of\r
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\r
- * GNU General Public License for more details.\r
- *\r
- * You should have received a copy of the GNU General Public License\r
- * along with this program; if not, write to the Free Software\r
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.\r
- *****************************************************************************/\r
-\r
-#ifndef __OLEINPLACEACTIVEOBJECT_H__\r
-#define __OLEINPLACEACTIVEOBJECT_H__\r
-\r
-#include "oleidl.h"\r
-\r
-class VLCOleInPlaceActiveObject : public IOleInPlaceActiveObject\r
-{\r
-\r
-public:\r
-\r
-    VLCOleInPlaceActiveObject(VLCPlugin *p_instance) : _p_instance(p_instance) {};\r
-    virtual ~VLCOleInPlaceActiveObject() {};\r
-\r
-    // IUnknown methods\r
-    STDMETHODIMP QueryInterface(REFIID riid, void **ppv)\r
-    {\r
-        if( (NULL != ppv)\r
-         && (IID_IUnknown == riid) \r
-         && (IID_IOleWindow == riid) \r
-         && (IID_IOleInPlaceActiveObject == riid) )\r
-        {\r
-            AddRef();\r
-            *ppv = reinterpret_cast<LPVOID>(this);\r
-            return NOERROR;\r
-        }\r
-        return _p_instance->QueryInterface(riid, ppv);\r
-    };\r
-\r
-    STDMETHODIMP_(ULONG) AddRef(void) { return _p_instance->AddRef(); };\r
-    STDMETHODIMP_(ULONG) Release(void) { return _p_instance->Release(); };\r
-\r
-    // IOleWindow methods\r
-    STDMETHODIMP GetWindow(HWND *);\r
-    STDMETHODIMP ContextSensitiveHelp(BOOL);\r
-\r
-    // IOleInPlaceActiveObject methods\r
-    STDMETHODIMP EnableModeless(BOOL);\r
-    STDMETHODIMP TranslateAccelerator(LPMSG);\r
-    STDMETHODIMP OnFrameWindowActivate(BOOL);\r
-    STDMETHODIMP OnDocWindowActivate(BOOL);\r
-    STDMETHODIMP ResizeBorder(LPCRECT, LPOLEINPLACEUIWINDOW, BOOL);\r
-\r
-private:\r
-\r
-    VLCPlugin *_p_instance;\r
-};\r
-\r
-#endif\r
-\r
+/*****************************************************************************
+ * oleinplaceactiveobject.h: ActiveX control for VLC
+ *****************************************************************************
+ * Copyright (C) 2005 the VideoLAN team
+ *
+ * Authors: Damien Fouilleul <Damien.Fouilleul@laposte.net>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * 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., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ *****************************************************************************/
+
+#ifndef __OLEINPLACEACTIVEOBJECT_H__
+#define __OLEINPLACEACTIVEOBJECT_H__
+
+#include "oleidl.h"
+
+class VLCOleInPlaceActiveObject : public IOleInPlaceActiveObject
+{
+
+public:
+
+    VLCOleInPlaceActiveObject(VLCPlugin *p_instance) : _p_instance(p_instance) {};
+    virtual ~VLCOleInPlaceActiveObject() {};
+
+    // IUnknown methods
+    STDMETHODIMP QueryInterface(REFIID riid, void **ppv)
+    {
+        if( NULL == ppv )
+            return E_POINTER;
+        if( (IID_IUnknown == riid)
+         || (IID_IOleWindow == riid)
+         || (IID_IOleInPlaceActiveObject == riid) )
+        {
+            AddRef();
+            *ppv = reinterpret_cast<LPVOID>(this);
+            return NOERROR;
+        }
+        return _p_instance->pUnkOuter->QueryInterface(riid, ppv);
+    };
+
+    STDMETHODIMP_(ULONG) AddRef(void) { return _p_instance->pUnkOuter->AddRef(); };
+    STDMETHODIMP_(ULONG) Release(void) { return _p_instance->pUnkOuter->Release(); };
+
+    // IOleWindow methods
+    STDMETHODIMP GetWindow(HWND *);
+    STDMETHODIMP ContextSensitiveHelp(BOOL);
+
+    // IOleInPlaceActiveObject methods
+    STDMETHODIMP EnableModeless(BOOL);
+    STDMETHODIMP TranslateAccelerator(LPMSG);
+    STDMETHODIMP OnFrameWindowActivate(BOOL);
+    STDMETHODIMP OnDocWindowActivate(BOOL);
+    STDMETHODIMP ResizeBorder(LPCRECT, LPOLEINPLACEUIWINDOW, BOOL);
+
+private:
+
+    VLCPlugin *_p_instance;
+};
+
+#endif
+