flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-03-31 04:25:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

Added a temporary remove in containerbase. This will be reverted when #106 is ready.

Browse Source
This commit is contained in:
Klaus Basan
2014-01-25 19:47:37 +01:00
parent 38d07286e1
commit c4f189a547
1 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/blackmisc/containerbase.h
View File

@@ -36,7 +36,7 @@ namespace BlackMisc
C<T> findBy(Predicate p) const C<T> findBy(Predicate p) const
{ {
C<T> result = derived(); C<T> result = derived();
result.erase(std::remove_if(result.begin(), result.end(), [ = ](const T &value) { return !p(value); }), result.end()); result.erase(std::remove_if(result.begin(), result.end(), [ = ](const T & value) { return !p(value); }), result.end());
return result; return result;
} }
@@ -89,7 +89,7 @@ namespace BlackMisc
*/ */
C<T> findBy(const CValueMap &valueMap) const C<T> findBy(const CValueMap &valueMap) const
{ {
return findBy([ & ](const T &value) { return value == valueMap; }); return findBy([ & ](const T & value) { return value == valueMap; });
} }
/*! /*!
@@ -125,6 +125,15 @@ namespace BlackMisc
return contains(BlackMisc::Predicates::MemberEqual<T>(key1, value1)); return contains(BlackMisc::Predicates::MemberEqual<T>(key1, value1));
} }
/*!
* \brief Remove given object
* \param object remove this object from in container
*/
void remove(const T &object)
{
std::remove(derived().begin(), derived().end(), object);
}
/*! /*!
* \brief Remove elements for which a given predicate returns true. * \brief Remove elements for which a given predicate returns true.
* \param p * \param p
@@ -165,7 +174,7 @@ namespace BlackMisc
{ {
QString str; QString str;
// qualifying stringify with this-> to workaround bug in GCC 4.7.2 http://gcc.gnu.org/bugzilla/show_bug.cgi?id=56402 // qualifying stringify with this-> to workaround bug in GCC 4.7.2 http://gcc.gnu.org/bugzilla/show_bug.cgi?id=56402
std::for_each(derived().begin(), derived().end(), [ & ](const T &value) { str += (str.isEmpty() ? "{" : ",") + this->stringify(value, i18n); }); std::for_each(derived().begin(), derived().end(), [ & ](const T & value) { str += (str.isEmpty() ? "{" : ",") + this->stringify(value, i18n); });
if (str.isEmpty()) { str = "{"; } if (str.isEmpty()) { str = "{"; }
return str += "}"; return str += "}";
} }
@@ -203,7 +212,7 @@ namespace BlackMisc
virtual void marshallToDbus(QDBusArgument &argument) const virtual void marshallToDbus(QDBusArgument &argument) const
{ {
argument.beginArray(qMetaTypeId<T>()); argument.beginArray(qMetaTypeId<T>());
std::for_each(derived().begin(), derived().end(), [ & ](const T &value) { argument << value; }); std::for_each(derived().begin(), derived().end(), [ & ](const T & value) { argument << value; });
argument.endArray(); argument.endArray();
} }