qtqmlandroidfunctions.* -> qtnativeandroidfunctions.*

Change-Id: I948102f06fd3ab61ff6d52e908d9f726be339749
Reviewed-by: J-P Nurmi <jpnurmi@qt.io>

35 files changed, 38 insertions, 38 deletions

diff --git a/src/android/app/qnativeandroidactionbar.cpp b/src/android/app/qnativeandroidactionbar.cpp
index eefc43c..7bee021 100644
--- a/src/android/app/qnativeandroidactionbar.cpp
+++ b/src/android/app/qnativeandroidactionbar.cpp
@@ -36,7 +36,7 @@
 
 #include "qnativeandroidactionbar_p.h"
 #include "qnativeandroiddrawable_p.h"
-#include "qtqmlandroidfunctions_p.h"
+#include "qtnativeandroidfunctions_p.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/android/app/qnativeandroidactivity.cpp b/src/android/app/qnativeandroidactivity.cpp
index a1fea4d..840cf0d 100644
--- a/src/android/app/qnativeandroidactivity.cpp
+++ b/src/android/app/qnativeandroidactivity.cpp
@@ -40,7 +40,7 @@
 #include "qnativeandroidmenu_p.h"
 #include "qnativeandroidview_p.h"
 #include "qnativeandroidwindow_p.h"
-#include "qtqmlandroidfunctions_p.h"
+#include "qtnativeandroidfunctions_p.h"
 #include <QtCore/private/qjnihelpers_p.h>
 #include <QtAndroidExtras/qandroidfunctions.h>
 #include <QtAndroidExtras/qandroidjnienvironment.h>
diff --git a/src/android/app/qnativeandroidalertdialog.cpp b/src/android/app/qnativeandroidalertdialog.cpp
index 1b8d329..0b89c4f 100644
--- a/src/android/app/qnativeandroidalertdialog.cpp
+++ b/src/android/app/qnativeandroidalertdialog.cpp
@@ -35,7 +35,7 @@
 ****************************************************************************/
 
 #include "qnativeandroidalertdialog_p.h"
-#include "qtqmlandroidfunctions_p.h"
+#include "qtnativeandroidfunctions_p.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/android/app/qnativeandroiddialog.cpp b/src/android/app/qnativeandroiddialog.cpp
index b73fdc6..04ee54a 100644
--- a/src/android/app/qnativeandroiddialog.cpp
+++ b/src/android/app/qnativeandroiddialog.cpp
@@ -35,7 +35,7 @@
 ****************************************************************************/
 
 #include "qnativeandroiddialog_p.h"
-#include "qtqmlandroidfunctions_p.h"
+#include "qtnativeandroidfunctions_p.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/android/app/qnativeandroidservice.cpp b/src/android/app/qnativeandroidservice.cpp
index 94be518..46f726a 100644
--- a/src/android/app/qnativeandroidservice.cpp
+++ b/src/android/app/qnativeandroidservice.cpp
@@ -35,7 +35,7 @@
 ****************************************************************************/
 
 #include "qnativeandroidservice_p.h"
-#include "qtqmlandroidfunctions_p.h"
+#include "qtnativeandroidfunctions_p.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/android/core/core.pri b/src/android/core/core.pri
index 47850f3..873f879 100644
--- a/src/android/core/core.pri
+++ b/src/android/core/core.pri
@@ -3,8 +3,8 @@ INCLUDEPATH += $$PWD
 HEADERS += \
     $$PWD/qnativeandroidobject_p.h \
     $$PWD/qnativeandroidoptional_p.h \
-    $$PWD/qtqmlandroidfunctions_p.h
+    $$PWD/qtnativeandroidfunctions_p.h
 
 SOURCES += \
     $$PWD/qnativeandroidobject.cpp \
-    $$PWD/qtqmlandroidfunctions.cpp
+    $$PWD/qtnativeandroidfunctions.cpp
diff --git a/src/android/core/qnativeandroidobject.cpp b/src/android/core/qnativeandroidobject.cpp
index 19d0932..d481e03 100644
--- a/src/android/core/qnativeandroidobject.cpp
+++ b/src/android/core/qnativeandroidobject.cpp
@@ -35,7 +35,7 @@
 ****************************************************************************/
 
 #include "qnativeandroidobject_p.h"
-#include "qtqmlandroidfunctions_p.h"
+#include "qtnativeandroidfunctions_p.h"
 #include <QtCore/qcoreapplication.h>
 #include <QtCore/qcoreevent.h>
 
