projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Move preset networks handling out of Network
[quassel.git]
/
src
/
qtui
/
settingspages
/
networkssettingspage.cpp
diff --git
a/src/qtui/settingspages/networkssettingspage.cpp
b/src/qtui/settingspages/networkssettingspage.cpp
index
6f15075
..
618636a
100644
(file)
--- a/
src/qtui/settingspages/networkssettingspage.cpp
+++ b/
src/qtui/settingspages/networkssettingspage.cpp
@@
-28,6
+28,7
@@
#include "iconloader.h"
#include "identity.h"
#include "network.h"
#include "iconloader.h"
#include "identity.h"
#include "network.h"
+#include "presetnetworks.h"
#include "settingspagedlg.h"
#include "util.h"
#include "settingspagedlg.h"
#include "util.h"
@@
-786,7
+787,7
@@
NetworkAddDlg::NetworkAddDlg(const QStringList &exist, QWidget *parent) : QDialo
ui.useSSL->setIcon(SmallIcon("document-encrypt"));
// read preset networks
ui.useSSL->setIcon(SmallIcon("document-encrypt"));
// read preset networks
- QStringList networks =
Network::presetNetwork
s();
+ QStringList networks =
PresetNetworks::name
s();
foreach(QString s, existing)
networks.removeAll(s);
if (networks.count())
foreach(QString s, existing)
networks.removeAll(s);
if (networks.count())
@@
-810,7
+811,7
@@
NetworkInfo NetworkAddDlg::networkInfo() const
return info;
}
else
return info;
}
else
- return
Network::networkInfoFromPreset
(ui.presetList->currentText());
+ return
PresetNetworks::networkInfo
(ui.presetList->currentText());
}
}