Purge QextSerialPort, move to QSerialPort

iakov · iakov · commit 2a9d2344fe26 · 2025-02-01T16:16:00.000+03:00
diff --git a/.gitmodules b/.gitmodules
@@ -30,6 +30,3 @@
 [submodule "trik-checkapp"]
 	path = thirdparty/checkapp/checkapp
 	url = https://github.com/trikset/trik-checkapp
-[submodule "plugins/robots/thirdparty/qextserialport/qextserialport"]
-	path = plugins/robots/thirdparty/qextserialport/qextserialport
-	url = https://github.com/qextserialport/qextserialport
diff --git a/plugins/robots/common/ev3Kit/ev3Kit.pri b/plugins/robots/common/ev3Kit/ev3Kit.pri
@@ -12,18 +12,18 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-QT += widgets
+QT += widgets serialport
 
 links(qrkernel qrutils qrtext qrgui-preferences-dialog qrgui-tool-plugin-interface \
-		robots-utils robots-kit-base robots-2d-model qextserialport \
+		robots-utils robots-kit-base robots-2d-model \
 		)
 
 includes(plugins/robots/common/ev3Kit \
 		plugins/robots/common/kitBase \
 		plugins/robots/common/twoDModel \
 		plugins/robots/utils \
 		qrtext \
-                plugins/robots/thirdparty/hidapi/hidapi \
+		plugins/robots/thirdparty/hidapi/hidapi \
 )
 
 
diff --git a/plugins/robots/common/ev3Kit/include/ev3Kit/communication/bluetoothRobotCommunicationThread.h b/plugins/robots/common/ev3Kit/include/ev3Kit/communication/bluetoothRobotCommunicationThread.h
@@ -16,7 +16,8 @@
 
 #include "ev3RobotCommunicationThread.h"
 
-class QextSerialPort;
+#include <QtSerialPort/QSerialPort>
+
 class QTimer;
 
 namespace ev3 {
@@ -49,7 +50,7 @@ private slots:
 
 	QByteArray receive(int size) const override;
 
-	QextSerialPort *mPort;
+	QScopedPointer<QSerialPort> mPort;
 
 	/// Timer that sends messages to robot to check that connection is still alive
 	QTimer *mKeepAliveTimer;
diff --git a/plugins/robots/common/ev3Kit/src/communication/bluetoothRobotCommunicationThread.cpp b/plugins/robots/common/ev3Kit/src/communication/bluetoothRobotCommunicationThread.cpp
@@ -20,7 +20,6 @@
 #include <QtCore/QFileInfo>
 
 #include <qrkernel/settingsManager.h>
-#include <plugins/robots/thirdparty/qextserialport/qextserialport/src/qextserialport.h>
 
 #include "ev3Kit/communication/commandConstants.h"
 #include "ev3Kit/communication/ev3DirectCommand.h"
@@ -68,13 +67,14 @@ bool BluetoothRobotCommunicationThread::connect()
 	}
 
 	const QString portName = qReal::SettingsManager::value("Ev3BluetoothPortName").toString();
-	mPort = new QextSerialPort(portName, QextSerialPort::Polling, this);
-	mPort->setBaudRate(BAUD9600);
-	mPort->setFlowControl(FLOW_OFF);
-	mPort->setParity(PAR_NONE);
-	mPort->setDataBits(DATA_8);
-	mPort->setStopBits(STOP_2);
-	mPort->setTimeout(3000);
+	mPort.reset(new QSerialPort(portName));
+	mPort->setBaudRate(QSerialPort::BaudRate::Baud9600);
+	mPort->setFlowControl(QSerialPort::FlowControl::NoFlowControl);
+	mPort->setParity(QSerialPort::Parity::NoParity);
+	mPort->setDataBits(QSerialPort::DataBits::Data8);
+	mPort->setStopBits(QSerialPort::StopBits::TwoStop);
+	// ??? mPort->setTimeout(3000);
+
 
 	mPort->open(QIODevice::ReadWrite | QIODevice::Unbuffered);
 
@@ -99,8 +99,7 @@ void BluetoothRobotCommunicationThread::reconnect()
 
 void BluetoothRobotCommunicationThread::disconnect()
 {
-	delete mPort;
-	mPort = nullptr;
+	mPort.reset();
 	emit disconnected();
 }
 
