Add setSocketState.

instead of capturing connected and disconnected signals we can use stateChanged signal and simplify a bit.

src/core/positioning/egenioussreceiver.cpp

@@ -9,37 +9,57 @@ EgenioussReceiver::EgenioussReceiver( QObject *parent )
 {
  connect( mTcpSocket, &QTcpSocket::readyRead, this, &EgenioussReceiver::onReadyRead );
  connect( mTcpSocket, &QTcpSocket::errorOccurred, this, &EgenioussReceiver::handleError );
- connect( mTcpSocket, &QTcpSocket::connected, this, &EgenioussReceiver::connected );
- connect( mTcpSocket, &QTcpSocket::disconnected, this, &EgenioussReceiver::disconnected );
+ connect( mTcpSocket, &QTcpSocket::stateChanged, this, &EgenioussReceiver::setSocketState );
  setValid( true );
 }
 
-void EgenioussReceiver::handleConnectDevice()
+EgenioussReceiver::~EgenioussReceiver()
 {
- mTcpSocket->connectToHost( mAddress, mPort, QTcpSocket::ReadWrite );
+ disconnect( mTcpSocket, &QTcpSocket::stateChanged, this, &EgenioussReceiver::setSocketState );
 }
 
-void EgenioussReceiver::connected()
+void EgenioussReceiver::handleConnectDevice()
 {
- mSocketState = QAbstractSocket::ConnectedState;
- mSocketStateString = tr( "Successfully connected" );
- emit socketStateChanged( mSocketState );
- setValid( true );
+ mTcpSocket->connectToHost( mAddress, mPort, QTcpSocket::ReadWrite );
 }
 
 void EgenioussReceiver::handleDisconnectDevice()
 {
  mTcpSocket->disconnectFromHost();
 }
 
-void EgenioussReceiver::disconnected()
+void EgenioussReceiver::setSocketState( const QAbstractSocket::SocketState socketState )
 {
- if ( mTcpSocket->state() == QAbstractSocket::ConnectedState )
+ if ( mSocketState == socketState )
  {
- mSocketState = QAbstractSocket::UnconnectedState;
- mSocketStateString = tr( "Disconnected" );
- emit socketStateChanged( mSocketState );
+ return;
  }
+
+ switch ( socketState )
+ {
+ case QAbstractSocket::ConnectingState:
+ case QAbstractSocket::HostLookupState:
+ {
+ mSocketStateString = tr( "Connecting…" );
+ break;
+ }
+ case QAbstractSocket::ConnectedState:
+ case QAbstractSocket::BoundState:
+ {
+ mSocketStateString = tr( "Successfully connected" );
+ break;
+ }
+ case QAbstractSocket::UnconnectedState:
+ mSocketStateString = tr( "Disconnected" );
+ default:
+ {
+ mSocketStateString = tr( "Socket state %1" ).arg( static_cast<int>( socketState ) );
+ }
+ }
+
+ mSocketState = socketState;
+ emit socketStateChanged( mSocketState );
+ emit socketStateStringChanged( mSocketStateString );
 }
 
 QList<QPair<QString, QVariant>> EgenioussReceiver::details()

src/core/positioning/egenioussreceiver.h

@@ -12,10 +12,12 @@ class EgenioussReceiver : public AbstractGnssReceiver
 
  public:
  explicit EgenioussReceiver( QObject *parent = nullptr );
+ ~EgenioussReceiver();
 
  private:
  void handleConnectDevice() override;
  void handleDisconnectDevice() override;
+ void setSocketState( const QAbstractSocket::SocketState socketState );
  QList<QPair<QString, QVariant>> details() override;
 
  private slots:
@@ -24,8 +26,6 @@ class EgenioussReceiver : public AbstractGnssReceiver
 
  private:
  void processReceivedData();
- void connected();
- void disconnected();
 
  private:
  QTcpSocket *mTcpSocket = nullptr;

src/qml/PositioningDeviceSettings.qml

@@ -49,8 +49,10 @@ Popup {
  });
  } else {
  positioningDeviceTypeModel.remove(0, 1);
- positioningDeviceModel.removeDevice("Egeniouss");
- positioningDeviceComboBox.currentIndex = 0;
+ if (positioningDeviceModel.findIndexFromDeviceId("egeniouss:") !== -1) {
+ positioningDeviceModel.removeDevice("Egeniouss");
+ positioningDeviceComboBox.currentIndex = 0;
+ }
  }
  positioningDeviceType.model = positioningDeviceTypeModel;
  }