fix Warning
This commit is contained in:
1 parent
593c221d23
commit
8345470273
316 files changed
+1246
-929
No files matched your search
@@ -89,7 +89,6 @@ void populateModel(LtsTimeline::TimelineModel* model)
|
||||
|
||||
try
|
||||
{
|
||||
const TestItem& testItem = dynamic_cast<const TestItem&>(model->item(5));
|
||||
}
|
||||
catch (const std::exception& ex)
|
||||
{
|
||||
@@ -109,6 +108,7 @@ void populateModel(LtsTimeline::TimelineModel* model)
|
||||
#define unsorted false
|
||||
QVector<int> x;
|
||||
bool y;
|
||||
(void)y;
|
||||
|
||||
x = model->itemIdsBetween(now + 60'000 + 1, now + 150'000 - 1, non_strict, recursive);
|
||||
|
||||
|
||||
@@ -51,7 +51,10 @@ Track& TimelineModel::track(int id) noexcept(false)
|
||||
{
|
||||
if (id == m_rootTrack.id())
|
||||
return m_rootTrack;
|
||||
#pragma GCC diagnostic push
|
||||
#pragma GCC diagnostic ignored "-Wdeprecated-declarations" // model facade delegates to the deprecated root Track lookup
|
||||
return m_rootTrack.track(id);
|
||||
#pragma GCC diagnostic pop
|
||||
}
|
||||
|
||||
auto it = m_trackCache.find(id);
|
||||
@@ -68,7 +71,10 @@ const Track& TimelineModel::track(int id) const noexcept(false)
|
||||
{
|
||||
if (id == m_rootTrack.id())
|
||||
return m_rootTrack;
|
||||
#pragma GCC diagnostic push
|
||||
#pragma GCC diagnostic ignored "-Wdeprecated-declarations" // model facade delegates to the deprecated root Track lookup
|
||||
return m_rootTrack.track(id);
|
||||
#pragma GCC diagnostic pop
|
||||
}
|
||||
|
||||
std::map<int, Track*>::const_iterator it = m_trackCache.find(id);
|
||||
@@ -82,7 +88,10 @@ const Track& TimelineModel::track(int id) const noexcept(false)
|
||||
Item& TimelineModel::item(int id) noexcept(false)
|
||||
{
|
||||
if (!m_itemCaching)
|
||||
#pragma GCC diagnostic push
|
||||
#pragma GCC diagnostic ignored "-Wdeprecated-declarations" // model facade delegates to the deprecated root Track lookup
|
||||
return m_rootTrack.item(id);
|
||||
#pragma GCC diagnostic pop
|
||||
|
||||
auto it = m_itemCache.find(id);
|
||||
|
||||
@@ -95,7 +104,10 @@ Item& TimelineModel::item(int id) noexcept(false)
|
||||
const Item& TimelineModel::item(int id) const noexcept(false)
|
||||
{
|
||||
if (!m_itemCaching)
|
||||
#pragma GCC diagnostic push
|
||||
#pragma GCC diagnostic ignored "-Wdeprecated-declarations" // model facade delegates to the deprecated root Track lookup
|
||||
return m_rootTrack.item(id);
|
||||
#pragma GCC diagnostic pop
|
||||
|
||||
decltype(m_itemCache)::const_iterator it = m_itemCache.find(id);
|
||||
|
||||
@@ -132,7 +144,10 @@ bool TimelineModel::isItemsBetween(qint64 start, qint64 end, const QVector<int>&
|
||||
const QVector<int> TimelineModel::copyItemIdsBetween(qint64 start, qint64 end, bool strict, bool complete,
|
||||
bool sorted) const
|
||||
{
|
||||
#pragma GCC diagnostic push
|
||||
#pragma GCC diagnostic ignored "-Wdeprecated-declarations" // model facade delegates to the deprecated root Track lookup
|
||||
return m_rootTrack.copyItemIdsBetween(start, end, strict, complete, true, sorted);
|
||||
#pragma GCC diagnostic pop
|
||||
}
|
||||
|
||||
bool TimelineModel::isItemsBetween(qint64 start, qint64 end, int ignoreId, bool strict, bool complete,
|
||||
|
||||
+3
-3
@@ -45,9 +45,9 @@ void TimelineViewDragHandler::dragMoveEvent(QDragMoveEvent* e)
|
||||
if (!e->mimeData()->hasFormat(Item::mimetype))
|
||||
return;
|
||||
|
||||
m_dragPos = e->pos();
|
||||
m_dragPos = e->position().toPoint();
|
||||
m_view->m_header->setHoverPosition(m_dragPos.x());
|
||||
e->setAccepted(canDragItemsTo(e->pos()));
|
||||
e->setAccepted(canDragItemsTo(e->position().toPoint()));
|
||||
m_view->viewport()->update();
|
||||
}
|
||||
|
||||
@@ -67,7 +67,7 @@ void TimelineViewDragHandler::dropEvent(QDropEvent* e)
|
||||
if (!e->mimeData()->hasFormat(Item::mimetype))
|
||||
return;
|
||||
|
||||
if (!canDragItemsTo(e->pos()))
|
||||
if (!canDragItemsTo(e->position().toPoint()))
|
||||
{
|
||||
clear();
|
||||
e->acceptProposedAction();
|
||||
|
||||
@@ -22,8 +22,8 @@ namespace LtsTimeline
|
||||
|
||||
TimelineWidget::TimelineWidget(QWidget *parent)
|
||||
: QWidget(parent)
|
||||
, m_ui(new Ui::Timeline)
|
||||
, m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger().getNGLLogger("Timeline.TimelineWidget"))
|
||||
, m_ui(new Ui::Timeline)
|
||||
{
|
||||
m_ui->setupUi(this);
|
||||
m_ui->debugWidget->hide();
|
||||
|
||||
@@ -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