Transmission/transmission
1
0
Fork 0
mirror of https://github.com/transmission/transmission.git synced 2025-12-27 21:53:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix most of critical issues reported by Sonar (GTK client) (#2309)

Browse Source 
* (C++) Macros should not be used to define constants

* (C++) Memory should not be managed manually

* (C++) "void*" should not be used in typedefs, member variables, function parameters or return type

* (C++) When the "Rule-of-Zero" is not applicable, the "Rule-of-Five" should be followed

* (C++) "switch" statements should have "default" clauses

* (C++) "explicit" should be used on single-parameter constructors and conversiosn operators

* (C++) Non-const global variables should not be used
This commit is contained in:
Mike Gelfand
2021-12-14 11:43:27 +03:00
committed by GitHub
parent 7015f48798
commit 3e072f9bd4
82 changed files with 459 additions and 287 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
gtk/FilterBar.cc
View File

@@ -28,7 +28,6 @@ namespace
auto const DIRTY_KEY = Glib::Quark("tr-filter-dirty-key");
auto const SESSION_KEY = Glib::Quark("tr-session-key");
auto const TEXT_KEY = Glib::Quark("tr-filter-text-key");
auto const TORRENT_MODEL_KEY = Glib::Quark("tr-filter-torrent-model-key");
} // namespace
@@ -39,6 +38,8 @@ public:
Impl(FilterBar& widget, tr_session* session, Glib::RefPtr<Gtk::TreeModel> const& torrent_model);
~Impl();
TR_DISABLE_COPY_MOVE(Impl)
Glib::RefPtr<Gtk::TreeModel> get_filter_model() const;
private:
@@ -72,6 +73,8 @@ private:
sigc::connection torrent_model_row_changed_tag_;
sigc::connection torrent_model_row_inserted_tag_;
sigc::connection torrent_model_row_deleted_cb_tag_;
Glib::ustring filter_text_;
};
/***
@@ -611,23 +614,23 @@ Gtk::ComboBox* FilterBar::Impl::activity_combo_box_new(Glib::RefPtr<Gtk::TreeMod
namespace
{
bool testText(tr_torrent const* tor, Glib::ustring const* key)
bool testText(tr_torrent const* tor, Glib::ustring const& key)
{
bool ret = false;
if (key == nullptr || key->empty())
if (key.empty())
{
ret = true;
}
else
{
/* test the torrent name... */
ret = Glib::ustring(tr_torrentName(tor)).casefold().find(*key) != Glib::ustring::npos;
ret = Glib::ustring(tr_torrentName(tor)).casefold().find(key) != Glib::ustring::npos;
/* test the files... */
for (tr_file_index_t i = 0, n = tr_torrentFileCount(tor); i < n && !ret; ++i)
{
ret = Glib::ustring(tr_torrentFile(tor, i).name).casefold().find(*key) != Glib::ustring::npos;
ret = Glib::ustring(tr_torrentFile(tor, i).name).casefold().find(key) != Glib::ustring::npos;
}
}
@@ -638,10 +641,7 @@ bool testText(tr_torrent const* tor, Glib::ustring const* key)
void FilterBar::Impl::filter_entry_changed()
{
filter_model_->set_data(
TEXT_KEY,
new Glib::ustring(gtr_str_strip(entry_->get_text().casefold())),
[](void* p) { delete static_cast<Glib::ustring*>(p); });
filter_text_ = gtr_str_strip(entry_->get_text().casefold());
filter_model_->refilter();
}
@@ -654,10 +654,9 @@ void FilterBar::Impl::filter_entry_changed()
bool FilterBar::Impl::is_row_visible(Gtk::TreeModel::const_iterator const& iter)
{
auto* tor = static_cast<tr_torrent*>(iter->get_value(torrent_cols.torrent));
auto const* text = static_cast<Glib::ustring const*>(filter_model_->get_data(TEXT_KEY));
return tor != nullptr && test_tracker(tor, active_tracker_type_, active_tracker_host_) &&
test_torrent_activity(tor, active_activity_type_) && testText(tor, text);
test_torrent_activity(tor, active_activity_type_) && testText(tor, filter_text_);
}
void FilterBar::Impl::selection_changed_cb()