From a2cc65e49ba1b920918fed19d9dde096214799cb Mon Sep 17 00:00:00 2001 From: Martin Rotter Date: Sun, 19 Feb 2017 10:07:03 +0100 Subject: [PATCH] Transfer to newer connect() usage. --- src/gui/dialogs/formbackupdatabasesettings.cpp | 16 ++++++++++------ src/gui/dialogs/formbackupdatabasesettings.h | 1 + 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/src/gui/dialogs/formbackupdatabasesettings.cpp b/src/gui/dialogs/formbackupdatabasesettings.cpp index bac66a4aa..4eead7d8d 100755 --- a/src/gui/dialogs/formbackupdatabasesettings.cpp +++ b/src/gui/dialogs/formbackupdatabasesettings.cpp @@ -35,12 +35,12 @@ FormBackupDatabaseSettings::FormBackupDatabaseSettings(QWidget *parent) : QDialo setWindowIcon(qApp->icons()->fromTheme(QSL("document-export"))); setWindowFlags(Qt::MSWindowsFixedSizeDialogHint | Qt::Dialog | Qt::WindowSystemMenuHint); - connect(m_ui->m_checkBackupDatabase, SIGNAL(toggled(bool)), this, SLOT(checkOkButton())); - connect(m_ui->m_checkBackupSettings, SIGNAL(toggled(bool)), this, SLOT(checkOkButton())); - connect(m_ui->m_buttonBox->button(QDialogButtonBox::Ok), SIGNAL(clicked()), this, SLOT(performBackup())); - connect(m_ui->m_txtBackupName->lineEdit(), SIGNAL(textChanged(QString)), this, SLOT(checkBackupNames(QString))); - connect(m_ui->m_txtBackupName->lineEdit(), SIGNAL(textChanged(QString)), this, SLOT(checkOkButton())); - connect(m_ui->m_btnSelectFolder, SIGNAL(clicked()), this, SLOT(selectFolder())); + connect(m_ui->m_checkBackupDatabase, &QCheckBox::toggled, this, &FormBackupDatabaseSettings::checkOkButton); + connect(m_ui->m_checkBackupSettings, &QCheckBox::toggled, this, &FormBackupDatabaseSettings::checkOkButton); + connect(m_ui->m_buttonBox->button(QDialogButtonBox::Ok), &QPushButton::clicked, this, &FormBackupDatabaseSettings::performBackup); + connect(m_ui->m_txtBackupName->lineEdit(), &BaseLineEdit::textChanged, this, &FormBackupDatabaseSettings::checkBackupNames); + connect(m_ui->m_txtBackupName->lineEdit(), &BaseLineEdit::textChanged, this, &FormBackupDatabaseSettings::checkOkButton); + connect(m_ui->m_btnSelectFolder, &QPushButton::clicked, this, &FormBackupDatabaseSettings::selectFolderInitial); selectFolder(qApp->getDocumentsFolderPath()); m_ui->m_txtBackupName->lineEdit()->setText(QString(APP_LOW_NAME) + QL1S("_") + QDateTime::currentDateTime().toString(QSL("yyyyMMddHHmm"))); @@ -69,6 +69,10 @@ void FormBackupDatabaseSettings::performBackup() { } } +void FormBackupDatabaseSettings::selectFolderInitial() { + selectFolder(); +} + void FormBackupDatabaseSettings::selectFolder(QString path) { if (path.isEmpty()) { path = QFileDialog::getExistingDirectory(this, tr("Select destination directory"), m_ui->m_lblSelectFolder->label()->text()); diff --git a/src/gui/dialogs/formbackupdatabasesettings.h b/src/gui/dialogs/formbackupdatabasesettings.h index 5110155c5..cc00c1b5f 100755 --- a/src/gui/dialogs/formbackupdatabasesettings.h +++ b/src/gui/dialogs/formbackupdatabasesettings.h @@ -34,6 +34,7 @@ class FormBackupDatabaseSettings : public QDialog { private slots: void performBackup(); + void selectFolderInitial(); void selectFolder(QString path = QString()); void checkBackupNames(const QString &name); void checkOkButton();