Rename qflagpointer_p.h to qbipointer_p.h

QFlagPointer has been moved to qtbase. As a drive-by, remove includes
of qbipointer_p.h which are no longer needed and add them where the
type is actually used.

Change-Id: I067864e6c082dcbd422deb79812ea7c36412caba
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>

15 files changed, 9 insertions, 15 deletions

diff --git a/src/qml/CMakeLists.txt b/src/qml/CMakeLists.txt
index 879436ac7a..a6c16a84df 100644
--- a/src/qml/CMakeLists.txt
+++ b/src/qml/CMakeLists.txt
@@ -237,7 +237,7 @@ qt_internal_add_qml_module(Qml
         qml/ftw/qdoubleendedlist_p.h
         qml/ftw/qfieldlist_p.h
         qml/ftw/qfinitestack_p.h
-        qml/ftw/qflagpointer_p.h
+        qml/ftw/qbipointer_p.h
         qml/ftw/qhashedstring.cpp qml/ftw/qhashedstring_p.h
         qml/ftw/qintrusivelist.cpp qml/ftw/qintrusivelist_p.h
         qml/ftw/qlazilyallocated_p.h
diff --git a/src/qml/jsapi/qjsvalue_p.h b/src/qml/jsapi/qjsvalue_p.h
index 69837d6575..6058ab926a 100644
--- a/src/qml/jsapi/qjsvalue_p.h
+++ b/src/qml/jsapi/qjsvalue_p.h
@@ -56,7 +56,6 @@
 #include <private/qv4value_p.h>
 #include <private/qv4string_p.h>
 #include <private/qv4engine_p.h>
-#include <private/qflagpointer_p.h>
 #include <private/qv4mm_p.h>
 #include <private/qv4persistent_p.h>
 
diff --git a/src/qml/qml/ftw/qflagpointer_p.h b/src/qml/qml/ftw/qbipointer_p.h
index 3d1de3c136..009f371846 100644
--- a/src/qml/qml/ftw/qflagpointer_p.h
+++ b/src/qml/qml/ftw/qbipointer_p.h
@@ -37,8 +37,8 @@
 **
 ****************************************************************************/
 
-#ifndef QFLAGPOINTER_P_H
-#define QFLAGPOINTER_P_H
+#ifndef QBIPOINTER_P_H
+#define QBIPOINTER_P_H
 
 //
 //  W A R N I N G
@@ -241,4 +241,4 @@ T2 *QBiPointer<T, T2>::asT2() const
 
 QT_END_NAMESPACE
 
-#endif // QFLAGPOINTER_P_H
+#endif // QBIPOINTER_P_H
diff --git a/src/qml/qml/ftw/qfieldlist_p.h b/src/qml/qml/ftw/qfieldlist_p.h
index b11fbcf40b..c6553b5fe9 100644
--- a/src/qml/qml/ftw/qfieldlist_p.h
+++ b/src/qml/qml/ftw/qfieldlist_p.h
@@ -54,7 +54,6 @@
 #include <QtCore/qglobal.h>
 #include <QtCore/qtaggedpointer.h>
 
-#include <private/qflagpointer_p.h>
 
 // QForwardFieldList is a super simple linked list that can only prepend
 template<class N, N *N::*nextMember, typename Tag = QtPrivate::TagInfo<N>>
diff --git a/src/qml/qml/ftw/qhashedstring_p.h b/src/qml/qml/ftw/qhashedstring_p.h
index 6bef117646..564baf2ed9 100644
--- a/src/qml/qml/ftw/qhashedstring_p.h
+++ b/src/qml/qml/ftw/qhashedstring_p.h
@@ -55,8 +55,6 @@
 #include <QtCore/qstring.h>
 #include <private/qv4string_p.h>
 
-#include <private/qflagpointer_p.h>
-
 #if defined(Q_OS_QNX)
 #include <stdlib.h>
 #endif
diff --git a/src/qml/qml/qqmlboundsignal_p.h b/src/qml/qml/qqmlboundsignal_p.h
index 89635dec69..f519fee4c3 100644
--- a/src/qml/qml/qqmlboundsignal_p.h
+++ b/src/qml/qml/qqmlboundsignal_p.h
@@ -55,7 +55,6 @@
 
 #include <private/qqmljavascriptexpression_p.h>
 #include <private/qqmlnotifier_p.h>
-#include <private/qflagpointer_p.h>
 #include <private/qqmlrefcount_p.h>
 #include <private/qqmlglobal_p.h>
 
diff --git a/src/qml/qml/qqmlexpression_p.h b/src/qml/qml/qqmlexpression_p.h
index 26c0cddb9e..f514006df2 100644
--- a/src/qml/qml/qqmlexpression_p.h
+++ b/src/qml/qml/qqmlexpression_p.h
@@ -55,7 +55,6 @@
 
 #include <private/qqmlengine_p.h>
 #include <private/qfieldlist_p.h>
-#include <private/qflagpointer_p.h>
 #include <private/qqmljavascriptexpression_p.h>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/qml/qml/qqmljavascriptexpression_p.h b/src/qml/qml/qqmljavascriptexpression_p.h
index bfdc922729..ddf7aa7761 100644
--- a/src/qml/qml/qqmljavascriptexpression_p.h
+++ b/src/qml/qml/qqmljavascriptexpression_p.h
@@ -55,6 +55,7 @@
 #include <QtCore/qtaggedpointer.h>
 #include <QtQml/qqmlerror.h>
 #include <private/qqmlengine_p.h>
+#include <QtQml/private/qbipointer_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/qml/qml/qqmllist_p.h b/src/qml/qml/qqmllist_p.h
index 7ecb09b51d..745f856ab1 100644
--- a/src/qml/qml/qqmllist_p.h
+++ b/src/qml/qml/qqmllist_p.h
@@ -55,6 +55,7 @@
 #include "qqmlmetaobject_p.h"
 #include "qqmlmetatype_p.h"
 #include "qqmlengine_p.h"
+#include <QtQml/private/qbipointer_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/qml/qml/qqmlmetaobject_p.h b/src/qml/qml/qqmlmetaobject_p.h
index 14e1a0c088..8f9b9e3daa 100644
--- a/src/qml/qml/qqmlmetaobject_p.h
+++ b/src/qml/qml/qqmlmetaobject_p.h
@@ -53,7 +53,6 @@
 
 #include <QtQml/qtqmlglobal.h>
 
-#include <private/qflagpointer_p.h>
 #include <private/qqmlpropertycache_p.h>
 
 #include <QtCore/qvarlengtharray.h>
diff --git a/src/qml/qml/qqmlobjectorgadget_p.h b/src/qml/qml/qqmlobjectorgadget_p.h
index 109a1813e8..de2a8167b5 100644
--- a/src/qml/qml/qqmlobjectorgadget_p.h
+++ b/src/qml/qml/qqmlobjectorgadget_p.h
@@ -52,6 +52,7 @@
 //
 
 #include <private/qqmlmetaobject_p.h>
+#include <private/qbipointer_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/qml/qml/qqmlpropertycache_p.h b/src/qml/qml/qqmlpropertycache_p.h
index 0146f9d123..fcfa84f441 100644
--- a/src/qml/qml/qqmlpropertycache_p.h
+++ b/src/qml/qml/qqmlpropertycache_p.h
@@ -52,7 +52,6 @@
 //
 
 #include <private/qqmlrefcount_p.h>
-#include <private/qflagpointer_p.h>
 #include "qqmlnotifier_p.h"
 #include <private/qqmlpropertyindex_p.h>
 
diff --git a/src/qml/qml/qqmlpropertycachevector_p.h b/src/qml/qml/qqmlpropertycachevector_p.h
index 2e09423206..45fc2364df 100644
--- a/src/qml/qml/qqmlpropertycachevector_p.h
+++ b/src/qml/qml/qqmlpropertycachevector_p.h
@@ -51,7 +51,6 @@
 // We mean it.
 //
 
-#include <private/qflagpointer_p.h>
 #include <private/qqmlpropertycache_p.h>
 
 #include <QtCore/qtaggedpointer.h>
diff --git a/src/qml/qml/qqmlvmemetaobject_p.h b/src/qml/qml/qqmlvmemetaobject_p.h
index 885efa01c5..adcaacf894 100644
--- a/src/qml/qml/qqmlvmemetaobject_p.h
+++ b/src/qml/qml/qqmlvmemetaobject_p.h
@@ -66,7 +66,7 @@
 #include "qqmlguard_p.h"
 
 #include <private/qqmlguardedcontextdata_p.h>
-#include <private/qflagpointer_p.h>
+#include <private/qbipointer_p.h>
 
 #include <private/qv4object_p.h>
 #include <private/qv4value_p.h>
diff --git a/src/quicktemplates2/qquickdeferredpointer_p_p.h b/src/quicktemplates2/qquickdeferredpointer_p_p.h
index b8a07c2ae8..2c9aebaf5f 100644
--- a/src/quicktemplates2/qquickdeferredpointer_p_p.h
+++ b/src/quicktemplates2/qquickdeferredpointer_p_p.h
@@ -49,7 +49,7 @@
 //
 
 #include <QtCore/qglobal.h>
-#include <QtQml/private/qflagpointer_p.h>
+#include <QtQml/private/qbipointer_p.h>
 #include <QtQml/private/qqmlcomponent_p.h>
 
 QT_BEGIN_NAMESPACE