DirectShow: Use member initialization

Change-Id: I4e696083c2ed78b374f2df64706ecb2297f122dd
Reviewed-by: André de la Rocha <andre.rocha@qt.io>
 

12 files changed, 25 insertions, 48 deletions

diff --git a/src/plugins/directshow/common/directshowbasefilter.cpp b/src/plugins/directshow/common/directshowbasefilter.cpp
index b792c4d3f..fd86cc3da 100644
--- a/src/plugins/directshow/common/directshowbasefilter.cpp
+++ b/src/plugins/directshow/common/directshowbasefilter.cpp
@@ -45,10 +45,6 @@ QT_BEGIN_NAMESPACE
 
 DirectShowBaseFilter::DirectShowBaseFilter()
     : m_mutex(QMutex::Recursive)
-    , m_state(State_Stopped)
-    , m_graph(NULL)
-    , m_clock(NULL)
-    , m_sink(NULL)
 {
 
 }
diff --git a/src/plugins/directshow/common/directshowbasefilter.h b/src/plugins/directshow/common/directshowbasefilter.h
index fe78f96b2..ea5b8fafe 100644
--- a/src/plugins/directshow/common/directshowbasefilter.h
+++ b/src/plugins/directshow/common/directshowbasefilter.h
@@ -79,12 +79,12 @@ public:
 
 protected:
     QMutex m_mutex;
-    FILTER_STATE m_state;
-    IFilterGraph *m_graph;
-    IReferenceClock *m_clock;
-    IMediaEventSink *m_sink;
+    FILTER_STATE m_state = State_Stopped;
+    IFilterGraph *m_graph = nullptr;
+    IReferenceClock *m_clock = nullptr;
+    IMediaEventSink *m_sink = nullptr;
     QString m_filterName;
-    REFERENCE_TIME m_startTime;
+    REFERENCE_TIME m_startTime = 0;
 
 private:
     Q_DISABLE_COPY(DirectShowBaseFilter)
diff --git a/src/plugins/directshow/common/directshoweventloop.cpp b/src/plugins/directshow/common/directshoweventloop.cpp
index fbc7b8cee..a848f41e7 100644
--- a/src/plugins/directshow/common/directshoweventloop.cpp
+++ b/src/plugins/directshow/common/directshoweventloop.cpp
@@ -51,7 +51,6 @@ public:
     DirectShowPostedEvent(QObject *receiver, QEvent *event)
         : receiver(receiver)
         , event(event)
-        , next(0)
     {
     }
 
@@ -62,13 +61,11 @@ public:
 
     QObject *receiver;
     QEvent *event;
-    DirectShowPostedEvent *next;
+    DirectShowPostedEvent *next = nullptr;
 };
 
 DirectShowEventLoop::DirectShowEventLoop(QObject *parent)
     : QObject(parent)
