Make all the classes in the src/knx/knxproj directory private

Change-Id: I5bc7815cdb1000b4b8cc949478f7c40bbd2a94ca
Reviewed-by: Karsten Heimrich <karsten.heimrich@qt.io>

24 files changed, 147 insertions, 59 deletions

diff --git a/examples/knx/knxproj/main.cpp b/examples/knx/knxproj/main.cpp
index 6765bd3..d14e5cf 100644
--- a/examples/knx/knxproj/main.cpp
+++ b/examples/knx/knxproj/main.cpp
@@ -31,9 +31,9 @@
 #include <QtCore/qvector.h>
 #include <QtCore/qversionnumber.h>
 #include <QtCore/qxmlstream.h>
-#include <QtKnx/qknxinstallation.h>
-#include <QtKnx/qknxprojectroot.h>
-#include <QtKnx/qknxprojectinformation.h>
+#include <QtKnx/private/qknxinstallation_p.h>
+#include <QtKnx/private/qknxprojectroot_p.h>
+#include <QtKnx/private/qknxprojectinformation_p.h>
 
 #include <QtKnx/private/qzipreader_p.h>
 #include <QtKnx/private/qzipwriter_p.h>
diff --git a/src/knx/knxproj/knxproj.pri b/src/knx/knxproj/knxproj.pri
index 63e0122..08acabd 100644
--- a/src/knx/knxproj/knxproj.pri
+++ b/src/knx/knxproj/knxproj.pri
@@ -21,11 +21,11 @@ PRIVATE_HEADERS += $$PWD/qzipreader_p.h
     $$PWD/qzipwriter_p.h
 
 HEADERS += \
-    $$PWD/qknxbuildings.h \
-    $$PWD/qknxdeviceinstance.h \
-    $$PWD/qknxgroupaddresses.h \
-    $$PWD/qknxinstallation.h \
-    $$PWD/qknxprojectinformation.h \
-    $$PWD/qknxprojectroot.h \
-    $$PWD/qknxprojectutils.h \
-    $$PWD/qknxtopology.h
+    $$PWD/qknxbuildings_p.h \
+    $$PWD/qknxdeviceinstance_p.h \
+    $$PWD/qknxgroupaddresses_p.h \
+    $$PWD/qknxinstallation_p.h \
+    $$PWD/qknxprojectinformation_p.h \
+    $$PWD/qknxprojectroot_p.h \
+    $$PWD/qknxprojectutils_p.h \
+    $$PWD/qknxtopology_p.h
diff --git a/src/knx/knxproj/qknxbuildings.cpp b/src/knx/knxproj/qknxbuildings.cpp
index 2c67a43..850cf6a 100644
--- a/src/knx/knxproj/qknxbuildings.cpp
+++ b/src/knx/knxproj/qknxbuildings.cpp
@@ -27,7 +27,7 @@
 **
 ******************************************************************************/
 
-#include "qknxbuildings.h"
+#include "qknxbuildings_p.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/knx/knxproj/qknxbuildings.h b/src/knx/knxproj/qknxbuildings_p.h
index b768570..35d748c 100644
--- a/src/knx/knxproj/qknxbuildings.h
+++ b/src/knx/knxproj/qknxbuildings_p.h
@@ -27,12 +27,23 @@
 **
 ******************************************************************************/
 
-#ifndef QKNXBUILDINGS_H
-#define QKNXBUILDINGS_H
+#ifndef QKNXBUILDINGS_P_H
+#define QKNXBUILDINGS_P_H
+
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists for the convenience
+// of the QZipReader class.  This header file may change from
+// version to version without notice, or even be removed.
+//
+// We mean it.
+//
 
 #include <QtCore/qstring.h>
 #include <QtCore/qvector.h>
-#include <QtKnx/qknxprojectutils.h>
+#include <QtKnx/private/qknxprojectutils_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/knx/knxproj/qknxdeviceinstance.cpp b/src/knx/knxproj/qknxdeviceinstance.cpp
index ebd7871..c20dbe8 100644
--- a/src/knx/knxproj/qknxdeviceinstance.cpp
+++ b/src/knx/knxproj/qknxdeviceinstance.cpp
@@ -27,7 +27,7 @@
 **
 ******************************************************************************/
 
-#include "qknxdeviceinstance.h"
+#include "qknxdeviceinstance_p.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/knx/knxproj/qknxdeviceinstance.h b/src/knx/knxproj/qknxdeviceinstance_p.h
index 8e2beac..a16177c 100644
--- a/src/knx/knxproj/qknxdeviceinstance.h
+++ b/src/knx/knxproj/qknxdeviceinstance_p.h
@@ -27,13 +27,24 @@
 **
 ******************************************************************************/
 
