Browse Source

Follow project coding style. Issue #2192.

--HG--
branch : magao-dev
adaptive-webui-19844
Tim Delaney 8 years ago committed by Eugene Shalygin
parent
commit
19bb6f5fe0
  1. 2
      src/base/preferences.cpp
  2. 6
      src/base/torrentfilter.h
  3. 3
      src/gui/guiiconprovider.cpp
  4. 2
      src/gui/mainwindow.cpp
  5. 3
      src/gui/optionsdlg.cpp
  6. 6
      src/gui/optionsdlg.h

2
src/base/preferences.cpp

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

6
src/base/torrentfilter.h

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

3
src/gui/guiiconprovider.cpp

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

2
src/gui/mainwindow.cpp

@ -859,7 +859,7 @@ void MainWindow::createKeyboardShortcuts() @@ -859,7 +859,7 @@ void MainWindow::createKeyboardShortcuts()
m_ui->actionDocumentation->setShortcut(QKeySequence::HelpContents);
m_ui->actionOptions->setShortcut(Qt::ALT + Qt::Key_O);
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->actionPauseAll->setShortcut(Qt::CTRL + Qt::SHIFT + Qt::Key_P);
m_ui->actionBottomPriority->setShortcut(Qt::CTRL + Qt::SHIFT + Qt::Key_Minus);

3
src/gui/optionsdlg.cpp

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

6
src/gui/optionsdlg.h

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

Loading…
Cancel
Save