X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fqtui%2Fircconnectionwizard.cpp;h=d7e865877a087c54bbdff10232fed2cbeffb1904;hb=80950b87640acfb2a75902f8aabf3419da094bf4;hp=2665f0158eb25eb5bb364d6be067df1bd4f3d2ea;hpb=9fc57dc2c000e80fb8bd746a090e2e8210e1278e;p=quassel.git

diff --git a/src/qtui/ircconnectionwizard.cpp b/src/qtui/ircconnectionwizard.cpp
index 2665f015..d7e86587 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,15 @@
 #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)
+    _introductionPage(nullptr),
+    _identityPage(nullptr),
+    _networkPage(nullptr)
 {
     _introductionPage = createIntroductionPage(this);
     _identityPage = new IdentityPage(this);
@@ -110,7 +111,7 @@ void IrcConnectionWizard::networkReady(NetworkId id)
 IdentityPage::IdentityPage(QWidget *parent)
     : QWizardPage(parent),
     _identityEditWidget(new IdentityEditWidget(this)),
-    _identity(0)
+    _identity(nullptr)
 {
     setTitle(tr("Setup Identity"));
 
@@ -143,12 +144,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]);
         }
     }