Unify Qt namespace declarations

Use QT_{BEGIN|END}_NAMESPACE instead of QT_USE_NAMESPACE as that puts
any additional symbols into the Qt namespace rather than polluting the
outer namespace. Also, add declarations where they were missing.

Change-Id: I29a308ca62497ee613feca7355aa819be4fb6f51
Reviewed-by: Erik Verbruggen <erik.verbruggen@theqtcompany.com>

7 files changed, 22 insertions, 5 deletions

diff --git a/src/scxml/qscxmlcppdatamodel.cpp b/src/scxml/qscxmlcppdatamodel.cpp
index d2874ea..8a95354 100644
--- a/src/scxml/qscxmlcppdatamodel.cpp
+++ b/src/scxml/qscxmlcppdatamodel.cpp
@@ -40,7 +40,7 @@
 #include "qscxmlcppdatamodel_p.h"
 #include "qscxmlstatemachine.h"
 
-QT_USE_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 using namespace QScxmlExecutableContent;
 
@@ -242,3 +242,5 @@ bool QScxmlCppDataModel::In(const QString &stateName) const
 {
     return stateMachine()->isActive(stateName);
 }
+
+QT_END_NAMESPACE
diff --git a/src/scxml/qscxmldatamodel.cpp b/src/scxml/qscxmldatamodel.cpp
index c3a6614..9808532 100644
--- a/src/scxml/qscxmldatamodel.cpp
+++ b/src/scxml/qscxmldatamodel.cpp
@@ -42,7 +42,7 @@
 #include "qscxmlecmascriptdatamodel.h"
 #include "qscxmlstatemachine_p.h"
 
-QT_USE_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 /*!
  * \class QScxmlDataModel::ForeachLoopBody
@@ -165,3 +165,5 @@ void QScxmlDataModelPrivate::setStateMachine(QScxmlStateMachine *stateMachine)
  *
  * Returns \c true if successful or \c false if an error occurred.
  */
+
+QT_END_NAMESPACE
diff --git a/src/scxml/qscxmlecmascriptplatformproperties.cpp b/src/scxml/qscxmlecmascriptplatformproperties.cpp
index a2c1336..8433d78 100644
--- a/src/scxml/qscxmlecmascriptplatformproperties.cpp
+++ b/src/scxml/qscxmlecmascriptplatformproperties.cpp
@@ -53,7 +53,6 @@ public:
     QScxmlStateMachine *m_stateMachine;
     QJSValue m_jsValue;
 };
-QT_END_NAMESPACE
 
 QScxmlPlatformProperties::QScxmlPlatformProperties(QObject *parent)
     : QObject(parent)
@@ -98,3 +97,5 @@ bool QScxmlPlatformProperties::In(const QString &stateName)
 {
     return stateMachine()->isActive(stateName);
 }
+
+QT_END_NAMESPACE
diff --git a/src/scxml/qscxmlevent.cpp b/src/scxml/qscxmlevent.cpp
index 052ee95..71e4407 100644
--- a/src/scxml/qscxmlevent.cpp
+++ b/src/scxml/qscxmlevent.cpp
@@ -41,7 +41,7 @@
 #include "qscxmlevent_p.h"
 #include "qscxmlstatemachine_p.h"
 
-QT_USE_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 using namespace QScxmlExecutableContent;
 
@@ -563,3 +563,5 @@ void QScxmlEvent::makeIgnorable()
 {
     t = ignoreEventType;
 }
+
+QT_END_NAMESPACE
diff --git a/src/scxml/qscxmlexecutablecontent.cpp b/src/scxml/qscxmlexecutablecontent.cpp
index 8eb2d9c..279aa52 100644
--- a/src/scxml/qscxmlexecutablecontent.cpp
+++ b/src/scxml/qscxmlexecutablecontent.cpp
@@ -42,6 +42,8 @@
 #include "qscxmlparser_p.h"
 #include "qscxmlevent_p.h"
 
+QT_BEGIN_NAMESPACE
+
 using namespace QScxmlExecutableContent;
 
 #ifndef BUILD_QSCXMLC
@@ -661,3 +663,5 @@ StringIds DynamicTableData::allDataNameIds() const
 {
     return theDataNameIds;
 }
+
+QT_END_NAMESPACE
diff --git a/src/scxml/qscxmlnulldatamodel.cpp b/src/scxml/qscxmlnulldatamodel.cpp
index bb03c90..21a3241 100644
--- a/src/scxml/qscxmlnulldatamodel.cpp
+++ b/src/scxml/qscxmlnulldatamodel.cpp
@@ -42,6 +42,8 @@
 #include "qscxmlstatemachine_p.h"
 #include "qscxmltabledata.h"
 
+QT_BEGIN_NAMESPACE
+
 class QScxmlNullDataModel::Data
 {
     struct ResolvedEvaluatorInfo {
@@ -244,3 +246,5 @@ bool QScxmlNullDataModel::setProperty(const QString &name, const QVariant &value
     Q_UNUSED(context);
     return false;
 }
+
+QT_END_NAMESPACE
diff --git a/src/scxml/qscxmltabledata.cpp b/src/scxml/qscxmltabledata.cpp
index 18efe80..75469f9 100644
--- a/src/scxml/qscxmltabledata.cpp
+++ b/src/scxml/qscxmltabledata.cpp
@@ -39,7 +39,9 @@
 
 #include "qscxmltabledata.h"
 
-QT_USE_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 QScxmlTableData::~QScxmlTableData()
 {}
+
+QT_END_NAMESPACE