From da867fd022787893c763abd0a3aa6182b5bc30c7 Mon Sep 17 00:00:00 2001 From: Ivan Sorokin Date: Wed, 5 Nov 2014 03:05:21 +0300 Subject: [PATCH] Split trackerlogin into .h and .cpp --- src/mainwindow.cpp | 2 ++ src/src.pro | 3 ++- src/trackerlogin.cpp | 57 ++++++++++++++++++++++++++++++++++++++++++++ src/trackerlogin.h | 28 ++++------------------ 4 files changed, 65 insertions(+), 25 deletions(-) create mode 100644 src/trackerlogin.cpp diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp index 6be49ca86..c0e233816 100755 --- a/src/mainwindow.cpp +++ b/src/mainwindow.cpp @@ -89,6 +89,8 @@ void qt_mac_set_dock_menu(QMenu *menu); #include "downloadthread.h" #endif +#include + using namespace libtorrent; #define TIME_TRAY_BALLOON 5000 diff --git a/src/src.pro b/src/src.pro index a6d960373..b00956a2e 100644 --- a/src/src.pro +++ b/src/src.pro @@ -179,7 +179,8 @@ nox { statsdialog.cpp \ messageboxraised.cpp \ statussortfilterproxymodel.cpp \ - statusbar.cpp + statusbar.cpp \ + trackerlogin.cpp win32 { HEADERS += programupdater.h diff --git a/src/trackerlogin.cpp b/src/trackerlogin.cpp new file mode 100644 index 000000000..d0ab212b7 --- /dev/null +++ b/src/trackerlogin.cpp @@ -0,0 +1,57 @@ +/* + * Bittorrent Client using Qt4 and libtorrent. + * Copyright (C) 2006 Christophe Dumez + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + * + * In addition, as a special exception, the copyright holders give permission to + * link this program with the OpenSSL project's "OpenSSL" library (or with + * modified versions of it that use the same license as the "OpenSSL" library), + * and distribute the linked executables. You must obey the GNU General Public + * License in all respects for all of the code used other than "OpenSSL". If you + * modify file(s), you may extend this exception to your version of the file(s), + * but you are not obligated to do so. If you do not wish to do so, delete this + * exception statement from your version. + * + * Contact : chris@qbittorrent.org + */ + +#include "trackerlogin.h" + +trackerLogin::trackerLogin(QWidget *parent, QTorrentHandle h) + : QDialog(parent) + , h(h) +{ + setupUi(this); + setAttribute(Qt::WA_DeleteOnClose); + login_logo->setPixmap(QPixmap(QString::fromUtf8(":/Icons/oxygen/encrypted.png"))); + tracker_url->setText(h.current_tracker()); + connect(this, SIGNAL(trackerLoginCancelled(QPair)), parent, SLOT(addUnauthenticatedTracker(QPair))); + show(); +} + +trackerLogin::~trackerLogin() {} + +void trackerLogin::on_loginButton_clicked() { + // login + h.set_tracker_login(lineUsername->text(), linePasswd->text()); + close(); +} + +void trackerLogin::on_cancelButton_clicked() { + // Emit a signal to GUI to stop asking for authentication + emit trackerLoginCancelled(QPair(h, h.current_tracker())); + close(); +} diff --git a/src/trackerlogin.h b/src/trackerlogin.h index 4d017a399..f9679308d 100644 --- a/src/trackerlogin.h +++ b/src/trackerlogin.h @@ -32,9 +32,6 @@ #define TRACKERLOGIN_H #include -#include - -#include #include "ui_login.h" #include "qtorrenthandle.h" @@ -46,32 +43,15 @@ class trackerLogin : public QDialog, private Ui::authentication{ QTorrentHandle h; public: - trackerLogin(QWidget *parent, QTorrentHandle h): QDialog(parent), h(h) { - setupUi(this); - setAttribute(Qt::WA_DeleteOnClose); - login_logo->setPixmap(QPixmap(QString::fromUtf8(":/Icons/oxygen/encrypted.png"))); - tracker_url->setText(h.current_tracker()); - connect(this, SIGNAL(trackerLoginCancelled(QPair)), parent, SLOT(addUnauthenticatedTracker(QPair))); - show(); - } - - ~trackerLogin() {} + trackerLogin(QWidget *parent, QTorrentHandle h); + ~trackerLogin(); signals: void trackerLoginCancelled(QPair tracker); public slots: - void on_loginButton_clicked() { - // login - h.set_tracker_login(lineUsername->text(), linePasswd->text()); - close(); - } - - void on_cancelButton_clicked() { - // Emit a signal to GUI to stop asking for authentication - emit trackerLoginCancelled(QPair(h, h.current_tracker())); - close(); - } + void on_loginButton_clicked(); + void on_cancelButton_clicked(); }; #endif