This should really fix the osx build. Give up on QVector for now.

MythTV · Apr 15, 2012 · 04e0d94 · 04e0d94
1 parent 2d6fb9a
commit 04e0d94
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/mythtv/libs/libmythtv/tvremoteutil.cpp b/mythtv/libs/libmythtv/tvremoteutil.cpp
@@ -163,15 +163,17 @@ vector<uint> RemoteRequestFreeRecorderList(const vector<uint> &excluded_cardids)
 
     return list;
 #endif
-    QVector<uint> result;
+    vector<uint> result;
     vector<uint> cards = CardUtil::GetCardList();
     for (uint i = 0; i < cards.size(); i++)
     {
         vector<InputInfo> inputs =
             RemoteRequestFreeInputList(cards[i], excluded_cardids);
         for (uint j = 0; j < inputs.size(); j++)
         {
-            if (!result.contains(inputs[j].cardid))
+            if (find(result.begin(),
+                     result.end(),
+                     inputs[j].cardid) == result.end())
                 result.push_back(inputs[j].cardid);
         }
     }
@@ -180,7 +182,7 @@ vector<uint> RemoteRequestFreeRecorderList(const vector<uint> &excluded_cardids)
         msg += QString(" %1").arg(result[k]);
     msg += "}";
     LOG(VB_CHANNEL, LOG_INFO, msg);
-    return result.toStdVector();
+    return result;
 }
 
 RemoteEncoder *RemoteRequestFreeRecorderFromList