diff options
author | Hendrik Leppkes <h.leppkes@gmail.com> | 2013-12-16 23:13:08 +0400 |
---|---|---|
committer | Hendrik Leppkes <h.leppkes@gmail.com> | 2013-12-16 23:51:06 +0400 |
commit | 9d946c62eb3b9de9ec0d7c21983d9c9c22d28a52 (patch) | |
tree | ddeaec966579362f942594037bf150f281ae37dd /common | |
parent | 24d83006f7832d1e5fcfba48ee247e4fb69aef08 (diff) |
Initialize class variables in the class, instead of the constructor
This uses the new C++11 initialization features, which put the init
in the same place where they are declared.
Diffstat (limited to 'common')
-rw-r--r-- | common/DSUtilLite/BaseDSPropPage.cpp | 2 | ||||
-rw-r--r-- | common/DSUtilLite/BaseDSPropPage.h | 2 | ||||
-rw-r--r-- | common/DSUtilLite/BaseTrayIcon.cpp | 6 | ||||
-rw-r--r-- | common/DSUtilLite/BaseTrayIcon.h | 13 | ||||
-rw-r--r-- | common/DSUtilLite/ByteParser.h | 6 | ||||
-rw-r--r-- | common/DSUtilLite/FloatingAverage.h | 10 | ||||
-rw-r--r-- | common/DSUtilLite/FontInstaller.h | 4 | ||||
-rw-r--r-- | common/DSUtilLite/H264Nalu.h | 21 | ||||
-rw-r--r-- | common/DSUtilLite/PopupMenu.cpp | 1 | ||||
-rw-r--r-- | common/DSUtilLite/PopupMenu.h | 4 | ||||
-rw-r--r-- | common/DSUtilLite/growarray.h | 10 | ||||
-rw-r--r-- | common/DSUtilLite/registry.cpp | 3 | ||||
-rw-r--r-- | common/DSUtilLite/registry.h | 2 |
13 files changed, 40 insertions, 44 deletions
diff --git a/common/DSUtilLite/BaseDSPropPage.cpp b/common/DSUtilLite/BaseDSPropPage.cpp index 05f45174..74664f48 100644 --- a/common/DSUtilLite/BaseDSPropPage.cpp +++ b/common/DSUtilLite/BaseDSPropPage.cpp @@ -22,7 +22,7 @@ #include "BaseDSPropPage.h" CBaseDSPropPage::CBaseDSPropPage(LPCTSTR pName, __inout_opt LPUNKNOWN pUnk, int DialogId, int TitleId) - : CBasePropertyPage(pName, pUnk, DialogId, TitleId), m_hHint(0) + : CBasePropertyPage(pName, pUnk, DialogId, TitleId) { } diff --git a/common/DSUtilLite/BaseDSPropPage.h b/common/DSUtilLite/BaseDSPropPage.h index 69a618df..a8d8f596 100644 --- a/common/DSUtilLite/BaseDSPropPage.h +++ b/common/DSUtilLite/BaseDSPropPage.h @@ -37,5 +37,5 @@ private: HWND createHintWindow(HWND parent, int timePop = 1700, int timeInit = 70, int timeReshow = 7); private: - HWND m_hHint; + HWND m_hHint = 0; }; diff --git a/common/DSUtilLite/BaseTrayIcon.cpp b/common/DSUtilLite/BaseTrayIcon.cpp index af14ed6b..0694e9db 100644 --- a/common/DSUtilLite/BaseTrayIcon.cpp +++ b/common/DSUtilLite/BaseTrayIcon.cpp @@ -54,13 +54,9 @@ BOOL CBaseTrayIcon::ProcessBlackList() } CBaseTrayIcon::CBaseTrayIcon(IBaseFilter *pFilter, const WCHAR *wszName, int resIcon) - : m_hWnd(0) - , m_hThread(0) - , m_pFilter(pFilter) + : m_pFilter(pFilter) , m_wszName(wszName) , m_resIcon(resIcon) - , m_bPropPageOpen(FALSE) - , m_evSetupFinished(TRUE) { memset(&m_NotifyIconData, 0, sizeof(m_NotifyIconData)); m_evSetupFinished.Reset(); diff --git a/common/DSUtilLite/BaseTrayIcon.h b/common/DSUtilLite/BaseTrayIcon.h index 53cd16e0..6edf17d8 100644 --- a/common/DSUtilLite/BaseTrayIcon.h +++ b/common/DSUtilLite/BaseTrayIcon.h @@ -51,14 +51,15 @@ protected: IBaseFilter *m_pFilter; private: - CAMEvent m_evSetupFinished; + CAMEvent m_evSetupFinished{TRUE}; - HANDLE m_hThread; - HWND m_hWnd; - BOOL m_bPropPageOpen; + HANDLE m_hThread = 0; + HWND m_hWnd = 0; + BOOL m_bPropPageOpen = FALSE; WCHAR m_wszClassName[64]; - const WCHAR *m_wszName; - int m_resIcon; + const WCHAR *m_wszName = NULL; + int m_resIcon = 0; + NOTIFYICONDATA m_NotifyIconData; }; diff --git a/common/DSUtilLite/ByteParser.h b/common/DSUtilLite/ByteParser.h index 8847ec1a..c8312492 100644 --- a/common/DSUtilLite/ByteParser.h +++ b/common/DSUtilLite/ByteParser.h @@ -60,8 +60,8 @@ public: void BitByteAlign(); private: - GetBitContext *m_gbCtx; + GetBitContext *m_gbCtx = nullptr; - const BYTE *m_pData; - const BYTE *m_pEnd; + const BYTE *m_pData = nullptr; + const BYTE *m_pEnd = nullptr; }; diff --git a/common/DSUtilLite/FloatingAverage.h b/common/DSUtilLite/FloatingAverage.h index 6e25a22a..a99cd4f4 100644 --- a/common/DSUtilLite/FloatingAverage.h +++ b/common/DSUtilLite/FloatingAverage.h @@ -26,7 +26,7 @@ template <class T> class FloatingAverage { public: - FloatingAverage(unsigned int iNumSamples = 10) : m_NumSamples(0), m_CurrentSample(0), m_Samples(NULL), m_NumSamplesAlloc(0) { + FloatingAverage(unsigned int iNumSamples = 10) { SetNumSamples(iNumSamples); } @@ -106,8 +106,8 @@ public: } private: - T *m_Samples; - unsigned int m_NumSamples; - unsigned int m_NumSamplesAlloc; - unsigned int m_CurrentSample; + T *m_Samples = nullptr; + unsigned int m_NumSamples = 0; + unsigned int m_NumSamplesAlloc = 0; + unsigned int m_CurrentSample = 0; }; diff --git a/common/DSUtilLite/FontInstaller.h b/common/DSUtilLite/FontInstaller.h index 3be425c6..33b0a455 100644 --- a/common/DSUtilLite/FontInstaller.h +++ b/common/DSUtilLite/FontInstaller.h @@ -25,8 +25,8 @@ class CFontInstaller { - HANDLE (WINAPI *pAddFontMemResourceEx)(PVOID,DWORD,PVOID,DWORD*); - BOOL (WINAPI *pRemoveFontMemResourceEx)(HANDLE); + HANDLE (WINAPI *pAddFontMemResourceEx)(PVOID,DWORD,PVOID,DWORD*) = nullptr; + BOOL (WINAPI *pRemoveFontMemResourceEx)(HANDLE) = nullptr; std::vector<HANDLE> m_fonts; bool InstallFontMemory(const void* pData, UINT len); diff --git a/common/DSUtilLite/H264Nalu.h b/common/DSUtilLite/H264Nalu.h index 3989940e..2e14a078 100644 --- a/common/DSUtilLite/H264Nalu.h +++ b/common/DSUtilLite/H264Nalu.h @@ -24,6 +24,7 @@ typedef enum { + NALU_TYPE_UNKNOWN = 0, NALU_TYPE_SLICE = 1, NALU_TYPE_DPA = 2, NALU_TYPE_DPB = 3, @@ -42,18 +43,18 @@ typedef enum class CH264Nalu { private : - int forbidden_bit; //! should be always FALSE - int nal_reference_idc; //! NALU_PRIORITY_xxxx - NALU_TYPE nal_unit_type; //! NALU_TYPE_xxxx + int forbidden_bit = 0; //! should be always FALSE + int nal_reference_idc = 0; //! NALU_PRIORITY_xxxx + NALU_TYPE nal_unit_type = NALU_TYPE_UNKNOWN; //! NALU_TYPE_xxxx - size_t m_nNALStartPos; //! NALU start (including startcode / size) - size_t m_nNALDataPos; //! Useful part + size_t m_nNALStartPos = 0; //! NALU start (including startcode / size) + size_t m_nNALDataPos = 0; //! Useful part - const BYTE *m_pBuffer; - size_t m_nCurPos; - size_t m_nNextRTP; - size_t m_nSize; - int m_nNALSize; + const BYTE *m_pBuffer = nullptr; + size_t m_nCurPos = 0; + size_t m_nNextRTP = 0; + size_t m_nSize = 0; + int m_nNALSize = 0; bool MoveToNextAnnexBStartcode(); bool MoveToNextRTPStartcode(); diff --git a/common/DSUtilLite/PopupMenu.cpp b/common/DSUtilLite/PopupMenu.cpp index ee9f7a72..d1b03a94 100644 --- a/common/DSUtilLite/PopupMenu.cpp +++ b/common/DSUtilLite/PopupMenu.cpp @@ -21,7 +21,6 @@ #include "PopupMenu.h" CPopupMenu::CPopupMenu(void) - : order(0) { m_hMenu = CreatePopupMenu(); } diff --git a/common/DSUtilLite/PopupMenu.h b/common/DSUtilLite/PopupMenu.h index 72c97c3b..9057e604 100644 --- a/common/DSUtilLite/PopupMenu.h +++ b/common/DSUtilLite/PopupMenu.h @@ -31,6 +31,6 @@ public: HMENU Finish(); private: - HMENU m_hMenu; - int order; + HMENU m_hMenu = 0; + int order = 0; }; diff --git a/common/DSUtilLite/growarray.h b/common/DSUtilLite/growarray.h index e1aa3633..c987b06a 100644 --- a/common/DSUtilLite/growarray.h +++ b/common/DSUtilLite/growarray.h @@ -36,10 +36,10 @@ template <class T> class GrowableArray { public: - GrowableArray() : m_count(0), m_allocated(0), m_pArray(NULL) + GrowableArray() { - } + virtual ~GrowableArray() { free(m_pArray); @@ -128,7 +128,7 @@ protected: GrowableArray& operator=(const GrowableArray& r); GrowableArray(const GrowableArray &r); - T *m_pArray; - DWORD m_count; // Nominal count. - DWORD m_allocated; // Actual allocation size. + T *m_pArray = nullptr; + DWORD m_count = 0; // Nominal count. + DWORD m_allocated = 0; // Actual allocation size. }; diff --git a/common/DSUtilLite/registry.cpp b/common/DSUtilLite/registry.cpp index fae20585..20baa410 100644 --- a/common/DSUtilLite/registry.cpp +++ b/common/DSUtilLite/registry.cpp @@ -48,12 +48,11 @@ bool CreateRegistryKey(HKEY hKeyRoot, LPCTSTR pszSubKey) return false; } -CRegistry::CRegistry() : m_key(NULL) +CRegistry::CRegistry() { } CRegistry::CRegistry(HKEY hkeyRoot, LPCTSTR pszSubKey, HRESULT &hr, BOOL bReadOnly, BOOL b64Bit) - : m_key(NULL) { hr = Open(hkeyRoot, pszSubKey, bReadOnly, b64Bit); } diff --git a/common/DSUtilLite/registry.h b/common/DSUtilLite/registry.h index b09d30cf..0982a2f1 100644 --- a/common/DSUtilLite/registry.h +++ b/common/DSUtilLite/registry.h @@ -47,5 +47,5 @@ public: HRESULT DeleteKey(LPCTSTR pszKey); private: - HKEY *m_key; + HKEY *m_key = nullptr; }; |