mirror of
https://github.com/transmission/transmission.git
synced 2026-04-28 04:34:02 +01:00
fix: sonarcloud warnings / code smells (#2242)
* fix: use-init-statement Xref: https://sonarcloud.io/project/issues\?id\=transmission_transmission\&issues\=AX1f6EvHJiycnfA7gfrG\&open\=AX1f6EvHJiycnfA7gfrG * fix replace-use-of-new warning Xref: https://sonarcloud.io/project/issues\?id\=transmission_transmission\&issues\=AX1ZNs41ZmlvCveKTzon\&open\=AX1ZNs41ZmlvCveKTzon * fix has-virtual-functions-but-non-virtual-destructor warning Xref: https://sonarcloud.io/project/issues\?id\=transmission_transmission\&issues\=AX1ZNs72ZmlvCveKTzo6\&open\=AX1ZNs72ZmlvCveKTzo6 * fix make-variable-const warning Xref: https://sonarcloud.io/project/issues\?id\=transmission_transmission\&issues\=AX0_a_OVNJn7rAzml_7B\&open\=AX0_a_OVNJn7rAzml_7B * fix remove-redundant-static-specifiers Xref: https://sonarcloud.io/project/issues\?id\=transmission_transmission\&issues\=AX06St-81usi2gyYkPTb\&open\=AX06St-81usi2gyYkPTb * fix function-should-be-declared-const Xref: https://sonarcloud.io/project/issues\?id\=transmission_transmission\&issues\=AX06St-81usi2gyYkPTd\&open\=AX06St-81usi2gyYkPTd * fix use-init-statement warning Xref: https://sonarcloud.io/project/issues\?id\=transmission_transmission\&issues\=AX06St-81usi2gyYkPTc\&open\=AX06St-81usi2gyYkPTc * fix class-has-virtual-functions-but-non-virtual-destructor warning Xref: https://sonarcloud.io/project/issues\?id\=transmission_transmission\&issues\=AX06Stz41usi2gyYkPTS\&open\=AX06Stz41usi2gyYkPTS * fix remove-commented-out-code warning Xref: https://sonarcloud.io/project/issues\?id\=transmission_transmission\&issues\=AX06St241usi2gyYkPTT\&open\=AX06St241usi2gyYkPTT * fix remove-commented-out-code warning Xref: https://sonarcloud.io/project/issues\?id\=transmission_transmission\&issues\=AX06St241usi2gyYkPTV\&open\=AX06St241usi2gyYkPTV * fix has-virtual-functions-but-non-virtual-destructor warning https://sonarcloud.io/project/issues\?id\=transmission_transmission\&issues\=AX06St241usi2gyYkPTW\&open\=AX06St241usi2gyYkPTW * fix remove-commented-out-code warning Xref: https://sonarcloud.io/project/issues\?id\=transmission_transmission\&issues\=AX06SuCA1usi2gyYkPTh\&open\=AX06SuCA1usi2gyYkPTh * fix use-init-statement warning Xref: https://sonarcloud.io/project/issues\?id\=transmission_transmission\&issues\=AX0rAQvnfJ-O-YIDS9xF\&open\=AX0rAQvnfJ-O-YIDS9xF * fix use-init-statement warning Xref: https://sonarcloud.io/project/issues\?id\=transmission_transmission\&issues\=AX0rAQvnfJ-O-YIDS9xG\&open\=AX0rAQvnfJ-O-YIDS9xG * fix remove-redundant-access-specifier warning Xref: https://sonarcloud.io/project/issues\?id\=transmission_transmission\&issues\=AX1ZNs5tZmlvCveKTzor\&open\=AX1ZNs5tZmlvCveKTzor * fix use-init-statement warning Xref: https://sonarcloud.io/project/issues\?id\=transmission_transmission\&issues\=AX01Itl7f_SST5i7BN1l\&open\=AX01Itl7f_SST5i7BN1l * fix use-init-statement warning Xref: https://sonarcloud.io/project/issues\?id\=transmission_transmission\&issues\=AX0wDijI2l89lDvp1C9P\&open\=AX0wDijI2l89lDvp1C9P * fix use-automatically-managed-memory-instead-of-new warning Xref: https://sonarcloud.io/project/issues\?id\=transmission_transmission\&issues\=AX1f6E6HJiycnfA7gfrI\&open\=AX1f6E6HJiycnfA7gfrI * fix use-init-statement warning Xref: https://sonarcloud.io/project/issues\?id\=transmission_transmission\&issues\=AX0l8vknEafnvRiIHUEv\&open\=AX0l8vknEafnvRiIHUEv * fixup! fix has-virtual-functions-but-non-virtual-destructor warning
This commit is contained in:
@@ -92,7 +92,7 @@ public:
|
||||
|
||||
FileTreeModel::FileTreeModel(QObject* parent, bool is_editable)
|
||||
: QAbstractItemModel{ parent }
|
||||
, root_item_{ new FileTreeItem }
|
||||
, root_item_{ std::make_unique<FileTreeItem>() }
|
||||
, is_editable_{ is_editable }
|
||||
{
|
||||
}
|
||||
@@ -100,8 +100,6 @@ FileTreeModel::FileTreeModel(QObject* parent, bool is_editable)
|
||||
FileTreeModel::~FileTreeModel()
|
||||
{
|
||||
clear();
|
||||
|
||||
delete root_item_;
|
||||
}
|
||||
|
||||
void FileTreeModel::setEditable(bool is_editable)
|
||||
@@ -233,7 +231,7 @@ QModelIndex FileTreeModel::index(int row, int column, QModelIndex const& parent)
|
||||
|
||||
if (!parent.isValid())
|
||||
{
|
||||
parent_item = root_item_;
|
||||
parent_item = root_item_.get();
|
||||
}
|
||||
else
|
||||
{
|
||||
@@ -270,7 +268,7 @@ QModelIndex FileTreeModel::parent(QModelIndex const& child, int column) const
|
||||
|
||||
int FileTreeModel::rowCount(QModelIndex const& parent) const
|
||||
{
|
||||
FileTreeItem const* parent_item = parent.isValid() ? itemFromIndex(parent) : root_item_;
|
||||
FileTreeItem const* parent_item = parent.isValid() ? itemFromIndex(parent) : root_item_.get();
|
||||
|
||||
return parent_item->childCount();
|
||||
}
|
||||
@@ -284,7 +282,7 @@ int FileTreeModel::columnCount(QModelIndex const& parent) const
|
||||
|
||||
QModelIndex FileTreeModel::indexOf(FileTreeItem* item, int column) const
|
||||
{
|
||||
if (item == nullptr || item == root_item_)
|
||||
if (item == nullptr || item == root_item_.get())
|
||||
{
|
||||
return QModelIndex();
|
||||
}
|
||||
@@ -320,8 +318,7 @@ void FileTreeModel::clear()
|
||||
{
|
||||
beginResetModel();
|
||||
clearSubtree(QModelIndex());
|
||||
delete root_item_;
|
||||
root_item_ = new FileTreeItem{};
|
||||
root_item_ = std::make_unique<FileTreeItem>();
|
||||
endResetModel();
|
||||
|
||||
assert(index_cache_.isEmpty());
|
||||
@@ -368,7 +365,7 @@ void FileTreeModel::addFile(
|
||||
item = item->parent();
|
||||
}
|
||||
|
||||
assert(item == root_item_);
|
||||
assert(item == root_item_.get());
|
||||
|
||||
if (index_with_changed_parents.isValid())
|
||||
{
|
||||
@@ -379,7 +376,7 @@ void FileTreeModel::addFile(
|
||||
{
|
||||
bool added = false;
|
||||
|
||||
item = root_item_;
|
||||
item = root_item_.get();
|
||||
BackwardPathIterator filename_it(filename);
|
||||
|
||||
while (filename_it.hasNext())
|
||||
@@ -411,7 +408,7 @@ void FileTreeModel::addFile(
|
||||
item = child;
|
||||
}
|
||||
|
||||
if (item != root_item_)
|
||||
if (item != root_item_.get())
|
||||
{
|
||||
assert(item->fileIndex() == file_index);
|
||||
assert(item->totalSize() == total_size);
|
||||
|
||||
Reference in New Issue
Block a user