diff --git a/src/android/core/qtqmlandroidfunctions.cpp b/src/android/core/qtnativeandroidfunctions.cpp
index 628737c..5c7ab5b 100644
--- a/src/android/core/qtqmlandroidfunctions.cpp
+++ b/src/android/core/qtnativeandroidfunctions.cpp
@@ -34,7 +34,7 @@
 **
 ****************************************************************************/
 
-#include "qtqmlandroidfunctions_p.h"
+#include "qtnativeandroidfunctions_p.h"
 #include <QtCore/qstring.h>
 #include <QtCore/private/qjnihelpers_p.h>
 #include <QtConcurrent/qtconcurrentrun.h>
diff --git a/src/android/core/qtqmlandroidfunctions_p.h b/src/android/core/qtnativeandroidfunctions_p.h
index b9b9e35..07d89ff 100644
--- a/src/android/core/qtqmlandroidfunctions_p.h
+++ b/src/android/core/qtnativeandroidfunctions_p.h
@@ -34,8 +34,8 @@
 **
 ****************************************************************************/
 
-#ifndef QTQMLANDROIDFUNCTIONS_P_H
-#define QTQMLANDROIDFUNCTIONS_P_H
+#ifndef QTNATIVEANDROIDFUNCTIONS_P_H
+#define QTNATIVEANDROIDFUNCTIONS_P_H
 
 //
 //  W A R N I N G
@@ -68,4 +68,4 @@ namespace QtQmlAndroid
 
 QT_END_NAMESPACE
 
-#endif // QTQMLANDROIDFUNCTIONS_P_H
+#endif // QTNATIVEANDROIDFUNCTIONS_P_H
diff --git a/src/android/graphics/drawable/qnativeandroidcolordrawable.cpp b/src/android/graphics/drawable/qnativeandroidcolordrawable.cpp
index 9c840f0..7fb9108 100644
--- a/src/android/graphics/drawable/qnativeandroidcolordrawable.cpp
+++ b/src/android/graphics/drawable/qnativeandroidcolordrawable.cpp
@@ -35,7 +35,7 @@
 ****************************************************************************/
 
 #include "qnativeandroidcolordrawable_p.h"
-#include "qtqmlandroidfunctions_p.h"
+#include "qtnativeandroidfunctions_p.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/android/support/v4/widget/qnativeandroiddrawerlayout.cpp b/src/android/support/v4/widget/qnativeandroiddrawerlayout.cpp
index 2ec6327..5a0394c 100644
--- a/src/android/support/v4/widget/qnativeandroiddrawerlayout.cpp
+++ b/src/android/support/v4/widget/qnativeandroiddrawerlayout.cpp
@@ -36,7 +36,7 @@
 
 #include "qnativeandroiddrawerlayout_p.h"
 #include "qnativeandroidactionbardrawertoggle_p.h"
-#include "qtqmlandroidfunctions_p.h"
+#include "qtnativeandroidfunctions_p.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/android/support/v4/widget/qnativeandroidswiperefreshlayout.cpp b/src/android/support/v4/widget/qnativeandroidswiperefreshlayout.cpp
index 2ab766d..f7fbe7d 100644
--- a/src/android/support/v4/widget/qnativeandroidswiperefreshlayout.cpp
+++ b/src/android/support/v4/widget/qnativeandroidswiperefreshlayout.cpp
@@ -35,7 +35,7 @@
 ****************************************************************************/
 
 #include "qnativeandroidswiperefreshlayout_p.h"
-#include "qtqmlandroidfunctions_p.h"
+#include "qtnativeandroidfunctions_p.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/android/support/v7/widget/qnativeandroidrecycleradapter.cpp b/src/android/support/v7/widget/qnativeandroidrecycleradapter.cpp
index c02b040..426074a 100644
--- a/src/android/support/v7/widget/qnativeandroidrecycleradapter.cpp
+++ b/src/android/support/v7/widget/qnativeandroidrecycleradapter.cpp
@@ -35,7 +35,7 @@
 ****************************************************************************/
 
 #include "qnativeandroidrecycleradapter_p.h"
-#include "qtqmlandroidfunctions_p.h"
+#include "qtnativeandroidfunctions_p.h"
 #include "qnativeandroidview_p.h"
 #include <QtQml/qqmlcomponent.h>
 #include <QtQml/qqmlcontext.h>
