rbutil: Fix various warnings.

Replace use of deprecated APIs with their replacements, and fix some
other minor warnings.

Change-Id: I3f63e0bd91b96ce86ce39c087fe0040fc226d16d

1 files changed, 2 insertions, 2 deletions

diff --git a/rbutil/rbutilqt/configure.cpp b/rbutil/rbutilqt/configure.cpp
index cc8b0ff976..ab0281774d 100644
--- a/rbutil/rbutilqt/configure.cpp
+++ b/rbutil/rbutilqt/configure.cpp
@@ -350,12 +350,12 @@ void Config::setDevices()
     else
         platformList = SystemInfo::platforms(SystemInfo::PlatformAll);
 
-    QMap <QString, QString> manuf;
+    QMultiMap <QString, QString> manuf;
     for(int it = 0; it < platformList.size(); it++)
     {
         QString curbrand = SystemInfo::platformValue(platformList.at(it),
                     SystemInfo::CurBrand).toString();
-        manuf.insertMulti(curbrand, platformList.at(it));
+        manuf.insert(curbrand, platformList.at(it));
     }
 
     // set up devices table