-#ifndef QKNXDEVICEINSTANCE_H
-#define QKNXDEVICEINSTANCE_H
+#ifndef QKNXDEVICEINSTANCE_P_H
+#define QKNXDEVICEINSTANCE_P_H
+
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists for the convenience
+// of the QZipReader class.  This header file may change from
+// version to version without notice, or even be removed.
+//
+// We mean it.
+//
 
 #include <QtCore/qdatetime.h>
 #include <QtCore/qstring.h>
 #include <QtCore/qvector.h>
-#include <QtKnx/qknxprojectutils.h>
+#include <QtKnx/private/qknxprojectutils_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/knx/knxproj/qknxgroupaddresses.cpp b/src/knx/knxproj/qknxgroupaddresses.cpp
index 3ab917e..7d002a8 100644
--- a/src/knx/knxproj/qknxgroupaddresses.cpp
+++ b/src/knx/knxproj/qknxgroupaddresses.cpp
@@ -27,7 +27,7 @@
 **
 ******************************************************************************/
 
-#include "qknxgroupaddresses.h"
+#include "qknxgroupaddresses_p.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/knx/knxproj/qknxgroupaddresses.h b/src/knx/knxproj/qknxgroupaddresses_p.h
index 7f6b4cd..a751697 100644
--- a/src/knx/knxproj/qknxgroupaddresses.h
+++ b/src/knx/knxproj/qknxgroupaddresses_p.h
@@ -27,12 +27,23 @@
 **
 ******************************************************************************/
 
-#ifndef QKNXGROUPADDRESSES_H
-#define QKNXGROUPADDRESSES_H
+#ifndef QKNXGROUPADDRESSES_P_H
+#define QKNXGROUPADDRESSES_P_H
+
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists for the convenience
+// of the QZipReader class.  This header file may change from
+// version to version without notice, or even be removed.
+//
+// We mean it.
+//
 
 #include <QtCore/qstring.h>
 #include <QtCore/qvector.h>
-#include <QtKnx/qknxprojectutils.h>
+#include <QtKnx/private/qknxprojectutils_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/knx/knxproj/qknxinstallation.cpp b/src/knx/knxproj/qknxinstallation.cpp
index 8a08f74..88577a0 100644
--- a/src/knx/knxproj/qknxinstallation.cpp
+++ b/src/knx/knxproj/qknxinstallation.cpp
@@ -27,7 +27,7 @@
 **
 ******************************************************************************/
 
-#include "qknxinstallation.h"
+#include "qknxinstallation_p.h"
 #include "qregularexpression.h"
 
 QT_BEGIN_NAMESPACE
diff --git a/src/knx/knxproj/qknxinstallation.h b/src/knx/knxproj/qknxinstallation_p.h
index 718faa8..0b167ef 100644
--- a/src/knx/knxproj/qknxinstallation.h
+++ b/src/knx/knxproj/qknxinstallation_p.h
@@ -27,16 +27,27 @@
 **
 ******************************************************************************/
 
-#ifndef QKNXINSTALLATION_H
-#define QKNXINSTALLATION_H
+#ifndef QKNXINSTALLATION_P_H
+#define QKNXINSTALLATION_P_H
+
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists for the convenience
+// of the QZipReader class.  This header file may change from
+// version to version without notice, or even be removed.
+//
+// We mean it.
+//
 
 #include <QtCore/qdatetime.h>
 #include <QtCore/qstring.h>
 #include <QtCore/qvector.h>
-#include <QtKnx/qknxbuildings.h>
-#include <QtKnx/qknxgroupaddresses.h>
-#include <QtKnx/qknxprojectutils.h>
-#include <QtKnx/qknxtopology.h>
+#include <QtKnx/private/qknxbuildings_p.h>
+#include <QtKnx/private/qknxgroupaddresses_p.h>
+#include <QtKnx/private/qknxprojectutils_p.h>
+#include <QtKnx/private/qknxtopology_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/knx/knxproj/qknxprojectinformation.cpp b/src/knx/knxproj/qknxprojectinformation.cpp
index 865b4f4..260e24d 100644
--- a/src/knx/knxproj/qknxprojectinformation.cpp
+++ b/src/knx/knxproj/qknxprojectinformation.cpp
@@ -27,7 +27,7 @@
 **
 ******************************************************************************/
 
-#include "qknxprojectinformation.h"
+#include "qknxprojectinformation_p.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/knx/knxproj/qknxprojectinformation.h b/src/knx/knxproj/qknxprojectinformation_p.h
index 5a31860..fb69d2d 100644
--- a/src/knx/knxproj/qknxprojectinformation.h
+++ b/src/knx/knxproj/qknxprojectinformation_p.h
@@ -27,13 +27,24 @@
 **
 ******************************************************************************/
 
