Improve coding style
This commit is contained in:
parent
af2dd554a9
commit
57f4307c16
|
@ -12,7 +12,7 @@ set(META_GUI_OPTIONAL true)
|
||||||
set(META_JS_SRC_DIR renamingutility)
|
set(META_JS_SRC_DIR renamingutility)
|
||||||
set(META_VERSION_MAJOR 3)
|
set(META_VERSION_MAJOR 3)
|
||||||
set(META_VERSION_MINOR 1)
|
set(META_VERSION_MINOR 1)
|
||||||
set(META_VERSION_PATCH 2)
|
set(META_VERSION_PATCH 3)
|
||||||
|
|
||||||
# add project files
|
# add project files
|
||||||
set(HEADER_FILES
|
set(HEADER_FILES
|
||||||
|
|
|
@ -125,7 +125,7 @@ KnownFieldModel::KnownFieldModel(QObject *parent, DefaultSelection defaultSelect
|
||||||
items << mkItem(KnownField::Composer, Qt::Unchecked);
|
items << mkItem(KnownField::Composer, Qt::Unchecked);
|
||||||
items << mkItem(KnownField::Rating, Qt::Unchecked);
|
items << mkItem(KnownField::Rating, Qt::Unchecked);
|
||||||
items << mkItem(KnownField::Description, Qt::Unchecked);
|
items << mkItem(KnownField::Description, Qt::Unchecked);
|
||||||
setItems(items);
|
setItems(std::move(items));
|
||||||
}
|
}
|
||||||
|
|
||||||
KnownFieldModel::KnownFieldModel(const QList<Models::ChecklistItem> &items, QObject *parent)
|
KnownFieldModel::KnownFieldModel(const QList<Models::ChecklistItem> &items, QObject *parent)
|
||||||
|
|
|
@ -34,8 +34,8 @@ public:
|
||||||
explicit KnownFieldModel(QObject *parent = nullptr, DefaultSelection defaultSelection = DefaultSelection::None);
|
explicit KnownFieldModel(QObject *parent = nullptr, DefaultSelection defaultSelection = DefaultSelection::None);
|
||||||
explicit KnownFieldModel(const QList<Models::ChecklistItem> &items, QObject *parent = nullptr);
|
explicit KnownFieldModel(const QList<Models::ChecklistItem> &items, QObject *parent = nullptr);
|
||||||
|
|
||||||
QVariant headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const;
|
QVariant headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const override;
|
||||||
virtual QString labelForId(const QVariant &id) const;
|
QString labelForId(const QVariant &id) const override;
|
||||||
#endif
|
#endif
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -306,13 +306,13 @@ void RenamingEngine::executeScriptForItem(const QFileInfo &fileInfo, FileSystemI
|
||||||
break;
|
break;
|
||||||
case ActionType::Rename:
|
case ActionType::Rename:
|
||||||
if (!newRelativeDirectory.isEmpty()) {
|
if (!newRelativeDirectory.isEmpty()) {
|
||||||
FileSystemItem *counterpartParent = item->root()->makeChildAvailable(newRelativeDirectory);
|
FileSystemItem *const counterpartParent = item->root()->makeChildAvailable(newRelativeDirectory);
|
||||||
const QString &counterpartName = newName.isEmpty() ? item->name() : newName;
|
const QString &counterpartName = newName.isEmpty() ? item->name() : newName;
|
||||||
if (counterpartParent->findChild(counterpartName, item)) {
|
if (counterpartParent->findChild(counterpartName, item)) {
|
||||||
item->setNote(tr("name is already used at new location"));
|
item->setNote(tr("name is already used at new location"));
|
||||||
item->setErrorOccured(true);
|
item->setErrorOccured(true);
|
||||||
} else {
|
} else {
|
||||||
auto *counterpart = new FileSystemItem(ItemStatus::New, item->type(), counterpartName, counterpartParent);
|
auto *const counterpart = new FileSystemItem(ItemStatus::New, item->type(), counterpartName, counterpartParent);
|
||||||
item->setCounterpart(counterpart);
|
item->setCounterpart(counterpart);
|
||||||
counterpart->setCheckable(true);
|
counterpart->setCheckable(true);
|
||||||
counterpart->setChecked(true);
|
counterpart->setChecked(true);
|
||||||
|
@ -320,7 +320,7 @@ void RenamingEngine::executeScriptForItem(const QFileInfo &fileInfo, FileSystemI
|
||||||
} else if (!newName.isEmpty()) {
|
} else if (!newName.isEmpty()) {
|
||||||
item->setNewName(newName);
|
item->setNewName(newName);
|
||||||
}
|
}
|
||||||
if (FileSystemItem *newItem = item->counterpart()) {
|
if (FileSystemItem *const newItem = item->counterpart()) {
|
||||||
if ((newItem->name().isEmpty() || newItem->name() == item->name()) && (newItem->parent() == item->parent())) {
|
if ((newItem->name().isEmpty() || newItem->name() == item->name()) && (newItem->parent() == item->parent())) {
|
||||||
item->setNote(tr("name doesn't change"));
|
item->setNote(tr("name doesn't change"));
|
||||||
} else if (newItem->parent() && newItem->parent()->findChild(newItem->name(), newItem)) {
|
} else if (newItem->parent() && newItem->parent()->findChild(newItem->name(), newItem)) {
|
||||||
|
|
Loading…
Reference in New Issue