Fix the potential build breaks introduced by a previous commit (regression)

This is due to the fact the Qt namespace is not considered which is normally not
a problem as it is empty by default. However, using something like "-qtnamespace
MyNamespace" when configuring Qt will break the QtSerialPort build completely.

This is intended to be a fix for the library, and the examples/tests will be
fixed in a separate commit if necessary.

Change-Id: Iecd24dc5135c3a9645910754589dfd8bf4942337
Reviewed-by: Sergey Belyashov <Sergey.Belyashov@gmail.com>
Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>

18 files changed, 72 insertions, 0 deletions

diff --git a/src/serialport/qserialport.cpp b/src/serialport/qserialport.cpp
index d2d15fab..53a73d0b 100644
--- a/src/serialport/qserialport.cpp
+++ b/src/serialport/qserialport.cpp
@@ -59,6 +59,8 @@
 #  define SERIALPORT_BUFFERSIZE 16384
 #endif
 
+QT_BEGIN_NAMESPACE
+
 QT_BEGIN_NAMESPACE_SERIALPORT
 
 QSerialPortPrivateData::QSerialPortPrivateData(QSerialPort *q)
@@ -1187,3 +1189,5 @@ void QSerialPort::setError(QSerialPort::SerialPortError error)
 #include "moc_qserialport.cpp"
 
 QT_END_NAMESPACE_SERIALPORT
+
+QT_END_NAMESPACE
diff --git a/src/serialport/qserialport_p.h b/src/serialport/qserialport_p.h
index c365fb81..d334adf3 100644
--- a/src/serialport/qserialport_p.h
+++ b/src/serialport/qserialport_p.h
@@ -52,6 +52,8 @@
 #include "qt4support/qringbuffer_p.h"
 #endif
 
+QT_BEGIN_NAMESPACE
+
 QT_BEGIN_NAMESPACE_SERIALPORT
 
 class QSerialPortPrivateData
@@ -84,4 +86,6 @@ public:
 
 QT_END_NAMESPACE_SERIALPORT
 
+QT_END_NAMESPACE
+
 #endif // QSERIALPORT_P_H
diff --git a/src/serialport/qserialport_symbian.cpp b/src/serialport/qserialport_symbian.cpp
index 1b1063d5..c8628ca0 100644
--- a/src/serialport/qserialport_symbian.cpp
+++ b/src/serialport/qserialport_symbian.cpp
@@ -47,6 +47,8 @@
 //#include <e32test.h>
 #include <f32file.h>
 
+QT_BEGIN_NAMESPACE
+
 QT_BEGIN_NAMESPACE_SERIALPORT
 
 // Physical device driver.
@@ -652,3 +654,5 @@ QList<qint32> QSerialPortPrivate::standardBaudRates()
 }
 
 QT_END_NAMESPACE_SERIALPORT
+
+QT_END_NAMESPACE
diff --git a/src/serialport/qserialport_symbian_p.h b/src/serialport/qserialport_symbian_p.h
index 4f610b94..5a0ca1a7 100644
--- a/src/serialport/qserialport_symbian_p.h
+++ b/src/serialport/qserialport_symbian_p.h
@@ -46,6 +46,8 @@
 
 #include <c32comm.h>
 
+QT_BEGIN_NAMESPACE
+
 QT_BEGIN_NAMESPACE_SERIALPORT
 
 class QSerialPortPrivate : public QSerialPortPrivateData
@@ -115,4 +117,6 @@ private:
 
 QT_END_NAMESPACE_SERIALPORT
 
+QT_END_NAMESPACE
+
 #endif // QSERIALPORT_SYMBIAN_P_H
diff --git a/src/serialport/qserialport_unix.cpp b/src/serialport/qserialport_unix.cpp
index 7f434cdc..ad9fcc78 100644
--- a/src/serialport/qserialport_unix.cpp
+++ b/src/serialport/qserialport_unix.cpp
@@ -60,6 +60,8 @@
 #include <QtCore/qsocketnotifier.h>
 #include <QtCore/qpair.h>
 
+QT_BEGIN_NAMESPACE
+
 QT_BEGIN_NAMESPACE_SERIALPORT
 
 class ReadNotifier : public QSocketNotifier
@@ -1341,3 +1343,5 @@ QList<qint32> QSerialPortPrivate::standardBaudRates()
 }
 
 QT_END_NAMESPACE_SERIALPORT
+
+QT_END_NAMESPACE
diff --git a/src/serialport/qserialport_unix_p.h b/src/serialport/qserialport_unix_p.h
index f9139955..fccd2ffe 100644
--- a/src/serialport/qserialport_unix_p.h
+++ b/src/serialport/qserialport_unix_p.h
@@ -51,6 +51,8 @@
 #  include <linux/serial.h>
 #endif
 
+QT_BEGIN_NAMESPACE
+
 class QSocketNotifier;
 
 QT_BEGIN_NAMESPACE_SERIALPORT
@@ -153,4 +155,6 @@ private:
 
 QT_END_NAMESPACE_SERIALPORT
 
+QT_END_NAMESPACE
+
 #endif // QSERIALPORT_UNIX_P_H
diff --git a/src/serialport/qserialport_win.cpp b/src/serialport/qserialport_win.cpp
index 05bafa9d..851d1f1b 100644
--- a/src/serialport/qserialport_win.cpp
+++ b/src/serialport/qserialport_win.cpp
@@ -85,6 +85,8 @@
 #  define SERIAL_RTS_STATE  0x00000002
 #endif
 
+QT_BEGIN_NAMESPACE
+
 QT_BEGIN_NAMESPACE_SERIALPORT
 
 #ifndef Q_OS_WINCE
@@ -1076,3 +1078,5 @@ QList<qint32> QSerialPortPrivate::standardBaudRates()
 }
 
 QT_END_NAMESPACE_SERIALPORT
+
+QT_END_NAMESPACE
diff --git a/src/serialport/qserialport_win_p.h b/src/serialport/qserialport_win_p.h
index 570a6c3b..5f4f97b3 100644
--- a/src/serialport/qserialport_win_p.h
+++ b/src/serialport/qserialport_win_p.h
@@ -47,6 +47,8 @@
 
 #include <qt_windows.h>
 
+QT_BEGIN_NAMESPACE
+
 #ifndef Q_OS_WINCE
 class QWinEventNotifier;
 #include <QtCore/qhash.h>
@@ -159,4 +161,6 @@ private:
 
 QT_END_NAMESPACE_SERIALPORT
 
+QT_END_NAMESPACE
+
 #endif // QSERIALPORT_WIN_P_H
diff --git a/src/serialport/qserialport_wince.cpp b/src/serialport/qserialport_wince.cpp
index 026d1941..18835051 100644
--- a/src/serialport/qserialport_wince.cpp
+++ b/src/serialport/qserialport_wince.cpp
@@ -48,6 +48,8 @@
 #include <QtCore/qthread.h>
 #include <QtCore/qtimer.h>
 
+QT_BEGIN_NAMESPACE
+
 QT_BEGIN_NAMESPACE_SERIALPORT
 
 class QSerialPortPrivate;
@@ -502,3 +504,5 @@ QString QSerialPortPrivate::portNameFromSystemLocation(const QString &location)
 #include "qserialport_wince.moc"
 
 QT_END_NAMESPACE_SERIALPORT
+
+QT_END_NAMESPACE
diff --git a/src/serialport/qserialportinfo.cpp b/src/serialport/qserialportinfo.cpp
index bd694ae2..d62fdb1b 100644
--- a/src/serialport/qserialportinfo.cpp
+++ b/src/serialport/qserialportinfo.cpp
@@ -45,6 +45,8 @@
 #include "qserialportinfo_p.h"
 #include "qserialport.h"
 
+QT_BEGIN_NAMESPACE
+
 QT_BEGIN_NAMESPACE_SERIALPORT
 
 
@@ -240,3 +242,5 @@ QString QSerialPortInfo::productIdentifier() const
 */
 
 QT_END_NAMESPACE_SERIALPORT
+
+QT_END_NAMESPACE
diff --git a/src/serialport/qserialportinfo_mac.cpp b/src/serialport/qserialportinfo_mac.cpp
index e4eaa2f3..b66f84d3 100644
--- a/src/serialport/qserialportinfo_mac.cpp
+++ b/src/serialport/qserialportinfo_mac.cpp
@@ -57,6 +57,8 @@
 #endif
 #include <IOKit/IOBSD.h>
 
+QT_BEGIN_NAMESPACE
+
 QT_BEGIN_NAMESPACE_SERIALPORT
 
 enum { MATCHING_PROPERTIES_COUNT = 6 };
@@ -262,3 +264,5 @@ QList<QSerialPortInfo> QSerialPortInfo::availablePorts()
 }
 
 QT_END_NAMESPACE_SERIALPORT
+
+QT_END_NAMESPACE
diff --git a/src/serialport/qserialportinfo_p.h b/src/serialport/qserialportinfo_p.h
index a5f8bba8..436bbd23 100644
--- a/src/serialport/qserialportinfo_p.h
+++ b/src/serialport/qserialportinfo_p.h
@@ -48,6 +48,8 @@
 
 #include <QtCore/qstring.h>
 
+QT_BEGIN_NAMESPACE
+
 QT_BEGIN_NAMESPACE_SERIALPORT
 
 class QSerialPortInfoPrivate
@@ -74,4 +76,6 @@ public:
 
 QT_END_NAMESPACE_SERIALPORT
 
+QT_END_NAMESPACE
+
 #endif // QSERIALPORTINFO_P_H
diff --git a/src/serialport/qserialportinfo_symbian.cpp b/src/serialport/qserialportinfo_symbian.cpp
index 47b270ff..88293fab 100644
--- a/src/serialport/qserialportinfo_symbian.cpp
+++ b/src/serialport/qserialportinfo_symbian.cpp
@@ -52,6 +52,8 @@
 
 #include <QtCore/qobject.h>
 
+QT_BEGIN_NAMESPACE
+
 QT_BEGIN_NAMESPACE_SERIALPORT
 
 // Physical device driver.
@@ -247,3 +249,5 @@ bool QSerialPortInfo::isValid() const
 }
 
 QT_END_NAMESPACE_SERIALPORT
+
+QT_END_NAMESPACE
diff --git a/src/serialport/qserialportinfo_unix.cpp b/src/serialport/qserialportinfo_unix.cpp
index cda65295..3c5205c3 100644
--- a/src/serialport/qserialportinfo_unix.cpp
+++ b/src/serialport/qserialportinfo_unix.cpp
@@ -61,6 +61,8 @@ extern "C"
 
 #endif // Q_OS_MAC
 
+QT_BEGIN_NAMESPACE
+
 QT_BEGIN_NAMESPACE_SERIALPORT
 
 #ifndef Q_OS_MAC
@@ -254,3 +256,5 @@ bool QSerialPortInfo::isValid() const
 }
 
 QT_END_NAMESPACE_SERIALPORT
+
+QT_END_NAMESPACE
diff --git a/src/serialport/qserialportinfo_win.cpp b/src/serialport/qserialportinfo_win.cpp
index e464c606..74cfffb3 100644
--- a/src/serialport/qserialportinfo_win.cpp
+++ b/src/serialport/qserialportinfo_win.cpp
@@ -53,6 +53,8 @@
 #include <QtCore/qvariant.h>
 #include <QtCore/qstringlist.h>
 
+QT_BEGIN_NAMESPACE
+
 QT_BEGIN_NAMESPACE_SERIALPORT
 
 #ifndef Q_OS_WINCE
@@ -229,3 +231,5 @@ bool QSerialPortInfo::isValid() const
 }
 
 QT_END_NAMESPACE_SERIALPORT
+
+QT_END_NAMESPACE
diff --git a/src/serialport/qserialportinfo_wince.cpp b/src/serialport/qserialportinfo_wince.cpp
index d6623bfb..fd5ae31c 100644
--- a/src/serialport/qserialportinfo_wince.cpp
+++ b/src/serialport/qserialportinfo_wince.cpp
@@ -47,6 +47,8 @@
 
 #include <QtCore/qstringlist.h>
 
+QT_BEGIN_NAMESPACE
+
 QT_BEGIN_NAMESPACE_SERIALPORT
 
 static QString findDescription(HKEY parentKeyHandle, const QString &subKey)
@@ -132,3 +134,5 @@ QList<QSerialPortInfo> QSerialPortInfo::availablePorts()
 }
 
 QT_END_NAMESPACE_SERIALPORT
+
+QT_END_NAMESPACE
diff --git a/src/serialport/ttylocker_unix.cpp b/src/serialport/ttylocker_unix.cpp
index 4a6230ac..a0fafd37 100644
--- a/src/serialport/ttylocker_unix.cpp
+++ b/src/serialport/ttylocker_unix.cpp
@@ -58,6 +58,8 @@
 #  include <QtCore/qstringlist.h>
 #endif // defined (HAVE_BAUDBOY_H)
 
+QT_BEGIN_NAMESPACE
+
 QT_BEGIN_NAMESPACE_SERIALPORT
 
 #if !(defined (HAVE_BAUDBOY_H) || defined (HAVE_LOCKDEV_H))
@@ -178,3 +180,5 @@ bool TtyLocker::isLocked(const char *portName, bool *currentPid)
 }
 
 QT_END_NAMESPACE_SERIALPORT
+
+QT_END_NAMESPACE
diff --git a/src/serialport/ttylocker_unix_p.h b/src/serialport/ttylocker_unix_p.h
index 2aca6328..09e8397d 100644
--- a/src/serialport/ttylocker_unix_p.h
+++ b/src/serialport/ttylocker_unix_p.h
@@ -44,6 +44,8 @@
 
 #include "qserialport-global.h"
 
+QT_BEGIN_NAMESPACE
+
 QT_BEGIN_NAMESPACE_SERIALPORT
 
 class TtyLocker
@@ -56,4 +58,6 @@ public:
 
 QT_END_NAMESPACE_SERIALPORT
 
+QT_END_NAMESPACE
+
 #endif // TTYLOCKER_UNIX_P_H