diff options
-rw-r--r-- | src/plugins/canbus/passthrucan/passthrucan.pro | 1 | ||||
-rw-r--r-- | src/plugins/canbus/peakcan/peakcan.pro | 1 | ||||
-rw-r--r-- | src/plugins/canbus/socketcan/socketcan.pro | 1 | ||||
-rw-r--r-- | src/plugins/canbus/systeccan/systeccan.pro | 1 | ||||
-rw-r--r-- | src/plugins/canbus/tinycan/tinycan.pro | 1 | ||||
-rw-r--r-- | src/plugins/canbus/vectorcan/vectorcan.pro | 1 | ||||
-rw-r--r-- | src/plugins/canbus/virtualcan/virtualcan.pro | 1 | ||||
-rw-r--r-- | src/serialbus/qmodbusdevice.cpp | 16 |
8 files changed, 11 insertions, 12 deletions
diff --git a/src/plugins/canbus/passthrucan/passthrucan.pro b/src/plugins/canbus/passthrucan/passthrucan.pro index 96ed090..cb9bdc5 100644 --- a/src/plugins/canbus/passthrucan/passthrucan.pro +++ b/src/plugins/canbus/passthrucan/passthrucan.pro @@ -16,6 +16,5 @@ HEADERS += \ DISTFILES = plugin.json PLUGIN_TYPE = canbus -PLUGIN_EXTENDS = serialbus PLUGIN_CLASS_NAME = PassThruCanBusPlugin load(qt_plugin) diff --git a/src/plugins/canbus/peakcan/peakcan.pro b/src/plugins/canbus/peakcan/peakcan.pro index 9f9a2de..d5b809c 100644 --- a/src/plugins/canbus/peakcan/peakcan.pro +++ b/src/plugins/canbus/peakcan/peakcan.pro @@ -14,6 +14,5 @@ SOURCES += \ DISTFILES = plugin.json PLUGIN_TYPE = canbus -PLUGIN_EXTENDS = serialbus PLUGIN_CLASS_NAME = PeakCanBusPlugin load(qt_plugin) diff --git a/src/plugins/canbus/socketcan/socketcan.pro b/src/plugins/canbus/socketcan/socketcan.pro index a4874b0..20a2c5d 100644 --- a/src/plugins/canbus/socketcan/socketcan.pro +++ b/src/plugins/canbus/socketcan/socketcan.pro @@ -12,6 +12,5 @@ SOURCES += \ DISTFILES = plugin.json PLUGIN_TYPE = canbus -PLUGIN_EXTENDS = serialbus PLUGIN_CLASS_NAME = SocketCanBusPlugin load(qt_plugin) diff --git a/src/plugins/canbus/systeccan/systeccan.pro b/src/plugins/canbus/systeccan/systeccan.pro index f1c2180..3520325 100644 --- a/src/plugins/canbus/systeccan/systeccan.pro +++ b/src/plugins/canbus/systeccan/systeccan.pro @@ -14,6 +14,5 @@ SOURCES += \ DISTFILES = plugin.json PLUGIN_TYPE = canbus -PLUGIN_EXTENDS = serialbus PLUGIN_CLASS_NAME = SystecCanBusPlugin load(qt_plugin) diff --git a/src/plugins/canbus/tinycan/tinycan.pro b/src/plugins/canbus/tinycan/tinycan.pro index c0aa948..c450bb9 100644 --- a/src/plugins/canbus/tinycan/tinycan.pro +++ b/src/plugins/canbus/tinycan/tinycan.pro @@ -13,6 +13,5 @@ SOURCES += main.cpp \ DISTFILES = plugin.json PLUGIN_TYPE = canbus -PLUGIN_EXTENDS = serialbus PLUGIN_CLASS_NAME = TinyCanBusPlugin load(qt_plugin) diff --git a/src/plugins/canbus/vectorcan/vectorcan.pro b/src/plugins/canbus/vectorcan/vectorcan.pro index b22492b..847f2aa 100644 --- a/src/plugins/canbus/vectorcan/vectorcan.pro +++ b/src/plugins/canbus/vectorcan/vectorcan.pro @@ -14,6 +14,5 @@ SOURCES += \ DISTFILES = plugin.json PLUGIN_TYPE = canbus -PLUGIN_EXTENDS = serialbus PLUGIN_CLASS_NAME = VectorCanBusPlugin load(qt_plugin) diff --git a/src/plugins/canbus/virtualcan/virtualcan.pro b/src/plugins/canbus/virtualcan/virtualcan.pro index 7b5504d..d719f70 100644 --- a/src/plugins/canbus/virtualcan/virtualcan.pro +++ b/src/plugins/canbus/virtualcan/virtualcan.pro @@ -12,6 +12,5 @@ SOURCES += \ DISTFILES = plugin.json PLUGIN_TYPE = canbus -PLUGIN_EXTENDS = serialbus PLUGIN_CLASS_NAME = VirtualCanBusPlugin load(qt_plugin) diff --git a/src/serialbus/qmodbusdevice.cpp b/src/serialbus/qmodbusdevice.cpp index 7ef358c..aa1bddc 100644 --- a/src/serialbus/qmodbusdevice.cpp +++ b/src/serialbus/qmodbusdevice.cpp @@ -228,10 +228,14 @@ void QModbusDevice::setConnectionParameter(int parameter, const QVariant &value) */ /*! - Connects the device to the Modbus network. Returns \c true on success; - otherwise \c false. + Connects the device to the Modbus network. Returns \c true if the connection + process was successfully initiated; otherwise \c false. Final connection + success confirmation requires the \l state() changing to \l QModbusDevice::ConnectedState. + This function calls \l open() as part of its implementation. + + \sa open() */ bool QModbusDevice::connectDevice() { @@ -333,11 +337,13 @@ QString QModbusDevice::errorString() const This function is called by connectDevice(). Subclasses must provide an implementation that returns \c true on successful Modbus connection - or \c false otherwise. + or connection initiation; otherwise returns \c false. The implementation must ensure that the instance's \l state() - is set to \l QModbusDevice::ConnectedState upon success; otherwise - \l QModbusDevice::UnconnectedState. + is set to \l QModbusDevice::ConnectingState or \l QModbusDevice::ConnectedState upon success; otherwise + \l QModbusDevice::UnconnectedState. Typically, \l QModbusDevice::ConnectingState is used + when the connection process reports back asynchronously and \l QModbusDevice::ConnectedState + in case of synchronous connect behavior. \sa connectDevice() */ |