This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2godesktopsharing. commit cae9d40d0c49ed844aca3da86b3c0ebbf2002706 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Wed Nov 14 00:25:33 2018 +0100 Revert "accessdialog.cpp: fix connect () calls." This reverts commit 2aa9bc9b9d46911ffabfa3b81ef67d03d85f3ec0. --- accessdialog.cpp | 4 ++-- debian/changelog | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/accessdialog.cpp b/accessdialog.cpp index 9c05fd9..1f775e7 100644 --- a/accessdialog.cpp +++ b/accessdialog.cpp @@ -42,10 +42,10 @@ AccessWindow::AccessWindow(QString uname, QString hname, QWidget *parent) /* dialog buttons */ QDialogButtonBox *buttonBox = new QDialogButtonBox(QDialogButtonBox::Ok | QDialogButtonBox::Cancel); buttonBox->button(QDialogButtonBox::Ok)->setText(tr("Grant access")); - connect(buttonBox, SIGNAL(accepted), this, SLOT(accept)); + connect(buttonBox, &QDialogButtonBox::accepted, this, &QDialog::accept); buttonBox->button(QDialogButtonBox::Cancel)->setText(tr("Deny access")); buttonBox->button(QDialogButtonBox::Cancel)->setDefault(true); - connect(buttonBox, SIGNAL(rejected), this, SLOT(reject)); + connect(buttonBox, &QDialogButtonBox::rejected, this, &QDialog::reject); hbox->addWidget(buttonBox, 1, Qt::AlignRight | Qt::AlignBottom); /* modality */ diff --git a/debian/changelog b/debian/changelog index fe97cc6..a3b3177 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,7 +2,6 @@ x2godesktopsharing (3.2.0.0-0x2go1) UNRELEASED; urgency=medium [ Mihai Moldovan ] * New upstream version (3.1.1.5): - - accessdialog.cpp: fix connect () calls. - sharetray.cpp: fix misleading if indentation warning. - sharetray.cpp: fix another misleading if indentation warning. * x2godesktopsharing.spec: -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2godesktopsharing.git