Commit 1ff9cfd7 authored by Jean-Baptiste Mardelle's avatar Jean-Baptiste Mardelle

Merge branch '16.04'

parents 6b1f2174 919a802c
......@@ -126,7 +126,7 @@ Qt::ItemFlags ProjectItemModel::flags(const QModelIndex& index) const
}
}
// Responsible for dropping effects
// cppcheck-suppress unusedFunction
bool ProjectItemModel::dropMimeData(const QMimeData *data, Qt::DropAction action, int row, int column, const QModelIndex &parent)
{
Q_UNUSED(row)
......@@ -243,6 +243,7 @@ int ProjectItemModel::columnCount(const QModelIndex& parent) const
}
}
// cppcheck-suppress unusedFunction
Qt::DropActions ProjectItemModel::supportedDropActions() const
{
return Qt::CopyAction | Qt::MoveAction;
......
......@@ -51,6 +51,7 @@ private slots:
protected:
/** @brief Decide which items should be displayed depending on the search string */
// cppcheck-suppress unusedFunction
bool filterAcceptsRow(int sourceRow, const QModelIndex &sourceParent) const;
/** @brief Reimplemented to show folders first */
bool lessThan(const QModelIndex & left, const QModelIndex & right) const;
......
......@@ -174,6 +174,7 @@ void MonitorAudioLevel::drawBackground(int channels)
p.end();
}
// cppcheck-suppress unusedFunction
void MonitorAudioLevel::setAudioValues(const QVector <int>& values)
{
m_values = values;
......
......@@ -767,7 +767,10 @@ int Track::changeClipSpeed(ItemInfo info, ItemInfo speedIndependantInfo, Playlis
delete cut;
clipIndex = m_playlist.get_clip_index_at(startPos);
newLength = m_playlist.clip_length(clipIndex);
if (removeEffect)
delete prod;
}
//Do not delete prod, it is now stored in the slowmotion producers list
m_playlist.unlock();
if (clipIndex + 1 == m_playlist.count()) {
// We changed the speed of last clip in playlist, check track length
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment