From 04ed3f5685a8cae43ab96b329edc6cead45c8def Mon Sep 17 00:00:00 2001
From: Michael Zanetti <mzanetti@kde.org>
Date: Sun, 12 Oct 2014 01:01:35 +0200
Subject: [PATCH] fix merge for real

---
 libguh/devicemanager.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/libguh/devicemanager.cpp b/libguh/devicemanager.cpp
index b582d659..2060d6ac 100644
--- a/libguh/devicemanager.cpp
+++ b/libguh/devicemanager.cpp
@@ -201,8 +201,8 @@ DeviceManager::DeviceError DeviceManager::discoverDevices(const DeviceClassId &d
         return DeviceErrorPluginNotFound;
     }
     m_discoveringPlugins.append(plugin);
-    QPair<DeviceError, QString> ret = plugin->discoverDevices(deviceClassId, effectiveParams);
-    if (ret.first != DeviceErrorAsync) {
+    DeviceError ret = plugin->discoverDevices(deviceClassId, effectiveParams);
+    if (ret != DeviceErrorAsync) {
         m_discoveringPlugins.removeOne(plugin);
     }
     return ret;