fix Warning
This commit is contained in:
1 parent
593c221d23
commit
8345470273
316 files changed
+1246
-929
No files matched your search
@@ -20,7 +20,10 @@ const Track& Track::track(int id) const noexcept(false)
|
||||
{
|
||||
try
|
||||
{
|
||||
#pragma GCC diagnostic push
|
||||
#pragma GCC diagnostic ignored "-Wdeprecated-declarations" // self-recursive lookup: recurses via the deprecated public Track API
|
||||
return track->track(id);
|
||||
#pragma GCC diagnostic pop
|
||||
}
|
||||
catch (...)
|
||||
{
|
||||
@@ -131,6 +134,7 @@ void Track::removeCopyItem(int itemId) noexcept(false)
|
||||
const QVector<int> Track::copyItemIdsBetween(qint64 start, qint64 end, bool strict, bool complete, bool recursive,
|
||||
bool sorted, qint64 minimumDuration) const
|
||||
{
|
||||
Q_UNUSED(minimumDuration);
|
||||
auto itemPtrRefs = _copyItems();
|
||||
|
||||
if (recursive)
|
||||
@@ -153,7 +157,10 @@ const QVector<int> Track::copyItemIdsBetween(qint64 start, qint64 end, bool stri
|
||||
sort(itemPtrRefs);
|
||||
}
|
||||
|
||||
#pragma GCC diagnostic push
|
||||
#pragma GCC diagnostic ignored "-Wdeprecated-declarations" // internal call to the deprecated transformItemPtrsToIds helper
|
||||
return transformItemPtrsToIds(itemPtrRefs);
|
||||
#pragma GCC diagnostic pop
|
||||
}
|
||||
|
||||
const QVector<int> Track::itemIdsBetween(qint64 start, qint64 end, bool strict, bool complete, bool recursive,
|
||||
@@ -171,7 +178,10 @@ const QVector<int> Track::itemIdsBetween(qint64 start, qint64 end, bool strict,
|
||||
|
||||
sort(itemPtrRefs);
|
||||
|
||||
#pragma GCC diagnostic push
|
||||
#pragma GCC diagnostic ignored "-Wdeprecated-declarations" // internal call to the deprecated transformItemPtrsToIds helper
|
||||
return transformItemPtrsToIds(itemPtrRefs);
|
||||
#pragma GCC diagnostic pop
|
||||
}
|
||||
|
||||
QVector<int> itemIds;
|
||||
@@ -209,7 +219,10 @@ bool Track::isItemsBetween(qint64 start, qint64 end, const QVector<int>& ignoreI
|
||||
|
||||
for (const int itemId : std::as_const(m_copyItemIds))
|
||||
{
|
||||
#pragma GCC diagnostic push
|
||||
#pragma GCC diagnostic ignored "-Wdeprecated-declarations" // internal lookup via the deprecated Track::item
|
||||
const Item& i = item(itemId);
|
||||
#pragma GCC diagnostic pop
|
||||
if (!ignoreIds.contains(i.id()))
|
||||
if (isItemBetween(i, start, end, strict, complete, minimumDuration))
|
||||
return true;
|
||||
@@ -304,7 +317,10 @@ ItemPtrNCVRefs Track::_itemsNCV(bool recursive)
|
||||
|
||||
const QVector<int> Track::_itemIds(bool recursive) const
|
||||
{
|
||||
#pragma GCC diagnostic push
|
||||
#pragma GCC diagnostic ignored "-Wdeprecated-declarations" // internal call to the deprecated transformItemPtrsToIds helper
|
||||
QVector<int> itemIds(transformItemPtrsToIds(m_items));
|
||||
#pragma GCC diagnostic pop
|
||||
|
||||
if (!recursive)
|
||||
return itemIds;
|
||||
@@ -363,19 +379,28 @@ QVector<int> Track::itemIds(bool recursive, bool sorted) const
|
||||
if (sorted)
|
||||
{
|
||||
if (!recursive)
|
||||
#pragma GCC diagnostic push
|
||||
#pragma GCC diagnostic ignored "-Wdeprecated-declarations" // internal call to the deprecated transformItemPtrsToIds helper
|
||||
return transformItemPtrsToIds(m_items);
|
||||
#pragma GCC diagnostic pop
|
||||
|
||||
ItemPtrRefs is(_items(true));
|
||||
|
||||
sort(is);
|
||||
|
||||
#pragma GCC diagnostic push
|
||||
#pragma GCC diagnostic ignored "-Wdeprecated-declarations" // internal call to the deprecated transformItemPtrsToIds helper
|
||||
return transformItemPtrsToIds(is);
|
||||
#pragma GCC diagnostic pop
|
||||
}
|
||||
|
||||
QVector<int> itemIds;
|
||||
itemIds.reserve(m_items.size());
|
||||
|
||||
#pragma GCC diagnostic push
|
||||
#pragma GCC diagnostic ignored "-Wdeprecated-declarations" // internal call to the deprecated transformItemPtrsToIds helper
|
||||
itemIds += transformItemPtrsToIds(m_items);
|
||||
#pragma GCC diagnostic pop
|
||||
|
||||
if (!recursive)
|
||||
return itemIds;
|
||||
@@ -448,7 +473,10 @@ Track& Track::track(int id) noexcept(false)
|
||||
{
|
||||
try
|
||||
{
|
||||
#pragma GCC diagnostic push
|
||||
#pragma GCC diagnostic ignored "-Wdeprecated-declarations" // self-recursive lookup: recurses via the deprecated public Track API
|
||||
return track->track(id);
|
||||
#pragma GCC diagnostic pop
|
||||
}
|
||||
catch (...)
|
||||
{
|
||||
@@ -495,7 +523,10 @@ Item& Track::item(int id) noexcept(false)
|
||||
{
|
||||
try
|
||||
{
|
||||
#pragma GCC diagnostic push
|
||||
#pragma GCC diagnostic ignored "-Wdeprecated-declarations" // self-recursive lookup: recurses via the deprecated public Track API
|
||||
return track->item(id);
|
||||
#pragma GCC diagnostic pop
|
||||
}
|
||||
catch (...)
|
||||
{
|
||||
@@ -519,7 +550,10 @@ const Item& Track::item(int id) const noexcept(false)
|
||||
{
|
||||
try
|
||||
{
|
||||
#pragma GCC diagnostic push
|
||||
#pragma GCC diagnostic ignored "-Wdeprecated-declarations" // self-recursive lookup: recurses via the deprecated public Track API
|
||||
return track->item(id);
|
||||
#pragma GCC diagnostic pop
|
||||
}
|
||||
catch (...)
|
||||
{
|
||||
|
||||
Reference in new issue
Block a user