From 2ceba3c866356522ab72ef0e9bea363e7b801385 Mon Sep 17 00:00:00 2001
From: staticfox
Date: Sat, 6 Aug 2016 21:08:24 -0400
Subject: KviProxyDatabase: Move to vector and unique pointers

---
 src/modules/options/OptionsWidget_servers.cpp | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'src/modules/options/OptionsWidget_servers.cpp')

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()));
 	}
-- 
cgit v1.3.1-10-gc9f91