DirectShow: Merge the helpers and common folder

Change-Id: Ie1c39c26ae6dec288daafb24b5aa0b6cc2bdd218
Reviewed-by: Yoann Lopes <yoann.lopes@qt.io>

22 files changed, 19 insertions, 25 deletions

diff --git a/src/plugins/directshow/common/common.pri b/src/plugins/directshow/common/common.pri
index 9b7c1e3f4..06f8582ac 100644
--- a/src/plugins/directshow/common/common.pri
+++ b/src/plugins/directshow/common/common.pri
@@ -1,11 +1,30 @@
 INCLUDEPATH += $$PWD
 
 HEADERS += \
+    $$PWD/directshowbasefilter.h \
+    $$PWD/directshoweventloop.h \
+    $$PWD/directshowglobal.h \
+    $$PWD/directshowmediatype.h \
+    $$PWD/directshowmediatypeenum.h \
+    $$PWD/directshowobject.h \
+    $$PWD/directshowpin.h \
+    $$PWD/directshowpinenum.h \
+    $$PWD/directshowvideobuffer.h \
+    $$PWD/directshowutils.h \
     $$PWD/directshowvideoprobecontrol.h \
     $$PWD/directshowaudioprobecontrol.h \
     $$PWD/directshowsamplegrabber.h
 
 SOURCES += \
+    $$PWD/directshowbasefilter.cpp \
+    $$PWD/directshoweventloop.cpp \
+    $$PWD/directshowmediatype.cpp \
+    $$PWD/directshowmediatypeenum.cpp \
+    $$PWD/directshowobject.cpp \
+    $$PWD/directshowpin.cpp \
+    $$PWD/directshowpinenum.cpp \
+    $$PWD/directshowvideobuffer.cpp \
+    $$PWD/directshowutils.cpp \
     $$PWD/directshowvideoprobecontrol.cpp \
     $$PWD/directshowaudioprobecontrol.cpp \
     $$PWD/directshowsamplegrabber.cpp
