squidy/qBittorrent
1
0
Fork 0
mirror of https://github.com/qbittorrent/qBittorrent.git synced 2026-01-08 00:22:31 -06:00
Code Issues Packages Projects Releases Wiki Activity

Convert the names used in ui and c++ files from snake_case to camelCase

Browse Source
This commit is contained in:
thalieht
2018-06-14 12:38:18 +03:00
parent ca68b86550
commit 6d4434ad66
22 changed files with 315 additions and 314 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/gui/properties/peersadditiondialog.cpp
View File

@@ -55,13 +55,13 @@ QList<BitTorrent::PeerAddress> PeersAdditionDialog::askForPeers(QWidget *parent)
void PeersAdditionDialog::validateInput()
{
if (m_ui->peers_txt->toPlainText().trimmed().isEmpty()) {
if (m_ui->textEditPeers->toPlainText().trimmed().isEmpty()) {
QMessageBox::warning(this, tr("No peer entered"),
tr("Please type at least one peer."),
QMessageBox::Ok);
return;
}
foreach (const QString &peer, m_ui->peers_txt->toPlainText().trimmed().split('\n')) {
foreach (const QString &peer, m_ui->textEditPeers->toPlainText().trimmed().split('\n')) {
BitTorrent::PeerAddress addr = parsePeer(peer);
if (!addr.ip.isNull()) {
m_peersList.append(addr);

2
src/gui/properties/peersadditiondialog.ui
View File

@@ -22,7 +22,7 @@
</widget>
</item>
<item>
<widget class="QTextEdit" name="peers_txt">
<widget class="QTextEdit" name="textEditPeers">
<property name="lineWrapMode">
<enum>QTextEdit::NoWrap</enum>
</property>

8
src/gui/properties/propertieswidget.cpp
View File

@@ -139,10 +139,10 @@ PropertiesWidget::PropertiesWidget(QWidget *parent, MainWindow *mainWindow, Tran
m_ui->trackerDownButton->setIconSize(Utils::Gui::smallIconSize());
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);
m_ui->hBoxLayoutTrackers->insertWidget(0, m_trackerList);
// Peers list
m_peerList = new PeerListWidget(this);
m_ui->peerpage_layout->addWidget(m_peerList);
m_ui->vBoxLayoutPeerPage->addWidget(m_peerList);
// Speed widget
m_speedWidget = new SpeedWidget(this);
m_ui->speedLayout->addWidget(m_speedWidget);
@@ -604,7 +604,7 @@ void PropertiesWidget::displayFilesListMenu(const QPoint &)
QMenu subMenu;
if (!m_torrent->isSeed()) {
subMenu.setTitle(tr("Priority"));
subMenu.addAction(m_ui->actionNot_downloaded);
subMenu.addAction(m_ui->actionNotDownloaded);
subMenu.addAction(m_ui->actionNormal);
subMenu.addAction(m_ui->actionHigh);
subMenu.addAction(m_ui->actionMaximum);
@@ -632,7 +632,7 @@ void PropertiesWidget::displayFilesListMenu(const QPoint &)
prio = prio::HIGH;
else if (act == m_ui->actionMaximum)
prio = prio::MAXIMUM;
else if (act == m_ui->actionNot_downloaded)
else if (act == m_ui->actionNotDownloaded)
prio = prio::IGNORED;
qDebug("Setting files priority");

6
src/gui/properties/propertieswidget.ui
View File

@@ -905,7 +905,7 @@
</layout>
</widget>
<widget class="QWidget" name="pageTrackers">
<layout class="QHBoxLayout" name="horizontalLayout_trackers">
<layout class="QHBoxLayout" name="hBoxLayoutTrackers">
<property name="leftMargin">
<number>0</number>
</property>
@@ -957,7 +957,7 @@
</layout>
</widget>
<widget class="QWidget" name="pagePeers">
<layout class="QVBoxLayout" name="peerpage_layout">
<layout class="QVBoxLayout" name="vBoxLayoutPeerPage">
<property name="leftMargin">
<number>0</number>
</property>
@@ -1083,7 +1083,7 @@
</widget>
</item>
</layout>
<action name="actionNot_downloaded">
<action name="actionNotDownloaded">
<property name="text">
<string>Do not download</string>
</property>

12
src/gui/properties/trackersadditiondialog.cpp
View File

@@ -60,7 +60,7 @@ TrackersAdditionDialog::~TrackersAdditionDialog()
QStringList TrackersAdditionDialog::newTrackers() const
{
QStringList cleanTrackers;
foreach (QString url, m_ui->trackers_list->toPlainText().split('\n')) {
foreach (QString url, m_ui->textEditTrackersList->toPlainText().split('\n')) {
url = url.trimmed();
if (!url.isEmpty())
cleanTrackers << url;
@@ -71,7 +71,7 @@ QStringList TrackersAdditionDialog::newTrackers() const
void TrackersAdditionDialog::on_uTorrentListButton_clicked()
{
m_ui->uTorrentListButton->setEnabled(false);
Net::DownloadHandler *handler = Net::DownloadManager::instance()->download({m_ui->list_url->text()});
Net::DownloadHandler *handler = Net::DownloadManager::instance()->download({m_ui->lineEditListURL->text()});
connect(handler, static_cast<void (Net::DownloadHandler::*)(const QString &, const QByteArray &)>(&Net::DownloadHandler::downloadFinished)
, this, &TrackersAdditionDialog::parseUTorrentList);
connect(handler, &Net::DownloadHandler::downloadFailed, this, &TrackersAdditionDialog::getTrackerError);
@@ -84,7 +84,7 @@ void TrackersAdditionDialog::parseUTorrentList(const QString &, const QByteArray
// Load from torrent handle
QList<BitTorrent::TrackerEntry> existingTrackers = m_torrent->trackers();
// Load from current user list
QStringList tmp = m_ui->trackers_list->toPlainText().split('\n');
QStringList tmp = m_ui->textEditTrackersList->toPlainText().split('\n');
foreach (const QString &userURL, tmp) {
BitTorrent::TrackerEntry userTracker(userURL);
if (!existingTrackers.contains(userTracker))
@@ -92,8 +92,8 @@ void TrackersAdditionDialog::parseUTorrentList(const QString &, const QByteArray
}
// Add new trackers to the list
if (!m_ui->trackers_list->toPlainText().isEmpty() && !m_ui->trackers_list->toPlainText().endsWith('\n'))
m_ui->trackers_list->insertPlainText("\n");
if (!m_ui->textEditTrackersList->toPlainText().isEmpty() && !m_ui->textEditTrackersList->toPlainText().endsWith('\n'))
m_ui->textEditTrackersList->insertPlainText("\n");
int nb = 0;
QBuffer buffer;
buffer.setData(data);
@@ -104,7 +104,7 @@ void TrackersAdditionDialog::parseUTorrentList(const QString &, const QByteArray
BitTorrent::TrackerEntry newTracker(line);
if (!existingTrackers.contains(newTracker)) {
m_ui->trackers_list->insertPlainText(line + '\n');
m_ui->textEditTrackersList->insertPlainText(line + '\n');
++nb;
}
}

4
src/gui/properties/trackersadditiondialog.ui
View File

@@ -22,7 +22,7 @@
</widget>
</item>
<item>
<widget class="QTextEdit" name="trackers_list">
<widget class="QTextEdit" name="textEditTrackersList">
<property name="lineWrapMode">
<enum>QTextEdit::NoWrap</enum>
</property>
@@ -41,7 +41,7 @@
<item>
<layout class="QHBoxLayout" name="horizontalLayout">
<item>
<widget class="QLineEdit" name="list_url"/>
<widget class="QLineEdit" name="lineEditListURL"/>
</item>
<item>
<widget class="QPushButton" name="uTorrentListButton"/>