Skip to content

Commit

Permalink
add prefix QtAV to all include to avoid potential build error
Browse files Browse the repository at this point in the history 
why it happens? e.g. meego toolchain
  • Loading branch information
@wang-bin
wang-bin committed Mar 18, 2014
1 parent 37298b2 commit cbb78a2
Show file tree
Hide file tree
Showing 38 changed files with 85 additions and 64 deletions.
2 changes: 1 addition & 1 deletion examples/player/config/CaptureConfigPage.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
#include <QDesktopServices>
#include <QFileDialog>
#include <QtCore/QUrl>
#include "Slider.h"
#include "../Slider.h"

CaptureConfigPage::CaptureConfigPage(QWidget *parent) :
ConfigPageBase(parent)
Expand Down
2 changes: 1 addition & 1 deletion examples/player/config/VideoEQConfigPage.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
#include <QPushButton>
#include <QLabel>
#include <QLayout>
#include "Slider.h"
#include "../Slider.h"

VideoEQConfigPage::VideoEQConfigPage(QWidget *parent) :
QWidget(parent)
Expand Down
2 changes: 1 addition & 1 deletion examples/player/playlist/PlayList.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
#include "PlayList.h"
#include "PlayListModel.h"
#include "PlayListDelegate.h"
#include "config/Config.h"
#include "../config/Config.h"
#include <QFileDialog>
#include <QListView>
#include <QLayout>
Expand Down
4 changes: 2 additions & 2 deletions src/AVDecoder.cpp
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/******************************************************************************
QtAV: Media play library based on Qt and FFmpeg
Copyright (C) 2012-2013 Wang Bin <[email protected]>
Copyright (C) 2012-2014 Wang Bin <[email protected]>
* This file is part of QtAV
Expand All @@ -20,7 +20,7 @@
******************************************************************************/

#include <QtAV/AVDecoder.h>
#include <private/AVDecoder_p.h>
#include <QtAV/private/AVDecoder_p.h>

