d4708/qBittorrent
1
0
Fork 0
mirror of https://github.com/d47081/qBittorrent.git synced 2025-01-10 23:07:59 +00:00
Code Issues Projects Releases Wiki Activity

Follow project coding style. Issue #2192.

Browse Source 
--HG--
branch : magao-dev
This commit is contained in:
Tim Delaney 2017-02-12 12:14:01 +11:00 committed by Eugene Shalygin
parent 8c75fdcb4c
commit 19bb6f5fe0
6 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/base/preferences.cpp
View File

@ -59,7 +59,7 @@
Preferences *Preferences::m_instance = 0; Preferences *Preferences::m_instance = 0;
Preferences::Preferences() {} Preferences::Preferences() = default;
Preferences *Preferences::instance() Preferences *Preferences::instance()
{ {

6
src/base/torrentfilter.h
View File

@ -36,10 +36,8 @@ typedef QSet<QString> QStringSet;
namespace BitTorrent namespace BitTorrent
{ {
class TorrentHandle;
class TorrentHandle; class TorrentState;
class TorrentState;
} }
class TorrentFilter class TorrentFilter

3
src/gui/guiiconprovider.cpp
View File

@ -43,7 +43,7 @@ GuiIconProvider::GuiIconProvider(QObject *parent)
connect(Preferences::instance(), SIGNAL(changed()), SLOT(configure())); connect(Preferences::instance(), SIGNAL(changed()), SLOT(configure()));
} }
GuiIconProvider::~GuiIconProvider() {} GuiIconProvider::~GuiIconProvider() = default;
void GuiIconProvider::initInstance() void GuiIconProvider::initInstance()
{ {
@ -138,7 +138,6 @@ QString GuiIconProvider::getIconPath(const QString &iconId)
return IconProvider::getIconPath(iconId); return IconProvider::getIconPath(iconId);
} }
void GuiIconProvider::configure() void GuiIconProvider::configure()
{ {
#if (defined(Q_OS_UNIX) && !defined(Q_OS_MAC)) #if (defined(Q_OS_UNIX) && !defined(Q_OS_MAC))

2
src/gui/mainwindow.cpp
View File

@ -859,7 +859,7 @@ void MainWindow::createKeyboardShortcuts()
m_ui->actionDocumentation->setShortcut(QKeySequence::HelpContents); m_ui->actionDocumentation->setShortcut(QKeySequence::HelpContents);
m_ui->actionOptions->setShortcut(Qt::ALT + Qt::Key_O); m_ui->actionOptions->setShortcut(Qt::ALT + Qt::Key_O);
m_ui->actionStart->setShortcut(Qt::CTRL + Qt::Key_S); m_ui->actionStart->setShortcut(Qt::CTRL + Qt::Key_S);
m_ui->actionStartAll->setShortcut(Qt::CTRL + Qt::SHIFT +Qt::Key_S); m_ui->actionStartAll->setShortcut(Qt::CTRL + Qt::SHIFT + Qt::Key_S);
m_ui->actionPause->setShortcut(Qt::CTRL + Qt::Key_P); m_ui->actionPause->setShortcut(Qt::CTRL + Qt::Key_P);
m_ui->actionPauseAll->setShortcut(Qt::CTRL + Qt::SHIFT + Qt::Key_P); m_ui->actionPauseAll->setShortcut(Qt::CTRL + Qt::SHIFT + Qt::Key_P);
m_ui->actionBottomPriority->setShortcut(Qt::CTRL + Qt::SHIFT + Qt::Key_Minus); m_ui->actionBottomPriority->setShortcut(Qt::CTRL + Qt::SHIFT + Qt::Key_Minus);

3
src/gui/optionsdlg.cpp
View File

@ -312,8 +312,7 @@ OptionsDialog::OptionsDialog(QWidget *parent)
connect(m_ui->comboRatioLimitAct, qComboBoxCurrentIndexChanged, this, &ThisType::enableApplyButton); connect(m_ui->comboRatioLimitAct, qComboBoxCurrentIndexChanged, this, &ThisType::enableApplyButton);
connect(m_ui->checkMaxSeedingMinutes, &QAbstractButton::toggled, this, &ThisType::enableApplyButton); connect(m_ui->checkMaxSeedingMinutes, &QAbstractButton::toggled, this, &ThisType::enableApplyButton);
connect(m_ui->checkMaxSeedingMinutes, &QAbstractButton::toggled, this, &ThisType::toggleComboRatioLimitAct); connect(m_ui->checkMaxSeedingMinutes, &QAbstractButton::toggled, this, &ThisType::toggleComboRatioLimitAct);
connect(m_ui->spinMaxSeedingMinutes, static_cast<void (QSpinBox::*)(int)>(&QSpinBox::valueChanged), connect(m_ui->spinMaxSeedingMinutes, qSpinBoxValueChanged, this, &ThisType::enableApplyButton);
this, &ThisType::enableApplyButton);
// Proxy tab // Proxy tab
connect(m_ui->comboProxyType, qComboBoxCurrentIndexChanged, this, &ThisType::enableApplyButton); connect(m_ui->comboProxyType, qComboBoxCurrentIndexChanged, this, &ThisType::enableApplyButton);
connect(m_ui->textProxyIP, &QLineEdit::textChanged, this, &ThisType::enableApplyButton); connect(m_ui->textProxyIP, &QLineEdit::textChanged, this, &ThisType::enableApplyButton);

6
src/gui/optionsdlg.h
View File

@ -88,10 +88,10 @@ private slots:
void on_buttonBox_accepted(); void on_buttonBox_accepted();
void closeEvent(QCloseEvent *e); void closeEvent(QCloseEvent *e);
void on_buttonBox_rejected(); void on_buttonBox_rejected();
void applySettings(QAbstractButton* button); void applySettings(QAbstractButton *button);
void enableApplyButton(); void enableApplyButton();
void toggleComboRatioLimitAct(); void toggleComboRatioLimitAct();
void changePage(QListWidgetItem*, QListWidgetItem*); void changePage(QListWidgetItem *, QListWidgetItem *);
void loadWindowState(); void loadWindowState();
void loadSplitterState(); void loadSplitterState();
void saveWindowState() const; void saveWindowState() const;
@ -132,7 +132,7 @@ private:
bool addTorrentsInPause() const; bool addTorrentsInPause() const;
QString getTorrentExportDir() const; QString getTorrentExportDir() const;
QString getFinishedTorrentExportDir() const; QString getFinishedTorrentExportDir() const;
QString askForExportDir(const QString& currentExportPath); QString askForExportDir(const QString &currentExportPath);
int getActionOnDblClOnTorrentDl() const; int getActionOnDblClOnTorrentDl() const;
int getActionOnDblClOnTorrentFn() const; int getActionOnDblClOnTorrentFn() const;
// Connection options // Connection options