Commit c67ff4dd authored by Alexander Lohnau's avatar Alexander Lohnau 💬

Port Qt4 style connects

parent a3e1bb78
......@@ -61,50 +61,50 @@ FileViewBazaarPlugin::FileViewBazaarPlugin(QObject* parent, const QList<QVariant
m_updateAction = new QAction(this);
m_updateAction->setIcon(QIcon::fromTheme("go-down"));
m_updateAction->setText(i18nc("@item:inmenu", "Bazaar Update"));
connect(m_updateAction, SIGNAL(triggered()),
this, SLOT(updateFiles()));
connect(m_updateAction, &QAction::triggered,
this, &FileViewBazaarPlugin::updateFiles);
m_pullAction = new QAction(this);
m_pullAction->setIcon(QIcon::fromTheme("go-bottom"));
m_pullAction->setText(i18nc("@item:inmenu", "Bazaar Pull"));
connect(m_pullAction, SIGNAL(triggered()),
this, SLOT(pullFiles()));
connect(m_pullAction, &QAction::triggered,
this, &FileViewBazaarPlugin::pullFiles);
m_pushAction = new QAction(this);
m_pushAction->setIcon(QIcon::fromTheme("go-top"));
m_pushAction->setText(i18nc("@item:inmenu", "Bazaar Push"));
connect(m_pushAction, SIGNAL(triggered()),
this, SLOT(pushFiles()));
connect(m_pushAction, &QAction::triggered,
this, &FileViewBazaarPlugin::pushFiles);
m_showLocalChangesAction = new QAction(this);
m_showLocalChangesAction->setIcon(QIcon::fromTheme("view-split-left-right"));
m_showLocalChangesAction->setText(i18nc("@item:inmenu", "Show Local Bazaar Changes"));
connect(m_showLocalChangesAction, SIGNAL(triggered()),
this, SLOT(showLocalChanges()));
connect(m_showLocalChangesAction, &QAction::triggered,
this, &FileViewBazaarPlugin::showLocalChanges);
m_commitAction = new QAction(this);
m_commitAction->setIcon(QIcon::fromTheme("svn-commit"));
m_commitAction->setText(i18nc("@item:inmenu", "Bazaar Commit..."));
connect(m_commitAction, SIGNAL(triggered()),
this, SLOT(commitFiles()));
connect(m_commitAction, &QAction::triggered,
this, &FileViewBazaarPlugin::commitFiles);
m_addAction = new QAction(this);
m_addAction->setIcon(QIcon::fromTheme("list-add"));
m_addAction->setText(i18nc("@item:inmenu", "Bazaar Add..."));
connect(m_addAction, SIGNAL(triggered()),
this, SLOT(addFiles()));
connect(m_addAction, &QAction::triggered,
this, &FileViewBazaarPlugin::addFiles);
m_removeAction = new QAction(this);
m_removeAction->setIcon(QIcon::fromTheme("list-remove"));
m_removeAction->setText(i18nc("@item:inmenu", "Bazaar Delete"));
connect(m_removeAction, SIGNAL(triggered()),
this, SLOT(removeFiles()));
connect(m_removeAction, &QAction::triggered,
this, &FileViewBazaarPlugin::removeFiles);
m_logAction = new QAction(this);
m_logAction->setIcon(QIcon::fromTheme("format-list-ordered"));
m_logAction->setText(i18nc("@item:inmenu", "Bazaar Log"));
connect(m_logAction, SIGNAL(triggered()),
this, SLOT(log()));
connect(m_logAction, &QAction::triggered,
this, &FileViewBazaarPlugin::log);
connect(&m_process, QOverload<int, QProcess::ExitStatus>::of(&QProcess::finished),
this, &FileViewBazaarPlugin::slotOperationCompleted);
......
......@@ -88,8 +88,8 @@ FileViewDropboxPlugin::FileViewDropboxPlugin(QObject* parent, const QVariantList
}
}
connect(d->databaseFileWatcher, SIGNAL(fileChanged(QString)), SIGNAL(itemVersionsChanged()));
connect(d->contextActions, SIGNAL(actionTriggered(QAction*)), SLOT(handleContextAction(QAction*)));
connect(d->databaseFileWatcher.data(), &QFileSystemWatcher::fileChanged, this, &KVersionControlPlugin::itemVersionsChanged);
connect(d->contextActions.data(), &KActionCollection::actionTriggered, this, &FileViewDropboxPlugin::handleContextAction);
}
FileViewDropboxPlugin::~FileViewDropboxPlugin()
......
......@@ -48,8 +48,8 @@ CheckoutDialog::CheckoutDialog(QWidget* parent):
QPushButton *okButton = m_buttonBox->button(QDialogButtonBox::Ok);
okButton->setDefault(true);
okButton->setShortcut(Qt::CTRL | Qt::Key_Return);
this->connect(m_buttonBox, SIGNAL(accepted()), this, SLOT(accept()));
this->connect(m_buttonBox, SIGNAL(rejected()), this, SLOT(reject()));
this->connect(m_buttonBox, &QDialogButtonBox::accepted, this, &QDialog::accept);
this->connect(m_buttonBox, &QDialogButtonBox::rejected, this, &QDialog::reject);
okButton->setText(i18nc("@action:button", "Checkout"));
QWidget *boxWidget = new QWidget(this);
......@@ -140,20 +140,20 @@ CheckoutDialog::CheckoutDialog(QWidget* parent):
}
//signals
connect(m_branchRadioButton, SIGNAL(toggled(bool)),
this, SLOT(branchRadioButtonToggled(bool)));
connect(m_branchRadioButton, &QAbstractButton::toggled,
this, &CheckoutDialog::branchRadioButtonToggled);
connect(m_branchComboBox, SIGNAL(currentIndexChanged(QString)),
this, SLOT(setDefaultNewBranchName(QString)));
connect(m_branchComboBox, SIGNAL(currentIndexChanged(QString)),
this, SLOT(setOkButtonState()));
connect(m_tagComboBox, SIGNAL(currentIndexChanged(QString)),
this, SLOT(setDefaultNewBranchName(QString)));
connect(m_newBranchCheckBox, SIGNAL(stateChanged(int)),
this, SLOT(newBranchCheckBoxStateToggled(int)));
connect(m_newBranchName, SIGNAL(textChanged(QString)),
this, SLOT(setOkButtonState()));
connect(m_newBranchName, SIGNAL(textEdited(QString)),
this, SLOT(noteUserEditedNewBranchName()));
connect(m_newBranchCheckBox, &QCheckBox::stateChanged,
this, &CheckoutDialog::newBranchCheckBoxStateToggled);
connect(m_newBranchName, &QLineEdit::textChanged,
this, &CheckoutDialog::setOkButtonState);
connect(m_newBranchName, &QLineEdit::textEdited,
this, &CheckoutDialog::noteUserEditedNewBranchName);
//set initial widget states
newBranchCheckBoxStateToggled(Qt::Unchecked);
}
......
......@@ -45,8 +45,8 @@ CommitDialog::CommitDialog (QWidget* parent ):
QPushButton *okButton = m_buttonBox->button(QDialogButtonBox::Ok);
okButton->setDefault(true);
okButton->setShortcut(Qt::CTRL | Qt::Key_Return);
this->connect(m_buttonBox, SIGNAL(accepted()), this, SLOT(accept()));
this->connect(m_buttonBox, SIGNAL(rejected()), this, SLOT(reject()));
this->connect(m_buttonBox, &QDialogButtonBox::accepted, this, &QDialog::accept);
this->connect(m_buttonBox, &QDialogButtonBox::rejected, this, &QDialog::reject);
okButton->setText(i18nc("@action:button", "Commit"));
QWidget* boxWidget = new QWidget(this);
......@@ -68,7 +68,7 @@ CommitDialog::CommitDialog (QWidget* parent ):
m_commitMessageTextEdit->setLineWrapColumnOrWidth(72);
messageVBox->addWidget(m_commitMessageTextEdit);
setOkButtonState();
connect(m_commitMessageTextEdit, SIGNAL(textChanged()), this, SLOT(setOkButtonState()));
connect(m_commitMessageTextEdit, &QTextEdit::textChanged, this, &CommitDialog::setOkButtonState);
QHBoxLayout* messageHBox = new QHBoxLayout();
messageVBox->addLayout(messageHBox);
......@@ -81,8 +81,8 @@ CommitDialog::CommitDialog (QWidget* parent ):
m_amendCheckBox->setEnabled(false);
m_amendCheckBox->setToolTip(i18nc("@info:tooltip", "There is nothing to amend."));
} else {
connect(m_amendCheckBox, SIGNAL(stateChanged(int)),
this, SLOT(amendCheckBoxStateChanged()));
connect(m_amendCheckBox, &QCheckBox::stateChanged,
this, &CommitDialog::amendCheckBoxStateChanged);
}
QPushButton * signOffButton = new QPushButton(
......@@ -95,8 +95,8 @@ CommitDialog::CommitDialog (QWidget* parent ):
FileViewGitPluginSettings* settings = FileViewGitPluginSettings::self();
this->resize(QSize(settings->commitDialogWidth(), settings->commitDialogHeight()));
connect(this, SIGNAL(finished()), this, SLOT(saveDialogSize()));
connect(signOffButton, SIGNAL(clicked(bool)), this, SLOT(signOffButtonClicked()));
connect(this, &QDialog::finished, this, &CommitDialog::saveDialogSize);
connect(signOffButton, &QAbstractButton::clicked, this, &CommitDialog::signOffButtonClicked);
}
void CommitDialog::signOffButtonClicked()
......
......@@ -58,53 +58,53 @@ FileViewGitPlugin::FileViewGitPlugin(QObject* parent, const QList<QVariant>& arg
m_revertAction = new QAction(this);
m_revertAction->setIcon(QIcon::fromTheme("document-revert"));
m_revertAction->setText(xi18nd("@action:inmenu", "<application>Git</application> Revert"));
connect(m_revertAction, SIGNAL(triggered()),
this, SLOT(revertFiles()));
connect(m_revertAction, &QAction::triggered,
this, &FileViewGitPlugin::revertFiles);
m_addAction = new QAction(this);
m_addAction->setIcon(QIcon::fromTheme("list-add"));
m_addAction->setText(xi18nd("@action:inmenu", "<application>Git</application> Add"));
connect(m_addAction, SIGNAL(triggered()),
this, SLOT(addFiles()));
connect(m_addAction, &QAction::triggered,
this, &FileViewGitPlugin::addFiles);
m_showLocalChangesAction = new QAction(this);
m_showLocalChangesAction->setIcon(QIcon::fromTheme("view-split-left-right"));
m_showLocalChangesAction->setText(xi18nd("@item:inmenu", "Show Local <application>Git</application> Changes"));
connect(m_showLocalChangesAction, SIGNAL(triggered()),
this, SLOT(showLocalChanges()));
connect(m_showLocalChangesAction, &QAction::triggered,
this, &FileViewGitPlugin::showLocalChanges);
m_removeAction = new QAction(this);
m_removeAction->setIcon(QIcon::fromTheme("list-remove"));
m_removeAction->setText(xi18nd("@action:inmenu", "<application>Git</application> Remove"));
connect(m_removeAction, SIGNAL(triggered()),
this, SLOT(removeFiles()));
connect(m_removeAction, &QAction::triggered,
this, &FileViewGitPlugin::removeFiles);
m_checkoutAction = new QAction(this);
// m_checkoutAction->setIcon(QIcon::fromTheme("svn_switch")); does not exist in normal kde SC
m_checkoutAction->setText(xi18nd("@action:inmenu", "<application>Git</application> Checkout..."));
connect(m_checkoutAction, SIGNAL(triggered()),
this, SLOT(checkout()));
connect(m_checkoutAction, &QAction::triggered,
this, &FileViewGitPlugin::checkout);
m_commitAction = new QAction(this);
m_commitAction->setIcon(QIcon::fromTheme("svn-commit"));
m_commitAction->setText(xi18nd("@action:inmenu", "<application>Git</application> Commit..."));
connect(m_commitAction, SIGNAL(triggered()),
this, SLOT(commit()));
connect(m_commitAction, &QAction::triggered,
this, &FileViewGitPlugin::commit);
m_tagAction = new QAction(this);
// m_tagAction->setIcon(QIcon::fromTheme("svn-commit"));
m_tagAction->setText(xi18nd("@action:inmenu", "<application>Git</application> Create Tag..."));
connect(m_tagAction, SIGNAL(triggered()),
this, SLOT(createTag()));
connect(m_tagAction, &QAction::triggered,
this, &FileViewGitPlugin::createTag);
m_pushAction = new QAction(this);
// m_pushAction->setIcon(QIcon::fromTheme("svn-commit"));
m_pushAction->setText(xi18nd("@action:inmenu", "<application>Git</application> Push..."));
connect(m_pushAction, SIGNAL(triggered()),
this, SLOT(push()));
connect(m_pushAction, &QAction::triggered,
this, &FileViewGitPlugin::push);
m_pullAction = new QAction(this);
m_pullAction->setText(xi18nd("@action:inmenu", "<application>Git</application> Pull..."));
connect(m_pullAction, SIGNAL(triggered()),
this, SLOT(pull()));
connect(m_pullAction, &QAction::triggered,
this, &FileViewGitPlugin::pull);
m_mergeAction = new QAction(this);
m_mergeAction->setIcon(QIcon::fromTheme("merge"));
m_mergeAction->setText(xi18nd("@action:inmenu", "<application>Git</application> Merge..."));
......
......@@ -43,8 +43,8 @@ PullDialog::PullDialog(QWidget* parent):
QPushButton *okButton = m_buttonBox->button(QDialogButtonBox::Ok);
okButton->setDefault(true);
okButton->setShortcut(Qt::CTRL | Qt::Key_Return);
this->connect(m_buttonBox, SIGNAL(accepted()), this, SLOT(accept()));
this->connect(m_buttonBox, SIGNAL(rejected()), this, SLOT(reject()));
this->connect(m_buttonBox, &QDialogButtonBox::accepted, this, &QDialog::accept);
this->connect(m_buttonBox, &QDialogButtonBox::rejected, this, &QDialog::reject);
okButton->setText(i18nc("@action:button", "Pull"));
QWidget * boxWidget = new QWidget(this);
......
......@@ -44,8 +44,8 @@ PushDialog::PushDialog (QWidget* parent ):
QPushButton *okButton = m_buttonBox->button(QDialogButtonBox::Ok);
okButton->setDefault(true);
okButton->setShortcut(Qt::CTRL | Qt::Key_Return);
this->connect(m_buttonBox, SIGNAL(accepted()), this, SLOT(accept()));
this->connect(m_buttonBox, SIGNAL(rejected()), this, SLOT(reject()));
this->connect(m_buttonBox, &QDialogButtonBox::accepted, this, &QDialog::accept);
this->connect(m_buttonBox, &QDialogButtonBox::rejected, this, &QDialog::reject);
m_buttonBox->button(QDialogButtonBox::Ok)->setDefault(true);
okButton->setText(i18nc("@action:button", "Push"));
......
......@@ -48,8 +48,8 @@ TagDialog::TagDialog (QWidget* parent ):
QPushButton *okButton = m_buttonBox->button(QDialogButtonBox::Ok);
okButton->setDefault(true);
okButton->setShortcut(Qt::CTRL | Qt::Key_Return);
this->connect(m_buttonBox, SIGNAL(accepted()), this, SLOT(accept()));
this->connect(m_buttonBox, SIGNAL(rejected()), this, SLOT(reject()));
this->connect(m_buttonBox, &QDialogButtonBox::accepted, this, &QDialog::accept);
this->connect(m_buttonBox, &QDialogButtonBox::rejected, this, &QDialog::reject);
m_buttonBox->button(QDialogButtonBox::Ok)->setDefault(true);
okButton->setText(i18nc("@action:button", "Create Tag"));
......@@ -70,7 +70,7 @@ TagDialog::TagDialog (QWidget* parent ):
m_tagNameTextEdit = new QLineEdit(tagInformationGroupBox);
tagInformationLayout->addWidget(m_tagNameTextEdit);
setOkButtonState();
connect(m_tagNameTextEdit, SIGNAL(textChanged(QString)), this, SLOT(setOkButtonState()));
connect(m_tagNameTextEdit, &QLineEdit::textChanged, this, &TagDialog::setOkButtonState);
QLabel* messageLabel = new QLabel(i18nc("@label:textbox", "Tag Message:"), tagInformationGroupBox);
tagInformationLayout->addWidget(messageLabel);
......
......@@ -56,10 +56,10 @@ HgBackoutDialog::HgBackoutDialog(QWidget *parent) :
// connections
connect(this, SIGNAL(finished(int)), this, SLOT(saveGeometry()));
connect(m_selectBaseCommitButton, SIGNAL(clicked()),
this, SLOT(slotSelectBaseChangeset()));
connect(m_selectParentCommitButton, SIGNAL(clicked()),
this, SLOT(slotSelectParentChangeset()));
connect(m_selectBaseCommitButton, &QAbstractButton::clicked,
this, &HgBackoutDialog::slotSelectBaseChangeset);
connect(m_selectParentCommitButton, &QAbstractButton::clicked,
this, &HgBackoutDialog::slotSelectParentChangeset);
connect(m_baseRevision, &QLineEdit::textChanged,
this, &HgBackoutDialog::slotUpdateOkButton);
}
......
......@@ -63,10 +63,10 @@ HgBranchDialog::HgBranchDialog(QWidget *parent):
slotUpdateDialog(m_branchComboBox->currentText());
// connections
connect(m_createBranch, SIGNAL(clicked()),
this, SLOT(slotCreateBranch()));
connect(m_updateBranch, SIGNAL(clicked()),
this, SLOT(slotSwitch()));
connect(m_createBranch, &QAbstractButton::clicked,
this, &HgBranchDialog::slotCreateBranch);
connect(m_updateBranch, &QAbstractButton::clicked,
this, &HgBranchDialog::slotSwitch);
connect(m_branchComboBox, &QComboBox::editTextChanged,
this, &HgBranchDialog::slotUpdateDialog);
connect(m_branchComboBox->lineEdit(), &QLineEdit::textChanged,
......
......@@ -53,10 +53,10 @@ HgBundleDialog::HgBundleDialog(QWidget *parent) :
// connections
connect(this, SIGNAL(finished(int)), this, SLOT(saveGeometry()));
connect(m_selectCommitButton, SIGNAL(clicked()),
this, SLOT(slotSelectChangeset()));
connect(m_allChangesets, SIGNAL(stateChanged(int)),
this, SLOT(slotAllChangesCheckToggled(int)));
connect(m_selectCommitButton, &QAbstractButton::clicked,
this, &HgBundleDialog::slotSelectChangeset);
connect(m_allChangesets, &QCheckBox::stateChanged,
this, &HgBundleDialog::slotAllChangesCheckToggled);
}
void HgBundleDialog::setupUI()
......
......@@ -108,15 +108,15 @@ HgCloneDialog::HgCloneDialog(const QString &directory, QWidget *parent):
connect(this, SIGNAL(finished(int)), this, SLOT(saveGeometry()));
connect(m_source, &QLineEdit::textChanged,
this, &HgCloneDialog::slotUpdateOkButton);
connect(m_browse_dest, SIGNAL(clicked()),
this, SLOT(slotBrowseDestClicked()));
connect(m_browse_source, SIGNAL(clicked()),
this, SLOT(slotBrowseSourceClicked()));
connect(&m_process, SIGNAL(started()), this, SLOT(slotCloningStarted()));
connect(m_browse_dest, &QAbstractButton::clicked,
this, &HgCloneDialog::slotBrowseDestClicked);
connect(m_browse_source, &QAbstractButton::clicked,
this, &HgCloneDialog::slotBrowseSourceClicked);
connect(&m_process, &QProcess::started, this, &HgCloneDialog::slotCloningStarted);
connect(&m_process, QOverload<int, QProcess::ExitStatus>::of(&QProcess::finished),
this, &HgCloneDialog::slotCloningFinished);
connect(&m_process, SIGNAL(readyReadStandardOutput()),
this, SLOT(slotUpdateCloneOutput()));
connect(&m_process, &QProcess::readyReadStandardOutput,
this, &HgCloneDialog::slotUpdateCloneOutput);
}
void HgCloneDialog::browseDirectory(QLineEdit *dest)
......
......@@ -158,8 +158,8 @@ HgCommitDialog::HgCommitDialog(QWidget *parent):
connect(m_statusList, &HgStatusList::itemSelectionChanged,
this, &HgCommitDialog::slotItemSelectionChanged);
connect(m_commitMessage, SIGNAL(textChanged(KTextEditor::Document*)),
this, SLOT(slotMessageChanged()));
connect(m_commitMessage, &KTextEditor::Document::textChanged,
this, &HgCommitDialog::slotMessageChanged);
connect(this, SIGNAL(finished(int)), this, SLOT(saveGeometry()));
}
......@@ -324,8 +324,8 @@ NewBranchDialog::NewBranchDialog(QWidget *parent):
connect(m_branchNameInput, &QLineEdit::textChanged,
this, &NewBranchDialog::slotTextChanged);
connect(buttonBox, SIGNAL(accepted()), this, SLOT(accept()));
connect(buttonBox, SIGNAL(rejected()), this, SLOT(reject()));
connect(buttonBox, &QDialogButtonBox::accepted, this, &QDialog::accept);
connect(buttonBox, &QDialogButtonBox::rejected, this, &QDialog::reject);
}
void NewBranchDialog::slotTextChanged(const QString &text)
......
......@@ -36,8 +36,8 @@ HgCommitInfoWidget::HgCommitInfoWidget(QWidget *parent) :
{
setupUI();
connect(m_commitListWidget, SIGNAL(itemSelectionChanged()),
this, SLOT(slotUpdateInfo()));
connect(m_commitListWidget, &QListWidget::itemSelectionChanged,
this, &HgCommitInfoWidget::slotUpdateInfo);
}
void HgCommitInfoWidget::setupUI()
......
......@@ -38,8 +38,8 @@ DialogBase::DialogBase(QDialogButtonBox::StandardButtons buttons, QWidget* paren
setLayout(m_layout);
connect(m_buttonBox, SIGNAL(accepted()), this, SLOT(accept()));
connect(m_buttonBox, SIGNAL(rejected()), this, SLOT(reject()));
connect(m_buttonBox, &QDialogButtonBox::accepted, this, &QDialog::accept);
connect(m_buttonBox, &QDialogButtonBox::rejected, this, &QDialog::reject);
}
void DialogBase::keyReleaseEvent(QKeyEvent* event)
......
This diff is collapsed.
......@@ -40,10 +40,10 @@ HgWrapper::HgWrapper(QObject *parent) :
this, &HgWrapper::errorOccurred);
connect(&m_process, QOverload<int, QProcess::ExitStatus>::of(&QProcess::finished),
this, &HgWrapper::finished);
connect(&m_process, SIGNAL(stateChanged(QProcess::ProcessState)),
this, SIGNAL(stateChanged(QProcess::ProcessState)));
connect(&m_process, SIGNAL(started()),
this, SIGNAL(started()));
connect(&m_process, &QProcess::stateChanged,
this, &HgWrapper::stateChanged);
connect(&m_process, &QProcess::started,
this, &HgWrapper::started);
connect(&m_process, QOverload<int, QProcess::ExitStatus>::of(&QProcess::finished),
this, &HgWrapper::slotOperationCompleted);
......
......@@ -53,10 +53,10 @@ HgImportDialog::HgImportDialog(QWidget *parent) :
//
connect(this, SIGNAL(finished(int)), this, SLOT(saveGeometry()));
connect(m_addPatches, SIGNAL(clicked()),
this, SLOT(slotAddPatches()));
connect(m_removePatches, SIGNAL(clicked()),
this, SLOT(slotRemovePatches()));
connect(m_addPatches, &QAbstractButton::clicked,
this, &HgImportDialog::slotAddPatches);
connect(m_removePatches, &QAbstractButton::clicked,
this, &HgImportDialog::slotRemovePatches);
}
void HgImportDialog::setupUI()
......
......@@ -80,8 +80,8 @@ void HgPullDialog::createChangesGroup()
m_changesGroup->setLayout(hbox);
m_changesGroup->setVisible(false);
connect(this, SIGNAL(changeListAvailable()),
this, SLOT(slotUpdateChangesGeometry()));
connect(this, &HgSyncBaseDialog::changeListAvailable,
this, &HgPullDialog::slotUpdateChangesGeometry);
}
void HgPullDialog::getHgChangesArguments(QStringList &args)
......
......@@ -83,10 +83,10 @@ void HgPushDialog::createChangesGroup()
m_changesGroup->setLayout(hbox);
m_changesGroup->setVisible(false);
connect(m_outChangesList, SIGNAL(itemSelectionChanged()),
this, SLOT(slotOutSelChanged()));
connect(this, SIGNAL(changeListAvailable()),
this, SLOT(slotUpdateChangesGeometry()));
connect(m_outChangesList, &QTableWidget::itemSelectionChanged,
this, &HgPushDialog::slotOutSelChanged);
connect(this, &HgSyncBaseDialog::changeListAvailable,
this, &HgPushDialog::slotUpdateChangesGeometry);
}
void HgPushDialog::slotOutSelChanged()
......
......@@ -51,17 +51,17 @@ HgServeDialog::HgServeDialog(QWidget *parent) :
// connections
connect(this, SIGNAL(finished(int)), this, SLOT(saveGeometry()));
connect(m_startButton, SIGNAL(clicked()), this, SLOT(slotStart()));
connect(m_stopButton, SIGNAL(clicked()), this, SLOT(slotStop()));
connect(m_browseButton, SIGNAL(clicked()), this, SLOT(slotBrowse()));
connect(m_serverWrapper, SIGNAL(finished()),
this, SLOT(slotUpdateButtons()));
connect(m_serverWrapper, SIGNAL(started()),
this, SLOT(slotUpdateButtons()));
connect(m_serverWrapper, SIGNAL(error()),
this, SLOT(slotUpdateButtons()));
connect(m_serverWrapper, SIGNAL(error()),
this, SLOT(slotServerError()));
connect(m_startButton, &QAbstractButton::clicked, this, &HgServeDialog::slotStart);
connect(m_stopButton, &QAbstractButton::clicked, this, &HgServeDialog::slotStop);
connect(m_browseButton, &QAbstractButton::clicked, this, &HgServeDialog::slotBrowse);
connect(m_serverWrapper, &HgServeWrapper::finished,
this, &HgServeDialog::slotUpdateButtons);
connect(m_serverWrapper, &HgServeWrapper::started,
this, &HgServeDialog::slotUpdateButtons);
connect(m_serverWrapper, &HgServeWrapper::error,
this, &HgServeDialog::slotUpdateButtons);
connect(m_serverWrapper, &HgServeWrapper::error,
this, &HgServeDialog::slotServerError);
connect(m_serverWrapper, &HgServeWrapper::readyReadLine,
this, &HgServeDialog::appendServerOutput);
}
......
......@@ -63,8 +63,8 @@ void HgServeWrapper::startServer(const QString &repoLocation, int portNumber)
server->port = portNumber;
server->process.setWorkingDirectory(HgWrapper::instance()->getBaseDir());
connect(&server->process, SIGNAL(started()),
this, SIGNAL(started()));
connect(&server->process, &QProcess::started,
this, &HgServeWrapper::started);
connect(&server->process, QOverload<int, QProcess::ExitStatus>::of(&QProcess::finished),
this, &HgServeWrapper::slotFinished);
connect(server, &ServerProcessType::readyReadLine,
......
......@@ -132,10 +132,10 @@ public:
ServerProcessType()
{
connect(&process, SIGNAL(readyReadStandardOutput()),
this, SLOT(slotAppendOutput()));
connect(&process, SIGNAL(readyReadStandardError()),
this, SLOT(slotAppendRemainingOutput()));
connect(&process, &QProcess::readyReadStandardOutput,
this, &ServerProcessType::slotAppendOutput);
connect(&process, &QProcess::readyReadStandardError,
this, &ServerProcessType::slotAppendRemainingOutput);
connect(&process, QOverload<int, QProcess::ExitStatus>::of(&QProcess::finished),
this, &ServerProcessType::slotFinished);
}
......
......@@ -54,8 +54,8 @@ HgStatusList::HgStatusList(QWidget *parent):
connect(m_statusTable, &QTableWidget::currentItemChanged,
this, &HgStatusList::currentItemChangedSlot);
connect(m_statusTable->horizontalHeader(), SIGNAL(sectionClicked(int)),
this, SLOT(headerClickedSlot(int)));
connect(m_statusTable->horizontalHeader(), &QHeaderView::sectionClicked,
this, &HgStatusList::headerClickedSlot);
}
void HgStatusList::currentItemChangedSlot()
......
......@@ -52,12 +52,12 @@ void HgSyncBaseDialog::setup()
readBigSize();
setupUI();
connect(m_changesButton, SIGNAL(clicked()),
this, SLOT(slotGetChanges()));
connect(&m_process, SIGNAL(stateChanged(QProcess::ProcessState)),
this, SLOT(slotUpdateBusy(QProcess::ProcessState)));
connect(&m_main_process, SIGNAL(stateChanged(QProcess::ProcessState)),
this, SLOT(slotUpdateBusy(QProcess::ProcessState)));
connect(m_changesButton, &QAbstractButton::clicked,
this, &HgSyncBaseDialog::slotGetChanges);
connect(&m_process, &QProcess::stateChanged,
this, &HgSyncBaseDialog::slotUpdateBusy);
connect(&m_main_process, &QProcess::stateChanged,
this, &HgSyncBaseDialog::slotUpdateBusy);
connect(&m_main_process, QOverload<int, QProcess::ExitStatus>::of(&QProcess::finished),
this, &HgSyncBaseDialog::slotOperationComplete);
connect(&m_main_process, &QProcess::errorOccurred,
......@@ -66,7 +66,7 @@ void HgSyncBaseDialog::setup()
this, &HgSyncBaseDialog::slotOperationError);
connect(&m_process, QOverload<int, QProcess::ExitStatus>::of(&QProcess::finished),
this, &HgSyncBaseDialog::slotChangesProcessComplete);
connect(this, SIGNAL(finished(int)), this, SLOT(slotWriteBigSize()));
connect(this, &QDialog::finished, this, &HgSyncBaseDialog::slotWriteBigSize);
}
void HgSyncBaseDialog::createOptionGroup()
......@@ -140,7 +140,7 @@ void HgSyncBaseDialog::setupUI()
buttonBox()->addButton(m_optionsButton, QDialogButtonBox::ResetRole);
layout()->insertLayout(0, mainLayout);
connect(m_optionsButton, SIGNAL(clicked()), this, SLOT(slotOptionsButtonClick()));
connect(m_optionsButton, &QAbstractButton::clicked, this, &HgSyncBaseDialog::slotOptionsButtonClick);
}
void HgSyncBaseDialog::slotGetChanges()
......
......@@ -59,12 +59,12 @@ HgTagDialog::HgTagDialog(QWidget *parent):
slotUpdateDialog(m_tagComboBox->currentText());
// connections
connect(m_createTag, SIGNAL(clicked()),
this, SLOT(slotCreateTag()));
connect(m_removeTag, SIGNAL(clicked()),
this, SLOT(slotRemoveTag()));
connect(m_updateTag, SIGNAL(clicked()),
this, SLOT(slotSwitch()));
connect(m_createTag, &QAbstractButton::clicked,
this, &HgTagDialog::slotCreateTag);
connect(m_removeTag, &QAbstractButton::clicked,
this, &HgTagDialog::slotRemoveTag);
connect(m_updateTag, &QAbstractButton::clicked,
this, &HgTagDialog::slotSwitch);
connect(m_tagComboBox, &QComboBox::editTextChanged,
this, &HgTagDialog::slotUpdateDialog);
connect(m_tagComboBox->lineEdit(), &QLineEdit::textChanged,
......