diff --git a/plugins/robots/common/nxtKit/include/nxtKit/communication/bluetoothRobotCommunicationThread.h b/plugins/robots/common/nxtKit/include/nxtKit/communication/bluetoothRobotCommunicationThread.h
@@ -16,7 +16,9 @@
 
 #include <utils/robotCommunication/robotCommunicationThreadInterface.h>
 
-class QextSerialPort;
+#include <QtSerialPort/QSerialPort>
+#include <QtCore/QScopedPointer>
+
 class QTimer;
 
 namespace nxt {
@@ -47,7 +49,7 @@ private slots:
 	bool send(const QByteArray &buffer) const;
 	QByteArray receive(int size) const;
 
-	QextSerialPort *mPort;
+	QScopedPointer<QSerialPort> mPort;
 
 	/// Timer that sends messages to robot to check that connection is still alive
 	QTimer *mKeepAliveTimer;
diff --git a/plugins/robots/common/nxtKit/nxtKit.pri b/plugins/robots/common/nxtKit/nxtKit.pri
@@ -22,7 +22,7 @@ includes(plugins/robots/common/nxtKit \
 )
 
 links(qrkernel qrutils qrtext qrgui-preferences-dialog qrgui-tool-plugin-interface \
-                robots-utils robots-kit-base qextserialport )
+		robots-utils robots-kit-base)
 
 PKGCONFIG *= libusb-1.0
 CONFIG += link_pkgconfig
diff --git a/plugins/robots/common/nxtKit/src/communication/bluetoothRobotCommunicationThread.cpp b/plugins/robots/common/nxtKit/src/communication/bluetoothRobotCommunicationThread.cpp
@@ -21,7 +21,6 @@
 #include <ctime>
 
 #include <qrkernel/settingsManager.h>
-#include <plugins/robots/thirdparty/qextserialport/qextserialport/src/qextserialport.h>
 
 #include "nxtKit/communication/nxtCommandConstants.h"
 
@@ -71,13 +70,13 @@ bool BluetoothRobotCommunicationThread::connect()
 	}
 
 	const QString portName = qReal::SettingsManager::value("NxtBluetoothPortName").toString();
-	mPort = new QextSerialPort(portName, QextSerialPort::Polling);
-	mPort->setBaudRate(BAUD9600);
-	mPort->setFlowControl(FLOW_OFF);
-	mPort->setParity(PAR_NONE);
-	mPort->setDataBits(DATA_8);
-	mPort->setStopBits(STOP_2);
-	mPort->setTimeout(3000);
+	mPort.reset(new QSerialPort(portName));
+	mPort->setBaudRate(QSerialPort::BaudRate::Baud9600);
+	mPort->setFlowControl(QSerialPort::FlowControl::NoFlowControl);
+	mPort->setParity(QSerialPort::Parity::NoParity);
+	mPort->setDataBits(QSerialPort::DataBits::Data8);
+	mPort->setStopBits(QSerialPort::StopBits::TwoStop);
+	// ??? mPort->setTimeout(3000);
 
 	mPort->open(QIODevice::ReadWrite | QIODevice::Unbuffered);
 
@@ -104,8 +103,7 @@ void BluetoothRobotCommunicationThread::reconnect()
 
 void BluetoothRobotCommunicationThread::disconnect()
 {
-	delete mPort;
-	mPort = nullptr;
+	mPort.reset();
 	emit disconnected();
 }
 
diff --git a/plugins/robots/interpreters/ev3KitInterpreter/src/ev3KitInterpreter.pri b/plugins/robots/interpreters/ev3KitInterpreter/src/ev3KitInterpreter.pri
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-QT += widgets
+QT += widgets serialport
 
 includes(plugins/robots/common/kitBase \
 		plugins/robots/common/twoDModel \
@@ -23,7 +23,7 @@ includes(plugins/robots/common/kitBase \
 )
 
 links(qrkernel qrutils qrtext qrgui-preferences-dialog qrgui-tool-plugin-interface \
-                robots-utils robots-kit-base robots-ev3-kit robots-2d-model qextserialport)
+		robots-utils robots-kit-base robots-ev3-kit robots-2d-model)
 
 win32: QMAKE_CXXFLAGS += -Wno-error=pedantic
 
