feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

remotelinux: fix index computation in the presence of hidden devices

Browse Source 
Change-Id: I65bb3854003783ad36dfad76c35535c83ab6d427
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
This commit is contained in:
hjk
2012-05-04 18:32:12 +02:00
committed by Christian Kandeler
parent 740a6c7dad
commit 8c2972be05
3 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/projectexplorer/devicesupport/devicemanagermodel.h
View File

@@ -56,6 +56,7 @@ public:
IDevice::ConstPtr device(int pos) const;
Core::Id deviceId(int pos) const;
int indexOf(IDevice::ConstPtr dev) const;
int rowCount(const QModelIndex &parent = QModelIndex()) const;
private slots:
void handleDeviceAdded(Core::Id id);
@@ -64,7 +65,6 @@ private slots:
void handleDeviceListChanged();
private:
int rowCount(const QModelIndex &parent = QModelIndex()) const;
QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const;
int indexForId(Core::Id id) const;

18
src/plugins/remotelinux/startgdbserverdialog.cpp
View File

@@ -87,8 +87,7 @@ public:
LinuxDeviceConfiguration::ConstPtr currentDevice() const
{
DeviceManager *devices = DeviceManager::instance();
return devices->deviceAt(deviceComboBox->currentIndex())
return deviceManagerModel->device(deviceComboBox->currentIndex())
.dynamicCast<const LinuxDeviceConfiguration>();
}
@@ -96,6 +95,7 @@ public:
bool startServerOnly;
AbstractRemoteLinuxProcessList *processList;
QSortFilterProxyModel proxyModel;
DeviceManagerModel *deviceManagerModel;
QComboBox *deviceComboBox;
QLineEdit *processFilterLineEdit;
@@ -175,16 +175,15 @@ StartGdbServerDialog::StartGdbServerDialog(QWidget *parent) :
{
setWindowTitle(tr("List of Remote Processes"));
DeviceManager *devices = DeviceManager::instance();
DeviceManagerModel * const model = new DeviceManagerModel(devices, this);
d->deviceManagerModel = new DeviceManagerModel(DeviceManager::instance(), this);
QObject::connect(d->closeButton, SIGNAL(clicked()), this, SLOT(reject()));
d->deviceComboBox->setModel(model);
d->deviceComboBox->setModel(d->deviceManagerModel);
d->deviceComboBox->setCurrentIndex(d->settings->value(LastDevice).toInt());
connect(&d->gatherer, SIGNAL(error(QString)), SLOT(portGathererError(QString)));
connect(&d->gatherer, SIGNAL(portListReady()), SLOT(portListReady()));
if (devices->deviceCount() == 0) {
if (d->deviceManagerModel->rowCount() == 0) {
d->tableView->setEnabled(false);
} else {
d->tableView->setSelectionBehavior(QAbstractItemView::SelectRows);
@@ -217,11 +216,12 @@ StartGdbServerDialog::~StartGdbServerDialog()
delete d;
}
void StartGdbServerDialog::attachToDevice(int index)
void StartGdbServerDialog::attachToDevice(int modelIndex)
{
DeviceManager *devices = DeviceManager::instance();
LinuxDeviceConfiguration::ConstPtr device
= devices->deviceAt(index).dynamicCast<const LinuxDeviceConfiguration>();
= d->deviceManagerModel->device(modelIndex)
.dynamicCast<const LinuxDeviceConfiguration>();
// TODO: display error on non-matching device.
if (!device)
return;
delete d->processList;

2
src/plugins/remotelinux/startgdbserverdialog.h
View File

@@ -56,7 +56,7 @@ signals:
void processAborted();
private slots:
void attachToDevice(int index);
void attachToDevice(int modelIndex);
void handleRemoteError(const QString &errorMessage);
void handleProcessListUpdated();
void updateProcessList();