diff --git a/src/plugins/directshow/helpers/directshowbasefilter.cpp b/src/plugins/directshow/common/directshowbasefilter.cpp
index 342f0c271..342f0c271 100644
--- a/src/plugins/directshow/helpers/directshowbasefilter.cpp
+++ b/src/plugins/directshow/common/directshowbasefilter.cpp
diff --git a/src/plugins/directshow/helpers/directshowbasefilter.h b/src/plugins/directshow/common/directshowbasefilter.h
index 9a2f44567..9a2f44567 100644
--- a/src/plugins/directshow/helpers/directshowbasefilter.h
+++ b/src/plugins/directshow/common/directshowbasefilter.h
diff --git a/src/plugins/directshow/helpers/directshoweventloop.cpp b/src/plugins/directshow/common/directshoweventloop.cpp
index ef85c0429..ef85c0429 100644
--- a/src/plugins/directshow/helpers/directshoweventloop.cpp
+++ b/src/plugins/directshow/common/directshoweventloop.cpp
diff --git a/src/plugins/directshow/helpers/directshoweventloop.h b/src/plugins/directshow/common/directshoweventloop.h
index 609e53134..609e53134 100644
--- a/src/plugins/directshow/helpers/directshoweventloop.h
+++ b/src/plugins/directshow/common/directshoweventloop.h
diff --git a/src/plugins/directshow/helpers/directshowglobal.h b/src/plugins/directshow/common/directshowglobal.h
index 5f391710e..5f391710e 100644
--- a/src/plugins/directshow/helpers/directshowglobal.h
+++ b/src/plugins/directshow/common/directshowglobal.h
diff --git a/src/plugins/directshow/helpers/directshowmediatype.cpp b/src/plugins/directshow/common/directshowmediatype.cpp
index 65882806c..65882806c 100644
--- a/src/plugins/directshow/helpers/directshowmediatype.cpp
+++ b/src/plugins/directshow/common/directshowmediatype.cpp
diff --git a/src/plugins/directshow/helpers/directshowmediatype.h b/src/plugins/directshow/common/directshowmediatype.h
index 7f495f3b2..7f495f3b2 100644
--- a/src/plugins/directshow/helpers/directshowmediatype.h
+++ b/src/plugins/directshow/common/directshowmediatype.h
diff --git a/src/plugins/directshow/helpers/directshowmediatypeenum.cpp b/src/plugins/directshow/common/directshowmediatypeenum.cpp
index 8fbdf7dea..8fbdf7dea 100644
--- a/src/plugins/directshow/helpers/directshowmediatypeenum.cpp
+++ b/src/plugins/directshow/common/directshowmediatypeenum.cpp
diff --git a/src/plugins/directshow/helpers/directshowmediatypeenum.h b/src/plugins/directshow/common/directshowmediatypeenum.h
index 9b058fc5b..9b058fc5b 100644
--- a/src/plugins/directshow/helpers/directshowmediatypeenum.h
+++ b/src/plugins/directshow/common/directshowmediatypeenum.h
diff --git a/src/plugins/directshow/helpers/directshowobject.cpp b/src/plugins/directshow/common/directshowobject.cpp
index db1817a8d..db1817a8d 100644
--- a/src/plugins/directshow/helpers/directshowobject.cpp
+++ b/src/plugins/directshow/common/directshowobject.cpp
diff --git a/src/plugins/directshow/helpers/directshowobject.h b/src/plugins/directshow/common/directshowobject.h
index cfac16f61..cfac16f61 100644
--- a/src/plugins/directshow/helpers/directshowobject.h
+++ b/src/plugins/directshow/common/directshowobject.h
diff --git a/src/plugins/directshow/helpers/directshowpin.cpp b/src/plugins/directshow/common/directshowpin.cpp
index b49c3f8a4..b49c3f8a4 100644
--- a/src/plugins/directshow/helpers/directshowpin.cpp
+++ b/src/plugins/directshow/common/directshowpin.cpp
diff --git a/src/plugins/directshow/helpers/directshowpin.h b/src/plugins/directshow/common/directshowpin.h
index 97e808384..97e808384 100644
--- a/src/plugins/directshow/helpers/directshowpin.h
+++ b/src/plugins/directshow/common/directshowpin.h
diff --git a/src/plugins/directshow/helpers/directshowpinenum.cpp b/src/plugins/directshow/common/directshowpinenum.cpp
index 910bba77d..910bba77d 100644
--- a/src/plugins/directshow/helpers/directshowpinenum.cpp
+++ b/src/plugins/directshow/common/directshowpinenum.cpp
diff --git a/src/plugins/directshow/helpers/directshowpinenum.h b/src/plugins/directshow/common/directshowpinenum.h
index 77214e376..77214e376 100644
--- a/src/plugins/directshow/helpers/directshowpinenum.h
+++ b/src/plugins/directshow/common/directshowpinenum.h
diff --git a/src/plugins/directshow/helpers/directshowutils.cpp b/src/plugins/directshow/common/directshowutils.cpp
index 96fabd6da..96fabd6da 100644
--- a/src/plugins/directshow/helpers/directshowutils.cpp
+++ b/src/plugins/directshow/common/directshowutils.cpp
diff --git a/src/plugins/directshow/helpers/directshowutils.h b/src/plugins/directshow/common/directshowutils.h
index 09c81c257..09c81c257 100644
--- a/src/plugins/directshow/helpers/directshowutils.h
+++ b/src/plugins/directshow/common/directshowutils.h
diff --git a/src/plugins/directshow/helpers/directshowvideobuffer.cpp b/src/plugins/directshow/common/directshowvideobuffer.cpp
index 7f94da97e..7f94da97e 100644
--- a/src/plugins/directshow/helpers/directshowvideobuffer.cpp
+++ b/src/plugins/directshow/common/directshowvideobuffer.cpp
diff --git a/src/plugins/directshow/helpers/directshowvideobuffer.h b/src/plugins/directshow/common/directshowvideobuffer.h
index 85e02b53d..85e02b53d 100644
--- a/src/plugins/directshow/helpers/directshowvideobuffer.h
+++ b/src/plugins/directshow/common/directshowvideobuffer.h
diff --git a/src/plugins/directshow/directshow.pro b/src/plugins/directshow/directshow.pro
index 35301474f..2857f87d9 100644
--- a/src/plugins/directshow/directshow.pro
+++ b/src/plugins/directshow/directshow.pro
@@ -11,7 +11,6 @@ SOURCES += dsserviceplugin.cpp
 mingw: DEFINES += NO_DSHOW_STRSAFE
 
 include(common/common.pri)
-include(helpers/helpers.pri)
 qtConfig(directshow-player): include(player/player.pri)
 include(camera/camera.pri)
 
diff --git a/src/plugins/directshow/helpers/helpers.pri b/src/plugins/directshow/helpers/helpers.pri
deleted file mode 100644
index ca883eeb8..000000000
--- a/src/plugins/directshow/helpers/helpers.pri
+++ /dev/null
@@ -1,24 +0,0 @@
-INCLUDEPATH += $$PWD
-
-HEADERS += \
-    $$PWD/directshowbasefilter.h \
-    $$PWD/directshoweventloop.h \
-    $$PWD/directshowglobal.h \
-    $$PWD/directshowmediatype.h \
-    $$PWD/directshowmediatypeenum.h \
-    $$PWD/directshowobject.h \
-    $$PWD/directshowpin.h \
-    $$PWD/directshowpinenum.h \
-    $$PWD/directshowvideobuffer.h \
-    $$PWD/directshowutils.h
-
-SOURCES += \
-    $$PWD/directshowbasefilter.cpp \
-    $$PWD/directshoweventloop.cpp \
-    $$PWD/directshowmediatype.cpp \
-    $$PWD/directshowmediatypeenum.cpp \
-    $$PWD/directshowobject.cpp \
-    $$PWD/directshowpin.cpp \
-    $$PWD/directshowpinenum.cpp \
-    $$PWD/directshowvideobuffer.cpp \
-    $$PWD/directshowutils.cpp