diff options
| author |  staticfox | 2016-08-06 21:08:24 -0400 |
|---|---|---|
| committer | staticfox | 2016-08-07 23:12:47 -0400 |
| commit | 2ceba3c866356522ab72ef0e9bea363e7b801385 (patch) | |
| tree | 351640564483aa0da9635f2766c2e41a70d37067 /src/modules/options/OptionsWidget_servers.cpp | |
| parent | KviIrcConnectionAsyncData: Move to std::set (diff) | |
| download | KVIrc-2ceba3c866356522ab72ef0e9bea363e7b801385.tar.gz KVIrc-2ceba3c866356522ab72ef0e9bea363e7b801385.tar.bz2 KVIrc-2ceba3c866356522ab72ef0e9bea363e7b801385.zip | |
KviProxyDatabase: Move to vector and unique pointers
Diffstat (limited to 'src/modules/options/OptionsWidget_servers.cpp')
| -rw-r--r-- | src/modules/options/OptionsWidget_servers.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/modules/options/OptionsWidget_servers.cpp b/src/modules/options/OptionsWidget_servers.cpp index a00724c98..a1fb87aad 100644 --- a/src/modules/options/OptionsWidget_servers.cpp +++ b/src/modules/options/OptionsWidget_servers.cpp @@ -67,6 +67,9 @@ #include <QShortcut> #include <QMenu> +#include <memory> +#include <vector> + #if defined(COMPILE_ON_WINDOWS) || defined(COMPILE_ON_MINGW) || defined(COMPILE_ON_MAC) #include <QStyleFactory> #endif //COMPILE_ON_WINDOWS || COMPILE_ON_MINGW @@ -791,9 +794,9 @@ IrcServerDetailsWidget::IrcServerDetailsWidget(QWidget * par, KviIrcServer * s) m_pProxyEditor->addItem(__tr2qs_ctx("Default", "options")); m_pProxyEditor->addItem(__tr2qs_ctx("Direct Connection", "options")); - KviPointerList<KviProxy> * proxylist = g_pProxyDataBase->proxyList(); + std::vector<std::unique_ptr<KviProxy>> & proxylist = g_pProxyDataBase->proxyList(); - for(KviProxy * p = proxylist->first(); p; p = proxylist->next()) + for(auto & p : proxylist) { m_pProxyEditor->insertItem(m_pProxyEditor->count(), QString("%1:%2").arg(p->hostName()).arg(p->port())); } |