diff --git a/plugins/robots/interpreters/nxtKitInterpreter/src/nxtKitInterpreter.pri b/plugins/robots/interpreters/nxtKitInterpreter/src/nxtKitInterpreter.pri
@@ -15,7 +15,7 @@
 QT += widgets
 
 links(qrkernel qrutils qrtext qrgui-preferences-dialog qrgui-tool-plugin-interface \
-                robots-utils robots-kit-base robots-2d-model robots-nxt-kit qextserialport )
+		robots-utils robots-kit-base robots-2d-model robots-nxt-kit )
 
 includes(plugins/robots/common/kitBase \
 		plugins/robots/common/twoDModel \
diff --git a/plugins/robots/thirdparty/qextserialport/.gitignore b/plugins/robots/thirdparty/qextserialport/.gitignore
diff --git a/plugins/robots/thirdparty/qextserialport/qextserialport b/plugins/robots/thirdparty/qextserialport/qextserialport
diff --git a/plugins/robots/thirdparty/qextserialport/qextserialport.pro b/plugins/robots/thirdparty/qextserialport/qextserialport.pro
diff --git a/plugins/robots/thirdparty/thirdparty.pro b/plugins/robots/thirdparty/thirdparty.pro
@@ -15,7 +15,6 @@
 TEMPLATE = subdirs
 
 SUBDIRS += \
-	qextserialport \
 	libusb-1.0 \
 	trikRuntime \
 	Box2D \
diff --git a/plugins/robots/utils/src/robotCommunication/robotCommunicator.cpp b/plugins/robots/utils/src/robotCommunication/robotCommunicator.cpp
@@ -17,9 +17,6 @@
 
 #include "utils/robotCommunication/robotCommunicator.h"
 
-#include <plugins/robots/thirdparty/qextserialport/qextserialport/src/qextserialenumerator.h>
-#include <plugins/robots/thirdparty/qextserialport/qextserialport/src/qextserialport.h>
-
 using namespace utils::robotCommunication;
 
 RobotCommunicator::RobotCommunicator(QObject *parent)
diff --git a/plugins/robots/utils/src/widgets/comPortPicker.cpp b/plugins/robots/utils/src/widgets/comPortPicker.cpp
@@ -16,7 +16,8 @@
 
 #include <qrkernel/settingsManager.h>
 #include <qrkernel/settingsListener.h>
-#include <plugins/robots/thirdparty/qextserialport/qextserialport/src/qextserialenumerator.h>
+
+#include <QtSerialPort/QSerialPortInfo>
 
 using namespace qReal::ui;
 
@@ -33,15 +34,14 @@ ComPortPicker::ComPortPicker(const QString &key, QObject *parent)
 
 void ComPortPicker::populate(QComboBox &box, const QString &settingsKey)
 {
-	const QList<QextPortInfo> ports = QextSerialEnumerator::getPorts();
 	const QString defaultPortName = SettingsManager::value(settingsKey).toString();
 	box.clear();
 
-	for (const QextPortInfo &info : ports) {
-		const QRegExp portNameRegexp("COM\\d+", Qt::CaseInsensitive);
-		if (portNameRegexp.indexIn(info.portName) != -1) {
-			const QString portName = portNameRegexp.cap();
-			box.addItem(portName);
+	for (auto &&info : QSerialPortInfo::availablePorts()) {
+		const static QRegularExpression portNameRegexp("COM\\d+", QRegularExpression::CaseInsensitiveOption);
+		auto m = portNameRegexp.match(info.portName());
+		if (m.hasMatch()) {
+			box.addItem(m.captured());
 		}
 	}
 
diff --git a/plugins/robots/utils/utils.pri b/plugins/robots/utils/utils.pri
@@ -12,9 +12,9 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-QT += widgets network
+QT += widgets network serialport
 
-links(qrkernel qrutils qextserialport qrtext)
+links(qrkernel qrutils qrtext)
 includes(qrtext)
 
 DEFINES += ROBOTS_UTILS_LIBRARY

Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ includes(plugins/robots/common/nxtKit \`
`22`	`22`	`)`
`23`	`23`
`24`	`24`	`links(qrkernel qrutils qrtext qrgui-preferences-dialog qrgui-tool-plugin-interface \`
`25`		`- robots-utils robots-kit-base qextserialport )`
	`25`	`+ robots-utils robots-kit-base)`
`26`	`26`
`27`	`27`	`PKGCONFIG *= libusb-1.0`
`28`	`28`	`CONFIG += link_pkgconfig`