diff --git a/src/android/support/v7/widget/qnativeandroidrecyclerview.cpp b/src/android/support/v7/widget/qnativeandroidrecyclerview.cpp
index c5697fe..27b8d0e 100644
--- a/src/android/support/v7/widget/qnativeandroidrecyclerview.cpp
+++ b/src/android/support/v7/widget/qnativeandroidrecyclerview.cpp
@@ -36,7 +36,7 @@
 
 #include "qnativeandroidrecyclerview_p.h"
 #include "qnativeandroidrecycleradapter_p.h"
-#include "qtqmlandroidfunctions_p.h"
+#include "qtnativeandroidfunctions_p.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/android/view/animation/qnativeandroidanimation.cpp b/src/android/view/animation/qnativeandroidanimation.cpp
index 433563e..5ab832a 100644
--- a/src/android/view/animation/qnativeandroidanimation.cpp
+++ b/src/android/view/animation/qnativeandroidanimation.cpp
@@ -35,7 +35,7 @@
 ****************************************************************************/
 
 #include "qnativeandroidanimation_p.h"
-#include "qtqmlandroidfunctions_p.h"
+#include "qtnativeandroidfunctions_p.h"
 #include "qnativeandroidinterpolator_p.h"
 
 QT_BEGIN_NAMESPACE
diff --git a/src/android/view/qnativeandroidlayoutparams.cpp b/src/android/view/qnativeandroidlayoutparams.cpp
index 0a1e8aa..3119a40 100644
--- a/src/android/view/qnativeandroidlayoutparams.cpp
+++ b/src/android/view/qnativeandroidlayoutparams.cpp
@@ -35,7 +35,7 @@
 ****************************************************************************/
 
 #include "qnativeandroidlayoutparams_p.h"
-#include "qtqmlandroidfunctions_p.h"
+#include "qtnativeandroidfunctions_p.h"
 #include "qnativeandroidview_p.h"
 
 QT_BEGIN_NAMESPACE
diff --git a/src/android/view/qnativeandroidmenuitem.cpp b/src/android/view/qnativeandroidmenuitem.cpp
index 1814f27..23e6fac 100644
--- a/src/android/view/qnativeandroidmenuitem.cpp
+++ b/src/android/view/qnativeandroidmenuitem.cpp
@@ -35,7 +35,7 @@
 ****************************************************************************/
 
 #include "qnativeandroidmenuitem_p.h"
-#include "qtqmlandroidfunctions_p.h"
+#include "qtnativeandroidfunctions_p.h"
 #include "qnativeandroidcontext_p.h"
 #include "qnativeandroidview_p.h"
 
diff --git a/src/android/view/qnativeandroidview.cpp b/src/android/view/qnativeandroidview.cpp
index a7763e6..fd07d76 100644
--- a/src/android/view/qnativeandroidview.cpp
+++ b/src/android/view/qnativeandroidview.cpp
@@ -39,7 +39,7 @@
 #include "qnativeandroidcolordrawable_p.h"
 #include "qnativeandroidlayoutparams_p.h"
 #include "qnativeandroidanimation_p.h"
-#include "qtqmlandroidfunctions_p.h"
+#include "qtnativeandroidfunctions_p.h"
 #include <QtCore/qcoreapplication.h>
 #include <QtCore/qcoreevent.h>
 #include <QtCore/qhash.h>
diff --git a/src/android/view/qnativeandroidviewgroup.cpp b/src/android/view/qnativeandroidviewgroup.cpp
index 7e1bac5..9fbde46 100644
--- a/src/android/view/qnativeandroidviewgroup.cpp
+++ b/src/android/view/qnativeandroidviewgroup.cpp
@@ -36,7 +36,7 @@
 
 #include "qnativeandroidviewgroup_p.h"
 #include "qnativeandroidlayoutparams_p.h"
-#include "qtqmlandroidfunctions_p.h"
+#include "qtnativeandroidfunctions_p.h"
 #include "qnativeandroidcontext_p.h"
 
 QT_BEGIN_NAMESPACE
diff --git a/src/android/view/qnativeandroidwindow.cpp b/src/android/view/qnativeandroidwindow.cpp
index 47bba19..28fc858 100644
--- a/src/android/view/qnativeandroidwindow.cpp
+++ b/src/android/view/qnativeandroidwindow.cpp
@@ -36,7 +36,7 @@
 
 #include "qnativeandroidwindow_p.h"
 #include "qnativeandroidcontext_p.h"