-    , m_postsHead(0)
-    , m_postsTail(0)
     , m_eventHandle(::CreateEvent(0, 0, 0, 0))
     , m_waitHandle(::CreateEvent(0, 0, 0, 0))
 {
diff --git a/src/plugins/directshow/common/directshoweventloop.h b/src/plugins/directshow/common/directshoweventloop.h
index a29274b7b..b9003209e 100644
--- a/src/plugins/directshow/common/directshoweventloop.h
+++ b/src/plugins/directshow/common/directshoweventloop.h
@@ -68,8 +68,8 @@ protected:
 private:
     void processEvents();
 
-    DirectShowPostedEvent *m_postsHead;
-    DirectShowPostedEvent *m_postsTail;
+    DirectShowPostedEvent *m_postsHead = nullptr;
+    DirectShowPostedEvent *m_postsTail = nullptr;
     HANDLE m_eventHandle;
     HANDLE m_waitHandle;
     QMutex m_mutex;
diff --git a/src/plugins/directshow/common/directshowmediatypeenum.cpp b/src/plugins/directshow/common/directshowmediatypeenum.cpp
index 10623a246..0ff147fea 100644
--- a/src/plugins/directshow/common/directshowmediatypeenum.cpp
+++ b/src/plugins/directshow/common/directshowmediatypeenum.cpp
@@ -42,17 +42,13 @@
 #include "directshowpin.h"
 
 DirectShowMediaTypeEnum::DirectShowMediaTypeEnum(DirectShowPin *pin)
-    : m_pin(pin)
-    , m_mediaTypes(pin->supportedMediaTypes())
-    , m_index(0)
+    : m_mediaTypes(pin->supportedMediaTypes())
 {
     m_pin->AddRef();
 }
 
 DirectShowMediaTypeEnum::DirectShowMediaTypeEnum(const QList<DirectShowMediaType> &types)
-    : m_pin(NULL)
-    , m_mediaTypes(types)
-    , m_index(0)
+    : m_mediaTypes(types)
 {
 }
 
diff --git a/src/plugins/directshow/common/directshowmediatypeenum.h b/src/plugins/directshow/common/directshowmediatypeenum.h
index e78e0a0f2..a5c347004 100644
--- a/src/plugins/directshow/common/directshowmediatypeenum.h
+++ b/src/plugins/directshow/common/directshowmediatypeenum.h
@@ -67,9 +67,9 @@ public:
 private:
     Q_DISABLE_COPY(DirectShowMediaTypeEnum)
 
-    DirectShowPin *m_pin;
+    DirectShowPin *m_pin = nullptr;
     QList<DirectShowMediaType> m_mediaTypes;
-    int m_index;
+    int m_index = 0;
 };
 
 QT_END_NAMESPACE
