Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Port from qAsConst to std::as_const #1480

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Port from qAsConst to std::as_const #1480

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions src/commands/undohelper.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -310,7 +310,7 @@ void UndoHelper::debugPrintState()
void UndoHelper::restoreAffectedTracks()
{
// Remove everything in the affected tracks.
for (const auto &trackIndex : qAsConst(m_affectedTracks)) {
for (const auto &trackIndex : std::as_const(m_affectedTracks)) {
if (trackIndex >= 0 && trackIndex < m_model.trackList().size()) {
auto mlt_index = m_model.trackList().at(trackIndex).mlt_index;
Mlt::Producer producer = m_model.tractor()->multitrack()->track(mlt_index);
Expand All @@ -324,7 +324,7 @@ void UndoHelper::restoreAffectedTracks()
}
}

for (const auto &uid : qAsConst(m_insertedOrder)) {
for (const auto &uid : std::as_const(m_insertedOrder)) {
const Info &info = m_state[uid];
if (m_affectedTracks.contains(info.oldTrackIndex)) {
UNDOLOG << "Handling uid" << uid << "on track" << info.oldTrackIndex << "index" <<
Expand Down Expand Up @@ -359,7 +359,7 @@ void UndoHelper::restoreAffectedTracks()
AudioLevelsTask::start(clip->parent(), &m_model, modelIndex);
}
}
for (const auto &trackIndex : qAsConst(m_affectedTracks)) {
for (const auto &trackIndex : std::as_const(m_affectedTracks)) {
if (trackIndex >= 0 && trackIndex < m_model.trackList().size()) {
auto mlt_index = m_model.trackList().at(trackIndex).mlt_index;
Mlt::Producer producer = m_model.tractor()->multitrack()->track(mlt_index);
Expand Down
2 changes: 1 addition & 1 deletion src/models/actionsmodel.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,7 @@ bool ActionsModel::setData(const QModelIndex &index, const QVariant &value, int
QAction *action = m_actions[index.row()];

if (!ks.isEmpty()) {
for (const auto a : qAsConst(m_actions)) {
for (const auto a : std::as_const(m_actions)) {
QList<QKeySequence> sequences = a->shortcuts();
for (int i = 0; i < sequences.size(); i++) {
if (sequences[i] == ks) {
Expand Down
14 changes: 7 additions & 7 deletions src/models/markersmodel.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -328,7 +328,7 @@ void MarkersModel::doShift(int shiftPosition, int shiftAmount)
int maxIndex = -1;
QScopedPointer<Mlt::Properties> markerList(m_producer->get_props(kShotcutMarkersProperty));
if (markerList && markerList->is_valid()) {
for (const auto i : qAsConst(m_keys)) {
for (const auto i : std::as_const(m_keys)) {
QScopedPointer<Mlt::Properties> markerProperties(markerList->get_props(qUtf8Printable(
QString::number(i))));
if (markerProperties && markerProperties->is_valid()) {
Expand Down Expand Up @@ -455,7 +455,7 @@ int MarkersModel::markerIndexForPosition(int position)
{
QScopedPointer<Mlt::Properties> markerList(m_producer->get_props(kShotcutMarkersProperty));
if (markerList && markerList->is_valid()) {
for (const auto i : qAsConst(m_keys)) {
for (const auto i : std::as_const(m_keys)) {
QScopedPointer<Mlt::Properties> marker(markerList->get_props(qUtf8Printable(QString::number(i))));
if (marker && marker->is_valid()) {
if (position == m_producer->time_to_frames(marker->get("start")) ||
Expand All @@ -471,7 +471,7 @@ int MarkersModel::markerIndexForRange(int start, int end)
{
QScopedPointer<Mlt::Properties> markerList(m_producer->get_props(kShotcutMarkersProperty));
if (markerList && markerList->is_valid()) {
for (const auto i : qAsConst(m_keys)) {
for (const auto i : std::as_const(m_keys)) {
QScopedPointer<Mlt::Properties> marker(markerList->get_props(qUtf8Printable(QString::number(i))));
if (marker && marker->is_valid()) {
if (start == m_producer->time_to_frames(marker->get("start")) &&
Expand All @@ -492,7 +492,7 @@ int MarkersModel::nextMarkerPosition(int position)
}
QScopedPointer<Mlt::Properties> markerList(m_producer->get_props(kShotcutMarkersProperty));
if (markerList && markerList->is_valid()) {
for (const auto i : qAsConst(m_keys)) {
for (const auto i : std::as_const(m_keys)) {
QScopedPointer<Mlt::Properties> marker(markerList->get_props(qUtf8Printable(QString::number(i))));
if (marker && marker->is_valid()) {
int markerPosition = m_producer->time_to_frames(marker->get("start"));
Expand All @@ -518,7 +518,7 @@ int MarkersModel::prevMarkerPosition(int position)
}
QScopedPointer<Mlt::Properties> markerList(m_producer->get_props(kShotcutMarkersProperty));
if (markerList && markerList->is_valid()) {
for (const auto i : qAsConst(m_keys)) {
for (const auto i : std::as_const(m_keys)) {
QScopedPointer<Mlt::Properties> marker(markerList->get_props(qUtf8Printable(QString::number(i))));
if (marker && marker->is_valid()) {
int markerPosition = m_producer->time_to_frames(marker->get("start"));
Expand All @@ -545,7 +545,7 @@ QMap<int, QString> MarkersModel::ranges()
QMap<int, QString> result;
QScopedPointer<Mlt::Properties> markerList(m_producer->get_props(kShotcutMarkersProperty));
if (markerList && markerList->is_valid()) {
for (const auto i : qAsConst(m_keys)) {
for (const auto i : std::as_const(m_keys)) {
QScopedPointer<Mlt::Properties> marker(markerList->get_props(qUtf8Printable(QString::number(i))));
if (marker && marker->is_valid()) {
Markers::Marker m;
Expand All @@ -571,7 +571,7 @@ QList<Markers::Marker> MarkersModel::getMarkers() const
return markers;
QScopedPointer<Mlt::Properties> markerList(m_producer->get_props(kShotcutMarkersProperty));
if (markerList && markerList->is_valid()) {
for (const auto i : qAsConst(m_keys)) {
for (const auto i : std::as_const(m_keys)) {
QScopedPointer<Mlt::Properties> marker(markerList->get_props(qUtf8Printable(QString::number(i))));
if (marker && marker->is_valid()) {
Markers::Marker m;
Expand Down