diff options
| -rw-r--r-- | src/serialport/qserialport.h | 6 | ||||
| -rw-r--r-- | src/serialport/qserialport_wince.cpp | 2 | ||||
| -rw-r--r-- | src/serialport/qserialportglobal.h | 4 |
3 files changed, 8 insertions, 4 deletions
diff --git a/src/serialport/qserialport.h b/src/serialport/qserialport.h index ee88c25..ae5eaf3 100644 --- a/src/serialport/qserialport.h +++ b/src/serialport/qserialport.h @@ -187,9 +187,9 @@ public: NotOpenError }; - explicit QSerialPort(QObject *parent = 0); - explicit QSerialPort(const QString &name, QObject *parent = 0); - explicit QSerialPort(const QSerialPortInfo &info, QObject *parent = 0); + explicit QSerialPort(QObject *parent = Q_NULLPTR); + explicit QSerialPort(const QString &name, QObject *parent = Q_NULLPTR); + explicit QSerialPort(const QSerialPortInfo &info, QObject *parent = Q_NULLPTR); virtual ~QSerialPort(); void setPortName(const QString &name); diff --git a/src/serialport/qserialport_wince.cpp b/src/serialport/qserialport_wince.cpp index f5b17a2..9ccc361 100644 --- a/src/serialport/qserialport_wince.cpp +++ b/src/serialport/qserialport_wince.cpp @@ -115,7 +115,7 @@ class WaitCommEventBreaker : public QThread { Q_OBJECT public: - WaitCommEventBreaker(HANDLE handle, int timeout, QObject *parent = 0) + WaitCommEventBreaker(HANDLE handle, int timeout, QObject *parent = Q_NULLPTR) : QThread(parent), handle(handle), timeout(timeout), worked(false) { start(); } diff --git a/src/serialport/qserialportglobal.h b/src/serialport/qserialportglobal.h index d17ce6b..50f53e9 100644 --- a/src/serialport/qserialportglobal.h +++ b/src/serialport/qserialportglobal.h @@ -71,6 +71,10 @@ QT_BEGIN_NAMESPACE #define QStringLiteral(str) QString::fromUtf8(str) #endif +#ifndef Q_NULLPTR +#define Q_NULLPTR NULL +#endif + QT_END_NAMESPACE #endif // QSERIALPORTGLOBAL_H |