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

Reorganize includes

parent 0dcf60a2
...@@ -37,7 +37,7 @@ ...@@ -37,7 +37,7 @@
#pragma once #pragma once
#include <QJniHelpers.h> #include "QJniHelpers.h"
class IJniObjectLinker class IJniObjectLinker
......
...@@ -36,15 +36,16 @@ ...@@ -36,15 +36,16 @@
#pragma once #pragma once
#include "IJniObjectLinker.h"
#include <QtCore/QObject> #include <QtCore/QObject>
#include <QtCore/QThread> #include <QtCore/QThread>
#include <QtCore/QReadLocker> #include <QtCore/QReadLocker>
#include <QtCore/QSet> #include <QtCore/QSet>
#include <QtCore/QSharedPointer> #include <QtCore/QSharedPointer>
#include <QtCore/QCoreApplication> #include <QtCore/QCoreApplication>
#include <QJniHelpers.h> #include "QJniHelpers.h"
#include <QAndroidQPAPluginGap.h> #include "QAndroidQPAPluginGap.h"
#include <IJniObjectLinker.h>
......
...@@ -37,10 +37,10 @@ ...@@ -37,10 +37,10 @@
#include "QAndroidCompass.h" #include "QAndroidCompass.h"
#include <QAndroidQPAPluginGap.h>
#include <QtCore/QSharedPointer> #include <QtCore/QSharedPointer>
#include <QtCore/QMutexLocker> #include <QtCore/QMutexLocker>
#include "TJniObjectLinker.h" #include <QJniHelpers/QAndroidQPAPluginGap.h>
#include <QJniHelpers/TJniObjectLinker.h>
......
...@@ -36,11 +36,11 @@ ...@@ -36,11 +36,11 @@
#pragma once #pragma once
#include <QJniHelpers.h>
#include <QtCore/QScopedPointer> #include <QtCore/QScopedPointer>
#include <QtCore/QWeakPointer> #include <QtCore/QWeakPointer>
#include <QtCore/QMutex> #include <QtCore/QMutex>
#include "IJniObjectLinker.h" #include <QJniHelpers/QJniHelpers.h>
#include <QJniHelpers/IJniObjectLinker.h>
class QAndroidCompass : public QObject class QAndroidCompass : public QObject
......
...@@ -35,8 +35,8 @@ ...@@ -35,8 +35,8 @@
*/ */
#include "QAndroidBatteryDataProvider.h" #include "QAndroidBatteryDataProvider.h"
#include <QAndroidQPAPluginGap.h> #include <QJniHelpers/QAndroidQPAPluginGap.h>
#include "TJniObjectLinker.h" #include <QJniHelpers/TJniObjectLinker.h>
namespace Mobility { namespace Mobility {
......
...@@ -37,8 +37,8 @@ ...@@ -37,8 +37,8 @@
#pragma once #pragma once
#include <QtCore/QObject> #include <QtCore/QObject>
#include <QJniHelpers.h> #include <QJniHelpers/QJniHelpers.h>
#include "IJniObjectLinker.h" #include <QJniHelpers/IJniObjectLinker.h>
namespace Mobility { namespace Mobility {
......
...@@ -39,8 +39,8 @@ ...@@ -39,8 +39,8 @@
#include "QAndroidCellDataProvider.h" #include "QAndroidCellDataProvider.h"
#include <QtCore/QtDebug> #include <QtCore/QtDebug>
#include <QAndroidQPAPluginGap.h> #include <QJniHelpers/QAndroidQPAPluginGap.h>
#include "TJniObjectLinker.h" #include <QJniHelpers/TJniObjectLinker.h>
namespace Mobility { namespace Mobility {
......
...@@ -40,8 +40,8 @@ ...@@ -40,8 +40,8 @@
#include <QtCore/QObject> #include <QtCore/QObject>
#include <QtCore/QReadWriteLock> #include <QtCore/QReadWriteLock>
#include <QJniHelpers.h> #include <QJniHelpers/QJniHelpers.h>
#include "IJniObjectLinker.h" #include <QJniHelpers/IJniObjectLinker.h>
#include "CellData.h" #include "CellData.h"
......
...@@ -37,8 +37,8 @@ ...@@ -37,8 +37,8 @@
*/ */
#include "QAndroidWifiDataProvider.h" #include "QAndroidWifiDataProvider.h"
#include <QAndroidQPAPluginGap.h> #include <QJniHelpers/QAndroidQPAPluginGap.h>
#include "TJniObjectLinker.h" #include <QJniHelpers/TJniObjectLinker.h>
namespace Mobility { namespace Mobility {
......
...@@ -39,8 +39,8 @@ ...@@ -39,8 +39,8 @@
#pragma once #pragma once
#include <QtCore/QObject> #include <QtCore/QObject>
#include <QJniHelpers.h> #include <QJniHelpers/QJniHelpers.h>
#include "IJniObjectLinker.h" #include <QJniHelpers/IJniObjectLinker.h>
#include "WifiData.h" #include "WifiData.h"
......
...@@ -36,8 +36,8 @@ ...@@ -36,8 +36,8 @@
#include "QAndroidAction.h" #include "QAndroidAction.h"
#include <QAndroidQPAPluginGap.h> #include <QJniHelpers/QAndroidQPAPluginGap.h>
#include "TJniObjectLinker.h" #include <QJniHelpers/TJniObjectLinker.h>
......
...@@ -37,8 +37,8 @@ ...@@ -37,8 +37,8 @@
#pragma once #pragma once
#include <QtCore/QObject> #include <QtCore/QObject>
#include <QJniHelpers.h> #include <QJniHelpers/QJniHelpers.h>
#include "IJniObjectLinker.h" #include <QJniHelpers/IJniObjectLinker.h>
class QAndroidAction : public QObject class QAndroidAction : public QObject
......
...@@ -34,9 +34,10 @@ ...@@ -34,9 +34,10 @@
THE POSSIBILITY OF SUCH DAMAGE. THE POSSIBILITY OF SUCH DAMAGE.
*/ */
#include <QJniHelpers.h>
#include <QAndroidQPAPluginGap.h>
#include "QAndroidConfiguration.h" #include "QAndroidConfiguration.h"
#include <QJniHelpers/QJniHelpers.h>
#include <QJniHelpers/QAndroidQPAPluginGap.h>
QAndroidConfiguration::QAndroidConfiguration(QObject * parent) QAndroidConfiguration::QAndroidConfiguration(QObject * parent)
: QObject(parent) : QObject(parent)
......
...@@ -34,7 +34,7 @@ ...@@ -34,7 +34,7 @@
THE POSSIBILITY OF SUCH DAMAGE. THE POSSIBILITY OF SUCH DAMAGE.
*/ */
#include <QAndroidQPAPluginGap.h> #include <QJniHelpers/QAndroidQPAPluginGap.h>
#include "QAndroidDesktopUtils.h" #include "QAndroidDesktopUtils.h"
namespace QAndroidDesktopUtils { namespace QAndroidDesktopUtils {
......
...@@ -34,10 +34,12 @@ ...@@ -34,10 +34,12 @@
THE POSSIBILITY OF SUCH DAMAGE. THE POSSIBILITY OF SUCH DAMAGE.
*/ */
#include <QAndroidQPAPluginGap.h>
#include <QAndroidScreenOrientation.h>
#include "QAndroidDialog.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"; static const char * const c_full_class_name_ = "ru/dublgis/androidhelpers/DialogHelper";
bool QAndroidDialog::interactive_ = true; bool QAndroidDialog::interactive_ = true;
......
...@@ -37,8 +37,8 @@ ...@@ -37,8 +37,8 @@
#pragma once #pragma once
#include <QtCore/QString> #include <QtCore/QString>
#include <QtCore/QObject> #include <QtCore/QObject>
#include <QJniHelpers.h> #include <QJniHelpers/QJniHelpers.h>
#include <IJniObjectLinker.h> #include <QJniHelpers/IJniObjectLinker.h>
/* /*
......
...@@ -34,8 +34,8 @@ ...@@ -34,8 +34,8 @@
THE POSSIBILITY OF SUCH DAMAGE. THE POSSIBILITY OF SUCH DAMAGE.
*/ */
#include <QJniHelpers.h> #include <QJniHelpers/QJniHelpers.h>
#include <QAndroidQPAPluginGap.h> #include <QJniHelpers/QAndroidQPAPluginGap.h>
#include "QAndroidDisplayMetrics.h" #include "QAndroidDisplayMetrics.h"
......
...@@ -39,8 +39,8 @@ ...@@ -39,8 +39,8 @@
#include <QtCore/QDir> #include <QtCore/QDir>
#include <QtCore/QFile> #include <QtCore/QFile>
#include <QtCore/QFileInfo> #include <QtCore/QFileInfo>
#include <QJniHelpers.h> #include <QJniHelpers/QJniHelpers.h>
#include <QAndroidQPAPluginGap.h> #include <QJniHelpers/QAndroidQPAPluginGap.h>
#include "QAndroidStorages.h" #include "QAndroidStorages.h"
#include "QAndroidFilePaths.h" #include "QAndroidFilePaths.h"
......
...@@ -37,8 +37,8 @@ ...@@ -37,8 +37,8 @@
#include "QAndroidPartialWakeLocker.h" #include "QAndroidPartialWakeLocker.h"
#include <QAndroidQPAPluginGap.h> #include <QJniHelpers/QAndroidQPAPluginGap.h>
#include <TJniObjectLinker.h> #include <QJniHelpers/TJniObjectLinker.h>
static const char * const c_full_class_name_ = "ru/dublgis/androidhelpers/WakeLocker"; static const char * const c_full_class_name_ = "ru/dublgis/androidhelpers/WakeLocker";
......
...@@ -37,9 +37,9 @@ ...@@ -37,9 +37,9 @@
#pragma once #pragma once
#include <QJniHelpers.h> #include <QJniHelpers/QJniHelpers.h>
#include "QLocks/QLockedObject.h" #include "QLocks/QLockedObject.h"
#include <IJniObjectLinker.h> #include <QJniHelpers/IJniObjectLinker.h>
/*! /*!
......
...@@ -35,8 +35,8 @@ ...@@ -35,8 +35,8 @@
*/ */
#include "QAndroidScreenLayoutHandler.h" #include "QAndroidScreenLayoutHandler.h"
#include <QAndroidQPAPluginGap.h> #include <QJniHelpers/QAndroidQPAPluginGap.h>
#include <TJniObjectLinker.h> #include <QJniHelpers/TJniObjectLinker.h>
Q_DECL_EXPORT void JNICALL Java_ScreenLayoutHandler_globalLayoutChanged(JNIEnv *, jobject, jlong param) Q_DECL_EXPORT void JNICALL Java_ScreenLayoutHandler_globalLayoutChanged(JNIEnv *, jobject, jlong param)
......
...@@ -37,7 +37,7 @@ ...@@ -37,7 +37,7 @@
#pragma once #pragma once
#include <QtCore/QObject> #include <QtCore/QObject>
#include <IJniObjectLinker.h> #include <QJniHelpers/IJniObjectLinker.h>
/*! /*!
......
...@@ -37,8 +37,8 @@ ...@@ -37,8 +37,8 @@
#include "QAndroidScreenLocker.h" #include "QAndroidScreenLocker.h"
#include <QAndroidQPAPluginGap.h> #include <QJniHelpers/QAndroidQPAPluginGap.h>
#include <TJniObjectLinker.h> #include <QJniHelpers/TJniObjectLinker.h>
static const char * const c_full_class_name_ = "ru/dublgis/androidhelpers/WakeLocker"; static const char * const c_full_class_name_ = "ru/dublgis/androidhelpers/WakeLocker";
......
...@@ -37,9 +37,9 @@ ...@@ -37,9 +37,9 @@
#pragma once #pragma once
#include <QJniHelpers.h> #include <QJniHelpers/QJniHelpers.h>
#include "QLocks/QLockedObject.h" #include "QLocks/QLockedObject.h"
#include <IJniObjectLinker.h> #include <QJniHelpers/IJniObjectLinker.h>
/*! /*!
......
...@@ -34,7 +34,7 @@ ...@@ -34,7 +34,7 @@
THE POSSIBILITY OF SUCH DAMAGE. THE POSSIBILITY OF SUCH DAMAGE.
*/ */
#include <QJniHelpers.h> #include <QJniHelpers/QJniHelpers.h>
#include "QAndroidDisplayMetrics.h" #include "QAndroidDisplayMetrics.h"
#include "QAndroidScreenOrientation.h" #include "QAndroidScreenOrientation.h"
......
...@@ -36,7 +36,7 @@ ...@@ -36,7 +36,7 @@
#pragma once #pragma once
#include <QtCore/QObject> #include <QtCore/QObject>
#include <QAndroidQPAPluginGap.h> #include <QJniHelpers/QAndroidQPAPluginGap.h>
namespace QAndroidScreenOrientation namespace QAndroidScreenOrientation
{ {
......
...@@ -36,8 +36,8 @@ ...@@ -36,8 +36,8 @@
#include "QAndroidSharedPreferences.h" #include "QAndroidSharedPreferences.h"
#include <QAndroidQPAPluginGap.h> #include <QJniHelpers/QAndroidQPAPluginGap.h>
#include <TJniObjectLinker.h> #include <QJniHelpers/TJniObjectLinker.h>
static const char * const c_full_class_name_ = "ru/dublgis/androidhelpers/SharedPreferencesHelper"; static const char * const c_full_class_name_ = "ru/dublgis/androidhelpers/SharedPreferencesHelper";
......
...@@ -37,8 +37,8 @@ ...@@ -37,8 +37,8 @@
#pragma once #pragma once
#include <QtCore/QObject> #include <QtCore/QObject>
#include <QJniHelpers.h> #include <QJniHelpers/QJniHelpers.h>
#include <IJniObjectLinker.h> #include <QJniHelpers/IJniObjectLinker.h>
class QAndroidSharedPreferences : public QObject class QAndroidSharedPreferences : public QObject
......
...@@ -35,7 +35,7 @@ ...@@ -35,7 +35,7 @@
*/ */
#include <QtCore/QDebug> #include <QtCore/QDebug>
#include <QAndroidQPAPluginGap.h> #include <QJniHelpers/QAndroidQPAPluginGap.h>
#include "QAndroidDesktopUtils.h" #include "QAndroidDesktopUtils.h"
#include "QAndroidSpeechRecognizer.h" #include "QAndroidSpeechRecognizer.h"
......
...@@ -41,7 +41,7 @@ ...@@ -41,7 +41,7 @@
#include <QtCore/QTimer> #include <QtCore/QTimer>
#include <QtCore/QVariantList> #include <QtCore/QVariantList>
#include <QtCore/QSharedPointer> #include <QtCore/QSharedPointer>
#include <QJniHelpers.h> #include <QJniHelpers/QJniHelpers.h>
// SpeechRecognizer wrapper. // SpeechRecognizer wrapper.
......
...@@ -34,8 +34,9 @@ ...@@ -34,8 +34,9 @@
THE POSSIBILITY OF SUCH DAMAGE. THE POSSIBILITY OF SUCH DAMAGE.
*/ */
#include <QAndroidQPAPluginGap.h>
#include "QAndroidToast.h" #include "QAndroidToast.h"
#include <QJniHelpers/QAndroidQPAPluginGap.h>
static const char * const c_full_class_name_ = "ru/dublgis/androidhelpers/ToastHelper"; static const char * const c_full_class_name_ = "ru/dublgis/androidhelpers/ToastHelper";
......
...@@ -36,7 +36,7 @@ ...@@ -36,7 +36,7 @@
#pragma once #pragma once
#include <QtCore/QString> #include <QtCore/QString>
#include <QJniHelpers.h> #include <QJniHelpers/QJniHelpers.h>
namespace QAndroidToast { namespace QAndroidToast {
......
...@@ -36,8 +36,8 @@ ...@@ -36,8 +36,8 @@
#include "QAndroidWiFiLocker.h" #include "QAndroidWiFiLocker.h"
#include <QAndroidQPAPluginGap.h> #include <QJniHelpers/QAndroidQPAPluginGap.h>
#include <TJniObjectLinker.h> #include <QJniHelpers/TJniObjectLinker.h>
static const char * const c_full_class_name_ = "ru/dublgis/androidhelpers/WifiLocker"; static const char * const c_full_class_name_ = "ru/dublgis/androidhelpers/WifiLocker";
......
...@@ -36,9 +36,9 @@ ...@@ -36,9 +36,9 @@
#pragma once #pragma once
#include <QJniHelpers.h> #include <QJniHelpers/QJniHelpers.h>
#include "QLocks/QLockedObject.h" #include "QLocks/QLockedObject.h"
#include <IJniObjectLinker.h> #include <QJniHelpers/IJniObjectLinker.h>
/*! /*!
......
...@@ -37,7 +37,7 @@ ...@@ -37,7 +37,7 @@
#pragma once #pragma once
#include <QtPositioning/QGeoPositionInfo> #include <QtPositioning/QGeoPositionInfo>
#include <QJniHelpers.h> #include <QJniHelpers/QJniHelpers.h>
QGeoPositionInfo positionInfoFromJavaLocation(const jobject jlocation); QGeoPositionInfo positionInfoFromJavaLocation(const jobject jlocation);
......
...@@ -34,13 +34,13 @@ ...@@ -34,13 +34,13 @@
THE POSSIBILITY OF SUCH DAMAGE. THE POSSIBILITY OF SUCH DAMAGE.
*/ */
#include "QAndroidGmsLocationProvider.h"
#include <algorithm> #include <algorithm>
#include <cassert> #include <cassert>
#include "QAndroidGmsLocationProvider.h"
#include <QAndroidQPAPluginGap.h>
#include <QtPositioning/QGeoPositionInfo> #include <QtPositioning/QGeoPositionInfo>
#include <QtGui/QGuiApplication> #include <QtGui/QGuiApplication>
#include <TJniObjectLinker.h> #include <QJniHelpers/QAndroidQPAPluginGap.h>
#include <QJniHelpers/TJniObjectLinker.h>
#include "PositionInfoConvertor.h" #include "PositionInfoConvertor.h"
......
...@@ -38,9 +38,9 @@ ...@@ -38,9 +38,9 @@
#include <QtCore/QObject> #include <QtCore/QObject>
#include <QtCore/QTimer> #include <QtCore/QTimer>
#include <QJniHelpers.h>
#include <QtPositioning/QGeoPositionInfo> #include <QtPositioning/QGeoPositionInfo>
#include <IJniObjectLinker.h> #include <QJniHelpers/QJniHelpers.h>
#include <QJniHelpers/IJniObjectLinker.h>
......
...@@ -37,7 +37,7 @@ ...@@ -37,7 +37,7 @@
#include "QGeoPositionInfoSourceAndroidGms.h" #include "QGeoPositionInfoSourceAndroidGms.h"
#include <QtPositioning/QGeoPositionInfo> #include <QtPositioning/QGeoPositionInfo>
#include <QAndroidQPAPluginGap.h> #include <QJniHelpers/QAndroidQPAPluginGap.h>
#include "QAndroidGmsLocationProvider.h" #include "QAndroidGmsLocationProvider.h"
#include "QLocationManagerProvidersListener.h" #include "QLocationManagerProvidersListener.h"
......
...@@ -39,7 +39,7 @@ ...@@ -39,7 +39,7 @@
#include <QtPositioning/QGeoPositionInfo> #include <QtPositioning/QGeoPositionInfo>
#include <TJniObjectLinker.h> #include <QJniHelpers/TJniObjectLinker.h>
#include "PositionInfoConvertor.h" #include "PositionInfoConvertor.h"
......
...@@ -37,7 +37,7 @@ ...@@ -37,7 +37,7 @@
#pragma once #pragma once
#include <QtPositioning/QGeoPositionInfoSource> #include <QtPositioning/QGeoPositionInfoSource>
#include <IJniObjectLinker.h> #include <QJniHelpers/IJniObjectLinker.h>
class QGeoPositionInfoSourceAndroidPassive : public QGeoPositionInfoSource class QGeoPositionInfoSourceAndroidPassive : public QGeoPositionInfoSource
......
...@@ -35,8 +35,8 @@ ...@@ -35,8 +35,8 @@
*/ */
#include "QLocationManagerProvidersListener.h" #include "QLocationManagerProvidersListener.h"
#include <QAndroidQPAPluginGap.h> #include <QJniHelpers/QAndroidQPAPluginGap.h>
#include <TJniObjectLinker.h> #include <QJniHelpers/TJniObjectLinker.h>
......
...@@ -37,7 +37,7 @@ ...@@ -37,7 +37,7 @@
#pragma once #pragma once
#include <QtCore/QObject> #include <QtCore/QObject>
#include <QtPositioning/QGeoPositionInfoSource> #include <QtPositioning/QGeoPositionInfoSource>
#include <IJniObjectLinker.h> #include <QJniHelpers/IJniObjectLinker.h>
class QLocationManagerProvidersListener : public QObject class QLocationManagerProvidersListener : public QObject
......
...@@ -34,10 +34,11 @@ ...@@ -34,10 +34,11 @@
THE POSSIBILITY OF SUCH DAMAGE. THE POSSIBILITY OF SUCH DAMAGE.
*/ */
#include <QAndroidQPAPluginGap.h> #include <QJniHelpers/QAndroidQPAPluginGap.h>
#include <QJniHelpers.h> #include <QJniHelpers/QJniHelpers.h>
#include <QJniHelpers/TJniObjectLinker.h>
#include "QNmeaListener.h" #include "QNmeaListener.h"
#include "TJniObjectLinker.h"
static const char c_full_class_name[] = "ru/dublgis/androidlocation/NmeaListener"; static const char c_full_class_name[] = "ru/dublgis/androidlocation/NmeaListener";
......
...@@ -36,8 +36,7 @@ ...@@ -36,8 +36,7 @@
#pragma once