X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fircconnectionwizard.cpp;h=156c2419ecc0f8441523e779a71e15a4a579a2a0;hp=2665f0158eb25eb5bb364d6be067df1bd4f3d2ea;hb=f9efdde7f3a6004af8f834c409cfa6ae1d877692;hpb=04315f46a16fc3627218377071e008b6b9744992

diff --git a/src/qtui/ircconnectionwizard.cpp b/src/qtui/ircconnectionwizard.cpp
index 2665f015..156c2419 100644
--- a/src/qtui/ircconnectionwizard.cpp
+++ b/src/qtui/ircconnectionwizard.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-2013 by the Quassel Project                        *
+ *   Copyright (C) 2005-2018 by the Quassel Project                        *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -23,14 +23,12 @@
 #include "client.h"
 #include "identityeditwidget.h"
 #include "simplenetworkeditor.h"
+#include "presetnetworks.h"
 
 #include <QVBoxLayout>
 
 IrcConnectionWizard::IrcConnectionWizard(QWidget *parent, Qt::WindowFlags flags)
-    : QWizard(parent, flags),
-    _introductionPage(0),
-    _identityPage(0),
-    _networkPage(0)
+    : QWizard(parent, flags)
 {
     _introductionPage = createIntroductionPage(this);
     _identityPage = new IdentityPage(this);
@@ -45,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;
@@ -74,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);
     }
 }
@@ -82,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();
@@ -109,8 +107,7 @@ void IrcConnectionWizard::networkReady(NetworkId id)
 // Identity Page
 IdentityPage::IdentityPage(QWidget *parent)
     : QWizardPage(parent),
-    _identityEditWidget(new IdentityEditWidget(this)),
-    _identity(0)
+    _identityEditWidget(new IdentityEditWidget(this))
 {
     setTitle(tr("Setup Identity"));
 
@@ -125,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);
 }
@@ -143,12 +140,12 @@ NetworkPage::NetworkPage(QWidget *parent)
     : QWizardPage(parent),
     _networkEditor(new SimpleNetworkEditor(this))
 {
-    QStringList defaultNets = Network::presetNetworks(true);
+    QStringList defaultNets = PresetNetworks::names(true);
     if (!defaultNets.isEmpty()) {
-        NetworkInfo info = Network::networkInfoFromPreset(defaultNets[0]);
+        NetworkInfo info = PresetNetworks::networkInfo(defaultNets[0]);
         if (!info.networkName.isEmpty()) {
             _networkInfo = info;
-            _channelList = Network::presetDefaultChannels(defaultNets[0]);
+            _channelList = PresetNetworks::defaultChannels(defaultNets[0]);
         }
     }
 
@@ -157,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);
 }