From 810a9710d7a558eb2ca8edb3effeae727e69bbbf Mon Sep 17 00:00:00 2001 From: Christophe Dumez Date: Sat, 5 May 2012 15:57:43 +0300 Subject: [PATCH] Minor clean up --- src/mainwindow.cpp | 8 ++++---- src/torrentadditiondlg.cpp | 2 +- src/torrentadditiondlg.h | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp index 067c98c1d..2a2463c9e 100644 --- a/src/mainwindow.cpp +++ b/src/mainwindow.cpp @@ -888,7 +888,7 @@ void MainWindow::dropEvent(QDropEvent *event) { torrentAdditionDialog *dialog = new torrentAdditionDialog(this); if (file.startsWith("file:", Qt::CaseInsensitive)) file = QUrl(file).toLocalFile(); - dialog->showLoad(file); + dialog->showLoadTorrent(file); }else{ QBtSession::instance()->addTorrent(file); } @@ -927,7 +927,7 @@ void MainWindow::on_actionOpen_triggered() { for (uint i=0; ishowLoad(pathsList.at(i)); + dialog->showLoadTorrent(pathsList.at(i)); }else{ QBtSession::instance()->addTorrent(pathsList.at(i)); } @@ -969,7 +969,7 @@ void MainWindow::processParams(const QStringList& params) { } else { if (useTorrentAdditionDialog) { torrentAdditionDialog *dialog = new torrentAdditionDialog(this); - dialog->showLoad(param); + dialog->showLoadTorrent(param); }else{ QBtSession::instance()->addTorrent(param); } @@ -987,7 +987,7 @@ void MainWindow::processDownloadedFiles(QString path, QString url) { const bool useTorrentAdditionDialog = settings.value(QString::fromUtf8("Preferences/Downloads/AdditionDialog"), true).toBool(); if (useTorrentAdditionDialog) { torrentAdditionDialog *dialog = new torrentAdditionDialog(this); - dialog->showLoad(path, url); + dialog->showLoadTorrent(path, url); }else{ QBtSession::instance()->addTorrent(path, false, url); } diff --git a/src/torrentadditiondlg.cpp b/src/torrentadditiondlg.cpp index 81aa08384..443e5f7a0 100644 --- a/src/torrentadditiondlg.cpp +++ b/src/torrentadditiondlg.cpp @@ -226,7 +226,7 @@ void torrentAdditionDialog::showLoadMagnetURI(const QString& magnet_uri) { show(); } -void torrentAdditionDialog::showLoad(const QString& filePath, const QString& from_url) { +void torrentAdditionDialog::showLoadTorrent(const QString& filePath, const QString& from_url) { m_isMagnet = false; // This is an URL to a local file, switch to local path diff --git a/src/torrentadditiondlg.h b/src/torrentadditiondlg.h index 37e27f96e..492352b92 100644 --- a/src/torrentadditiondlg.h +++ b/src/torrentadditiondlg.h @@ -47,7 +47,7 @@ public: torrentAdditionDialog(QWidget *parent); ~torrentAdditionDialog(); void showLoadMagnetURI(const QString& magnet_uri); - void showLoad(const QString& m_filePath, const QString& m_fromUrl = QString()); + void showLoadTorrent(const QString& filePath, const QString& fromUrl = QString()); QString getCurrentTruncatedSavePath(QString* root_folder_or_file_name = 0) const; QString getTruncatedSavePath(QString save_path, QString* root_folder_or_file_name = 0) const; bool allFiltered() const;