Change file names and classes names to match them

src/gui/properties/CMakeLists.txt

@@ -1,33 +1,38 @@
 add_library(qbt_properties STATIC
-propertieswidget.ui
-trackersadditiondlg.ui
-peersadditiondlg.ui
-propertieswidget.h
-peerlistwidget.h
-proplistdelegate.h
-trackerlist.h
+# headers
 downloadedpiecesbar.h
-piecesbar.h
 peerlistdelegate.h
 peerlistsortmodel.h
-peersadditiondlg.h
-trackersadditiondlg.h
+peerlistwidget.h
+peersadditiondialog.h
 pieceavailabilitybar.h
+piecesbar.h
+propertieswidget.h
+proplistdelegate.h
 proptabbar.h
-speedwidget.h
 speedplotview.h
+speedwidget.h
+trackerlistwidget.h
+trackersadditiondialog.h
+
+# sources
+downloadedpiecesbar.cpp
+peerlistwidget.cpp
+peersadditiondialog.cpp
+pieceavailabilitybar.cpp
+piecesbar.cpp
 propertieswidget.cpp
 proplistdelegate.cpp
-peerlistwidget.cpp
-trackerlist.cpp
-peersadditiondlg.cpp
-downloadedpiecesbar.cpp
-piecesbar.cpp
-trackersadditiondlg.cpp
-pieceavailabilitybar.cpp
 proptabbar.cpp
-speedwidget.cpp
 speedplotview.cpp
+speedwidget.cpp
+trackerlistwidget.cpp
+trackersadditiondialog.cpp
+
+# forms
+peersadditiondialog.ui
+propertieswidget.ui
+trackersadditiondialog.ui
 )
 
 target_link_libraries(qbt_properties

src/gui/properties/peerlistwidget.cpp

@@ -49,9 +49,9 @@
 #include "guiiconprovider.h"
 #include "peerlistdelegate.h"
 #include "peerlistsortmodel.h"
-#include "peersadditiondlg.h"
+#include "peersadditiondialog.h"
 #include "propertieswidget.h"
-#include "speedlimitdlg.h"
+#include "speedlimitdialog.h"
 
 PeerListWidget::PeerListWidget(PropertiesWidget *parent)
     : QTreeView(parent)
@@ -247,7 +247,7 @@ void PeerListWidget::showPeerListMenu(const QPoint &)
     if (!act) return;
 
     if (act == addPeerAct) {
-        QList<BitTorrent::PeerAddress> peersList = PeersAdditionDlg::askForPeers(this);
+        QList<BitTorrent::PeerAddress> peersList = PeersAdditionDialog::askForPeers(this);
         int peerCount = 0;
         foreach (const BitTorrent::PeerAddress &addr, peersList) {
             if (torrent->connectPeer(addr)) {

src/gui/properties/peersadditiondialog.cpp

@@ -26,34 +26,34 @@
  * exception statement from your version.
  */
 
-#include "peersadditiondlg.h"
+#include "peersadditiondialog.h"
 
 #include <QHostAddress>
 #include <QMessageBox>
 
-#include "ui_peersadditiondlg.h"
+#include "ui_peersadditiondialog.h"
 
-PeersAdditionDlg::PeersAdditionDlg(QWidget *parent)
+PeersAdditionDialog::PeersAdditionDialog(QWidget *parent)
     : QDialog(parent)
-    , m_ui(new Ui::addPeersDialog())
+    , m_ui(new Ui::PeersAdditionDialog())
 {
     m_ui->setupUi(this);
-    connect(m_ui->buttonBox, &QDialogButtonBox::accepted, this, &PeersAdditionDlg::validateInput);
+    connect(m_ui->buttonBox, &QDialogButtonBox::accepted, this, &PeersAdditionDialog::validateInput);
 }
 
-PeersAdditionDlg::~PeersAdditionDlg()
+PeersAdditionDialog::~PeersAdditionDialog()
 {
     delete m_ui;
 }
 
-QList<BitTorrent::PeerAddress> PeersAdditionDlg::askForPeers(QWidget *parent)
+QList<BitTorrent::PeerAddress> PeersAdditionDialog::askForPeers(QWidget *parent)
 {
-    PeersAdditionDlg dlg(parent);
+    PeersAdditionDialog dlg(parent);
     dlg.exec();
     return dlg.m_peersList;
 }
 
-void PeersAdditionDlg::validateInput()
+void PeersAdditionDialog::validateInput()
 {
     if (m_ui->peers_txt->toPlainText().trimmed().isEmpty()) {
         QMessageBox::warning(this, tr("No peer entered"),
@@ -77,7 +77,7 @@ void PeersAdditionDlg::validateInput()
     accept();
 }
 
-BitTorrent::PeerAddress PeersAdditionDlg::parsePeer(QString peer)
+BitTorrent::PeerAddress PeersAdditionDialog::parsePeer(QString peer)
 {
     BitTorrent::PeerAddress addr;
     QStringList ipPort;

src/gui/properties/peersadditiondialog.h

@@ -36,16 +36,16 @@
 
 namespace Ui
 {
-    class addPeersDialog;
+    class PeersAdditionDialog;
 }
 
-class PeersAdditionDlg : public QDialog
+class PeersAdditionDialog : public QDialog
 {
     Q_OBJECT
 
 public:
-    PeersAdditionDlg(QWidget *parent);
-    ~PeersAdditionDlg();
+    PeersAdditionDialog(QWidget *parent);
+    ~PeersAdditionDialog();
 
     static QList<BitTorrent::PeerAddress> askForPeers(QWidget *parent);
 
@@ -55,7 +55,7 @@ protected slots:
 private:
     BitTorrent::PeerAddress parsePeer(QString peer);
 
-    Ui::addPeersDialog *m_ui;
+    Ui::PeersAdditionDialog *m_ui;
     QList<BitTorrent::PeerAddress> m_peersList;
 };
 

src/gui/properties/peersadditiondialog.ui

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
- <class>addPeersDialog</class>
- <widget class="QDialog" name="addPeersDialog">
+ <class>PeersAdditionDialog</class>
+ <widget class="QDialog" name="PeersAdditionDialog">
   <property name="geometry">
    <rect>
     <x>0</x>
@@ -51,7 +51,7 @@
   <connection>
    <sender>buttonBox</sender>
    <signal>rejected()</signal>
-   <receiver>addPeersDialog</receiver>
+   <receiver>PeersAdditionDialog</receiver>
    <slot>reject()</slot>
    <hints>
     <hint type="sourcelabel">

src/gui/properties/properties.pri

@@ -1,16 +1,16 @@
 INCLUDEPATH += $$PWD
 
 FORMS += \
-    $$PWD/peersadditiondlg.ui \
+    $$PWD/peersadditiondialog.ui \
     $$PWD/propertieswidget.ui \
-    $$PWD/trackersadditiondlg.ui
+    $$PWD/trackersadditiondialog.ui
 
 HEADERS += \
     $$PWD/downloadedpiecesbar.h \
     $$PWD/peerlistdelegate.h \
     $$PWD/peerlistsortmodel.h \
     $$PWD/peerlistwidget.h \
-    $$PWD/peersadditiondlg.h \
+    $$PWD/peersadditiondialog.h \
     $$PWD/pieceavailabilitybar.h \
     $$PWD/piecesbar.h \
     $$PWD/propertieswidget.h \
@@ -18,13 +18,13 @@ HEADERS += \
     $$PWD/proptabbar.h \
     $$PWD/speedplotview.h \
     $$PWD/speedwidget.h \
-    $$PWD/trackerlist.h \
-    $$PWD/trackersadditiondlg.h
+    $$PWD/trackerlistwidget.h \
+    $$PWD/trackersadditiondialog.h
 
 SOURCES += \
     $$PWD/downloadedpiecesbar.cpp \
     $$PWD/peerlistwidget.cpp \
-    $$PWD/peersadditiondlg.cpp \
+    $$PWD/peersadditiondialog.cpp \
     $$PWD/pieceavailabilitybar.cpp \
     $$PWD/piecesbar.cpp \
     $$PWD/propertieswidget.cpp \
@@ -32,5 +32,5 @@ SOURCES += \
     $$PWD/proptabbar.cpp \
     $$PWD/speedplotview.cpp \
     $$PWD/speedwidget.cpp \
-    $$PWD/trackerlist.cpp \
-    $$PWD/trackersadditiondlg.cpp
+    $$PWD/trackerlistwidget.cpp \
+    $$PWD/trackersadditiondialog.cpp

src/gui/properties/propertieswidget.cpp

@@ -52,15 +52,15 @@
 #include "guiiconprovider.h"
 #include "lineedit.h"
 #include "mainwindow.h"
-#include "messageboxraised.h"
 #include "peerlistwidget.h"
 #include "pieceavailabilitybar.h"
 #include "proplistdelegate.h"
 #include "proptabbar.h"
+#include "raisedmessagebox.h"
 #include "speedwidget.h"
 #include "torrentcontentfiltermodel.h"
 #include "torrentcontentmodel.h"
-#include "trackerlist.h"
+#include "trackerlistwidget.h"
 #include "transferlistwidget.h"
 #include "utils.h"
 
@@ -132,13 +132,13 @@ PropertiesWidget::PropertiesWidget(QWidget *parent, MainWindow *mainWindow, Tran
     m_piecesAvailability->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed);
 
     // Tracker list
-    m_trackerList = new TrackerList(this);
+    m_trackerList = new TrackerListWidget(this);
     m_ui->trackerUpButton->setIcon(GuiIconProvider::instance()->getIcon("go-up"));
     m_ui->trackerUpButton->setIconSize(Utils::Gui::smallIconSize());
     m_ui->trackerDownButton->setIcon(GuiIconProvider::instance()->getIcon("go-down"));
     m_ui->trackerDownButton->setIconSize(Utils::Gui::smallIconSize());
-    connect(m_ui->trackerUpButton, &QPushButton::clicked, m_trackerList, &TrackerList::moveSelectionUp);
-    connect(m_ui->trackerDownButton, &QPushButton::clicked, m_trackerList, &TrackerList::moveSelectionDown);
+    connect(m_ui->trackerUpButton, &QPushButton::clicked, m_trackerList, &TrackerListWidget::moveSelectionUp);
+    connect(m_ui->trackerDownButton, &QPushButton::clicked, m_trackerList, &TrackerListWidget::moveSelectionDown);
     m_ui->horizontalLayout_trackers->insertWidget(0, m_trackerList);
     // Peers list
     m_peerList = new PeerListWidget(this);
@@ -276,7 +276,7 @@ BitTorrent::TorrentHandle *PropertiesWidget::getCurrentTorrent() const
     return m_torrent;
 }
 
-TrackerList *PropertiesWidget::getTrackerList() const
+TrackerListWidget *PropertiesWidget::getTrackerList() const
 {
     return m_trackerList;
 }
@@ -693,7 +693,7 @@ void PropertiesWidget::renameSelectedFile()
     if (!ok) return;
 
     if (newName.isEmpty() || !Utils::Fs::isValidFileSystemName(newName)) {
-        MessageBoxRaised::warning(this, tr("Rename error"),
+        RaisedMessageBox::warning(this, tr("Rename error"),
                                   tr("The name is empty or contains forbidden characters, please choose a different one."),
                                   QMessageBox::Ok);
         return;
@@ -722,7 +722,7 @@ void PropertiesWidget::renameSelectedFile()
         for (int i = 0; i < m_torrent->filesCount(); ++i) {
             if (i == fileIndex) continue;
             if (Utils::Fs::sameFileNames(m_torrent->filePath(i), newFilePath)) {
-                MessageBoxRaised::warning(this, tr("Rename error"),
+                RaisedMessageBox::warning(this, tr("Rename error"),
                                           tr("This name is already in use in this folder. Please use a different name."),
                                           QMessageBox::Ok);
                 return;

src/gui/properties/propertieswidget.h

@@ -49,7 +49,7 @@ class PropTabBar;
 class SpeedWidget;
 class torrent_file;
 class TorrentContentFilterModel;
-class TrackerList;
+class TrackerListWidget;
 class TransferListWidget;
 
 namespace Ui
@@ -72,7 +72,7 @@ public:
     PropertiesWidget(QWidget *parent, MainWindow *mainWindow, TransferListWidget *transferList);
     ~PropertiesWidget();
     BitTorrent::TorrentHandle *getCurrentTorrent() const;
-    TrackerList *getTrackerList() const;
+    TrackerListWidget *getTrackerList() const;
     PeerListWidget *getPeerList() const;
     QTreeView *getFilesList() const;
     SpeedWidget *getSpeedWidget() const;
@@ -120,7 +120,7 @@ private:
     TorrentContentFilterModel *m_propListModel;
     PropListDelegate *m_propListDelegate;
     PeerListWidget *m_peerList;
-    TrackerList *m_trackerList;
+    TrackerListWidget *m_trackerList;
     SpeedWidget *m_speedWidget;
     QList<int> m_slideSizes;
     DownloadedPiecesBar *m_downloadedPieces;

src/gui/properties/trackerlistwidget.cpp

@@ -26,7 +26,7 @@
  * exception statement from your version.
  */
 
-#include "trackerlist.h"
+#include "trackerlistwidget.h"
 
 #include <QAction>
 #include <QApplication>
@@ -50,9 +50,9 @@
 #include "autoexpandabledialog.h"
 #include "guiiconprovider.h"
 #include "propertieswidget.h"
-#include "trackersadditiondlg.h"
+#include "trackersadditiondialog.h"
 
-TrackerList::TrackerList(PropertiesWidget *properties)
+TrackerListWidget::TrackerListWidget(PropertiesWidget *properties)
     : QTreeWidget()
     , m_properties(properties)
 {
@@ -78,13 +78,13 @@ TrackerList::TrackerList(PropertiesWidget *properties)
             resizeColumnToContents(i);
     // Context menu
     setContextMenuPolicy(Qt::CustomContextMenu);
-    connect(this, &QWidget::customContextMenuRequested, this, &TrackerList::showTrackerListMenu);
+    connect(this, &QWidget::customContextMenuRequested, this, &TrackerListWidget::showTrackerListMenu);
     // Header
     header()->setContextMenuPolicy(Qt::CustomContextMenu);
-    connect(header(), &QWidget::customContextMenuRequested, this, &TrackerList::displayToggleColumnsMenu);
-    connect(header(), &QHeaderView::sectionMoved, this, &TrackerList::saveSettings);
-    connect(header(), &QHeaderView::sectionResized, this, &TrackerList::saveSettings);
-    connect(header(), &QHeaderView::sortIndicatorChanged, this, &TrackerList::saveSettings);
+    connect(header(), &QWidget::customContextMenuRequested, this, &TrackerListWidget::displayToggleColumnsMenu);
+    connect(header(), &QHeaderView::sectionMoved, this, &TrackerListWidget::saveSettings);
+    connect(header(), &QHeaderView::sectionResized, this, &TrackerListWidget::saveSettings);
+    connect(header(), &QHeaderView::sortIndicatorChanged, this, &TrackerListWidget::saveSettings);
     // Set DHT, PeX, LSD items
     m_DHTItem = new QTreeWidgetItem({ "",  "** [DHT] **", "", "0", "", "", "0" });
     insertTopLevelItem(0, m_DHTItem);
@@ -116,12 +116,12 @@ TrackerList::TrackerList(PropertiesWidget *properties)
     headerItem()->setTextAlignment(COL_DOWNLOADED, (Qt::AlignRight | Qt::AlignVCenter));
     // Set hotkeys
     m_editHotkey = new QShortcut(Qt::Key_F2, this, nullptr, nullptr, Qt::WidgetShortcut);
-    connect(m_editHotkey, &QShortcut::activated, this, &TrackerList::editSelectedTracker);
-    connect(this, &QAbstractItemView::doubleClicked, this, &TrackerList::editSelectedTracker);
+    connect(m_editHotkey, &QShortcut::activated, this, &TrackerListWidget::editSelectedTracker);
+    connect(this, &QAbstractItemView::doubleClicked, this, &TrackerListWidget::editSelectedTracker);
     m_deleteHotkey = new QShortcut(QKeySequence::Delete, this, nullptr, nullptr, Qt::WidgetShortcut);
-    connect(m_deleteHotkey, &QShortcut::activated, this, &TrackerList::deleteSelectedTrackers);
+    connect(m_deleteHotkey, &QShortcut::activated, this, &TrackerListWidget::deleteSelectedTrackers);
     m_copyHotkey = new QShortcut(QKeySequence::Copy, this, nullptr, nullptr, Qt::WidgetShortcut);
-    connect(m_copyHotkey, &QShortcut::activated, this, &TrackerList::copyTrackerUrl);
+    connect(m_copyHotkey, &QShortcut::activated, this, &TrackerListWidget::copyTrackerUrl);
 
     // This hack fixes reordering of first column with Qt5.
     // https://github.com/qtproject/qtbase/commit/e0fc088c0c8bc61dbcaf5928b24986cd61a22777
@@ -131,12 +131,12 @@ TrackerList::TrackerList(PropertiesWidget *properties)
     unused.setVerticalHeader(new QHeaderView(Qt::Horizontal));
 }
 
-TrackerList::~TrackerList()
+TrackerListWidget::~TrackerListWidget()
 {
     saveSettings();
 }
 
-QList<QTreeWidgetItem*> TrackerList::getSelectedTrackerItems() const
+QList<QTreeWidgetItem*> TrackerListWidget::getSelectedTrackerItems() const
 {
     const QList<QTreeWidgetItem *> selectedTrackerItems = selectedItems();
     QList<QTreeWidgetItem *> selectedTrackers;
@@ -148,7 +148,7 @@ QList<QTreeWidgetItem*> TrackerList::getSelectedTrackerItems() const
     return selectedTrackers;
 }
 
-void TrackerList::setRowColor(int row, QColor color)
+void TrackerListWidget::setRowColor(int row, QColor color)
 {
     unsigned int nbColumns = columnCount();
     QTreeWidgetItem *item = topLevelItem(row);
@@ -156,7 +156,7 @@ void TrackerList::setRowColor(int row, QColor color)
         item->setData(i, Qt::ForegroundRole, color);
 }
 
-void TrackerList::moveSelectionUp()
+void TrackerListWidget::moveSelectionUp()
 {
     BitTorrent::TorrentHandle *const torrent = m_properties->getCurrentTorrent();
     if (!torrent) {
@@ -197,7 +197,7 @@ void TrackerList::moveSelectionUp()
         torrent->forceReannounce();
 }
 
-void TrackerList::moveSelectionDown()
+void TrackerListWidget::moveSelectionDown()
 {
     BitTorrent::TorrentHandle *const torrent = m_properties->getCurrentTorrent();
     if (!torrent) {
@@ -238,7 +238,7 @@ void TrackerList::moveSelectionDown()
         torrent->forceReannounce();
 }
 
-void TrackerList::clear()
+void TrackerListWidget::clear()
 {
     qDeleteAll(m_trackerItems);
     m_trackerItems.clear();
@@ -256,7 +256,7 @@ void TrackerList::clear()
     m_LSDItem->setText(COL_MSG, "");
 }
 
-void TrackerList::loadStickyItems(BitTorrent::TorrentHandle *const torrent)
+void TrackerListWidget::loadStickyItems(BitTorrent::TorrentHandle *const torrent)
 {
     QString working = tr("Working");
     QString disabled = tr("Disabled");
@@ -320,7 +320,7 @@ void TrackerList::loadStickyItems(BitTorrent::TorrentHandle *const torrent)
     m_LSDItem->setText(COL_PEERS, QString::number(peersLSD));
 }
 
-void TrackerList::loadTrackers()
+void TrackerListWidget::loadTrackers()
 {
     // Load trackers from torrent handle
     BitTorrent::TorrentHandle *const torrent = m_properties->getCurrentTorrent();
@@ -388,19 +388,19 @@ void TrackerList::loadTrackers()
 }
 
 // Ask the user for new trackers and add them to the torrent
-void TrackerList::askForTrackers()
+void TrackerListWidget::askForTrackers()
 {
     BitTorrent::TorrentHandle *const torrent = m_properties->getCurrentTorrent();
     if (!torrent) return;
 
     QList<BitTorrent::TrackerEntry> trackers;
-    foreach (const QString &tracker, TrackersAdditionDlg::askForTrackers(this, torrent))
+    foreach (const QString &tracker, TrackersAdditionDialog::askForTrackers(this, torrent))
         trackers << tracker;
 
     torrent->addTrackers(trackers);
 }
 
-void TrackerList::copyTrackerUrl()
+void TrackerListWidget::copyTrackerUrl()
 {
     QList<QTreeWidgetItem *> selectedTrackerItems = getSelectedTrackerItems();
     if (selectedTrackerItems.isEmpty()) return;
@@ -415,7 +415,7 @@ void TrackerList::copyTrackerUrl()
 }
 
 
-void TrackerList::deleteSelectedTrackers()
+void TrackerListWidget::deleteSelectedTrackers()
 {
     BitTorrent::TorrentHandle *const torrent = m_properties->getCurrentTorrent();
     if (!torrent) {
@@ -447,7 +447,7 @@ void TrackerList::deleteSelectedTrackers()
         torrent->forceReannounce();
 }
 
-void TrackerList::editSelectedTracker()
+void TrackerListWidget::editSelectedTracker()
 {
     BitTorrent::TorrentHandle *const torrent = m_properties->getCurrentTorrent();
     if (!torrent) return;
@@ -491,7 +491,7 @@ void TrackerList::editSelectedTracker()
         torrent->forceReannounce();
 }
 
-void TrackerList::reannounceSelected()
+void TrackerListWidget::reannounceSelected()
 {
     QList<QTreeWidgetItem *> selItems = selectedItems();
     if (selItems.isEmpty()) return;
@@ -520,7 +520,7 @@ void TrackerList::reannounceSelected()
     loadTrackers();
 }
 
-void TrackerList::showTrackerListMenu(QPoint)
+void TrackerListWidget::showTrackerListMenu(QPoint)
 {
     BitTorrent::TorrentHandle *const torrent = m_properties->getCurrentTorrent();
     if (!torrent) return;
@@ -575,17 +575,17 @@ void TrackerList::showTrackerListMenu(QPoint)
     }
 }
 
-void TrackerList::loadSettings()
+void TrackerListWidget::loadSettings()
 {
     header()->restoreState(Preferences::instance()->getPropTrackerListState());
 }
 
-void TrackerList::saveSettings() const
+void TrackerListWidget::saveSettings() const
 {
     Preferences::instance()->setPropTrackerListState(header()->saveState());
 }
 
-QStringList TrackerList::headerLabels()
+QStringList TrackerListWidget::headerLabels()
 {
     static const QStringList header {
         "#"
@@ -601,7 +601,7 @@ QStringList TrackerList::headerLabels()
     return header;
 }
 
-int TrackerList::visibleColumnsCount() const
+int TrackerListWidget::visibleColumnsCount() const
 {
     int visibleCols = 0;
     for (unsigned int i = 0; i < COL_COUNT; ++i) {
@@ -612,7 +612,7 @@ int TrackerList::visibleColumnsCount() const
     return visibleCols;
 }
 
-void TrackerList::displayToggleColumnsMenu(const QPoint &)
+void TrackerListWidget::displayToggleColumnsMenu(const QPoint &)
 {
     QMenu hideshowColumn(this);
     hideshowColumn.setTitle(tr("Column visibility"));

src/gui/properties/trackerlistwidget.h

@@ -43,10 +43,10 @@ namespace BitTorrent
     class TorrentHandle;
 }
 
-class TrackerList : public QTreeWidget
+class TrackerListWidget : public QTreeWidget
 {
     Q_OBJECT
-    Q_DISABLE_COPY(TrackerList)
+    Q_DISABLE_COPY(TrackerListWidget)
 
 public:
     enum TrackerListColumn
@@ -63,8 +63,8 @@ public:
         COL_COUNT
     };
 
-    TrackerList(PropertiesWidget *properties);
-    ~TrackerList();
+    TrackerListWidget(PropertiesWidget *properties);
+    ~TrackerListWidget();
 
     int visibleColumnsCount() const;
 

src/gui/properties/trackersadditiondialog.cpp

@@ -25,7 +25,7 @@
  * but you are not obligated to do so. If you do not wish to do so, delete this
  * exception statement from your version.
  */
-#include "trackersadditiondlg.h"
+#include "trackersadditiondialog.h"
 
 #include <QFile>
 #include <QMessageBox>
@@ -39,11 +39,11 @@
 #include "base/utils/fs.h"
 #include "base/utils/misc.h"
 #include "guiiconprovider.h"
-#include "ui_trackersadditiondlg.h"
+#include "ui_trackersadditiondialog.h"
 
-TrackersAdditionDlg::TrackersAdditionDlg(QWidget *parent, BitTorrent::TorrentHandle *const torrent)
+TrackersAdditionDialog::TrackersAdditionDialog(QWidget *parent, BitTorrent::TorrentHandle *const torrent)
     : QDialog(parent)
-    , m_ui(new Ui::TrackersAdditionDlg())
+    , m_ui(new Ui::TrackersAdditionDialog())
     , m_torrent(torrent)
 {
     m_ui->setupUi(this);
@@ -51,12 +51,12 @@ TrackersAdditionDlg::TrackersAdditionDlg(QWidget *parent, BitTorrent::TorrentHan
     m_ui->uTorrentListButton->setIcon(GuiIconProvider::instance()->getIcon("download"));
 }
 
-TrackersAdditionDlg::~TrackersAdditionDlg()
+TrackersAdditionDialog::~TrackersAdditionDialog()
 {
     delete m_ui;
 }
 
-QStringList TrackersAdditionDlg::newTrackers() const
+QStringList TrackersAdditionDialog::newTrackers() const
 {
     QStringList cleanTrackers;
     foreach (QString url, m_ui->trackers_list->toPlainText().split('\n')) {
@@ -67,18 +67,18 @@ QStringList TrackersAdditionDlg::newTrackers() const
     return cleanTrackers;
 }
 
-void TrackersAdditionDlg::on_uTorrentListButton_clicked()
+void TrackersAdditionDialog::on_uTorrentListButton_clicked()
 {
     m_ui->uTorrentListButton->setEnabled(false);
     Net::DownloadHandler *handler = Net::DownloadManager::instance()->downloadUrl(m_ui->list_url->text(), true);
     connect(handler, static_cast<void (Net::DownloadHandler::*)(const QString &, const QString &)>(&Net::DownloadHandler::downloadFinished)
-            , this, &TrackersAdditionDlg::parseUTorrentList);
-    connect(handler, &Net::DownloadHandler::downloadFailed, this, &TrackersAdditionDlg::getTrackerError);
+            , this, &TrackersAdditionDialog::parseUTorrentList);
+    connect(handler, &Net::DownloadHandler::downloadFailed, this, &TrackersAdditionDialog::getTrackerError);
     // Just to show that it takes times
     setCursor(Qt::WaitCursor);
 }
 
-void TrackersAdditionDlg::parseUTorrentList(const QString &, const QString &path)
+void TrackersAdditionDialog::parseUTorrentList(const QString &, const QString &path)
 {
     QFile listFile(path);
     if (!listFile.open(QFile::ReadOnly)) {
@@ -123,7 +123,7 @@ void TrackersAdditionDlg::parseUTorrentList(const QString &, const QString &path
         QMessageBox::information(this, tr("No change"), tr("No additional trackers were found."), QMessageBox::Ok);
 }
 
-void TrackersAdditionDlg::getTrackerError(const QString &, const QString &error)
+void TrackersAdditionDialog::getTrackerError(const QString &, const QString &error)
 {
     // To restore the cursor ...
     setCursor(Qt::ArrowCursor);
@@ -131,10 +131,10 @@ void TrackersAdditionDlg::getTrackerError(const QString &, const QString &error)
     QMessageBox::warning(this, tr("Download error"), tr("The trackers list could not be downloaded, reason: %1").arg(error), QMessageBox::Ok);
 }
 
-QStringList TrackersAdditionDlg::askForTrackers(QWidget *parent, BitTorrent::TorrentHandle *const torrent)
+QStringList TrackersAdditionDialog::askForTrackers(QWidget *parent, BitTorrent::TorrentHandle *const torrent)
 {
     QStringList trackers;
-    TrackersAdditionDlg dlg(parent, torrent);
+    TrackersAdditionDialog dlg(parent, torrent);
     if (dlg.exec() == QDialog::Accepted)
         return dlg.newTrackers();
 

src/gui/properties/trackersadditiondialog.h

@@ -41,16 +41,16 @@ namespace BitTorrent
 
 namespace Ui
 {
-    class TrackersAdditionDlg;
+    class TrackersAdditionDialog;
 }
 
-class TrackersAdditionDlg : public QDialog
+class TrackersAdditionDialog : public QDialog
 {
     Q_OBJECT
 
 public:
-    TrackersAdditionDlg(QWidget *parent, BitTorrent::TorrentHandle *const torrent);
-    ~TrackersAdditionDlg();
+    TrackersAdditionDialog(QWidget *parent, BitTorrent::TorrentHandle *const torrent);
+    ~TrackersAdditionDialog();
 
     QStringList newTrackers() const;
     static QStringList askForTrackers(QWidget *parent, BitTorrent::TorrentHandle *const torrent);
@@ -61,7 +61,7 @@ public slots:
     void getTrackerError(const QString &, const QString &error);
 
 private:
-    Ui::TrackersAdditionDlg *m_ui;
+    Ui::TrackersAdditionDialog *m_ui;
     BitTorrent::TorrentHandle *const m_torrent;
 };
 

src/gui/properties/trackersadditiondialog.ui

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
- <class>TrackersAdditionDlg</class>
- <widget class="QDialog" name="TrackersAdditionDlg">
+ <class>TrackersAdditionDialog</class>
+ <widget class="QDialog" name="TrackersAdditionDialog">
   <property name="geometry">
    <rect>
     <x>0</x>
@@ -65,7 +65,7 @@
   <connection>
    <sender>buttonBox</sender>
    <signal>accepted()</signal>
-   <receiver>TrackersAdditionDlg</receiver>
+   <receiver>TrackersAdditionDialog</receiver>
    <slot>accept()</slot>
    <hints>
     <hint type="sourcelabel">
@@ -81,7 +81,7 @@
   <connection>
    <sender>buttonBox</sender>
    <signal>rejected()</signal>
-   <receiver>TrackersAdditionDlg</receiver>
+   <receiver>TrackersAdditionDialog</receiver>
    <slot>reject()</slot>
    <hints>
     <hint type="sourcelabel">