From d0c523ed00bb24fc0e84278acb625f800565dcf6 Mon Sep 17 00:00:00 2001 From: ADTC Date: Sat, 7 Feb 2015 02:56:24 +0800 Subject: [PATCH] Changed "caption" to "name" in code for consistency To maintain consistency with the actual English menu item, the variable names and method name have been changed to reflect the menu item text. Per comments in PR qbittorrent#2493 Signed-off-by: ADTC --- src/gui/transferlistwidget.cpp | 15 +++++++-------- src/gui/transferlistwidget.h | 2 +- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/src/gui/transferlistwidget.cpp b/src/gui/transferlistwidget.cpp index 5d43a5fef..a2d01dab3 100644 --- a/src/gui/transferlistwidget.cpp +++ b/src/gui/transferlistwidget.cpp @@ -424,17 +424,16 @@ void TransferListWidget::copySelectedMagnetURIs() const qApp->clipboard()->setText(magnet_uris.join("\n")); } -// create list of captions from tasklist. -void TransferListWidget::copySelectedCaptions() const +void TransferListWidget::copySelectedNames() const { - QStringList captions; + QStringList torrent_names; const QStringList hashes = getSelectedTorrentsHashes(); foreach (const QString &hash, hashes) { const QTorrentHandle h = BTSession->getTorrentHandle(hash); if (h.is_valid()) - captions << h.name(); + torrent_names << h.name(); } - qApp->clipboard()->setText(captions.join("\n")); + qApp->clipboard()->setText(torrent_names.join("\n")); } void TransferListWidget::hidePriorityColumn(bool hide) @@ -755,8 +754,8 @@ void TransferListWidget::displayListMenu(const QPoint&) QAction actionCopy_magnet_link(QIcon(":/icons/magnet.png"), tr("Copy magnet link"), 0); connect(&actionCopy_magnet_link, SIGNAL(triggered()), this, SLOT(copySelectedMagnetURIs())); - QAction actionCopy_caption_list(IconProvider::instance()->getIcon("edit-copy"), tr("Copy name"), 0); - connect(&actionCopy_caption_list, SIGNAL(triggered()), this, SLOT(copySelectedCaptions())); + QAction actionCopy_name(IconProvider::instance()->getIcon("edit-copy"), tr("Copy name"), 0); + connect(&actionCopy_name, SIGNAL(triggered()), this, SLOT(copySelectedNames())); QAction actionSuper_seeding_mode(tr("Super seeding mode"), 0); actionSuper_seeding_mode.setCheckable(true); @@ -890,7 +889,7 @@ void TransferListWidget::displayListMenu(const QPoint&) prioMenu->addAction(&actionBottomPriority); } listMenu.addSeparator(); - listMenu.addAction(&actionCopy_caption_list); + listMenu.addAction(&actionCopy_name); listMenu.addAction(&actionCopy_magnet_link); // Call menu QAction *act = 0; diff --git a/src/gui/transferlistwidget.h b/src/gui/transferlistwidget.h index 4988d812c..06c3fba8a 100644 --- a/src/gui/transferlistwidget.h +++ b/src/gui/transferlistwidget.h @@ -71,7 +71,7 @@ public slots: void topPrioSelectedTorrents(); void bottomPrioSelectedTorrents(); void copySelectedMagnetURIs() const; - void copySelectedCaptions() const; + void copySelectedNames() const; void openSelectedTorrentsFolder() const; void recheckSelectedTorrents(); void setDlLimitSelectedTorrents();