-#ifndef QKNXPROJECTINFORMATION_H
-#define QKNXPROJECTINFORMATION_H
+#ifndef QKNXPROJECTINFORMATION_P_H
+#define QKNXPROJECTINFORMATION_P_H
+
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists for the convenience
+// of the QZipReader class.  This header file may change from
+// version to version without notice, or even be removed.
+//
+// We mean it.
+//
 
 #include <QtCore/qdatetime.h>
 #include <QtCore/qstring.h>
 #include <QtCore/qvector.h>
-#include <QtKnx/qknxprojectutils.h>
+#include <QtKnx/private/qknxprojectutils_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/knx/knxproj/qknxprojectroot.cpp b/src/knx/knxproj/qknxprojectroot.cpp
index 00d280e..6d9ae73 100644
--- a/src/knx/knxproj/qknxprojectroot.cpp
+++ b/src/knx/knxproj/qknxprojectroot.cpp
@@ -27,7 +27,7 @@
 **
 ******************************************************************************/
 
-#include "qknxprojectroot.h"
+#include "qknxprojectroot_p.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/knx/knxproj/qknxprojectroot.h b/src/knx/knxproj/qknxprojectroot_p.h
index 5beec92..d93371e 100644
--- a/src/knx/knxproj/qknxprojectroot.h
+++ b/src/knx/knxproj/qknxprojectroot_p.h
@@ -27,15 +27,26 @@
 **
 ******************************************************************************/
 
-#ifndef QKNXPROJECTROOT_H
-#define QKNXPROJECTROOT_H
+#ifndef QKNXPROJECTROOT_P_H
+#define QKNXPROJECTROOT_P_H
+
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists for the convenience
+// of the QZipReader class.  This header file may change from
+// version to version without notice, or even be removed.
+//
+// We mean it.
+//
 
 #include <QtCore/qdatetime.h>
 #include <QtCore/qstring.h>
 #include <QtCore/qvector.h>
-#include <QtKnx/qknxinstallation.h>
-#include <QtKnx/qknxprojectinformation.h>
-#include <QtKnx/qknxprojectutils.h>
+#include <QtKnx/private/qknxinstallation_p.h>
+#include <QtKnx/private/qknxprojectinformation_p.h>
+#include <QtKnx/private/qknxprojectutils_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/knx/knxproj/qknxprojectutils.cpp b/src/knx/knxproj/qknxprojectutils.cpp
index f3db883..7cef564 100644
--- a/src/knx/knxproj/qknxprojectutils.cpp
+++ b/src/knx/knxproj/qknxprojectutils.cpp
@@ -27,7 +27,7 @@
 **
 ******************************************************************************/
 
-#include "qknxprojectutils.h"
+#include "qknxprojectutils_p.h"
 #include "private/qxmlutils_p.h"
 
 QT_BEGIN_NAMESPACE
diff --git a/src/knx/knxproj/qknxprojectutils.h b/src/knx/knxproj/qknxprojectutils_p.h
index 1aa5edb..fe15468 100644
--- a/src/knx/knxproj/qknxprojectutils.h
+++ b/src/knx/knxproj/qknxprojectutils_p.h
@@ -27,8 +27,19 @@
 **
 ******************************************************************************/
 
-#ifndef QKNXPROJECTUTILS_H
-#define QKNXPROJECTUTILS_H
+#ifndef QKNXPROJECTUTILS_P_H
+#define QKNXPROJECTUTILS_P_H
+
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists for the convenience
+// of the QZipReader class.  This header file may change from
+// version to version without notice, or even be removed.
+//
+// We mean it.
+//
 
 #include <QtCore/qcoreapplication.h>
 #include <QtCore/qxmlstream.h>
diff --git a/src/knx/knxproj/qknxtopology.cpp b/src/knx/knxproj/qknxtopology.cpp
index c5d6e18..34be52e 100644
--- a/src/knx/knxproj/qknxtopology.cpp
+++ b/src/knx/knxproj/qknxtopology.cpp
@@ -27,7 +27,7 @@
 **
 ******************************************************************************/
 
-#include "qknxtopology.h"
+#include "qknxtopology_p.h"
 #include "qregularexpression.h"
 
 QT_BEGIN_NAMESPACE
diff --git a/src/knx/knxproj/qknxtopology.h b/src/knx/knxproj/qknxtopology_p.h
index 62872cf..8e390b8 100644
--- a/src/knx/knxproj/qknxtopology.h
+++ b/src/knx/knxproj/qknxtopology_p.h
@@ -27,14 +27,25 @@
 **
 ******************************************************************************/
 
