Commit 9702df0d authored by Sergey Galin's avatar Sergey Galin

Fix most includes to point into their respective Qt module headers subdirectories.

parent ae14f748
......@@ -35,9 +35,7 @@
*/
#pragma once
#include <QObject>
#include <QtCore/QObject>
#include <QJniHelpers.h>
......
......@@ -33,9 +33,9 @@
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
THE POSSIBILITY OF SUCH DAMAGE.
*/
#include <qconfig.h>
#include <QDebug>
#include <QScopedPointer>
#include <QtCore/qconfig.h>
#include <QtCore/QDebug>
#include <QtCore/QScopedPointer>
#include "QAndroidQPAPluginGap.h"
#if QT_VERSION < 0x050000 && defined(QJNIHELPERS_GRYM)
......
......@@ -38,8 +38,8 @@
#include "QAndroidCompass.h"
#include <QAndroidQPAPluginGap.h>
#include <QSharedPointer>
#include <QMutexLocker>
#include <QtCore/QSharedPointer>
#include <QtCore/QMutexLocker>
static const char * const c_full_class_name_ = "ru/dublgis/androidcompass/CompassProvider";
......
......@@ -37,9 +37,9 @@
#pragma once
#include <QJniHelpers.h>
#include <QScopedPointer>
#include <QWeakPointer>
#include <QMutex>
#include <QtCore/QScopedPointer>
#include <QtCore/QWeakPointer>
#include <QtCore/QMutex>
class QAndroidCompass
......
......@@ -38,7 +38,7 @@
#pragma once
#include <QSharedPointer>
#include <QtCore/QSharedPointer>
namespace Mobility {
......
......@@ -38,7 +38,7 @@
#pragma once
#include <QObject>
#include <QtCore/QObject>
#include <QJniHelpers.h>
#include "JniObjectLinker.h"
#include "CellData.h"
......
......@@ -38,7 +38,7 @@
#pragma once
#include <QObject>
#include <QtCore/QObject>
#include <QJniHelpers.h>
#include "JniObjectLinker.h"
#include "WifiData.h"
......
......@@ -37,7 +37,7 @@
*/
#include "WifiData.h"
#include <QStringList>
#include <QtCore/QStringList>
namespace Mobility {
......
......@@ -38,7 +38,7 @@
#pragma once
#include <QString>
#include <QtCore/QString>
namespace Mobility {
......
......@@ -36,7 +36,7 @@
#pragma once
#include <QObject>
#include <QtCore/QObject>
#include <QJniHelpers.h>
#include "JniObjectLinker.h"
......
......@@ -36,7 +36,7 @@
#pragma once
#include <QObject>
#include <QtCore/QObject>
#include <QJniHelpers.h>
......
......@@ -35,10 +35,8 @@
*/
#pragma once
#include <QSharedPointer>
#include <QWeakPointer>
#include <QtCore/QSharedPointer>
#include <QtCore/QWeakPointer>
namespace QLocks
......
......@@ -33,7 +33,7 @@
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "QLockHandler_p.h"
......
......@@ -36,8 +36,8 @@
#pragma once
#include <QSharedPointer>
#include <QWeakPointer>
#include <QtCore/QSharedPointer>
#include <QtCore/QWeakPointer>
namespace QLocks
......
......@@ -36,8 +36,8 @@
#pragma once
#include <QObject>
#include <QTimer>
#include <QtCore/QObject>
#include <QtCore/QTimer>
#include <QJniHelpers.h>
#include <QtPositioning/QGeoPositionInfo>
......
......@@ -33,11 +33,9 @@
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
THE POSSIBILITY OF SUCH DAMAGE.
*/
#pragma once
#include <QObject>
#pragma once
#include <QtCore/QObject>
#include <QJniHelpers.h>
#include <QtPositioning/QGeoPositionInfoSource>
......
......@@ -33,9 +33,9 @@
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
THE POSSIBILITY OF SUCH DAMAGE.
*/
#include <QAndroidQPAPluginGap.h>
#include <QJniHelpers.h>
#include "QNmeaListener.h"
static const char c_full_class_name[] = "ru/dublgis/androidgpslocation/NmeaListener";
......
......@@ -35,7 +35,7 @@
*/
#pragma once
#include <QObject>
#include <QtCore/QObject>
#include "JniObjectLinker.h"
/*!
......
......@@ -39,8 +39,8 @@
#include <unistd.h>
#include <android/bitmap.h>
#include <QDebug>
#include <QColor>
#include <QtCore/QDebug>
#include <QtGui/QColor>
#include "QAndroidJniImagePair.h"
static QImage::Format AndroidBitmapFormat_to_QImageFormat(uint32_t abf)
......
......@@ -38,10 +38,10 @@
#include <stdlib.h>
#include <GLES2/gl2.h>
#include <GLES2/gl2ext.h>
#include <QThread>
#include <QTimer>
#include <QMutexLocker>
#include <QCoreApplication>
#include <QtCore/QThread>
#include <QtCore/QTimer>
#include <QtCore/QMutexLocker>
#include <QtCore/QCoreApplication>
#include <QAndroidQPAPluginGap.h>
#include "QAndroidJniImagePair.h"
#include "QAndroidOffscreenView.h"
......
......@@ -35,7 +35,7 @@
*/
#pragma once
#include <QMap>
#include <QtCore/QMap>
#include "QAndroidOffscreenView.h"
class QAndroidOffscreenWebView
......
......@@ -34,8 +34,8 @@
THE POSSIBILITY OF SUCH DAMAGE.
*/
#include <QCoreApplication>
#include <QDebug>
#include <QtCore/QCoreApplication>
#include <QtCore/QDebug>
#include "QApplicationActivityObserver.h"
......
......@@ -35,9 +35,9 @@
*/
#pragma once
#include <QScopedPointer>
#include <QMutex>
#include <QObject>
#include <QtCore/QScopedPointer>
#include <QtCore/QMutex>
#include <QtCore/QObject>
/*!
* A place where various QObjects can connect to receive signals about
......
......@@ -36,7 +36,7 @@
#include <GLES2/gl2.h>
#include <GLES2/gl2ext.h>
#include <QGLWidget>
#include <QtOpenGL/QGLWidget>
#include "QOpenGLTextureHolder.h"
static const GLuint c_vertex_coordinates_attr = 0;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment