diff options
Diffstat (limited to 'src/serialport')
-rw-r--r-- | src/serialport/qserialport.cpp | 4 | ||||
-rw-r--r-- | src/serialport/qserialport_p.h | 4 | ||||
-rw-r--r-- | src/serialport/qserialport_symbian.cpp | 4 | ||||
-rw-r--r-- | src/serialport/qserialport_symbian_p.h | 4 | ||||
-rw-r--r-- | src/serialport/qserialport_unix.cpp | 4 | ||||
-rw-r--r-- | src/serialport/qserialport_unix_p.h | 4 | ||||
-rw-r--r-- | src/serialport/qserialport_win.cpp | 4 | ||||
-rw-r--r-- | src/serialport/qserialport_win_p.h | 4 | ||||
-rw-r--r-- | src/serialport/qserialport_wince.cpp | 4 | ||||
-rw-r--r-- | src/serialport/qserialportinfo.cpp | 4 | ||||
-rw-r--r-- | src/serialport/qserialportinfo_mac.cpp | 4 | ||||
-rw-r--r-- | src/serialport/qserialportinfo_p.h | 4 | ||||
-rw-r--r-- | src/serialport/qserialportinfo_symbian.cpp | 4 | ||||
-rw-r--r-- | src/serialport/qserialportinfo_unix.cpp | 4 | ||||
-rw-r--r-- | src/serialport/qserialportinfo_win.cpp | 4 | ||||
-rw-r--r-- | src/serialport/qserialportinfo_wince.cpp | 4 | ||||
-rw-r--r-- | src/serialport/ttylocker_unix.cpp | 4 | ||||
-rw-r--r-- | src/serialport/ttylocker_unix_p.h | 4 |
18 files changed, 72 insertions, 0 deletions
diff --git a/src/serialport/qserialport.cpp b/src/serialport/qserialport.cpp index d2d15fa..53a73d0 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 c365fb8..d334adf 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 1b1063d..c8628ca 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 4f610b9..5a0ca1a 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 7f434cd..ad9fcc7 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 f913995..fccd2ff 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 05bafa9..851d1f1 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 570a6c3..5f4f97b 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 026d194..1883505 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 bd694ae..d62fdb1 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 e4eaa2f..b66f84d 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 a5f8bba..436bbd2 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 47b270f..88293fa 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 cda6529..3c5205c 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 e464c60..74cfffb 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 d6623bf..fd5ae31 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 4a6230a..a0fafd3 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 2aca632..09e8397 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 |