Commit 454c5f35 authored by Vyacheslav Koscheev's avatar Vyacheslav Koscheev

Reorganize includes

parent 0dcf60a2
......@@ -37,7 +37,7 @@
#pragma once
#include <QJniHelpers.h>
#include "QJniHelpers.h"
class IJniObjectLinker
......
......@@ -36,15 +36,16 @@
#pragma once
#include "IJniObjectLinker.h"
#include <QtCore/QObject>
#include <QtCore/QThread>
#include <QtCore/QReadLocker>
#include <QtCore/QSet>
#include <QtCore/QSharedPointer>
#include <QtCore/QCoreApplication>
#include <QJniHelpers.h>
#include <QAndroidQPAPluginGap.h>
#include <IJniObjectLinker.h>
#include "QJniHelpers.h"
#include "QAndroidQPAPluginGap.h"
......
......@@ -37,10 +37,10 @@
#include "QAndroidCompass.h"
#include <QAndroidQPAPluginGap.h>
#include <QtCore/QSharedPointer>
#include <QtCore/QMutexLocker>
#include "TJniObjectLinker.h"
#include <QJniHelpers/QAndroidQPAPluginGap.h>
#include <QJniHelpers/TJniObjectLinker.h>
......
......@@ -36,11 +36,11 @@
#pragma once
#include <QJniHelpers.h>
#include <QtCore/QScopedPointer>
#include <QtCore/QWeakPointer>
#include <QtCore/QMutex>
#include "IJniObjectLinker.h"
#include <QJniHelpers/QJniHelpers.h>
#include <QJniHelpers/IJniObjectLinker.h>
class QAndroidCompass : public QObject
......
......@@ -35,8 +35,8 @@
*/
#include "QAndroidBatteryDataProvider.h"
#include <QAndroidQPAPluginGap.h>
#include "TJniObjectLinker.h"
#include <QJniHelpers/QAndroidQPAPluginGap.h>
#include <QJniHelpers/TJniObjectLinker.h>
namespace Mobility {
......
......@@ -37,8 +37,8 @@
#pragma once
#include <QtCore/QObject>
#include <QJniHelpers.h>
#include "IJniObjectLinker.h"
#include <QJniHelpers/QJniHelpers.h>
#include <QJniHelpers/IJniObjectLinker.h>
namespace Mobility {
......
......@@ -39,8 +39,8 @@
#include "QAndroidCellDataProvider.h"
#include <QtCore/QtDebug>
#include <QAndroidQPAPluginGap.h>
#include "TJniObjectLinker.h"
#include <QJniHelpers/QAndroidQPAPluginGap.h>
#include <QJniHelpers/TJniObjectLinker.h>
namespace Mobility {
......
......@@ -40,8 +40,8 @@
#include <QtCore/QObject>
#include <QtCore/QReadWriteLock>
#include <QJniHelpers.h>
#include "IJniObjectLinker.h"
#include <QJniHelpers/QJniHelpers.h>
#include <QJniHelpers/IJniObjectLinker.h>
#include "CellData.h"
......
......@@ -37,8 +37,8 @@
*/
#include "QAndroidWifiDataProvider.h"
#include <QAndroidQPAPluginGap.h>
#include "TJniObjectLinker.h"
#include <QJniHelpers/QAndroidQPAPluginGap.h>
#include <QJniHelpers/TJniObjectLinker.h>
namespace Mobility {
......
......@@ -39,8 +39,8 @@
#pragma once
#include <QtCore/QObject>
#include <QJniHelpers.h>
#include "IJniObjectLinker.h"
#include <QJniHelpers/QJniHelpers.h>
#include <QJniHelpers/IJniObjectLinker.h>
#include "WifiData.h"
......
......@@ -36,8 +36,8 @@
#include "QAndroidAction.h"
#include <QAndroidQPAPluginGap.h>
#include "TJniObjectLinker.h"
#include <QJniHelpers/QAndroidQPAPluginGap.h>
#include <QJniHelpers/TJniObjectLinker.h>
......
......@@ -37,8 +37,8 @@
#pragma once
#include <QtCore/QObject>
#include <QJniHelpers.h>
#include "IJniObjectLinker.h"
#include <QJniHelpers/QJniHelpers.h>
#include <QJniHelpers/IJniObjectLinker.h>
class QAndroidAction : public QObject
......
......@@ -34,9 +34,10 @@
THE POSSIBILITY OF SUCH DAMAGE.
*/
#include <QJniHelpers.h>
#include <QAndroidQPAPluginGap.h>
#include "QAndroidConfiguration.h"
#include <QJniHelpers/QJniHelpers.h>
#include <QJniHelpers/QAndroidQPAPluginGap.h>
QAndroidConfiguration::QAndroidConfiguration(QObject * parent)
: QObject(parent)
......
......@@ -34,7 +34,7 @@
THE POSSIBILITY OF SUCH DAMAGE.
*/
#include <QAndroidQPAPluginGap.h>
#include <QJniHelpers/QAndroidQPAPluginGap.h>
#include "QAndroidDesktopUtils.h"
namespace QAndroidDesktopUtils {
......
......@@ -34,10 +34,12 @@
THE POSSIBILITY OF SUCH DAMAGE.
*/
#include <QAndroidQPAPluginGap.h>
#include <QAndroidScreenOrientation.h>
#include "QAndroidDialog.h"
#include <TJniObjectLinker.h>
#include <QJniHelpers/QAndroidQPAPluginGap.h>
#include <QJniHelpers/TJniObjectLinker.h>
#include "QAndroidScreenOrientation.h"
static const char * const c_full_class_name_ = "ru/dublgis/androidhelpers/DialogHelper";
bool QAndroidDialog::interactive_ = true;
......
......@@ -37,8 +37,8 @@
#pragma once
#include <QtCore/QString>
#include <QtCore/QObject>
#include <QJniHelpers.h>
#include <IJniObjectLinker.h>
#include <QJniHelpers/QJniHelpers.h>
#include <QJniHelpers/IJniObjectLinker.h>
/*
......
......@@ -34,8 +34,8 @@
THE POSSIBILITY OF SUCH DAMAGE.
*/
#include <QJniHelpers.h>
#include <QAndroidQPAPluginGap.h>
#include <QJniHelpers/QJniHelpers.h>
#include <QJniHelpers/QAndroidQPAPluginGap.h>
#include "QAndroidDisplayMetrics.h"
......
......@@ -39,8 +39,8 @@
#include <QtCore/QDir>
#include <QtCore/QFile>
#include <QtCore/QFileInfo>
#include <QJniHelpers.h>
#include <QAndroidQPAPluginGap.h>
#include <QJniHelpers/QJniHelpers.h>
#include <QJniHelpers/QAndroidQPAPluginGap.h>
#include "QAndroidStorages.h"
#include "QAndroidFilePaths.h"
......
......@@ -37,8 +37,8 @@
#include "QAndroidPartialWakeLocker.h"
#include <QAndroidQPAPluginGap.h>
#include <TJniObjectLinker.h>
#include <QJniHelpers/QAndroidQPAPluginGap.h>
#include <QJniHelpers/TJniObjectLinker.h>
static const char * const c_full_class_name_ = "ru/dublgis/androidhelpers/WakeLocker";
......
......@@ -37,9 +37,9 @@
#pragma once
#include <QJniHelpers.h>
#include <QJniHelpers/QJniHelpers.h>
#include "QLocks/QLockedObject.h"
#include <IJniObjectLinker.h>
#include <QJniHelpers/IJniObjectLinker.h>
/*!
......
......@@ -35,8 +35,8 @@
*/
#include "QAndroidScreenLayoutHandler.h"
#include <QAndroidQPAPluginGap.h>
#include <TJniObjectLinker.h>
#include <QJniHelpers/QAndroidQPAPluginGap.h>
#include <QJniHelpers/TJniObjectLinker.h>
Q_DECL_EXPORT void JNICALL Java_ScreenLayoutHandler_globalLayoutChanged(JNIEnv *, jobject, jlong param)
......
......@@ -37,7 +37,7 @@
#pragma once
#include <QtCore/QObject>
#include <IJniObjectLinker.h>
#include <QJniHelpers/IJniObjectLinker.h>
/*!
......
......@@ -37,8 +37,8 @@
#include "QAndroidScreenLocker.h"
#include <QAndroidQPAPluginGap.h>
#include <TJniObjectLinker.h>
#include <QJniHelpers/QAndroidQPAPluginGap.h>
#include <QJniHelpers/TJniObjectLinker.h>
static const char * const c_full_class_name_ = "ru/dublgis/androidhelpers/WakeLocker";
......
......@@ -37,9 +37,9 @@
#pragma once
#include <QJniHelpers.h>
#include <QJniHelpers/QJniHelpers.h>
#include "QLocks/QLockedObject.h"
#include <IJniObjectLinker.h>
#include <QJniHelpers/IJniObjectLinker.h>
/*!
......
......@@ -34,7 +34,7 @@
THE POSSIBILITY OF SUCH DAMAGE.
*/
#include <QJniHelpers.h>
#include <QJniHelpers/QJniHelpers.h>
#include "QAndroidDisplayMetrics.h"
#include "QAndroidScreenOrientation.h"
......
......@@ -36,7 +36,7 @@
#pragma once
#include <QtCore/QObject>
#include <QAndroidQPAPluginGap.h>
#include <QJniHelpers/QAndroidQPAPluginGap.h>
namespace QAndroidScreenOrientation
{
......
......@@ -36,8 +36,8 @@
#include "QAndroidSharedPreferences.h"
#include <QAndroidQPAPluginGap.h>
#include <TJniObjectLinker.h>
#include <QJniHelpers/QAndroidQPAPluginGap.h>
#include <QJniHelpers/TJniObjectLinker.h>
static const char * const c_full_class_name_ = "ru/dublgis/androidhelpers/SharedPreferencesHelper";
......
......@@ -37,8 +37,8 @@
#pragma once
#include <QtCore/QObject>
#include <QJniHelpers.h>
#include <IJniObjectLinker.h>
#include <QJniHelpers/QJniHelpers.h>
#include <QJniHelpers/IJniObjectLinker.h>
class QAndroidSharedPreferences : public QObject
......
......@@ -35,7 +35,7 @@
*/
#include <QtCore/QDebug>
#include <QAndroidQPAPluginGap.h>
#include <QJniHelpers/QAndroidQPAPluginGap.h>
#include "QAndroidDesktopUtils.h"
#include "QAndroidSpeechRecognizer.h"
......
......@@ -41,7 +41,7 @@
#include <QtCore/QTimer>
#include <QtCore/QVariantList>
#include <QtCore/QSharedPointer>
#include <QJniHelpers.h>
#include <QJniHelpers/QJniHelpers.h>
// SpeechRecognizer wrapper.
......
......@@ -34,8 +34,9 @@
THE POSSIBILITY OF SUCH DAMAGE.
*/
#include <QAndroidQPAPluginGap.h>
#include "QAndroidToast.h"
#include <QJniHelpers/QAndroidQPAPluginGap.h>
static const char * const c_full_class_name_ = "ru/dublgis/androidhelpers/ToastHelper";
......
......@@ -36,7 +36,7 @@
#pragma once
#include <QtCore/QString>
#include <QJniHelpers.h>
#include <QJniHelpers/QJniHelpers.h>
namespace QAndroidToast {
......
......@@ -36,8 +36,8 @@
#include "QAndroidWiFiLocker.h"
#include <QAndroidQPAPluginGap.h>
#include <TJniObjectLinker.h>
#include <QJniHelpers/QAndroidQPAPluginGap.h>
#include <QJniHelpers/TJniObjectLinker.h>
static const char * const c_full_class_name_ = "ru/dublgis/androidhelpers/WifiLocker";
......
......@@ -36,9 +36,9 @@
#pragma once
#include <QJniHelpers.h>
#include <QJniHelpers/QJniHelpers.h>
#include "QLocks/QLockedObject.h"
#include <IJniObjectLinker.h>
#include <QJniHelpers/IJniObjectLinker.h>
/*!
......
......@@ -37,7 +37,7 @@
#pragma once
#include <QtPositioning/QGeoPositionInfo>
#include <QJniHelpers.h>
#include <QJniHelpers/QJniHelpers.h>
QGeoPositionInfo positionInfoFromJavaLocation(const jobject jlocation);
......
......@@ -34,13 +34,13 @@
THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "QAndroidGmsLocationProvider.h"
#include <algorithm>
#include <cassert>
#include "QAndroidGmsLocationProvider.h"
#include <QAndroidQPAPluginGap.h>
#include <QtPositioning/QGeoPositionInfo>
#include <QtGui/QGuiApplication>
#include <TJniObjectLinker.h>
#include <QJniHelpers/QAndroidQPAPluginGap.h>
#include <QJniHelpers/TJniObjectLinker.h>
#include "PositionInfoConvertor.h"
......
......@@ -38,9 +38,9 @@
#include <QtCore/QObject>
#include <QtCore/QTimer>
#include <QJniHelpers.h>
#include <QtPositioning/QGeoPositionInfo>
#include <IJniObjectLinker.h>
#include <QJniHelpers/QJniHelpers.h>
#include <QJniHelpers/IJniObjectLinker.h>
......
......@@ -37,7 +37,7 @@
#include "QGeoPositionInfoSourceAndroidGms.h"
#include <QtPositioning/QGeoPositionInfo>
#include <QAndroidQPAPluginGap.h>
#include <QJniHelpers/QAndroidQPAPluginGap.h>
#include "QAndroidGmsLocationProvider.h"
#include "QLocationManagerProvidersListener.h"
......
......@@ -39,7 +39,7 @@
#include <QtPositioning/QGeoPositionInfo>
#include <TJniObjectLinker.h>
#include <QJniHelpers/TJniObjectLinker.h>
#include "PositionInfoConvertor.h"
......
......@@ -37,7 +37,7 @@
#pragma once
#include <QtPositioning/QGeoPositionInfoSource>
#include <IJniObjectLinker.h>
#include <QJniHelpers/IJniObjectLinker.h>
class QGeoPositionInfoSourceAndroidPassive : public QGeoPositionInfoSource
......
......@@ -35,8 +35,8 @@
*/
#include "QLocationManagerProvidersListener.h"
#include <QAndroidQPAPluginGap.h>
#include <TJniObjectLinker.h>
#include <QJniHelpers/QAndroidQPAPluginGap.h>
#include <QJniHelpers/TJniObjectLinker.h>
......
......@@ -37,7 +37,7 @@
#pragma once
#include <QtCore/QObject>
#include <QtPositioning/QGeoPositionInfoSource>
#include <IJniObjectLinker.h>
#include <QJniHelpers/IJniObjectLinker.h>
class QLocationManagerProvidersListener : public QObject
......
......@@ -34,10 +34,11 @@
THE POSSIBILITY OF SUCH DAMAGE.
*/
#include <QAndroidQPAPluginGap.h>
#include <QJniHelpers.h>
#include <QJniHelpers/QAndroidQPAPluginGap.h>
#include <QJniHelpers/QJniHelpers.h>
#include <QJniHelpers/TJniObjectLinker.h>
#include "QNmeaListener.h"
#include "TJniObjectLinker.h"
static const char c_full_class_name[] = "ru/dublgis/androidlocation/NmeaListener";
......
......@@ -36,8 +36,7 @@
#pragma once
#include <QtCore/QObject>
#include "IJniObjectLinker.h"
#include <QJniHelpers/IJniObjectLinker.h>
class QNmeaListener : public QObject
......
......@@ -42,8 +42,8 @@
#include <QtGui/QImage>
#include <QtCore/QSize>
#include <QtCore/QScopedPointer>
#include <QAndroidQPAPluginGap.h>
#include <QJniHelpers.h>
#include <QJniHelpers/QAndroidQPAPluginGap.h>
#include <QJniHelpers/QJniHelpers.h>
/*!
* This class holds QImage and Android Bitmap sharing the same pixel buffer.
......
......@@ -34,7 +34,7 @@
THE POSSIBILITY OF SUCH DAMAGE.
*/
#include <QAndroidQPAPluginGap.h>
#include <QJniHelpers/QAndroidQPAPluginGap.h>
#include "QAndroidOffscreenEditText.h"
......
......@@ -42,7 +42,7 @@
#include <QtCore/QTimer>
#include <QtCore/QMutexLocker>
#include <QtCore/QCoreApplication>
#include <QAndroidQPAPluginGap.h>
#include <QJniHelpers/QAndroidQPAPluginGap.h>
#include "QAndroidJniImagePair.h"
#include "QAndroidOffscreenView.h"
......
......@@ -40,7 +40,7 @@
#include <QtCore/QRect>
#include <QtCore/QScopedPointer>
#include <QtCore/QMutex>
#include <QJniHelpers.h>
#include <QJniHelpers/QJniHelpers.h>
#include "QAndroidJniImagePair.h"
#include "QOpenGLTextureHolder.h"
#include "QApplicationActivityObserver.h"
......
......@@ -34,7 +34,7 @@
THE POSSIBILITY OF SUCH DAMAGE.
*/
#include <QAndroidQPAPluginGap.h>
#include <QJniHelpers/QAndroidQPAPluginGap.h>
#include "QAndroidOffscreenWebView.h"
//! Convert nativeptr from Java to AndroidOffscreenWebView.
......
......@@ -38,7 +38,7 @@
#include <QtCore/QSharedPointer>
#include <QtGui/QFocusEvent>
#include <QtQuick/QQuickItem>
#include <QAndroidOffscreenView.h>
#include "../QAndroidOffscreenView.h"
/*!
* Base class for any Android offscreen view.
......
......@@ -36,7 +36,7 @@
#pragma once
#include "QQuickAndroidOffscreenView.h"
#include <QAndroidOffscreenEditText.h>
#include "../QAndroidOffscreenEditText.h"
class QQuickAndroidOffscreenEditText: public QQuickAndroidOffscreenView
{
......
......@@ -35,7 +35,7 @@
*/
#pragma once
#include <QAndroidOffscreenWebView.h>
#include "../QAndroidOffscreenWebView.h"
#include "QQuickAndroidOffscreenView.h"
class QQuickAndroidOffscreenWebView: public QQuickAndroidOffscreenView
......
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