From 79d2fca37545777e8bb17aebf6251df17247f3fe Mon Sep 17 00:00:00 2001
From: Christian Kandeler <christian.kandeler@nokia.com>
Date: Fri, 2 Mar 2012 19:37:29 +0100
Subject: [PATCH] RemoteLinux: Fix bugs introduced by recent refactorings.
Change-Id: I89eeb0bbd4bdc319e21d077d95eb50f31aa23ecd
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
---
src/plugins/remotelinux/devicemanagermodel.cpp | 1 +
src/plugins/remotelinux/linuxdeviceconfigurations.cpp | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/plugins/remotelinux/devicemanagermodel.cpp b/src/plugins/remotelinux/devicemanagermodel.cpp
index 3bfb8f61cf2..0d447c120b9 100644
--- a/src/plugins/remotelinux/devicemanagermodel.cpp
+++ b/src/plugins/remotelinux/devicemanagermodel.cpp
@@ -56,6 +56,7 @@ DeviceManagerModel::DeviceManagerModel(const LinuxDeviceConfigurations *deviceMa
SLOT(handleDeviceAdded(QSharedPointer<const LinuxDeviceConfiguration>)));
connect(deviceManager, SIGNAL(deviceRemoved(int)), SLOT(handleDeviceRemoved(int)));
connect(deviceManager, SIGNAL(displayNameChanged(int)), SLOT(handleDataChanged(int)));
+ connect(deviceManager, SIGNAL(defaultStatusChanged(int)), SLOT(handleDataChanged(int)));
connect(deviceManager, SIGNAL(deviceListChanged()), SLOT(handleDeviceListChanged()));
}
diff --git a/src/plugins/remotelinux/linuxdeviceconfigurations.cpp b/src/plugins/remotelinux/linuxdeviceconfigurations.cpp
index 1112bb6e0b0..ad4541ceb73 100644
--- a/src/plugins/remotelinux/linuxdeviceconfigurations.cpp
+++ b/src/plugins/remotelinux/linuxdeviceconfigurations.cpp
@@ -362,7 +362,7 @@ LinuxDeviceConfiguration::Id LinuxDeviceConfigurations::unusedId() const
{
typedef LinuxDeviceConfiguration::Id IdType;
for (IdType id = 0; id <= std::numeric_limits<IdType>::max(); ++id) {
- if (!find(id))
+ if (id != LinuxDeviceConfiguration::InvalidId && !find(id))
return id;
}
QTC_CHECK(false);
--
GitLab