Make a bunch of plugin headers private

This avoids a bunch of warnings and as these headers weren't exposed
before they might as well be kept private.

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

8 files changed, 37 insertions, 14 deletions

diff --git a/src/imports/folderlistmodel/plugin.cpp b/src/imports/folderlistmodel/plugin.cpp
index eda8ea19d7..28969a3d35 100644
--- a/src/imports/folderlistmodel/plugin.cpp
+++ b/src/imports/folderlistmodel/plugin.cpp
@@ -42,7 +42,7 @@
 #include <QtQml/private/qqmlmetatype_p.h>
 
 #include <QtLabsFolderListModel/private/qquickfolderlistmodelglobal_p.h>
-#include <QtLabsFolderListModel/qquickfolderlistmodel.h>
+#include <QtLabsFolderListModel/private/qquickfolderlistmodel_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/labs/folderlistmodel/CMakeLists.txt b/src/labs/folderlistmodel/CMakeLists.txt
index bcee01629b..7f087a0a6e 100644
--- a/src/labs/folderlistmodel/CMakeLists.txt
+++ b/src/labs/folderlistmodel/CMakeLists.txt
@@ -3,7 +3,7 @@ qt_internal_add_module(LabsFolderListModel
   SOURCES
         fileinfothread.cpp fileinfothread_p.h
         fileproperty_p.h
-        qquickfolderlistmodel.cpp qquickfolderlistmodel.h
+        qquickfolderlistmodel.cpp qquickfolderlistmodel_p.h
         qquickfolderlistmodelglobal_p.h
   DEFINES
         QT_BUILD_LABSFOLDERMODEL_LIB
diff --git a/src/labs/folderlistmodel/fileinfothread_p.h b/src/labs/folderlistmodel/fileinfothread_p.h
index 923cb29e03..1ed3a9904b 100644
--- a/src/labs/folderlistmodel/fileinfothread_p.h
+++ b/src/labs/folderlistmodel/fileinfothread_p.h
@@ -61,7 +61,7 @@
 #include <QDir>
 
 #include "fileproperty_p.h"
-#include "qquickfolderlistmodel.h"
+#include "qquickfolderlistmodel_p.h"
 
 class FileInfoThread : public QThread
 {
diff --git a/src/labs/folderlistmodel/qquickfolderlistmodel.cpp b/src/labs/folderlistmodel/qquickfolderlistmodel.cpp
index ef21471c0c..33206e5fe6 100644
--- a/src/labs/folderlistmodel/qquickfolderlistmodel.cpp
+++ b/src/labs/folderlistmodel/qquickfolderlistmodel.cpp
@@ -38,7 +38,7 @@
 ****************************************************************************/
 
 //![code]
-#include "qquickfolderlistmodel.h"
+#include "qquickfolderlistmodel_p.h"
 #include "fileinfothread_p.h"
 #include "fileproperty_p.h"
 #include <qqmlcontext.h>
@@ -921,7 +921,7 @@ int QQuickFolderListModel::indexOf(const QUrl &file) const
     return d->data.indexOf(toFind);
 }
 
-#include "moc_qquickfolderlistmodel.cpp"
+#include "moc_qquickfolderlistmodel_p.cpp"
 
 //![code]
 QT_END_NAMESPACE
diff --git a/src/labs/folderlistmodel/qquickfolderlistmodel.h b/src/labs/folderlistmodel/qquickfolderlistmodel_p.h
index ba55ad2b92..b5e979be03 100644
--- a/src/labs/folderlistmodel/qquickfolderlistmodel.h
+++ b/src/labs/folderlistmodel/qquickfolderlistmodel_p.h
@@ -37,12 +37,23 @@
 **
 ****************************************************************************/
 
-#ifndef QQUICKFOLDERLISTMODEL_H
-#define QQUICKFOLDERLISTMODEL_H
+#ifndef QQUICKFOLDERLISTMODEL_P_H
+#define QQUICKFOLDERLISTMODEL_P_H
+
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
 
 #include "qquickfolderlistmodelglobal_p.h"
 
-#include <qqml.h>
+#include <QtQml/qqml.h>
 #include <QStringList>
 #include <QUrl>
 #include <QAbstractListModel>
@@ -188,4 +199,4 @@ private:
 
 QT_END_NAMESPACE
 
-#endif // QQUICKFOLDERLISTMODEL_H
+#endif // QQUICKFOLDERLISTMODEL_P_H
diff --git a/src/labs/wavefrontmesh/CMakeLists.txt b/src/labs/wavefrontmesh/CMakeLists.txt
index 88e753ab24..bdd4b07b07 100644
--- a/src/labs/wavefrontmesh/CMakeLists.txt
+++ b/src/labs/wavefrontmesh/CMakeLists.txt
@@ -1,7 +1,7 @@
 qt_internal_add_module(LabsWavefrontMesh
   GENERATE_METATYPES
   SOURCES
-      qwavefrontmesh.cpp qwavefrontmesh.h
+      qwavefrontmesh.cpp qwavefrontmesh_p.h
       qqmlwavefrontmeshglobal_p.h
   DEFINES
         QT_BUILD_LABSWAVEFRONTMESH_LIB
diff --git a/src/labs/wavefrontmesh/qwavefrontmesh.cpp b/src/labs/wavefrontmesh/qwavefrontmesh.cpp
index 6be5c3d73f..b2a1edf1a7 100644
--- a/src/labs/wavefrontmesh/qwavefrontmesh.cpp
+++ b/src/labs/wavefrontmesh/qwavefrontmesh.cpp
@@ -37,7 +37,7 @@
 **
 ****************************************************************************/
 
-#include "qwavefrontmesh.h"
+#include "qwavefrontmesh_p.h"
 
 #include <QtCore/qfile.h>
 #include <QtCore/qtextstream.h>
diff --git a/src/labs/wavefrontmesh/qwavefrontmesh.h b/src/labs/wavefrontmesh/qwavefrontmesh_p.h
index b8246f22b1..1face34183 100644
--- a/src/labs/wavefrontmesh/qwavefrontmesh.h
+++ b/src/labs/wavefrontmesh/qwavefrontmesh_p.h
@@ -37,8 +37,19 @@
 **
 ****************************************************************************/
 
-#ifndef QWAVEFRONTMESH_H
-#define QWAVEFRONTMESH_H
+#ifndef QWAVEFRONTMESH_P_H
+#define QWAVEFRONTMESH_P_H
+
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
 
 #include "qqmlwavefrontmeshglobal_p.h"
 
@@ -112,4 +123,5 @@ private:
 
 QT_END_NAMESPACE
 
-#endif // QWAVEFRONTGEOMETRYMODEL_H
+#endif // QWAVEFRONTMESH_P_H
+