[Development] Qt 5.3 header diff: QtSerialPort

[Thiago Macieira]

http://macieira.org/~thiago/qt-5.3/QtSerialPort.diff

diff --git a/src/serialport/qserialport.h b/src/serialport/qserialport.h
index 6e16463..6ca5af4 100644
--- a/src/serialport/qserialport.h
+++ b/src/serialport/qserialport.h
@@ -64,11 +64,11 @@ class Q_SERIALPORT_EXPORT QSerialPort : public QIODevice
     Q_PROPERTY(FlowControl flowControl READ flowControl WRITE setFlowControl NOTIFY flowControlChanged)
 #if QT_DEPRECATED_SINCE(5, 2)
     Q_PROPERTY(DataErrorPolicy dataErrorPolicy READ dataErrorPolicy WRITE setDataErrorPolicy NOTIFY dataErrorPolicyChanged)
+    Q_PROPERTY(bool settingsRestoredOnClose READ settingsRestoredOnClose WRITE setSettingsRestoredOnClose NOTIFY settingsRestoredOnCloseChanged)
 #endif
     Q_PROPERTY(bool dataTerminalReady READ isDataTerminalReady WRITE setDataTerminalReady NOTIFY dataTerminalReadyChanged)
     Q_PROPERTY(bool requestToSend READ isRequestToSend WRITE setRequestToSend NOTIFY requestToSendChanged)
     Q_PROPERTY(SerialPortError error READ error RESET clearError NOTIFY error)
-    Q_PROPERTY(bool settingsRestoredOnClose READ settingsRestoredOnClose WRITE setSettingsRestoredOnClose NOTIFY settingsRestoredOnCloseChanged)
 
     Q_ENUMS(BaudRate DataBits Parity StopBits FlowControl DataErrorPolicy SerialPortError)
     Q_FLAGS(Directions PinoutSignals)
@@ -131,16 +131,6 @@ public:
         UnknownFlowControl = -1
     };
 
-#if QT_DEPRECATED_SINCE(5, 2)
-#if defined _MSC_VER
-#pragma deprecated(UnknownBaud)
-#pragma deprecated(UnknownDataBits)
-#pragma deprecated(UnknownParity)
-#pragma deprecated(UnknownStopBits)
-#pragma deprecated(UnknownFlowControl)
-#endif
-#endif
-
     enum PinoutSignal {
         NoSignal = 0x00,
         TransmittedDataSignal = 0x01,
@@ -157,6 +147,18 @@ public:
     Q_DECLARE_FLAGS(PinoutSignals, PinoutSignal)
 
 #if QT_DEPRECATED_SINCE(5, 2)
+#if defined _MSC_VER
+#pragma deprecated(UnknownBaud)
+#pragma deprecated(UnknownDataBits)
+#pragma deprecated(UnknownParity)
+#pragma deprecated(UnknownStopBits)
+#pragma deprecated(UnknownFlowControl)
+#pragma deprecated(TransmittedDataSignal)
+#pragma deprecated(ReceivedDataSignal)
+#endif
+#endif
+
+#if QT_DEPRECATED_SINCE(5, 2)
     enum DataErrorPolicy {
         SkipPolicy,
         PassZeroPolicy,
@@ -196,9 +198,6 @@ public:
     bool open(OpenMode mode) Q_DECL_OVERRIDE;
     void close() Q_DECL_OVERRIDE;
 
-    void setSettingsRestoredOnClose(bool restore);
-    bool settingsRestoredOnClose() const;
-
     bool setBaudRate(qint32 baudRate, Directions directions = AllDirections);
     qint32 baudRate(Directions directions = AllDirections) const;
 
@@ -211,7 +210,7 @@ public:
     bool setStopBits(StopBits stopBits);
     StopBits stopBits() const;
 
-    bool setFlowControl(FlowControl flow);
+    bool setFlowControl(FlowControl flowControl);
     FlowControl flowControl() const;
 
     bool setDataTerminalReady(bool set);
@@ -229,6 +228,8 @@ public:
 #if QT_DEPRECATED_SINCE(5, 2)
     QT_DEPRECATED bool setDataErrorPolicy(DataErrorPolicy policy = IgnorePolicy);
     QT_DEPRECATED DataErrorPolicy dataErrorPolicy() const;
+    void setSettingsRestoredOnClose(bool restore);
+    bool settingsRestoredOnClose() const;
 #endif
 
     SerialPortError error() const;
@@ -256,7 +257,7 @@ Q_SIGNALS:
     void dataBitsChanged(QSerialPort::DataBits dataBits);
     void parityChanged(QSerialPort::Parity parity);
     void stopBitsChanged(QSerialPort::StopBits stopBits);
-    void flowControlChanged(QSerialPort::FlowControl flow);
+    void flowControlChanged(QSerialPort::FlowControl flowControl);
     void dataErrorPolicyChanged(QSerialPort::DataErrorPolicy policy);
     void dataTerminalReadyChanged(bool set);
     void requestToSendChanged(bool set);
@@ -274,6 +275,12 @@ private:
     QSerialPortPrivate * const d_ptr;
 
     Q_DISABLE_COPY(QSerialPort)
+
+#if defined (Q_OS_WIN32) || defined(Q_OS_WIN64)
+    Q_PRIVATE_SLOT(d_func(), void _q_completeAsyncCommunication())
+    Q_PRIVATE_SLOT(d_func(), void _q_completeAsyncRead())
+    Q_PRIVATE_SLOT(d_func(), void _q_completeAsyncWrite())
+#endif
 };
 
 Q_DECLARE_OPERATORS_FOR_FLAGS(QSerialPort::Directions)
diff --git a/src/serialport/qserialportinfo.h b/src/serialport/qserialportinfo.h
index f76b77e..7635caa 100644
--- a/src/serialport/qserialportinfo.h
+++ b/src/serialport/qserialportinfo.h
@@ -71,6 +71,7 @@ public:
     QString systemLocation() const;
     QString description() const;
     QString manufacturer() const;
+    QString serialNumber() const;
 
     quint16 vendorIdentifier() const;
     quint16 productIdentifier() const;
@@ -88,6 +89,9 @@ public:
     static QList<QSerialPortInfo> availablePorts();
 
 private:
+    friend QList<QSerialPortInfo> availablePortsByUdev();
+    friend QList<QSerialPortInfo> availablePortsBySysfs();
+    friend QList<QSerialPortInfo> availablePortsByFiltersOfDevices();
     QScopedPointer<QSerialPortInfoPrivate, QSerialPortInfoPrivateDeleter> d_ptr;
 };
 

_______________________________________________
Development mailing list
Development@qt-project.org
http://lists.qt-project.org/mailman/listinfo/development