Browse Source

Minor clean up

adaptive-webui-19844
Christophe Dumez 13 years ago
parent
commit
810a9710d7
  1. 8
      src/mainwindow.cpp
  2. 2
      src/torrentadditiondlg.cpp
  3. 2
      src/torrentadditiondlg.h

8
src/mainwindow.cpp

@ -888,7 +888,7 @@ void MainWindow::dropEvent(QDropEvent *event) { @@ -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() { @@ -927,7 +927,7 @@ void MainWindow::on_actionOpen_triggered() {
for (uint i=0; i<listSize; ++i) {
if (useTorrentAdditionDialog) {
torrentAdditionDialog *dialog = new torrentAdditionDialog(this);
dialog->showLoad(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) { @@ -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) { @@ -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);
}

2
src/torrentadditiondlg.cpp

@ -226,7 +226,7 @@ void torrentAdditionDialog::showLoadMagnetURI(const QString& magnet_uri) { @@ -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

2
src/torrentadditiondlg.h

@ -47,7 +47,7 @@ public: @@ -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;

Loading…
Cancel
Save