diff --git a/src/plugins/directshow/common/directshowpin.cpp b/src/plugins/directshow/common/directshowpin.cpp
index 508a9b21d..a9a1d829a 100644
--- a/src/plugins/directshow/common/directshowpin.cpp
+++ b/src/plugins/directshow/common/directshowpin.cpp
@@ -52,7 +52,6 @@ DirectShowPin::DirectShowPin(DirectShowBaseFilter *filter, const QString &name,
     , m_filter(filter)
     , m_name(name)
     , m_direction(direction)
-    , m_peerPin(NULL)
 {
 }
 
@@ -380,8 +379,6 @@ HRESULT DirectShowPin::setActive(bool active)
 
 DirectShowOutputPin::DirectShowOutputPin(DirectShowBaseFilter *filter, const QString &name)
     : DirectShowPin(filter, name, PINDIR_OUTPUT)
-    , m_allocator(NULL)
-    , m_inputPin(NULL)
 {
 
 }
@@ -485,9 +482,6 @@ HRESULT DirectShowOutputPin::EndOfStream()
 
 DirectShowInputPin::DirectShowInputPin(DirectShowBaseFilter *filter, const QString &name)
     : DirectShowPin(filter, name, PINDIR_INPUT)
-    , m_allocator(NULL)
-    , m_flushing(false)
-    , m_inErrorState(false)
 {
     ZeroMemory(&m_sampleProperties, sizeof(m_sampleProperties));
 }
diff --git a/src/plugins/directshow/common/directshowpin.h b/src/plugins/directshow/common/directshowpin.h
index 5e513d002..419276c9c 100644
--- a/src/plugins/directshow/common/directshowpin.h
+++ b/src/plugins/directshow/common/directshowpin.h
@@ -102,7 +102,7 @@ protected:
     QString m_name;
     PIN_DIRECTION m_direction;
 
-    IPin *m_peerPin;
+    IPin *m_peerPin = nullptr;
     DirectShowMediaType m_mediaType;
 
 private:
@@ -128,8 +128,8 @@ public:
 protected:
     DirectShowOutputPin(DirectShowBaseFilter *filter, const QString &name);
 
-    IMemAllocator *m_allocator;
-    IMemInputPin *m_inputPin;
+    IMemAllocator *m_allocator = nullptr;
+    IMemInputPin *m_inputPin = nullptr;
 
 private:
     Q_DISABLE_COPY(DirectShowOutputPin)
@@ -166,9 +166,9 @@ public:
 protected:
     DirectShowInputPin(DirectShowBaseFilter *filter, const QString &name);
 
-    IMemAllocator *m_allocator;
-    bool m_flushing;
-    bool m_inErrorState;
+    IMemAllocator *m_allocator = nullptr;
+    bool m_flushing = false;
+    bool m_inErrorState = false;
     AM_SAMPLE2_PROPERTIES m_sampleProperties;
 
 private:
diff --git a/src/plugins/directshow/common/directshowpinenum.cpp b/src/plugins/directshow/common/directshowpinenum.cpp
index 20fa93d6e..7ba1bb6e9 100644
--- a/src/plugins/directshow/common/directshowpinenum.cpp
+++ b/src/plugins/directshow/common/directshowpinenum.cpp
@@ -44,7 +44,6 @@ QT_BEGIN_NAMESPACE
 
 DirectShowPinEnum::DirectShowPinEnum(DirectShowBaseFilter *filter)
     : m_filter(filter)
-    , m_index(0)
 {
     m_filter->AddRef();
     const QList<DirectShowPin *> pinList = filter->pins();
@@ -55,9 +54,7 @@ DirectShowPinEnum::DirectShowPinEnum(DirectShowBaseFilter *filter)
 }
 
 DirectShowPinEnum::DirectShowPinEnum(const QList<IPin *> &pins)
-    : m_filter(NULL)
-    , m_pins(pins)
-    , m_index(0)
+    : m_pins(pins)
 {
     for (IPin *pin : qAsConst(m_pins))
         pin->AddRef();
diff --git a/src/plugins/directshow/common/directshowpinenum.h b/src/plugins/directshow/common/directshowpinenum.h
index d89f140b1..aada1a71e 100644
--- a/src/plugins/directshow/common/directshowpinenum.h
+++ b/src/plugins/directshow/common/directshowpinenum.h
@@ -68,9 +68,9 @@ public:
 private:
     Q_DISABLE_COPY(DirectShowPinEnum)
 
-    DirectShowBaseFilter *m_filter;
+    DirectShowBaseFilter *m_filter = nullptr;
     QList<IPin *> m_pins;
-    int m_index;
+    int m_index = 0;
 };
 
 QT_END_NAMESPACE
diff --git a/src/plugins/directshow/common/directshowsamplegrabber.cpp b/src/plugins/directshow/common/directshowsamplegrabber.cpp
index 5744aea16..80d3f1c16 100644
--- a/src/plugins/directshow/common/directshowsamplegrabber.cpp
+++ b/src/plugins/directshow/common/directshowsamplegrabber.cpp
@@ -116,9 +116,6 @@ private:
 
 DirectShowSampleGrabber::DirectShowSampleGrabber(QObject *p)
     : QObject(p)
-    , m_sampleGrabber(nullptr)
-    , m_sampleGabberCb(nullptr)
-    , m_callbackType(CallbackMethod::BufferCB)
 {
     // Create sample grabber filter
     HRESULT hr = CoCreateInstance(cLSID_SampleGrabber, NULL, CLSCTX_INPROC, iID_ISampleGrabber, reinterpret_cast<void **>(&m_sampleGrabber));
diff --git a/src/plugins/directshow/common/directshowsamplegrabber.h b/src/plugins/directshow/common/directshowsamplegrabber.h
index a9b72fcd1..5fc61de14 100644
--- a/src/plugins/directshow/common/directshowsamplegrabber.h
+++ b/src/plugins/directshow/common/directshowsamplegrabber.h
@@ -78,10 +78,10 @@ Q_SIGNALS:
     void bufferAvailable(double time, const QByteArray &data);
 
 private:
-    IBaseFilter *m_filter;
-    ISampleGrabber *m_sampleGrabber;
-    SampleGrabberCallbackPrivate *m_sampleGabberCb;
-    CallbackMethod m_callbackType;
+    IBaseFilter *m_filter = nullptr;
+    ISampleGrabber *m_sampleGrabber = nullptr;
+    SampleGrabberCallbackPrivate *m_sampleGabberCb = nullptr;
+    CallbackMethod m_callbackType= CallbackMethod::BufferCB;
 };
 
 QT_END_NAMESPACE