Cleanup code

Also remove redundant code, it is already handled correctly in subsequent function calls.
This commit is contained in:
Chocobo1 2018-12-28 13:38:08 +08:00
parent 19d6de795c
commit 6759446639
No known key found for this signature in database
GPG key ID: 210D9C873253A68C
5 changed files with 27 additions and 31 deletions

View file

@ -227,7 +227,7 @@ void AddNewTorrentDialog::saveState()
settings()->storeValue(KEY_EXPANDED, m_ui->toolButtonAdvanced->isChecked());
}
void AddNewTorrentDialog::show(QString source, const BitTorrent::AddTorrentParams &inParams, QWidget *parent)
void AddNewTorrentDialog::show(const QString &source, const BitTorrent::AddTorrentParams &inParams, QWidget *parent)
{
AddNewTorrentDialog *dlg = new AddNewTorrentDialog(inParams, parent);
@ -240,27 +240,27 @@ void AddNewTorrentDialog::show(QString source, const BitTorrent::AddTorrentParam
, dlg, &AddNewTorrentDialog::handleDownloadFinished);
connect(handler, &Net::DownloadHandler::downloadFailed, dlg, &AddNewTorrentDialog::handleDownloadFailed);
connect(handler, &Net::DownloadHandler::redirectedToMagnet, dlg, &AddNewTorrentDialog::handleRedirectedToMagnet);
return;
}
const BitTorrent::MagnetUri magnetUri(source);
const bool isLoaded = magnetUri.isValid()
? dlg->loadMagnet(magnetUri)
: dlg->loadTorrent(source);
if (isLoaded) {
#ifdef Q_OS_MAC
dlg->exec();
#else
dlg->open();
#endif
}
else {
bool ok = false;
BitTorrent::MagnetUri magnetUri(source);
if (magnetUri.isValid())
ok = dlg->loadMagnet(magnetUri);
else
ok = dlg->loadTorrent(source);
if (ok)
#ifdef Q_OS_MAC
dlg->exec();
#else
dlg->open();
#endif
else
delete dlg;
delete dlg;
}
}
void AddNewTorrentDialog::show(QString source, QWidget *parent)
void AddNewTorrentDialog::show(const QString &source, QWidget *parent)
{
show(source, BitTorrent::AddTorrentParams(), parent);
}