Martchus
/
tageditor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix some issues reported by clang-tidy

This commit is contained in:
Martchus 2018-08-12 22:13:28 +02:00
parent 8a81aed6dd
commit 93b487d246
2 changed files with 21 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gui/fileinfomodel.cpp
View File

@ -182,6 +182,9 @@ template <class ElementType, bool isAdditional = false> void addElementNode(cons
*/
FileInfoModel::FileInfoModel(QObject *parent)
: QStandardItemModel(parent)
, m_file(nullptr)
, m_diag(nullptr)
, m_diagReparsing(nullptr)
{
}
@ -263,7 +266,7 @@ void FileInfoModel::updateCache()
Diagnostics &diag = m_diagReparsing ? *m_diagReparsing : *m_diag;
// get container
AbstractContainer *container = m_file->container();
auto *const container = m_file->container();
// get root item from model
QStandardItem *rootItem = invisibleRootItem();

36
gui/tagfieldedit.cpp
View File

@ -492,29 +492,27 @@ QLabel *TagFieldEdit::setupTypeNotSupportedLabel()
*/
void TagFieldEdit::updateValue(PreviousValueHandling previousValueHandling)
{
QListIterator<Tag *> i(tags());
i.toBack();
bool pictureSelectionUpdated = false;
while (i.hasPrevious()) {
Tag *tag = i.previous();
const TagValue &value = tag->value(m_field);
// use the values from the last tag which has the specified field
for (auto i = tags().crbegin(), end = tags().crend(); i != end; ++i) {
// FIXME: use tag->values(m_field) and handle all values
if (!value.isEmpty()) {
updateValue(value, previousValueHandling);
if (m_pictureSelection) {
m_pictureSelection->setTagField(tag, m_field, previousValueHandling);
pictureSelectionUpdated = true;
}
return;
auto *const tag = *i;
const TagValue &value = tag->value(m_field);
if (value.isEmpty()) {
continue;
}
updateValue(value, previousValueHandling);
if (m_pictureSelection) {
m_pictureSelection->setTagField(tag, m_field, previousValueHandling);
}
return;
}
// set an empty value
updateValue(TagValue(), previousValueHandling);
if (m_pictureSelection && !pictureSelectionUpdated) {
if (m_tags->size()) {
m_pictureSelection->setTagField(m_tags->last(), m_field, previousValueHandling);
} else {
m_pictureSelection->setTagField(nullptr, m_field, previousValueHandling);
}
if (m_pictureSelection) {
// pass the last tag if present so the picture selection can operate on that tag instance and won't be disabled
m_pictureSelection->setTagField(m_tags->isEmpty() ? nullptr : m_tags->back(), m_field, previousValueHandling);
}
}