forked from qt-creator/qt-creator
S60/Trk: Make the port a property of TrkDevice.
Associate the port with the device instead of passing it to open for better handling.
This commit is contained in:
@@ -51,7 +51,6 @@ trk::BluetoothListener *S60DebuggerBluetoothStarter::createListener()
|
||||
|
||||
trk::PromptStartCommunicationResult
|
||||
S60DebuggerBluetoothStarter::startCommunication(const TrkDevicePtr &trkDevice,
|
||||
const QString &device,
|
||||
int communicationType,
|
||||
QWidget *msgBoxParent,
|
||||
QString *errorMessage)
|
||||
@@ -59,12 +58,10 @@ S60DebuggerBluetoothStarter::startCommunication(const TrkDevicePtr &trkDevice,
|
||||
// Bluetooth?
|
||||
if (communicationType == TrkOptions::BlueTooth) {
|
||||
S60DebuggerBluetoothStarter bluetoothStarter(trkDevice);
|
||||
bluetoothStarter.setDevice(device);
|
||||
return trk::promptStartBluetooth(bluetoothStarter, msgBoxParent, errorMessage);
|
||||
}
|
||||
// Serial
|
||||
BaseCommunicationStarter serialStarter(trkDevice);
|
||||
serialStarter.setDevice(device);
|
||||
return trk::promptStartSerial(serialStarter, msgBoxParent, errorMessage);
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user