From 99ddb55a4dc4be988ed09c9b376aef4b0a1f4079 Mon Sep 17 00:00:00 2001 From: Laszlo Papp Date: Thu, 7 Feb 2013 13:05:19 +0000 Subject: Remove the QtSerialPort namespace define and hence namespace usage * This is for following the convention in the Qt Project with the rest. * This fixes examples and tests to build now as all of them are broken due to the regression. Change-Id: I3f4d64d97466520aea621da582a64a0d97e32136 Reviewed-by: Denis Shienkov --- src/serialport/doc/serialport.qdocconf | 2 -- src/serialport/qserialport-global.h | 10 ---------- src/serialport/qserialport.cpp | 4 ---- src/serialport/qserialport.h | 4 ---- src/serialport/qserialport_p.h | 4 ---- src/serialport/qserialport_symbian.cpp | 4 ---- src/serialport/qserialport_symbian_p.h | 4 ---- src/serialport/qserialport_unix.cpp | 4 ---- src/serialport/qserialport_unix_p.h | 4 ---- src/serialport/qserialport_win.cpp | 4 ---- src/serialport/qserialport_win_p.h | 4 ---- src/serialport/qserialport_wince.cpp | 4 ---- src/serialport/qserialportinfo.cpp | 4 ---- src/serialport/qserialportinfo.h | 4 ---- src/serialport/qserialportinfo_mac.cpp | 4 ---- src/serialport/qserialportinfo_p.h | 4 ---- src/serialport/qserialportinfo_symbian.cpp | 4 ---- src/serialport/qserialportinfo_unix.cpp | 4 ---- src/serialport/qserialportinfo_win.cpp | 4 ---- src/serialport/qserialportinfo_wince.cpp | 4 ---- src/serialport/qttylocker_unix.cpp | 4 ---- src/serialport/qttylocker_unix_p.h | 4 ---- 22 files changed, 92 deletions(-) (limited to 'src/serialport') diff --git a/src/serialport/doc/serialport.qdocconf b/src/serialport/doc/serialport.qdocconf index f4b8b0c..30b3e81 100644 --- a/src/serialport/doc/serialport.qdocconf +++ b/src/serialport/doc/serialport.qdocconf @@ -11,8 +11,6 @@ sourcedirs = ./src ../src indexes = $QT5DOC/doc/html/qt.index Cpp.ignoretokens = \ - QT_BEGIN_NAMESPACE_SERIALPORT \ - QT_END_NAMESPACE_SERIALPORT \ Q_ADDON_SERIALPORT_EXPORT Cpp.ignoredirectives = \ diff --git a/src/serialport/qserialport-global.h b/src/serialport/qserialport-global.h index b062727..dc43f4e 100644 --- a/src/serialport/qserialport-global.h +++ b/src/serialport/qserialport-global.h @@ -53,16 +53,6 @@ QT_BEGIN_NAMESPACE # define Q_SERIALPORT_EXPORT Q_DECL_IMPORT #endif -# define QT_BEGIN_NAMESPACE_SERIALPORT namespace QtSerialPort { -# define QT_END_NAMESPACE_SERIALPORT } -# define QT_USE_NAMESPACE_SERIALPORT using namespace QtSerialPort; - -// a workaround for moc - if there is a header file that doesn't use serialport -// namespace, we still force moc to do "using namespace" but the namespace have to -// be defined, so let's define an empty namespace here -QT_BEGIN_NAMESPACE_SERIALPORT -QT_END_NAMESPACE_SERIALPORT - QT_END_NAMESPACE #endif // SERIALPORT_GLOBAL_H diff --git a/src/serialport/qserialport.cpp b/src/serialport/qserialport.cpp index 53a73d0..397182b 100644 --- a/src/serialport/qserialport.cpp +++ b/src/serialport/qserialport.cpp @@ -61,8 +61,6 @@ QT_BEGIN_NAMESPACE -QT_BEGIN_NAMESPACE_SERIALPORT - QSerialPortPrivateData::QSerialPortPrivateData(QSerialPort *q) : readBufferMaxSize(0) , readBuffer(SERIALPORT_BUFFERSIZE) @@ -1188,6 +1186,4 @@ void QSerialPort::setError(QSerialPort::SerialPortError error) #include "moc_qserialport.cpp" -QT_END_NAMESPACE_SERIALPORT - QT_END_NAMESPACE diff --git a/src/serialport/qserialport.h b/src/serialport/qserialport.h index 643a927..2682820 100644 --- a/src/serialport/qserialport.h +++ b/src/serialport/qserialport.h @@ -49,8 +49,6 @@ QT_BEGIN_NAMESPACE -QT_BEGIN_NAMESPACE_SERIALPORT - class QSerialPortInfo; class QSerialPortPrivate; @@ -256,8 +254,6 @@ inline bool QSerialPort::clearBreak(bool clear) Q_DECLARE_OPERATORS_FOR_FLAGS(QSerialPort::Directions) Q_DECLARE_OPERATORS_FOR_FLAGS(QSerialPort::Lines) -QT_END_NAMESPACE_SERIALPORT - QT_END_NAMESPACE #endif // QSERIALPORT_H diff --git a/src/serialport/qserialport_p.h b/src/serialport/qserialport_p.h index d334adf..a10cda2 100644 --- a/src/serialport/qserialport_p.h +++ b/src/serialport/qserialport_p.h @@ -54,8 +54,6 @@ QT_BEGIN_NAMESPACE -QT_BEGIN_NAMESPACE_SERIALPORT - class QSerialPortPrivateData { Q_DECLARE_PUBLIC(QSerialPort) @@ -84,8 +82,6 @@ public: QSerialPort * const q_ptr; }; -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 c8628ca..200dc06 100644 --- a/src/serialport/qserialport_symbian.cpp +++ b/src/serialport/qserialport_symbian.cpp @@ -49,8 +49,6 @@ QT_BEGIN_NAMESPACE -QT_BEGIN_NAMESPACE_SERIALPORT - // Physical device driver. #ifdef __WINS__ _LIT(KPddName, "ECDRV"); @@ -653,6 +651,4 @@ QList QSerialPortPrivate::standardBaudRates() return ret; } -QT_END_NAMESPACE_SERIALPORT - QT_END_NAMESPACE diff --git a/src/serialport/qserialport_symbian_p.h b/src/serialport/qserialport_symbian_p.h index 5a0ca1a..9e26fec 100644 --- a/src/serialport/qserialport_symbian_p.h +++ b/src/serialport/qserialport_symbian_p.h @@ -48,8 +48,6 @@ QT_BEGIN_NAMESPACE -QT_BEGIN_NAMESPACE_SERIALPORT - class QSerialPortPrivate : public QSerialPortPrivateData { public: @@ -115,8 +113,6 @@ private: int msecs, bool *timedOut); }; -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 3fc5cba..b1fab1d 100644 --- a/src/serialport/qserialport_unix.cpp +++ b/src/serialport/qserialport_unix.cpp @@ -62,8 +62,6 @@ QT_BEGIN_NAMESPACE -QT_BEGIN_NAMESPACE_SERIALPORT - class ReadNotifier : public QSocketNotifier { public: @@ -1342,6 +1340,4 @@ QList QSerialPortPrivate::standardBaudRates() return ret; } -QT_END_NAMESPACE_SERIALPORT - QT_END_NAMESPACE diff --git a/src/serialport/qserialport_unix_p.h b/src/serialport/qserialport_unix_p.h index fccd2ff..79a8497 100644 --- a/src/serialport/qserialport_unix_p.h +++ b/src/serialport/qserialport_unix_p.h @@ -55,8 +55,6 @@ QT_BEGIN_NAMESPACE class QSocketNotifier; -QT_BEGIN_NAMESPACE_SERIALPORT - class QSerialPortPrivate : public QSerialPortPrivateData { public: @@ -153,8 +151,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 fad37cd..5046eea 100644 --- a/src/serialport/qserialport_win.cpp +++ b/src/serialport/qserialport_win.cpp @@ -87,8 +87,6 @@ QT_BEGIN_NAMESPACE -QT_BEGIN_NAMESPACE_SERIALPORT - #ifndef Q_OS_WINCE class AbstractOverlappedEventNotifier : public QWinEventNotifier @@ -1077,6 +1075,4 @@ QList QSerialPortPrivate::standardBaudRates() return ret; } -QT_END_NAMESPACE_SERIALPORT - QT_END_NAMESPACE diff --git a/src/serialport/qserialport_win_p.h b/src/serialport/qserialport_win_p.h index 5f4f97b..7f20a9d 100644 --- a/src/serialport/qserialport_win_p.h +++ b/src/serialport/qserialport_win_p.h @@ -57,8 +57,6 @@ class QThread; #include #endif -QT_BEGIN_NAMESPACE_SERIALPORT - #ifndef Q_OS_WINCE class AbstractOverlappedEventNotifier; #endif @@ -159,8 +157,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 1883505..2382cdd 100644 --- a/src/serialport/qserialport_wince.cpp +++ b/src/serialport/qserialport_wince.cpp @@ -50,8 +50,6 @@ QT_BEGIN_NAMESPACE -QT_BEGIN_NAMESPACE_SERIALPORT - class QSerialPortPrivate; class CommEventNotifier : public QThread @@ -503,6 +501,4 @@ 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 d62fdb1..4679319 100644 --- a/src/serialport/qserialportinfo.cpp +++ b/src/serialport/qserialportinfo.cpp @@ -47,8 +47,6 @@ QT_BEGIN_NAMESPACE -QT_BEGIN_NAMESPACE_SERIALPORT - /*! \class QSerialPortInfo @@ -241,6 +239,4 @@ QString QSerialPortInfo::productIdentifier() const Returns a list of available serial ports on the system. */ -QT_END_NAMESPACE_SERIALPORT - QT_END_NAMESPACE diff --git a/src/serialport/qserialportinfo.h b/src/serialport/qserialportinfo.h index 7ef2fcb..ab54915 100644 --- a/src/serialport/qserialportinfo.h +++ b/src/serialport/qserialportinfo.h @@ -50,8 +50,6 @@ QT_BEGIN_NAMESPACE -QT_BEGIN_NAMESPACE_SERIALPORT - class QSerialPort; class QSerialPortInfoPrivate; class QSerialPortInfoPrivateDeleter; @@ -90,8 +88,6 @@ private: inline bool QSerialPortInfo::isNull() const { return !d_ptr; } -QT_END_NAMESPACE_SERIALPORT - QT_END_NAMESPACE #endif // QSERIALPORTINFO_H diff --git a/src/serialport/qserialportinfo_mac.cpp b/src/serialport/qserialportinfo_mac.cpp index b66f84d..d9ab8d5 100644 --- a/src/serialport/qserialportinfo_mac.cpp +++ b/src/serialport/qserialportinfo_mac.cpp @@ -59,8 +59,6 @@ QT_BEGIN_NAMESPACE -QT_BEGIN_NAMESPACE_SERIALPORT - enum { MATCHING_PROPERTIES_COUNT = 6 }; QList QSerialPortInfo::availablePorts() @@ -263,6 +261,4 @@ QList QSerialPortInfo::availablePorts() return serialPortInfoList; } -QT_END_NAMESPACE_SERIALPORT - QT_END_NAMESPACE diff --git a/src/serialport/qserialportinfo_p.h b/src/serialport/qserialportinfo_p.h index 436bbd2..7c48ce5 100644 --- a/src/serialport/qserialportinfo_p.h +++ b/src/serialport/qserialportinfo_p.h @@ -50,8 +50,6 @@ QT_BEGIN_NAMESPACE -QT_BEGIN_NAMESPACE_SERIALPORT - class QSerialPortInfoPrivate { public: @@ -74,8 +72,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 88293fa..6c46c9d 100644 --- a/src/serialport/qserialportinfo_symbian.cpp +++ b/src/serialport/qserialportinfo_symbian.cpp @@ -54,8 +54,6 @@ QT_BEGIN_NAMESPACE -QT_BEGIN_NAMESPACE_SERIALPORT - // Physical device driver. #ifdef __WINS__ _LIT(KPddName, "ECDRV"); @@ -248,6 +246,4 @@ bool QSerialPortInfo::isValid() const return r == KErrNone || r == KErrLocked; } -QT_END_NAMESPACE_SERIALPORT - QT_END_NAMESPACE diff --git a/src/serialport/qserialportinfo_unix.cpp b/src/serialport/qserialportinfo_unix.cpp index 4b16144..c474e75 100644 --- a/src/serialport/qserialportinfo_unix.cpp +++ b/src/serialport/qserialportinfo_unix.cpp @@ -63,8 +63,6 @@ extern "C" QT_BEGIN_NAMESPACE -QT_BEGIN_NAMESPACE_SERIALPORT - #ifndef Q_OS_MAC #if !(defined (Q_OS_LINUX) && defined (HAVE_LIBUDEV)) @@ -255,6 +253,4 @@ bool QSerialPortInfo::isValid() const return f.exists(); } -QT_END_NAMESPACE_SERIALPORT - QT_END_NAMESPACE diff --git a/src/serialport/qserialportinfo_win.cpp b/src/serialport/qserialportinfo_win.cpp index 74cfffb..37880a7 100644 --- a/src/serialport/qserialportinfo_win.cpp +++ b/src/serialport/qserialportinfo_win.cpp @@ -55,8 +55,6 @@ QT_BEGIN_NAMESPACE -QT_BEGIN_NAMESPACE_SERIALPORT - #ifndef Q_OS_WINCE static const GUID guidsArray[] = @@ -230,6 +228,4 @@ bool QSerialPortInfo::isValid() const return true; } -QT_END_NAMESPACE_SERIALPORT - QT_END_NAMESPACE diff --git a/src/serialport/qserialportinfo_wince.cpp b/src/serialport/qserialportinfo_wince.cpp index fd5ae31..279acea 100644 --- a/src/serialport/qserialportinfo_wince.cpp +++ b/src/serialport/qserialportinfo_wince.cpp @@ -49,8 +49,6 @@ QT_BEGIN_NAMESPACE -QT_BEGIN_NAMESPACE_SERIALPORT - static QString findDescription(HKEY parentKeyHandle, const QString &subKey) { const static QString valueName(QLatin1String("FriendlyName")); @@ -133,6 +131,4 @@ QList QSerialPortInfo::availablePorts() return serialPortInfoList; } -QT_END_NAMESPACE_SERIALPORT - QT_END_NAMESPACE diff --git a/src/serialport/qttylocker_unix.cpp b/src/serialport/qttylocker_unix.cpp index 15aee0c..88545d9 100644 --- a/src/serialport/qttylocker_unix.cpp +++ b/src/serialport/qttylocker_unix.cpp @@ -60,8 +60,6 @@ QT_BEGIN_NAMESPACE -QT_BEGIN_NAMESPACE_SERIALPORT - #if !(defined (HAVE_BAUDBOY_H) || defined (HAVE_LOCKDEV_H)) static @@ -179,6 +177,4 @@ bool QTtyLocker::isLocked(const char *portName, bool *currentPid) #endif } -QT_END_NAMESPACE_SERIALPORT - QT_END_NAMESPACE diff --git a/src/serialport/qttylocker_unix_p.h b/src/serialport/qttylocker_unix_p.h index 4e3c786..4e2f55d 100644 --- a/src/serialport/qttylocker_unix_p.h +++ b/src/serialport/qttylocker_unix_p.h @@ -46,8 +46,6 @@ QT_BEGIN_NAMESPACE -QT_BEGIN_NAMESPACE_SERIALPORT - class QTtyLocker { public: @@ -56,8 +54,6 @@ public: static bool isLocked(const char *portName, bool *currentPid); }; -QT_END_NAMESPACE_SERIALPORT - QT_END_NAMESPACE #endif // TTYLOCKER_UNIX_P_H -- cgit v1.2.1