namespace QtAV {
AVDecoder::AVDecoder()
Expand Down
4 changes: 2 additions & 2 deletions src/AVOutput.cpp
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/******************************************************************************
QtAV: Media play library based on Qt and FFmpeg
Copyright (C) 2012-2013 Wang Bin <[email protected]>
Copyright (C) 2012-2014 Wang Bin <[email protected]>
* This file is part of QtAV
Expand All @@ -20,7 +20,7 @@
******************************************************************************/

#include <QtAV/AVOutput.h>
#include <private/AVOutput_p.h>
#include <QtAV/private/AVOutput_p.h>
#include <QtAV/Filter.h>
#include <QtAV/FilterContext.h>
#include <QtAV/FilterManager.h>
Expand Down
4 changes: 2 additions & 2 deletions src/AVThread.cpp
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/******************************************************************************
QtAV: Media play library based on Qt and FFmpeg
Copyright (C) 2012-2013 Wang Bin <[email protected]>
Copyright (C) 2012-2014 Wang Bin <[email protected]>
* This file is part of QtAV
Expand All @@ -20,7 +20,7 @@
******************************************************************************/

#include <QtAV/AVThread.h>
#include <private/AVThread_p.h>
#include <QtAV/private/AVThread_p.h>
#include <QtAV/AVOutput.h>
#include <QtAV/Filter.h>
#include <QtAV/OutputSet.h>
Expand Down
2 changes: 1 addition & 1 deletion src/AudioDecoder.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
******************************************************************************/

#include <QtAV/AudioDecoder.h>
#include <private/AVDecoder_p.h>
#include <QtAV/private/AVDecoder_p.h>
#include <QtAV/QtAV_Compat.h>
#include <QtAV/AudioResampler.h>
#include <QtAV/AudioResamplerTypes.h>
Expand Down
2 changes: 1 addition & 1 deletion src/AudioFrame.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
4 changes: 2 additions & 2 deletions src/AudioOutput.cpp
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/******************************************************************************
QtAV: Media play library based on Qt and FFmpeg
Copyright (C) 2012-2013 Wang Bin <[email protected]>
Copyright (C) 2012-2014 Wang Bin <[email protected]>
* This file is part of QtAV
Expand All @@ -20,7 +20,7 @@
******************************************************************************/

#include <QtAV/AudioOutput.h>
#include <private/AudioOutput_p.h>
#include <QtAV/private/AudioOutput_p.h>

namespace QtAV {
AudioOutput::AudioOutput()
Expand Down
6 changes: 3 additions & 3 deletions src/AudioOutputPortAudio.cpp
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/******************************************************************************
QtAV: Media play library based on Qt and FFmpeg
Copyright (C) 2012-2013 Wang Bin <[email protected]>
Copyright (C) 2012-2014 Wang Bin <[email protected]>
* This file is part of QtAV
Expand All @@ -21,8 +21,8 @@


#include <QtAV/AudioOutputPortAudio.h>
#include <private/AudioOutput_p.h>
#include "prepost.h"
#include <QtAV/private/AudioOutput_p.h>
#include "QtAV/prepost.h"
#include <portaudio.h>
#include <QtCore/QString>

Expand Down
23 changes: 22 additions & 1 deletion src/AudioOutputTypes.cpp
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,27 @@
/******************************************************************************
QtAV: Media play library based on Qt and FFmpeg
Copyright (C) 2012-2014 Wang Bin <[email protected]>
* 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 {

Expand Down
6 changes: 3 additions & 3 deletions src/AudioResampler.cpp
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/******************************************************************************
QtAV: Media play library based on Qt and FFmpeg
Copyright (C) 2013 Wang Bin <[email protected]>
Copyright (C) 2012-2014 Wang Bin <[email protected]>
* This file is part of QtAV
Expand All @@ -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 {

Expand Down
4 changes: 2 additions & 2 deletions src/AudioThread.cpp
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/******************************************************************************
QtAV: Media play library based on Qt and FFmpeg
Copyright (C) 2012-2013 Wang Bin <[email protected]>
Copyright (C) 2012-2014 Wang Bin <[email protected]>
* This file is part of QtAV
Expand All @@ -20,7 +20,7 @@
******************************************************************************/

#include <QtAV/AudioThread.h>
#include <private/AVThread_p.h>
#include <QtAV/private/AVThread_p.h>
#include <QtAV/AudioDecoder.h>
#include <QtAV/Packet.h>
#include <QtAV/AudioFormat.h>
Expand Down
4 changes: 2 additions & 2 deletions src/Filter.cpp
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/******************************************************************************
QtAV: Media play library based on Qt and FFmpeg
Copyright (C) 2013 Wang Bin <[email protected]>
Copyright (C) 2012-2014 Wang Bin <[email protected]>
* This file is part of QtAV
Expand All @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion src/Frame.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
******************************************************************************/

#include "QtAV/Frame.h"
#include "private/Frame_p.h"
#include "QtAV/private/Frame_p.h"

namespace QtAV {

Expand Down
2 changes: 1 addition & 1 deletion src/GraphicsItemRenderer.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
******************************************************************************/

#include <QtAV/GraphicsItemRenderer.h>
#include <private/GraphicsItemRenderer_p.h>
#include <QtAV/private/GraphicsItemRenderer_p.h>
#include <QtAV/FilterContext.h>
#include <QGraphicsScene>
#include <QtGui/QPainter>
Expand Down
2 changes: 1 addition & 1 deletion src/ImageConverter.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
******************************************************************************/


#include <private/ImageConverter_p.h>
#include <QtAV/private/ImageConverter_p.h>
#include <QtAV/QtAV_Compat.h>
#include <QtAV/factory.h>
#include <QtAV/ImageConverter.h>
Expand Down
6 changes: 3 additions & 3 deletions src/ImageConverterFF.cpp
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/******************************************************************************
ImageConverterFF: Image resizing & color model convertion using FFmpeg swscale
Copyright (C) 2012-2013 Wang Bin <[email protected]>
Copyright (C) 2012-2014 Wang Bin <[email protected]>
* This file is part of QtAV
Expand All @@ -20,9 +20,9 @@
******************************************************************************/

#include <QtAV/ImageConverter.h>
#include <private/ImageConverter_p.h>
#include <QtAV/private/ImageConverter_p.h>
#include <QtAV/QtAV_Compat.h>
#include "prepost.h"
#include "QtAV/prepost.h"

namespace QtAV {

Expand Down
4 changes: 2 additions & 2 deletions src/OSDFilter.cpp
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/******************************************************************************
QtAV: Media play library based on Qt and FFmpeg
Copyright (C) 2013 Wang Bin <[email protected]>
Copyright (C) 2012-2014 Wang Bin <[email protected]>
* This file is part of QtAV
Expand All @@ -21,7 +21,7 @@

#include "QtAV/OSDFilter.h"
#include "QtAV/Statistics.h"
#include <private/Filter_p.h>
#include <QtAV/private/Filter_p.h>
#include <QtGui/QPainter>
#if QTAV_HAVE(GL)
#include <QtOpenGL/QGLWidget>
Expand Down
4 changes: 2 additions & 2 deletions src/QPainterRenderer.cpp
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/******************************************************************************
QtAV: Media play library based on Qt and FFmpeg
Copyright (C) 2012-2013 Wang Bin <[email protected]>
Copyright (C) 2012-2014 Wang Bin <[email protected]>
* This file is part of QtAV
Expand All @@ -20,7 +20,7 @@
******************************************************************************/

#include <QtAV/QPainterRenderer.h>
#include <private/QPainterRenderer_p.h>
#include <QtAV/private/QPainterRenderer_p.h>
#include <QtAV/FilterContext.h>
#include <QtAV/OSDFilter.h>

Expand Down
4 changes: 2 additions & 2 deletions src/QtAV/private/AudioOutput_p.h
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/******************************************************************************
QtAV: Media play library based on Qt and FFmpeg
Copyright (C) 2012-2013 Wang Bin <[email protected]>
Copyright (C) 2012-2014 Wang Bin <[email protected]>
* This file is part of QtAV
Expand All @@ -23,7 +23,7 @@
#ifndef QTAV_AUDIOOUTPUT_P_H
#define QTAV_AUDIOOUTPUT_P_H

#include <private/AVOutput_p.h>
#include <QtAV/private/AVOutput_p.h>
#include <QtAV/AudioFormat.h>

namespace QtAV {
Expand Down
4 changes: 2 additions & 2 deletions src/QtAV/private/GraphicsItemRenderer_p.h
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/******************************************************************************
QtAV: Media play library based on Qt and FFmpeg
Copyright (C) 2012-2013 Wang Bin <[email protected]>
Copyright (C) 2012-2014 Wang Bin <[email protected]>
* This file is part of QtAV
Expand All @@ -23,7 +23,7 @@
#ifndef QTAV_GRAPHICSITEMRENDERER_P_H
#define QTAV_GRAPHICSITEMRENDERER_P_H

#include <private/QPainterRenderer_p.h>
#include <QtAV/private/QPainterRenderer_p.h>

namespace QtAV {

Expand Down
4 changes: 2 additions & 2 deletions src/QtAV/private/VideoDecoderFFmpegHW_p.h
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/******************************************************************************
QtAV: Media play library based on Qt and FFmpeg
Copyright (C) 2013 Wang Bin <[email protected]>
Copyright (C) 2012-2014 Wang Bin <[email protected]>
* This file is part of QtAV
Expand All @@ -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 {

Expand Down
4 changes: 2 additions & 2 deletions src/QtAV/private/VideoDecoderFFmpeg_p.h
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/******************************************************************************
QtAV: Media play library based on Qt and FFmpeg
Copyright (C) 2013 Wang Bin <[email protected]>
Copyright (C) 2012-2014 Wang Bin <[email protected]>
* This file is part of QtAV
Expand All @@ -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 {

Expand Down
4 changes: 2 additions & 2 deletions src/QtAV/private/VideoDecoder_p.h
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/******************************************************************************
QtAV: Media play library based on Qt and FFmpeg
Copyright (C) 2013 Wang Bin <[email protected]>
Copyright (C) 2012-2014 Wang Bin <[email protected]>
* This file is part of QtAV
Expand All @@ -22,7 +22,7 @@
#ifndef QTAV_VIDEODECODER_P_H
#define QTAV_VIDEODECODER_P_H

#include <private/AVDecoder_p.h>
#include <QtAV/private/AVDecoder_p.h>

namespace QtAV {

Expand Down
4 changes: 2 additions & 2 deletions src/QtAV/private/WidgetRenderer_p.h
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/******************************************************************************
QtAV: Media play library based on Qt and FFmpeg
Copyright (C) 2012-2013 Wang Bin <[email protected]>
Copyright (C) 2012-2014 Wang Bin <[email protected]>
* This file is part of QtAV
Expand All @@ -23,7 +23,7 @@
#ifndef QTAV_WIDGETRENDERER_P_H
#define QTAV_WIDGETRENDERER_P_H

#include <private/QPainterRenderer_p.h>
#include <QtAV/private/QPainterRenderer_p.h>
#include <QtAV/WidgetRenderer.h>

namespace QtAV {
Expand Down
Loading

0 comments on commit cbb78a2

Please sign in to comment.