# HG changeset patch # User Hasan Yavuz Ă–ZDERYA # Date 2015-09-05 03:41:17 # Node ID 1d9b6c31956c909ee078402e1710ea1cd8ba49cf # Parent cf2136c2b50122827de9ddac52192d2836e47f8c removed keepPortName, its functionality is now provided by PortList diff --git a/portcontrol.cpp b/portcontrol.cpp --- a/portcontrol.cpp +++ b/portcontrol.cpp @@ -66,10 +66,6 @@ PortControl::PortControl(QSerialPort* po SELECT::OVERLOAD_OF(&QComboBox::activated), this, &PortControl::selectPort); - QObject::connect(ui->cbPortList, - SELECT::OVERLOAD_OF(&QComboBox::activated), - this, &PortControl::onPortNameChanged); - QObject::connect(ui->cbBaudRate, SELECT::OVERLOAD_OF(&QComboBox::activated), this, &PortControl::selectBaudRate); @@ -279,24 +275,6 @@ void PortControl::enableSkipByte(bool en ui->pbSkipByte->setDisabled(enabled); } -void PortControl::keepPortName(QString portName) -{ - if(!discoveredPorts.contains(portName) && - !userEnteredPorts.contains(portName)) - { - userEnteredPorts << portName; - } - if(ui->cbPortList->findText(portName) < 0) - { - ui->cbPortList->addItem(portName); - } -} - -void PortControl::onPortNameChanged(QString portName) -{ - keepPortName(portName); -} - QToolBar* PortControl::toolBar() { return &portToolBar; diff --git a/portcontrol.h b/portcontrol.h --- a/portcontrol.h +++ b/portcontrol.h @@ -59,10 +59,6 @@ private: QComboBox tbPortList; PortList portList; - QStringList discoveredPorts; // list of port names returned by availablePorts - QStringList userEnteredPorts; // list of port names entered by user - void keepPortName(QString portName); // if it's not already in userEn. or discv. list - public slots: void loadPortList(); void loadBaudRateList(); @@ -77,7 +73,6 @@ public slots: void selectFlowControl(int flowControl); // flowControl must be one of QSerialPort::FlowControl private slots: - void onPortNameChanged(QString portName); void openActionTriggered(bool checked); void onCbPortListActivated(int index);