Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

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

  • Loading branch information...
commit 04e0d942ea0a1ccb14242084d3638e2ed4af5b7f 1 parent 2d6fb9a
@stichnot stichnot authored
Showing with 5 additions and 3 deletions.
  1. +5 −3 mythtv/libs/libmythtv/tvremoteutil.cpp
View
8 mythtv/libs/libmythtv/tvremoteutil.cpp
@@ -163,7 +163,7 @@ 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++)
{
@@ -171,7 +171,9 @@ vector<uint> RemoteRequestFreeRecorderList(const vector<uint> &excluded_cardids)
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
Please sign in to comment.
Something went wrong with that request. Please try again.