From 6e7a3657dd622d6dd1be6d3ea829ffb8ec69f1fa Mon Sep 17 00:00:00 2001 From: Andrew Knight Date: Mon, 30 Mar 2015 15:35:47 +0300 Subject: [PATCH] Remove stray includes Module includes slow down the build when PCH is disabled, so don't use them. Change-Id: Ic0bf0d938ef06dea9dba6897df592311230a6529 Reviewed-by: Yoann Lopes --- src/gsttools/qgstappsrc.cpp | 1 - src/multimedia/audio/qsamplecache_p.cpp | 6 +++++- src/multimedia/audio/qsoundeffect_pulse_p.cpp | 2 +- src/multimedia/playback/playlistfileparser.cpp | 2 ++ src/multimedia/playback/playlistfileparser_p.h | 2 +- 5 files changed, 9 insertions(+), 4 deletions(-) diff --git a/src/gsttools/qgstappsrc.cpp b/src/gsttools/qgstappsrc.cpp index 5057d65..66c3849 100644 --- a/src/gsttools/qgstappsrc.cpp +++ b/src/gsttools/qgstappsrc.cpp @@ -34,7 +34,6 @@ #include #include "qgstappsrc_p.h" -#include QGstAppSrc::QGstAppSrc(QObject *parent) :QObject(parent) diff --git a/src/multimedia/audio/qsamplecache_p.cpp b/src/multimedia/audio/qsamplecache_p.cpp index fbb53ff..8043b77 100644 --- a/src/multimedia/audio/qsamplecache_p.cpp +++ b/src/multimedia/audio/qsamplecache_p.cpp @@ -33,8 +33,12 @@ #include "qsamplecache_p.h" #include "qwavedecoder_p.h" -#include +#include +#include +#include + +#include //#define QT_SAMPLECACHE_DEBUG QT_BEGIN_NAMESPACE diff --git a/src/multimedia/audio/qsoundeffect_pulse_p.cpp b/src/multimedia/audio/qsoundeffect_pulse_p.cpp index 0a509a8..ecc42ca 100644 --- a/src/multimedia/audio/qsoundeffect_pulse_p.cpp +++ b/src/multimedia/audio/qsoundeffect_pulse_p.cpp @@ -44,8 +44,8 @@ #include #include -#include #include +#include #include "qsoundeffect_pulse_p.h" diff --git a/src/multimedia/playback/playlistfileparser.cpp b/src/multimedia/playback/playlistfileparser.cpp index 55835b4..a40bdd9 100644 --- a/src/multimedia/playback/playlistfileparser.cpp +++ b/src/multimedia/playback/playlistfileparser.cpp @@ -33,7 +33,9 @@ #include "playlistfileparser_p.h" #include +#include #include +#include #include "qmediaobject_p.h" #include "qmediametadata.h" diff --git a/src/multimedia/playback/playlistfileparser_p.h b/src/multimedia/playback/playlistfileparser_p.h index 272fac6..3e28b96 100644 --- a/src/multimedia/playback/playlistfileparser_p.h +++ b/src/multimedia/playback/playlistfileparser_p.h @@ -45,8 +45,8 @@ // We mean it. // -#include #include "qtmultimediadefs.h" +#include QT_BEGIN_NAMESPACE -- 2.7.4