export macro for private classes. add/remove some exports

src/QtAV/AVDemuxThread.h

@@ -31,7 +31,7 @@ namespace QtAV {
 
 class AVDemuxer;
 class AVThread;
-class Q_AV_EXPORT AVDemuxThread : public QThread
+class AVDemuxThread : public QThread
 {
     Q_OBJECT
 public:

src/QtAV/QtAV_Global.h

@@ -34,6 +34,7 @@
 #  undef Q_AV_EXPORT
 #  define Q_AV_EXPORT Q_DECL_IMPORT //only for vc?
 #endif
+#define Q_AV_PRIVATE_EXPORT Q_AV_EXPORT
 
 /* runtime version. used to compare with compile time version */
 Q_AV_EXPORT unsigned QtAV_Version();

src/QtAV/VideoShader.h

@@ -122,7 +122,7 @@ protected:
     DPTR_DECLARE(VideoMaterial)
 };
 
-class TexturedGeometry {
+class Q_AV_EXPORT TexturedGeometry {
 public:
     typedef struct {
         float x, y;

src/QtAV/private/AVDecoder_p.h

@@ -30,7 +30,7 @@
 
 namespace QtAV {
 
-class Q_AV_EXPORT AVDecoderPrivate : public DPtrPrivate<AVDecoder>
+class Q_AV_PRIVATE_EXPORT AVDecoderPrivate : public DPtrPrivate<AVDecoder>
 {
 public:
     AVDecoderPrivate():

src/QtAV/private/AVOutput_p.h

@@ -35,7 +35,7 @@ class Filter;
 class FilterContext;
 class Statistics;
 class OutputSet;
-class Q_AV_EXPORT AVOutputPrivate : public DPtrPrivate<AVOutput>
+class Q_AV_PRIVATE_EXPORT AVOutputPrivate : public DPtrPrivate<AVOutput>
 {
 public:
     AVOutputPrivate():

src/QtAV/private/AudioOutput_p.h

@@ -31,7 +31,7 @@
 
 namespace QtAV {
 
-class Q_AV_EXPORT AudioOutputPrivate : public AVOutputPrivate
+class Q_AV_PRIVATE_EXPORT AudioOutputPrivate : public AVOutputPrivate
 {
 public:
     AudioOutputPrivate():

src/QtAV/private/AudioResampler_p.h

@@ -29,7 +29,7 @@
 namespace QtAV {
 
 class AudioResampler;
-class AudioResamplerPrivate : public DPtrPrivate<AudioResampler>
+class Q_AV_PRIVATE_EXPORT AudioResamplerPrivate : public DPtrPrivate<AudioResampler>
 {
 public:
     AudioResamplerPrivate():

src/QtAV/private/Frame_p.h

@@ -30,7 +30,7 @@
 namespace QtAV {
 
 class Frame;
-class Q_AV_EXPORT FramePrivate : public QSharedData
+class FramePrivate : public QSharedData
 {
 public:
     FramePrivate()

src/QtAV/private/ImageConverter_p.h

@@ -29,7 +29,7 @@
 namespace QtAV {
 
 class ImageConverter;
-class Q_AV_EXPORT ImageConverterPrivate : public DPtrPrivate<ImageConverter>
+class Q_AV_PRIVATE_EXPORT ImageConverterPrivate : public DPtrPrivate<ImageConverter>
 {
 public:
     ImageConverterPrivate()

src/QtAV/private/QPainterRenderer_p.h

@@ -29,7 +29,7 @@
 
 namespace QtAV {
 
-class Q_AV_EXPORT QPainterRendererPrivate : public VideoRendererPrivate
+class Q_AV_PRIVATE_EXPORT QPainterRendererPrivate : public VideoRendererPrivate
 {
 public:
     QPainterRendererPrivate():

src/QtAV/private/VideoDecoderFFmpegHW_p.h

@@ -32,7 +32,7 @@
 
 namespace QtAV {
 
-class Q_AV_EXPORT VideoDecoderFFmpegHWPrivate : public VideoDecoderPrivate
+class Q_AV_PRIVATE_EXPORT VideoDecoderFFmpegHWPrivate : public VideoDecoderPrivate
 {
 public:
     VideoDecoderFFmpegHWPrivate()

src/QtAV/private/VideoDecoder_p.h

@@ -27,7 +27,7 @@
 namespace QtAV {
 
 
-class Q_AV_EXPORT VideoDecoderPrivate : public AVDecoderPrivate
+class Q_AV_PRIVATE_EXPORT VideoDecoderPrivate : public AVDecoderPrivate
 {
 public:
     VideoDecoderPrivate():

src/QtAV/private/VideoRenderer_p.h

@@ -36,7 +36,7 @@ class QObject;
 class QWidget;
 namespace QtAV {
 class Filter;
-class Q_AV_EXPORT VideoRendererPrivate : public AVOutputPrivate
+class Q_AV_PRIVATE_EXPORT VideoRendererPrivate : public AVOutputPrivate
 {
 public:
     VideoRendererPrivate():

src/QtAV/private/VideoShader_p.h

@@ -39,7 +39,7 @@
 namespace QtAV {
 
 class VideoShader;
-class Q_AV_EXPORT VideoShaderPrivate : public DPtrPrivate<VideoShader>
+class Q_AV_PRIVATE_EXPORT VideoShaderPrivate : public DPtrPrivate<VideoShader>
 {
 public:
     VideoShaderPrivate()

src/libQtAV.pro

@@ -313,7 +313,6 @@ HEADERS *= \
     QtAV/AudioThread.h \
     QtAV/VideoThread.h \
     QtAV/ColorTransform.h \
-    QtAV/VideoOutputEventFilter.h \
     QtAV/VideoDecoderFFmpegHW.h \
     QtAV/private/factory.h \
     QtAV/private/singleton.h \
@@ -333,6 +332,7 @@ HEADERS *= \
     QtAV/private/VideoShader_p.h \
     QtAV/private/VideoDecoder_p.h \
     QtAV/private/VideoDecoderFFmpegHW_p.h \
+    QtAV/private/VideoOutputEventFilter.h \
     QtAV/private/VideoRenderer_p.h \
     QtAV/private/QPainterRenderer_p.h
 

templates/base_p.h

@@ -7,7 +7,7 @@
 namespace QtAV {
 
 class %CLASS%;
-class Q_AV_EXPORT %CLASS%Private : public DPtrPrivate<%CLASS%>
+class Q_AV_PRIVATE_EXPORT %CLASS%Private : public DPtrPrivate<%CLASS%>
 {
 public:
     virtual ~%CLASS%Private() {}

templates/derived_p.h

@@ -6,7 +6,7 @@
 
 namespace QtAV {
 
-class Q_AV_EXPORT %CLASS%Private : public %BASE%Private
+class Q_AV_PRIVATE_EXPORT %CLASS%Private : public %BASE%Private
 {
 public:
     virtual ~%CLASS%Private() {}