From cbb78a20aa9c562d0d1611cb5b98e47ded5fd60d Mon Sep 17 00:00:00 2001 From: wang-bin Date: Tue, 18 Mar 2014 12:44:47 +0800 Subject: [PATCH] add prefix QtAV to all include to avoid potential build error why it happens? e.g. meego toolchain --- examples/player/config/CaptureConfigPage.cpp | 2 +- examples/player/config/VideoEQConfigPage.cpp | 2 +- examples/player/playlist/PlayList.cpp | 2 +- src/AVDecoder.cpp | 4 ++-- src/AVOutput.cpp | 4 ++-- src/AVThread.cpp | 4 ++-- src/AudioDecoder.cpp | 2 +- src/AudioFrame.cpp | 2 +- src/AudioOutput.cpp | 4 ++-- src/AudioOutputPortAudio.cpp | 6 ++--- src/AudioOutputTypes.cpp | 23 +++++++++++++++++++- src/AudioResampler.cpp | 6 ++--- src/AudioThread.cpp | 4 ++-- src/Filter.cpp | 4 ++-- src/Frame.cpp | 2 +- src/GraphicsItemRenderer.cpp | 2 +- src/ImageConverter.cpp | 2 +- src/ImageConverterFF.cpp | 6 ++--- src/OSDFilter.cpp | 4 ++-- src/QPainterRenderer.cpp | 4 ++-- src/QtAV/private/AudioOutput_p.h | 4 ++-- src/QtAV/private/GraphicsItemRenderer_p.h | 4 ++-- src/QtAV/private/VideoDecoderFFmpegHW_p.h | 4 ++-- src/QtAV/private/VideoDecoderFFmpeg_p.h | 4 ++-- src/QtAV/private/VideoDecoder_p.h | 4 ++-- src/QtAV/private/WidgetRenderer_p.h | 4 ++-- src/QtAV/private/XVRenderer_p.h | 2 +- src/QtAV_Compat.cpp | 4 ++-- src/VideoDecoder.cpp | 4 ++-- src/VideoDecoderFFmpeg.cpp | 4 ++-- src/VideoDecoderFFmpegHW.cpp | 2 +- src/VideoFormat.cpp | 2 +- src/VideoFrame.cpp | 2 +- src/VideoRenderer.cpp | 2 +- src/VideoRendererTypes.cpp | 4 ++-- src/VideoThread.cpp | 2 +- src/WidgetRenderer.cpp | 6 ++--- src/XVRenderer.cpp | 2 +- 38 files changed, 85 insertions(+), 64 deletions(-) diff --git a/examples/player/config/CaptureConfigPage.cpp b/examples/player/config/CaptureConfigPage.cpp index 0f53ba99a..1c7acbe89 100644 --- a/examples/player/config/CaptureConfigPage.cpp +++ b/examples/player/config/CaptureConfigPage.cpp @@ -27,7 +27,7 @@ #include #include #include -#include "Slider.h" +#include "../Slider.h" CaptureConfigPage::CaptureConfigPage(QWidget *parent) : ConfigPageBase(parent) diff --git a/examples/player/config/VideoEQConfigPage.cpp b/examples/player/config/VideoEQConfigPage.cpp index 733e7bfc6..9c8703da5 100644 --- a/examples/player/config/VideoEQConfigPage.cpp +++ b/examples/player/config/VideoEQConfigPage.cpp @@ -25,7 +25,7 @@ #include #include #include -#include "Slider.h" +#include "../Slider.h" VideoEQConfigPage::VideoEQConfigPage(QWidget *parent) : QWidget(parent) diff --git a/examples/player/playlist/PlayList.cpp b/examples/player/playlist/PlayList.cpp index c4e675110..49c138072 100644 --- a/examples/player/playlist/PlayList.cpp +++ b/examples/player/playlist/PlayList.cpp @@ -21,7 +21,7 @@ #include "PlayList.h" #include "PlayListModel.h" #include "PlayListDelegate.h" -#include "config/Config.h" +#include "../config/Config.h" #include #include #include diff --git a/src/AVDecoder.cpp b/src/AVDecoder.cpp index e4462fe8d..518e299e5 100644 --- a/src/AVDecoder.cpp +++ b/src/AVDecoder.cpp @@ -1,6 +1,6 @@ /****************************************************************************** QtAV: Media play library based on Qt and FFmpeg - Copyright (C) 2012-2013 Wang Bin + Copyright (C) 2012-2014 Wang Bin * This file is part of QtAV @@ -20,7 +20,7 @@ ******************************************************************************/ #include -#include +#include namespace QtAV { AVDecoder::AVDecoder() diff --git a/src/AVOutput.cpp b/src/AVOutput.cpp index 7b3bbb04e..dea941f73 100644 --- a/src/AVOutput.cpp +++ b/src/AVOutput.cpp @@ -1,6 +1,6 @@ /****************************************************************************** QtAV: Media play library based on Qt and FFmpeg - Copyright (C) 2012-2013 Wang Bin + Copyright (C) 2012-2014 Wang Bin * This file is part of QtAV @@ -20,7 +20,7 @@ ******************************************************************************/ #include -#include +#include #include #include #include diff --git a/src/AVThread.cpp b/src/AVThread.cpp index ab3f56471..1a153f08f 100644 --- a/src/AVThread.cpp +++ b/src/AVThread.cpp @@ -1,6 +1,6 @@ /****************************************************************************** QtAV: Media play library based on Qt and FFmpeg - Copyright (C) 2012-2013 Wang Bin + Copyright (C) 2012-2014 Wang Bin * This file is part of QtAV @@ -20,7 +20,7 @@ ******************************************************************************/ #include -#include +#include #include #include #include diff --git a/src/AudioDecoder.cpp b/src/AudioDecoder.cpp index baf7ef40e..21c73cde7 100644 --- a/src/AudioDecoder.cpp +++ b/src/AudioDecoder.cpp @@ -20,7 +20,7 @@ ******************************************************************************/ #include -#include +#include #include #include #include diff --git a/src/AudioFrame.cpp b/src/AudioFrame.cpp index 222b91ffa..fab578151 100644 --- a/src/AudioFrame.cpp +++ b/src/AudioFrame.cpp @@ -20,7 +20,7 @@ ******************************************************************************/ #include "QtAV/AudioFrame.h" -#include "private/Frame_p.h" +#include "QtAV/private/Frame_p.h" #include "QtAV/AudioResampler.h" #include "QtAV/QtAV_Compat.h" diff --git a/src/AudioOutput.cpp b/src/AudioOutput.cpp index a63a74f9b..ac8613b78 100644 --- a/src/AudioOutput.cpp +++ b/src/AudioOutput.cpp @@ -1,6 +1,6 @@ /****************************************************************************** QtAV: Media play library based on Qt and FFmpeg - Copyright (C) 2012-2013 Wang Bin + Copyright (C) 2012-2014 Wang Bin * This file is part of QtAV @@ -20,7 +20,7 @@ ******************************************************************************/ #include -#include +#include namespace QtAV { AudioOutput::AudioOutput() diff --git a/src/AudioOutputPortAudio.cpp b/src/AudioOutputPortAudio.cpp index b645fe9fa..ca580471f 100644 --- a/src/AudioOutputPortAudio.cpp +++ b/src/AudioOutputPortAudio.cpp @@ -1,6 +1,6 @@ /****************************************************************************** QtAV: Media play library based on Qt and FFmpeg - Copyright (C) 2012-2013 Wang Bin + Copyright (C) 2012-2014 Wang Bin * This file is part of QtAV @@ -21,8 +21,8 @@ #include -#include -#include "prepost.h" +#include +#include "QtAV/prepost.h" #include #include diff --git a/src/AudioOutputTypes.cpp b/src/AudioOutputTypes.cpp index 1023b57c2..d2b1239bf 100644 --- a/src/AudioOutputTypes.cpp +++ b/src/AudioOutputTypes.cpp @@ -1,6 +1,27 @@ +/****************************************************************************** + QtAV: Media play library based on Qt and FFmpeg + Copyright (C) 2012-2014 Wang Bin + +* This file is part of QtAV + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + This library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with this library; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA +******************************************************************************/ + #include "QtAV/AudioOutputTypes.h" #include "QtAV/FactoryDefine.h" -#include "factory.h" +#include "QtAV/factory.h" namespace QtAV { diff --git a/src/AudioResampler.cpp b/src/AudioResampler.cpp index f780829a5..0b5c39de4 100644 --- a/src/AudioResampler.cpp +++ b/src/AudioResampler.cpp @@ -1,6 +1,6 @@ /****************************************************************************** QtAV: Media play library based on Qt and FFmpeg - Copyright (C) 2013 Wang Bin + Copyright (C) 2012-2014 Wang Bin * This file is part of QtAV @@ -21,8 +21,8 @@ #include "QtAV/AudioResampler.h" #include "QtAV/AudioFormat.h" -#include "private/AudioResampler_p.h" -#include "factory.h" +#include "QtAV/private/AudioResampler_p.h" +#include "QtAV/factory.h" namespace QtAV { diff --git a/src/AudioThread.cpp b/src/AudioThread.cpp index 2d5855491..94febc38d 100644 --- a/src/AudioThread.cpp +++ b/src/AudioThread.cpp @@ -1,6 +1,6 @@ /****************************************************************************** QtAV: Media play library based on Qt and FFmpeg - Copyright (C) 2012-2013 Wang Bin + Copyright (C) 2012-2014 Wang Bin * This file is part of QtAV @@ -20,7 +20,7 @@ ******************************************************************************/ #include -#include +#include #include #include #include diff --git a/src/Filter.cpp b/src/Filter.cpp index db972f48a..67c2fcee5 100644 --- a/src/Filter.cpp +++ b/src/Filter.cpp @@ -1,6 +1,6 @@ /****************************************************************************** QtAV: Media play library based on Qt and FFmpeg - Copyright (C) 2013 Wang Bin + Copyright (C) 2012-2014 Wang Bin * This file is part of QtAV @@ -20,7 +20,7 @@ ******************************************************************************/ #include "QtAV/Filter.h" -#include "private/Filter_p.h" +#include "QtAV/private/Filter_p.h" #include "QtAV/Statistics.h" #include "QtAV/FilterManager.h" #include "QtAV/AVOutput.h" diff --git a/src/Frame.cpp b/src/Frame.cpp index 2967cbdc3..f94337817 100644 --- a/src/Frame.cpp +++ b/src/Frame.cpp @@ -20,7 +20,7 @@ ******************************************************************************/ #include "QtAV/Frame.h" -#include "private/Frame_p.h" +#include "QtAV/private/Frame_p.h" namespace QtAV { diff --git a/src/GraphicsItemRenderer.cpp b/src/GraphicsItemRenderer.cpp index 8a930410a..a337f357e 100644 --- a/src/GraphicsItemRenderer.cpp +++ b/src/GraphicsItemRenderer.cpp @@ -20,7 +20,7 @@ ******************************************************************************/ #include -#include +#include #include #include #include diff --git a/src/ImageConverter.cpp b/src/ImageConverter.cpp index af53ef255..18f1c2ba1 100644 --- a/src/ImageConverter.cpp +++ b/src/ImageConverter.cpp @@ -20,7 +20,7 @@ ******************************************************************************/ -#include +#include #include #include #include diff --git a/src/ImageConverterFF.cpp b/src/ImageConverterFF.cpp index 89f7c5c39..d2d781c95 100644 --- a/src/ImageConverterFF.cpp +++ b/src/ImageConverterFF.cpp @@ -1,6 +1,6 @@ /****************************************************************************** ImageConverterFF: Image resizing & color model convertion using FFmpeg swscale - Copyright (C) 2012-2013 Wang Bin + Copyright (C) 2012-2014 Wang Bin * This file is part of QtAV @@ -20,9 +20,9 @@ ******************************************************************************/ #include -#include +#include #include -#include "prepost.h" +#include "QtAV/prepost.h" namespace QtAV { diff --git a/src/OSDFilter.cpp b/src/OSDFilter.cpp index df4a166b9..8c14a52ca 100644 --- a/src/OSDFilter.cpp +++ b/src/OSDFilter.cpp @@ -1,6 +1,6 @@ /****************************************************************************** QtAV: Media play library based on Qt and FFmpeg - Copyright (C) 2013 Wang Bin + Copyright (C) 2012-2014 Wang Bin * This file is part of QtAV @@ -21,7 +21,7 @@ #include "QtAV/OSDFilter.h" #include "QtAV/Statistics.h" -#include +#include #include #if QTAV_HAVE(GL) #include diff --git a/src/QPainterRenderer.cpp b/src/QPainterRenderer.cpp index e11e30ca7..f2bb7d725 100644 --- a/src/QPainterRenderer.cpp +++ b/src/QPainterRenderer.cpp @@ -1,6 +1,6 @@ /****************************************************************************** QtAV: Media play library based on Qt and FFmpeg - Copyright (C) 2012-2013 Wang Bin + Copyright (C) 2012-2014 Wang Bin * This file is part of QtAV @@ -20,7 +20,7 @@ ******************************************************************************/ #include -#include +#include #include #include diff --git a/src/QtAV/private/AudioOutput_p.h b/src/QtAV/private/AudioOutput_p.h index 431a8af5e..4028bbf5a 100644 --- a/src/QtAV/private/AudioOutput_p.h +++ b/src/QtAV/private/AudioOutput_p.h @@ -1,6 +1,6 @@ /****************************************************************************** QtAV: Media play library based on Qt and FFmpeg - Copyright (C) 2012-2013 Wang Bin + Copyright (C) 2012-2014 Wang Bin * This file is part of QtAV @@ -23,7 +23,7 @@ #ifndef QTAV_AUDIOOUTPUT_P_H #define QTAV_AUDIOOUTPUT_P_H -#include +#include #include namespace QtAV { diff --git a/src/QtAV/private/GraphicsItemRenderer_p.h b/src/QtAV/private/GraphicsItemRenderer_p.h index b4c7ca9b0..e7551dafb 100644 --- a/src/QtAV/private/GraphicsItemRenderer_p.h +++ b/src/QtAV/private/GraphicsItemRenderer_p.h @@ -1,6 +1,6 @@ /****************************************************************************** QtAV: Media play library based on Qt and FFmpeg - Copyright (C) 2012-2013 Wang Bin + Copyright (C) 2012-2014 Wang Bin * This file is part of QtAV @@ -23,7 +23,7 @@ #ifndef QTAV_GRAPHICSITEMRENDERER_P_H #define QTAV_GRAPHICSITEMRENDERER_P_H -#include +#include namespace QtAV { diff --git a/src/QtAV/private/VideoDecoderFFmpegHW_p.h b/src/QtAV/private/VideoDecoderFFmpegHW_p.h index 05dfc9a3b..9ed83789b 100644 --- a/src/QtAV/private/VideoDecoderFFmpegHW_p.h +++ b/src/QtAV/private/VideoDecoderFFmpegHW_p.h @@ -1,6 +1,6 @@ /****************************************************************************** QtAV: Media play library based on Qt and FFmpeg - Copyright (C) 2013 Wang Bin + Copyright (C) 2012-2014 Wang Bin * This file is part of QtAV @@ -22,7 +22,7 @@ #ifndef QTAV_VIDEODECODERFFMPEGHW_P_H #define QTAV_VIDEODECODERFFMPEGHW_P_H -#include "private/VideoDecoderFFmpeg_p.h" +#include "QtAV/private/VideoDecoderFFmpeg_p.h" namespace QtAV { diff --git a/src/QtAV/private/VideoDecoderFFmpeg_p.h b/src/QtAV/private/VideoDecoderFFmpeg_p.h index ab388f2a8..ad3e02d2a 100644 --- a/src/QtAV/private/VideoDecoderFFmpeg_p.h +++ b/src/QtAV/private/VideoDecoderFFmpeg_p.h @@ -1,6 +1,6 @@ /****************************************************************************** QtAV: Media play library based on Qt and FFmpeg - Copyright (C) 2013 Wang Bin + Copyright (C) 2012-2014 Wang Bin * This file is part of QtAV @@ -22,7 +22,7 @@ #ifndef QTAV_VIDEODECODERFFMPEG_P_H #define QTAV_VIDEODECODERFFMPEG_P_H -#include "private/VideoDecoder_p.h" +#include "QtAV/private/VideoDecoder_p.h" namespace QtAV { diff --git a/src/QtAV/private/VideoDecoder_p.h b/src/QtAV/private/VideoDecoder_p.h index 3325ae86a..445165b04 100644 --- a/src/QtAV/private/VideoDecoder_p.h +++ b/src/QtAV/private/VideoDecoder_p.h @@ -1,6 +1,6 @@ /****************************************************************************** QtAV: Media play library based on Qt and FFmpeg - Copyright (C) 2013 Wang Bin + Copyright (C) 2012-2014 Wang Bin * This file is part of QtAV @@ -22,7 +22,7 @@ #ifndef QTAV_VIDEODECODER_P_H #define QTAV_VIDEODECODER_P_H -#include +#include namespace QtAV { diff --git a/src/QtAV/private/WidgetRenderer_p.h b/src/QtAV/private/WidgetRenderer_p.h index 1ee43d0e4..0cc73c382 100644 --- a/src/QtAV/private/WidgetRenderer_p.h +++ b/src/QtAV/private/WidgetRenderer_p.h @@ -1,6 +1,6 @@ /****************************************************************************** QtAV: Media play library based on Qt and FFmpeg - Copyright (C) 2012-2013 Wang Bin + Copyright (C) 2012-2014 Wang Bin * This file is part of QtAV @@ -23,7 +23,7 @@ #ifndef QTAV_WIDGETRENDERER_P_H #define QTAV_WIDGETRENDERER_P_H -#include +#include #include namespace QtAV { diff --git a/src/QtAV/private/XVRenderer_p.h b/src/QtAV/private/XVRenderer_p.h index 7be1c25ef..6da2efca5 100644 --- a/src/QtAV/private/XVRenderer_p.h +++ b/src/QtAV/private/XVRenderer_p.h @@ -22,7 +22,7 @@ #ifndef QTAV_XVRENDERER_P_H #define QTAV_XVRENDERER_P_H -#include "private/VideoRenderer_p.h" +#include "QtAV/private/VideoRenderer_p.h" #include #include #include diff --git a/src/QtAV_Compat.cpp b/src/QtAV_Compat.cpp index fdb910c9f..41cbc9be3 100644 --- a/src/QtAV_Compat.cpp +++ b/src/QtAV_Compat.cpp @@ -1,6 +1,6 @@ /****************************************************************************** QtAV: Media play library based on Qt and FFmpeg - Copyright (C) 2012-2013 Wang Bin + Copyright (C) 2012-2014 Wang Bin * This file is part of QtAV @@ -21,7 +21,7 @@ #include #include "QtAV/version.h" -#include "prepost.h" +#include "QtAV/prepost.h" void ffmpeg_version_print() { diff --git a/src/VideoDecoder.cpp b/src/VideoDecoder.cpp index a2136b048..4b58519b0 100644 --- a/src/VideoDecoder.cpp +++ b/src/VideoDecoder.cpp @@ -20,9 +20,9 @@ ******************************************************************************/ #include -#include +#include #include -#include "factory.h" +#include "QtAV/factory.h" namespace QtAV { diff --git a/src/VideoDecoderFFmpeg.cpp b/src/VideoDecoderFFmpeg.cpp index ac4b99eaa..4def33552 100644 --- a/src/VideoDecoderFFmpeg.cpp +++ b/src/VideoDecoderFFmpeg.cpp @@ -20,10 +20,10 @@ ******************************************************************************/ #include "QtAV/VideoDecoderFFmpeg.h" -#include "private/VideoDecoderFFmpeg_p.h" +#include "QtAV/private/VideoDecoderFFmpeg_p.h" #include #include -#include "prepost.h" +#include "QtAV/prepost.h" namespace QtAV { diff --git a/src/VideoDecoderFFmpegHW.cpp b/src/VideoDecoderFFmpegHW.cpp index f1362c0e8..7f26247bd 100644 --- a/src/VideoDecoderFFmpegHW.cpp +++ b/src/VideoDecoderFFmpegHW.cpp @@ -20,7 +20,7 @@ ******************************************************************************/ #include "QtAV/VideoDecoderFFmpegHW.h" -#include "private/VideoDecoderFFmpegHW_p.h" +#include "QtAV/private/VideoDecoderFFmpegHW_p.h" /* LIBAVCODEC_VERSION_CHECK checks for the right version of libav and FFmpeg * a is the major version diff --git a/src/VideoFormat.cpp b/src/VideoFormat.cpp index 2965f3745..d2e9b3dc5 100644 --- a/src/VideoFormat.cpp +++ b/src/VideoFormat.cpp @@ -19,7 +19,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA ******************************************************************************/ -#include "VideoFormat.h" +#include "QtAV/VideoFormat.h" #include #include "QtAV/QtAV_Compat.h" diff --git a/src/VideoFrame.cpp b/src/VideoFrame.cpp index 94a2d49da..5bf306637 100644 --- a/src/VideoFrame.cpp +++ b/src/VideoFrame.cpp @@ -20,7 +20,7 @@ ******************************************************************************/ #include "QtAV/VideoFrame.h" -#include "private/Frame_p.h" +#include "QtAV/private/Frame_p.h" #include "QtAV/ImageConverter.h" #include "QtAV/ImageConverterTypes.h" #include "QtAV/QtAV_Compat.h" diff --git a/src/VideoRenderer.cpp b/src/VideoRenderer.cpp index cd5b31e7b..79ce3d451 100644 --- a/src/VideoRenderer.cpp +++ b/src/VideoRenderer.cpp @@ -20,7 +20,7 @@ ******************************************************************************/ #include -#include +#include #include #include #include diff --git a/src/VideoRendererTypes.cpp b/src/VideoRendererTypes.cpp index 99bb1f5b2..c5809204a 100644 --- a/src/VideoRendererTypes.cpp +++ b/src/VideoRendererTypes.cpp @@ -1,6 +1,6 @@ /****************************************************************************** VideoRendererTypes: type id and manually id register function - Copyright (C) 2013 Wang Bin + Copyright (C) 2012-2014 Wang Bin * This file is part of QtAV @@ -22,7 +22,7 @@ #include "QtAV/VideoRendererTypes.h" #include #include -#include "prepost.h" +#include "QtAV/prepost.h" #include #include #if QTAV_HAVE(GL) diff --git a/src/VideoThread.cpp b/src/VideoThread.cpp index 020a5e4e1..7c2688783 100644 --- a/src/VideoThread.cpp +++ b/src/VideoThread.cpp @@ -20,7 +20,7 @@ ******************************************************************************/ #include -#include +#include #include #include #include diff --git a/src/WidgetRenderer.cpp b/src/WidgetRenderer.cpp index c97201d32..55cc9c8f1 100644 --- a/src/WidgetRenderer.cpp +++ b/src/WidgetRenderer.cpp @@ -20,10 +20,10 @@ ******************************************************************************/ #include -#include -#include +#include +#include #include -#include +#include #include #include diff --git a/src/XVRenderer.cpp b/src/XVRenderer.cpp index 707bd4adc..406719ee8 100644 --- a/src/XVRenderer.cpp +++ b/src/XVRenderer.cpp @@ -25,7 +25,7 @@ #include "QtAV/XVRenderer.h" #include #include -#include "private/XVRenderer_p.h" +#include "QtAV/private/XVRenderer_p.h" namespace QtAV { inline int scaleEQValue(int val, int min, int max)