From c792c00f072d8d9ff838393b3e5fa0b2a655e422 Mon Sep 17 00:00:00 2001 From: Dirk Hohndel Date: Wed, 20 Mar 2019 07:31:24 -0700 Subject: Core: simplify ConnectionListModel The complicated setup with the AddressRole is unnecessary. All we want to be able to do is get the index of a specific text in the list. In hindsight I am puzzled why I implemented this in such a complex fashion. Signed-off-by: Dirk Hohndel --- core/downloadfromdcthread.cpp | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'core/downloadfromdcthread.cpp') diff --git a/core/downloadfromdcthread.cpp b/core/downloadfromdcthread.cpp index 8e937346d..c5f75cba2 100644 --- a/core/downloadfromdcthread.cpp +++ b/core/downloadfromdcthread.cpp @@ -297,12 +297,8 @@ QStringList DCDeviceData::getProductListFromVendor(const QString &vendor) int DCDeviceData::getMatchingAddress(const QString &vendor, const QString &product) { - for (int i = 0; i < connectionListModel.rowCount(); i++) { - QString address = connectionListModel.address(i); - if (address.contains(product)) - return i; - } - return -1; + Q_UNUSED(vendor) + return connectionListModel.indexOf(product); } DCDeviceData *DownloadThread::data() -- cgit v1.2.3-70-g09d2