[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [kstars] kstars/indi: Only include first substring of driver name if found when doing device name ma
From:       Jasem Mutlaq <mutlaqja () ikarustech ! com>
Date:       2013-12-31 16:53:15
Message-ID: E1Vy2Z9-0005wM-Qx () scm ! kde ! org
[Download RAW message or body]

Git commit 6996c40663e6217aaa8e244bbc11c76c34153d5c by Jasem Mutlaq.
Committed on 31/12/2013 at 16:53.
Pushed by mutlaqja into branch 'master'.

Only include first substring of driver name if found when doing device name matching

M  +4    -1    kstars/indi/clientmanager.cpp

http://commits.kde.org/kstars/6996c40663e6217aaa8e244bbc11c76c34153d5c

diff --git a/kstars/indi/clientmanager.cpp b/kstars/indi/clientmanager.cpp
index a512c4f..fb3f6bd 100644
--- a/kstars/indi/clientmanager.cpp
+++ b/kstars/indi/clientmanager.cpp
@@ -56,8 +56,11 @@ void ClientManager::newDevice(INDI::BaseDevice *dp)
 
     foreach(DriverInfo *dv, managedDrivers)
     {
+        QString dvName = dv->getName().split(" ").first();
+        if (dvName.isEmpty())
+            dvName = dv->getName();
         if (dv->getUniqueLabel() == dp->getDeviceName() ||
-                QString(dp->getDeviceName()).startsWith(dv->getName(), \
Qt::CaseInsensitive) || dv->getDriverSource() == HOST_SOURCE) +                \
QString(dp->getDeviceName()).startsWith(dvName, Qt::CaseInsensitive) || \
dv->getDriverSource() == HOST_SOURCE)  {
             dv->setUniqueLabel(dp->getDeviceName());
 


[prev in list] [next in list] [prev in thread] [next in thread]