-#include "qtqmlandroidfunctions_p.h"
+#include "qtnativeandroidfunctions_p.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/android/widget/qnativeandroidadapterview.cpp b/src/android/widget/qnativeandroidadapterview.cpp
index 167895e..2482d82 100644
--- a/src/android/widget/qnativeandroidadapterview.cpp
+++ b/src/android/widget/qnativeandroidadapterview.cpp
@@ -36,7 +36,7 @@
 
 #include "qnativeandroidadapterview_p.h"
 #include "qnativeandroidbaseadapter_p.h"
-#include "qtqmlandroidfunctions_p.h"
+#include "qtnativeandroidfunctions_p.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/android/widget/qnativeandroidarrayadapter.cpp b/src/android/widget/qnativeandroidarrayadapter.cpp
index 07d2870..ee3b784 100644
--- a/src/android/widget/qnativeandroidarrayadapter.cpp
+++ b/src/android/widget/qnativeandroidarrayadapter.cpp
@@ -36,7 +36,7 @@
 
 #include "qnativeandroidarrayadapter_p.h"
 #include "qnativeandroidadapterview_p.h"
-#include "qtqmlandroidfunctions_p.h"
+#include "qtnativeandroidfunctions_p.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/android/widget/qnativeandroidcompoundbutton.cpp b/src/android/widget/qnativeandroidcompoundbutton.cpp
index 8e52135..889c761 100644
--- a/src/android/widget/qnativeandroidcompoundbutton.cpp
+++ b/src/android/widget/qnativeandroidcompoundbutton.cpp
@@ -35,7 +35,7 @@
 ****************************************************************************/
 
 #include "qnativeandroidcompoundbutton_p.h"
-#include "qtqmlandroidfunctions_p.h"
+#include "qtnativeandroidfunctions_p.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/android/widget/qnativeandroidimageview.cpp b/src/android/widget/qnativeandroidimageview.cpp
index d240c1b..35e0d23 100644
--- a/src/android/widget/qnativeandroidimageview.cpp
+++ b/src/android/widget/qnativeandroidimageview.cpp
@@ -35,7 +35,7 @@
 ****************************************************************************/
 
 #include "qnativeandroidimageview_p.h"
-#include "qtqmlandroidfunctions_p.h"
+#include "qtnativeandroidfunctions_p.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/android/widget/qnativeandroidnumberpicker.cpp b/src/android/widget/qnativeandroidnumberpicker.cpp
index 0572aa5..126e9ba 100644
--- a/src/android/widget/qnativeandroidnumberpicker.cpp
+++ b/src/android/widget/qnativeandroidnumberpicker.cpp
@@ -35,7 +35,7 @@
 ****************************************************************************/
 
 #include "qnativeandroidnumberpicker_p.h"
-#include "qtqmlandroidfunctions_p.h"
+#include "qtnativeandroidfunctions_p.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/android/widget/qnativeandroidpopupmenu.cpp b/src/android/widget/qnativeandroidpopupmenu.cpp
index 495728c..50299a4 100644
--- a/src/android/widget/qnativeandroidpopupmenu.cpp
+++ b/src/android/widget/qnativeandroidpopupmenu.cpp
@@ -35,7 +35,7 @@
 ****************************************************************************/
 
 #include "qnativeandroidpopupmenu_p.h"
-#include "qtqmlandroidfunctions_p.h"
+#include "qtnativeandroidfunctions_p.h"
 #include "qnativeandroidmenuitem_p.h"
 #include "qnativeandroidcontext_p.h"
 #include "qnativeandroidview_p.h"
diff --git a/src/android/widget/qnativeandroidprogressbar.cpp b/src/android/widget/qnativeandroidprogressbar.cpp
index 2044a7e..deb2823 100644
--- a/src/android/widget/qnativeandroidprogressbar.cpp
+++ b/src/android/widget/qnativeandroidprogressbar.cpp
@@ -35,7 +35,7 @@
 ****************************************************************************/
 
 #include "qnativeandroidprogressbar_p.h"
-#include "qtqmlandroidfunctions_p.h"
+#include "qtnativeandroidfunctions_p.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/android/widget/qnativeandroidradiogroup.cpp b/src/android/widget/qnativeandroidradiogroup.cpp
index bcd8d20..3727206 100644
--- a/src/android/widget/qnativeandroidradiogroup.cpp
+++ b/src/android/widget/qnativeandroidradiogroup.cpp
@@ -36,7 +36,7 @@
 
 #include "qnativeandroidradiogroup_p.h"
 #include "qnativeandroidradiobutton_p.h"
