Qt6 upgrades

Stellarium · Jun 8, 2022 · d87f9d2 · d87f9d2
1 parent 9d027d0
commit d87f9d2
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 3 deletions.
diff --git a/plugins/TelescopeControl/src/Lx200/TelescopeClientDirectLx200.cpp b/plugins/TelescopeControl/src/Lx200/TelescopeClientDirectLx200.cpp
@@ -77,7 +77,7 @@ TelescopeClientDirectLx200::TelescopeClientDirectLx200 (const QString &name, con
 	//end_of_timeout = -0x8000000000000000LL;
 
 	#ifdef Q_OS_WIN
-	if(serialDeviceName.rightRef(serialDeviceName.size() - 3).toInt() > 9)
+	if(serialDeviceName.right(serialDeviceName.size() - 3).toInt() > 9)
 		serialDeviceName = "\\\\.\\" + serialDeviceName;//"\\.\COMxx", not sure if it will work
 	#endif //Q_OS_WIN
 

diff --git a/plugins/TelescopeControl/src/NexStar/TelescopeClientDirectNexStar.cpp b/plugins/TelescopeControl/src/NexStar/TelescopeClientDirectNexStar.cpp
@@ -75,7 +75,7 @@ TelescopeClientDirectNexStar::TelescopeClientDirectNexStar(const QString &name,
 	//end_of_timeout = -0x8000000000000000LL;
 
 	#ifdef Q_OS_WIN
-	if(serialDeviceName.rightRef(serialDeviceName.size() - 3).toInt() > 9)
+	if(serialDeviceName.right(serialDeviceName.size() - 3).toInt() > 9)
 		serialDeviceName = "\\\\.\\" + serialDeviceName; // "\\.\COMxx", not sure if it will work
 	#endif //Q_OS_WIN
 

diff --git a/plugins/TelescopeControl/src/common/SerialPort.cpp b/plugins/TelescopeControl/src/common/SerialPort.cpp
@@ -39,7 +39,7 @@ SerialPort::SerialPort(Server &server, const char *serial_device)
 	#endif
 {
 #ifdef Q_OS_WIN
-	handle = CreateFile(serial_device, GENERIC_READ|GENERIC_WRITE, 0, Q_NULLPTR, OPEN_EXISTING, 0, Q_NULLPTR);
+	handle = CreateFile(LPCWSTR(serial_device), GENERIC_READ|GENERIC_WRITE, 0, Q_NULLPTR, OPEN_EXISTING, 0, Q_NULLPTR);
 	if (handle == INVALID_HANDLE_VALUE)
 	{
 		*log_file << Now() << "SerialPort::SerialPort(" << serial_device << "): "
@@ -70,7 +70,11 @@ SerialPort::SerialPort(Server &server, const char *serial_device)
 				DCB dcb;
 				memset(&dcb, 0, sizeof(dcb));
 				dcb.DCBlength = sizeof(dcb);
+#if (QT_VERSION>=QT_VERSION_CHECK(6,0,0))
+				if (!BuildCommDCB(LPCWSTR("9600,n,8,1"), &dcb))
+#else
 				if (!BuildCommDCB("9600,n,8,1", &dcb))
+#endif
 				{
 					*log_file << Now() << "SerialPort::SerialPort(" << serial_device << "): "
 							      "BuildCommDCB() failed: " << GetLastError() << StelUtils::getEndLineChar();

diff --git a/plugins/TelescopeControl/src/gui/TelescopeConfigurationDialog.cpp b/plugins/TelescopeControl/src/gui/TelescopeConfigurationDialog.cpp
@@ -218,7 +218,11 @@ void TelescopeConfigurationDialog::initConfigurationDialog()
 	QStringList* plist = listSerialPorts();
 	ui->comboSerialPort->clear();
 	ui->comboSerialPort->addItems(*plist);
+#if (QT_VERSION>=QT_VERSION_CHECK(6,0,0))
+	ui->comboSerialPort->textActivated(plist->value(0));
+#else
 	ui->comboSerialPort->activated(plist->value(0));
+#endif
 	ui->comboSerialPort->setEditText(plist->value(0));
 	delete (plist);
 
@@ -311,7 +315,11 @@ void TelescopeConfigurationDialog::initExistingTelescopeConfiguration(int slot)
 			ui->comboBoxDeviceModel->setCurrentIndex(index);
 
 		// Initialize the serial port value
+#if (QT_VERSION>=QT_VERSION_CHECK(6,0,0))
+		ui->comboSerialPort->textActivated(serialPortName);
+#else
 		ui->comboSerialPort->activated(serialPortName);
+#endif
 		ui->comboSerialPort->setEditText(serialPortName);
 	}
 	else if (connectionType == ConnectionRemote)
@@ -386,7 +394,11 @@ void TelescopeConfigurationDialog::toggleTypeLocal(bool isChecked)
 		// Re-initialize values that may have been changed
 		ui->comboBoxDeviceModel->setCurrentIndex(0);
 		QStringList* plist = listSerialPorts();
+#if (QT_VERSION>=QT_VERSION_CHECK(6,0,0))
+		ui->comboSerialPort->textActivated(plist->value(0));
+#else
 		ui->comboSerialPort->activated(plist->value(0));
+#endif
 		ui->comboSerialPort->setEditText(plist->value(0));
 		delete (plist);
 		ui->lineEditHostName->setText("localhost");