Merge branch 'master' into Sync-weave

1 files changed, 0 insertions, 57 deletions

diff --git a/other-licenses/7zstub/src/Windows/PropVariant.h b/other-licenses/7zstub/src/Windows/PropVariant.h
deleted file mode 100644
index 604a4b11b..000000000
--- a/other-licenses/7zstub/src/Windows/PropVariant.h
+++ /dev/null
@@ -1,57 +0,0 @@
-// Windows/PropVariant.h

-

-#ifndef __WINDOWS_PROPVARIANT_H

-#define __WINDOWS_PROPVARIANT_H

-

-#include "../Common/MyWindows.h"

-#include "../Common/Types.h"

-

-namespace NWindows {

-namespace NCOM {

-

-class CPropVariant : public tagPROPVARIANT

-{

-public:

-  CPropVariant() { vt = VT_EMPTY; }

-  ~CPropVariant() { Clear(); }

-  CPropVariant(const PROPVARIANT& varSrc);

-  CPropVariant(const CPropVariant& varSrc);

-  CPropVariant(BSTR bstrSrc);

-  CPropVariant(LPCOLESTR lpszSrc);

-  CPropVariant(bool bSrc) { vt = VT_BOOL; boolVal = (bSrc ? VARIANT_TRUE : VARIANT_FALSE); };

-  CPropVariant(UInt32 value) {  vt = VT_UI4; ulVal = value; }

-  CPropVariant(UInt64 value) {  vt = VT_UI8; uhVal = *(ULARGE_INTEGER*)&value; }

-  CPropVariant(const FILETIME &value) {  vt = VT_FILETIME; filetime = value; }

-  CPropVariant(Int32 value) { vt = VT_I4; lVal = value; }

-  CPropVariant(Byte value) { vt = VT_UI1; bVal = value; }

-  CPropVariant(Int16 value) { vt = VT_I2; iVal = value; }

-  // CPropVariant(LONG value, VARTYPE vtSrc = VT_I4) { vt = vtSrc; lVal = value; }

-

-  CPropVariant& operator=(const CPropVariant& varSrc);

-  CPropVariant& operator=(const PROPVARIANT& varSrc);

-  CPropVariant& operator=(BSTR bstrSrc);

-  CPropVariant& operator=(LPCOLESTR lpszSrc);

-  CPropVariant& operator=(bool bSrc);

-  CPropVariant& operator=(UInt32 value);

-  CPropVariant& operator=(UInt64 value);

-  CPropVariant& operator=(const FILETIME &value);

-

-  CPropVariant& operator=(Int32 value);

-  CPropVariant& operator=(Byte value);

-  CPropVariant& operator=(Int16 value);

-  // CPropVariant& operator=(LONG  value);

-

-  HRESULT Clear();

-  HRESULT Copy(const PROPVARIANT* pSrc);

-  HRESULT Attach(PROPVARIANT* pSrc);

-  HRESULT Detach(PROPVARIANT* pDest);

-

-  HRESULT InternalClear();

-  void InternalCopy(const PROPVARIANT* pSrc);

-

-  int Compare(const CPropVariant &a1);

-};

-

-}}

-

-#endif