X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fqtui%2Fircconnectionwizard.cpp;h=156c2419ecc0f8441523e779a71e15a4a579a2a0;hb=61f33c7895e324f6e95034d86897ad2e963653f1;hp=756caf8bf69f196c260cda134f07c5490d4d6781;hpb=158443f71d48215eea8b47b836b61afd77654b78;p=quassel.git

diff --git a/src/qtui/ircconnectionwizard.cpp b/src/qtui/ircconnectionwizard.cpp
index 756caf8b..156c2419 100644
--- a/src/qtui/ircconnectionwizard.cpp
+++ b/src/qtui/ircconnectionwizard.cpp
@@ -43,21 +43,21 @@ IrcConnectionWizard::IrcConnectionWizard(QWidget *parent, Qt::WindowFlags flags)
     setOptions(options() | (QWizard::WizardOptions)(QWizard::NoDefaultButton | QWizard::CancelButtonOnLeft));
     setOption(QWizard::NoCancelButton, false);
 
-    connect(button(QWizard::FinishButton), SIGNAL(clicked()), this, SLOT(finishClicked()));
+    connect(button(QWizard::FinishButton), &QAbstractButton::clicked, this, &IrcConnectionWizard::finishClicked);
     setButtonText(QWizard::FinishButton, tr("Save && Connect"));
 }
 
 
 QWizardPage *IrcConnectionWizard::createIntroductionPage(QWidget *parent)
 {
-    QWizardPage *page = new QWizardPage(parent);
+    auto *page = new QWizardPage(parent);
     page->setTitle(QObject::tr("Welcome to Quassel IRC"));
 
     QLabel *label = new QLabel(QObject::tr("This wizard will help you to set up your default identity and your IRC network connection.<br>"
                                            "This only covers basic settings. You can cancel this wizard any time and use the settings dialog for more detailed changes."), page);
     label->setWordWrap(true);
 
-    QVBoxLayout *layout = new QVBoxLayout;
+    auto *layout = new QVBoxLayout;
     layout->addWidget(label);
     page->setLayout(layout);
     return page;
@@ -72,7 +72,7 @@ void IrcConnectionWizard::finishClicked()
         identityReady(identity->id());
     }
     else {
-        connect(Client::instance(), SIGNAL(identityCreated(IdentityId)), this, SLOT(identityReady(IdentityId)));
+        connect(Client::instance(), &Client::identityCreated, this, &IrcConnectionWizard::identityReady);
         Client::createIdentity(*identity);
     }
 }
@@ -80,19 +80,19 @@ void IrcConnectionWizard::finishClicked()
 
 void IrcConnectionWizard::identityReady(IdentityId id)
 {
-    disconnect(Client::instance(), SIGNAL(identityCreated(IdentityId)), this, SLOT(identityReady(IdentityId)));
-    NetworkPage *networkPage = static_cast<NetworkPage *>(_networkPage);
+    disconnect(Client::instance(), &Client::identityCreated, this, &IrcConnectionWizard::identityReady);
+    auto *networkPage = static_cast<NetworkPage *>(_networkPage);
     NetworkInfo networkInfo = networkPage->networkInfo();
     QStringList channels = networkPage->channelList();
     networkInfo.identity = id;
-    connect(Client::instance(), SIGNAL(networkCreated(NetworkId)), this, SLOT(networkReady(NetworkId)));
+    connect(Client::instance(), &Client::networkCreated, this, &IrcConnectionWizard::networkReady);
     Client::createNetwork(networkInfo, channels);
 }
 
 
 void IrcConnectionWizard::networkReady(NetworkId id)
 {
-    disconnect(Client::instance(), SIGNAL(networkCreated(NetworkId)), this, SLOT(networkReady(NetworkId)));
+    disconnect(Client::instance(), &Client::networkCreated, this, &IrcConnectionWizard::networkReady);
     const Network *net = Client::network(id);
     Q_ASSERT(net);
     net->requestConnect();
@@ -122,7 +122,7 @@ IdentityPage::IdentityPage(QWidget *parent)
 
     _identityEditWidget->displayIdentity(_identity);
     _identityEditWidget->showAdvanced(false);
-    QVBoxLayout *layout = new QVBoxLayout;
+    auto *layout = new QVBoxLayout;
     layout->addWidget(_identityEditWidget);
     setLayout(layout);
 }
@@ -154,7 +154,7 @@ NetworkPage::NetworkPage(QWidget *parent)
 
     setTitle(tr("Setup Network Connection"));
 
-    QVBoxLayout *layout = new QVBoxLayout;
+    auto *layout = new QVBoxLayout;
     layout->addWidget(_networkEditor);
     setLayout(layout);
 }