-#include "qtqmlandroidfunctions_p.h"
+#include "qtnativeandroidfunctions_p.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/android/widget/qnativeandroidratingbar.cpp b/src/android/widget/qnativeandroidratingbar.cpp
index bd5cdda..2efb815 100644
--- a/src/android/widget/qnativeandroidratingbar.cpp
+++ b/src/android/widget/qnativeandroidratingbar.cpp
@@ -35,7 +35,7 @@
 ****************************************************************************/
 
 #include "qnativeandroidratingbar_p.h"
-#include "qtqmlandroidfunctions_p.h"
+#include "qtnativeandroidfunctions_p.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/android/widget/qnativeandroidscrollview.cpp b/src/android/widget/qnativeandroidscrollview.cpp
index 753961f..da75733 100644
--- a/src/android/widget/qnativeandroidscrollview.cpp
+++ b/src/android/widget/qnativeandroidscrollview.cpp
@@ -35,7 +35,7 @@
 ****************************************************************************/
 
 #include "qnativeandroidscrollview_p.h"
-#include "qtqmlandroidfunctions_p.h"
+#include "qtnativeandroidfunctions_p.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/android/widget/qnativeandroidtabspec.cpp b/src/android/widget/qnativeandroidtabspec.cpp
index 4c6f13a..fee84da 100644
--- a/src/android/widget/qnativeandroidtabspec.cpp
+++ b/src/android/widget/qnativeandroidtabspec.cpp
@@ -37,7 +37,7 @@
 #include "qnativeandroidtabspec_p.h"
 #include "qnativeandroidtabhost_p.h"
 #include "qnativeandroidview_p.h"
-#include "qtqmlandroidfunctions_p.h"
+#include "qtnativeandroidfunctions_p.h"
 #include <QtAndroidExtras/qandroidjniobject.h>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/android/widget/qnativeandroidtextview.cpp b/src/android/widget/qnativeandroidtextview.cpp
index b97ef39..c332ec8 100644
--- a/src/android/widget/qnativeandroidtextview.cpp
+++ b/src/android/widget/qnativeandroidtextview.cpp
@@ -35,7 +35,7 @@
 ****************************************************************************/
 
 #include "qnativeandroidtextview_p.h"
-#include "qtqmlandroidfunctions_p.h"
+#include "qtnativeandroidfunctions_p.h"
 #include "qnativeandroidcolor_p.h"
 
 QT_BEGIN_NAMESPACE
diff --git a/src/android/widget/qnativeandroidtoast.cpp b/src/android/widget/qnativeandroidtoast.cpp
index 4f35980..9725728 100644
--- a/src/android/widget/qnativeandroidtoast.cpp
+++ b/src/android/widget/qnativeandroidtoast.cpp
@@ -35,7 +35,7 @@
 ****************************************************************************/
 
 #include "qnativeandroidtoast_p.h"
-#include "qtqmlandroidfunctions_p.h"
+#include "qtnativeandroidfunctions_p.h"
 #include "qnativeandroidview_p.h"
 #include <QtCore/qdebug.h>
 
diff --git a/src/android/widget/qnativeandroidtogglebutton.cpp b/src/android/widget/qnativeandroidtogglebutton.cpp
index 97f417e..33a84c8 100644
--- a/src/android/widget/qnativeandroidtogglebutton.cpp
+++ b/src/android/widget/qnativeandroidtogglebutton.cpp
@@ -35,7 +35,7 @@
 ****************************************************************************/
 
 #include "qnativeandroidtogglebutton_p.h"
-#include "qtqmlandroidfunctions_p.h"
+#include "qtnativeandroidfunctions_p.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/android/widget/qnativeandroidviewanimator.cpp b/src/android/widget/qnativeandroidviewanimator.cpp
index c4b4369..7b9fec7 100644
--- a/src/android/widget/qnativeandroidviewanimator.cpp
+++ b/src/android/widget/qnativeandroidviewanimator.cpp
@@ -35,7 +35,7 @@
 ****************************************************************************/
 
 #include "qnativeandroidviewanimator_p.h"
-#include "qtqmlandroidfunctions_p.h"
+#include "qtnativeandroidfunctions_p.h"
 
 QT_BEGIN_NAMESPACE