-#ifndef QKNXTOPOLOGY_H
-#define QKNXTOPOLOGY_H
+#ifndef QKNXTOPOLOGY_P_H
+#define QKNXTOPOLOGY_P_H
+
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists for the convenience
+// of the QZipReader class.  This header file may change from
+// version to version without notice, or even be removed.
+//
+// We mean it.
+//
 
 #include <QtCore/qdatetime.h>
 #include <QtCore/qstring.h>
 #include <QtCore/qvector.h>
-#include <QtKnx/qknxdeviceinstance.h>
-#include <QtKnx/qknxprojectutils.h>
+#include <QtKnx/private/qknxdeviceinstance_p.h>
+#include <QtKnx/private/qknxprojectutils_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/knx/knxproj/qzipreader_p.h b/src/knx/knxproj/qzipreader_p.h
index a2a3564..90bad5d 100644
--- a/src/knx/knxproj/qzipreader_p.h
+++ b/src/knx/knxproj/qzipreader_p.h
@@ -37,8 +37,8 @@
 **
 ****************************************************************************/
 
-#ifndef QZIPREADER_H
-#define QZIPREADER_H
+#ifndef QZIPREADER_P_H
+#define QZIPREADER_P_H
 
 #include <QtCore/qglobal.h>
 
@@ -121,4 +121,4 @@ Q_DECLARE_TYPEINFO(QZipReader::Status, Q_PRIMITIVE_TYPE);
 
 QT_END_NAMESPACE
 
-#endif // QZIPREADER_H
+#endif // QZIPREADER_P_H
diff --git a/src/knx/knxproj/qzipwriter_p.h b/src/knx/knxproj/qzipwriter_p.h
index dc3a797..66360a3 100644
--- a/src/knx/knxproj/qzipwriter_p.h
+++ b/src/knx/knxproj/qzipwriter_p.h
@@ -37,8 +37,8 @@
 **
 ****************************************************************************/
 
-#ifndef QZIPWRITER_H
-#define QZIPWRITER_H
+#ifndef QZIPWRITER_P_H
+#define QZIPWRITER_P_H
 
 //
 //  W A R N I N G
@@ -111,4 +111,4 @@ private:
 
 QT_END_NAMESPACE
 
-#endif // QZIPWRITER_H
+#endif // QZIPWRITER_P_H
diff --git a/src/knx/qknxgroupaddressinfo.cpp b/src/knx/qknxgroupaddressinfo.cpp
index f057e0d..3e2b5c7 100644
--- a/src/knx/qknxgroupaddressinfo.cpp
+++ b/src/knx/qknxgroupaddressinfo.cpp
@@ -28,7 +28,7 @@
 ******************************************************************************/
 
 #include "qknxgroupaddressinfo.h"
-#include "qknxgroupaddresses.h"
+#include "qknxgroupaddresses_p.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/knx/qknxgroupaddressinfos.cpp b/src/knx/qknxgroupaddressinfos.cpp
index 033a474..092991e 100644
--- a/src/knx/qknxgroupaddressinfos.cpp
+++ b/src/knx/qknxgroupaddressinfos.cpp
@@ -28,8 +28,8 @@
 ******************************************************************************/
 
 #include "qknxgroupaddressinfos.h"
-#include "qknxgroupaddresses.h"
-#include "qknxprojectroot.h"
+#include "qknxgroupaddresses_p.h"
+#include "qknxprojectroot_p.h"
 
 #include "qzipreader_p.h"
 
diff --git a/tests/auto/qknxproject/qknxproject.pro b/tests/auto/qknxproject/qknxproject.pro
index 5dccadf..8ea8544 100644
--- a/tests/auto/qknxproject/qknxproject.pro
+++ b/tests/auto/qknxproject/qknxproject.pro
@@ -1,7 +1,7 @@
 TARGET = tst_qknxproject
 
-QT = core testlib knx
 CONFIG += testcase c++11
+QT = core testlib knx knx-private
 
 CONFIG -= app_bundle
 RESOURCES += project.qrc
diff --git a/tests/auto/qknxproject/tst_qknxproject.cpp b/tests/auto/qknxproject/tst_qknxproject.cpp
index 9219131..8dc04c4 100644
--- a/tests/auto/qknxproject/tst_qknxproject.cpp
+++ b/tests/auto/qknxproject/tst_qknxproject.cpp
@@ -27,7 +27,7 @@
 ******************************************************************************/
 
 #include <QtCore/qxmlstream.h>
-#include <QtKnx/qknxprojectroot.h>
+#include <QtKnx/private/qknxprojectroot_p.h>
 #include <QtTest/qtest.h>
 
 class tst_QKnxProject : public QObject