Merge pull request wang-bin#318 from mwachtler/cleanup_includes

Cleanup Qt includes: include the directory name in public headers
Chien-Mu · Oct 29, 2014 · e417774 · e417774
2 parents 41a176c 1255cd0
commit e417774
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 6 deletions.
diff --git a/src/QtAV/ColorTransform.h b/src/QtAV/ColorTransform.h
@@ -23,7  23,7 @@
 #define QTAV_COLORTRANSFORM_H
 
 #include <QtCore/QSharedDataPointer>
-#include <QMatrix4x4>
 #include <QtGui/QMatrix4x4>
 
 // TODO: kernel QGenericMatrix<M,N>
 //http://www.graficaobscura.com/matrix/index.html

diff --git a/src/QtAV/GraphicsItemRenderer.h b/src/QtAV/GraphicsItemRenderer.h
@@ -23,7  23,11 @@
 #define QAV_GRAPHICSITEMRENDERER_H
 
 #include <QtAV/QPainterRenderer.h>
-#include <QGraphicsWidget>
 #if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
 #include <QtWidgets/QGraphicsWidget>
 #else
 #include <QtGui/QGraphicsWidget>
 #endif
 
 //QGraphicsWidget will lose focus forever if TextItem inserted text. Why?
 #define CONFIG_GRAPHICSWIDGET 0

diff --git a/src/QtAV/OpenGLVideo.h b/src/QtAV/OpenGLVideo.h
@@ -25,7  25,7 @@
 #include <QtAV/QtAV_Global.h>
 #include <QtAV/VideoFormat.h>
 #include <QtCore/QHash>
-#include <QMatrix4x4>
 #include <QtGui/QMatrix4x4>
 #include <QtCore/QObject>
 #if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
 #include <QtGui/QOpenGLContext>

diff --git a/src/QtAV/QPainterRenderer.h b/src/QtAV/QPainterRenderer.h
@@ -23,7  23,7 @@
 #define QAV_QPAINTERRENDERER_H
 
 #include <QtAV/VideoRenderer.h>
-#include <qimage.h>
 #include <QtGui/QImage>
 //TODO: not abstract.
 namespace QtAV {
 

diff --git a/src/QtAV/QtAV_Global.h b/src/QtAV/QtAV_Global.h
@@ -24,7  24,7 @@
 #define QTAV_GLOBAL_H
 
 #include <stdarg.h>
-#include <qglobal.h>
 #include <QtCore/qglobal.h>
 #include "dptr.h"
 
 #if defined(BUILD_QTAV_LIB)

diff --git a/src/QtAV/WidgetRenderer.h b/src/QtAV/WidgetRenderer.h
@@ -23,7  23,11 @@
 #define QTAV_WIDGETRENDERER_H
 
 #include <QtAV/QPainterRenderer.h>
-#include <qwidget.h>
 #if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
 #include <QtWidgets/QWidget>
 #else
 #include <QtGui/QWidget>
 #endif
 
 namespace QtAV {