KviProxy: Make class member data private

8 files changed, 78 insertions, 110 deletions

diff --git a/src/kvilib/ext/KviProxy.cpp b/src/kvilib/ext/KviProxy.cpp
index 4df3ad135..9fb2064ef 100644
--- a/src/kvilib/ext/KviProxy.cpp
+++ b/src/kvilib/ext/KviProxy.cpp
@@ -23,7 +23,6 @@
 //=============================================================================
 
 #include "KviProxy.h"
-#include "KviCString.h"
 
 #include <QStringList>
 
@@ -35,21 +34,10 @@ KviProxy::KviProxy()
 	m_bIsIPv6 = false;
 }
 
-KviProxy::KviProxy(const KviProxy & prx)
-{
-	m_szHostname = prx.m_szHostname;
-	m_szIp = prx.m_szIp;
-	m_szUser = prx.m_szUser;
-	m_szPass = prx.m_szPass;
-	m_uPort = prx.m_uPort;
-	m_protocol = prx.m_protocol;
-	m_bIsIPv6 = prx.m_bIsIPv6;
-}
-
 KviProxy::~KviProxy()
     = default;
 
-static const QString proxy_protocols_table[3] = { "SOCKSv4", "SOCKSv5", "HTTP" };
+static const QStringList proxy_protocols_table{ "SOCKSv4", "SOCKSv5", "HTTP" };
 
 const QString KviProxy::protocolName() const
 {
@@ -63,26 +51,22 @@ const QString KviProxy::protocolName() const
 			break;
 		default:
 			return proxy_protocols_table[0];
-			break;
 	}
-
-	return proxy_protocols_table[0];
 }
 
-void KviProxy::setNamedProtocol(const char * proto)
+void KviProxy::setNamedProtocol(const QString & proto)
 {
-	if(kvi_strEqualCI(proto, "SOCKSv5"))
+	if(proto.compare(proxy_protocols_table[1], Qt::CaseInsensitive) == 0)
 		m_protocol = KviProxy::Socks5;
-	else if(kvi_strEqualCI(proto, "HTTP"))
+	else if(proto.compare(proxy_protocols_table[2], Qt::CaseInsensitive) == 0)
 		m_protocol = KviProxy::Http;
 	else
 		m_protocol = KviProxy::Socks4;
 }
 
-void KviProxy::getSupportedProtocolNames(QStringList & buf)
+QStringList KviProxy::getSupportedProtocolNames()
 {
-	for(const auto & i : proxy_protocols_table)
-		buf.append(QString(i));
+	return proxy_protocols_table;
 }
 
 void KviProxy::normalizeUserAndPass()
diff --git a/src/kvilib/ext/KviProxy.h b/src/kvilib/ext/KviProxy.h
index 018b02684..775f70111 100644
--- a/src/kvilib/ext/KviProxy.h
+++ b/src/kvilib/ext/KviProxy.h
@@ -43,42 +43,41 @@ public:
 		Http
 	};
 	KviProxy();
-	KviProxy(const KviProxy & prx);
 	~KviProxy();
 
-public: // FIXME: make it private!!!!!
+private:
 	QString m_szHostname;
 	QString m_szIp;
-	QString m_szPass;
 	QString m_szUser;
+	QString m_szPass;
 	kvi_u32_t m_uPort;
 	Protocol m_protocol;
 	bool m_bIsIPv6;
 
 public:
-	bool isIPv6() const { return m_bIsIPv6; };
-	Protocol protocol() const { return m_protocol; };
+	bool isIPv6() const { return m_bIsIPv6; }
+	Protocol protocol() const { return m_protocol; }
 	const QString protocolName() const;
-	void setNamedProtocol(const char * proto);
-	kvi_u32_t port() const { return m_uPort; };
-	const QString & user() const { return m_szUser; };
-	const QString & pass() const { return m_szPass; };
-	const QString & ip() const { return m_szIp; };
-	const QString & hostName() const { return m_szHostname; };
+	void setNamedProtocol(const QString & proto);
+	kvi_u32_t port() const { return m_uPort; }
+	const QString & user() const { return m_szUser; }
+	const QString & pass() const { return m_szPass; }
+	const QString & ip() const { return m_szIp; }
+	const QString & hostname() const { return m_szHostname; }
 	void normalizeUserAndPass();
-	bool hasPass() const { return !m_szPass.isEmpty(); };
-	bool hasUser() const { return !m_szUser.isEmpty(); };
-	unsigned int passLen() const { return (unsigned int)m_szPass.length(); };
-	unsigned int userLen() const { return (unsigned int)m_szUser.length(); };
-	static void getSupportedProtocolNames(QStringList & buf);
+	bool hasPass() const { return !m_szPass.isEmpty(); }
+	bool hasUser() const { return !m_szUser.isEmpty(); }
+	int passLen() const { return m_szPass.length(); }
+	int userLen() const { return m_szUser.length(); }
+	static QStringList getSupportedProtocolNames();
 
-	void setProtocol(Protocol p) { m_protocol = p; };
-	void setIPv6(bool b) { m_bIsIPv6 = b; };
-	void setPort(kvi_u32_t & p) { m_uPort = p; };
-	void setUser(const QString & u) { m_szUser = u; };
-	void setPass(const QString & p) { m_szPass = p; };
-	void setIp(const QString & i) { m_szIp = i; };
-	void setHostname(const QString & h) { m_szHostname = h; };
+	void setProtocol(Protocol p) { m_protocol = p; }
+	void setIPv6(bool b) { m_bIsIPv6 = b; }
+	void setPort(kvi_u32_t p) { m_uPort = p; }
+	void setUser(const QString & u) { m_szUser = u; }
+	void setPass(const QString & p) { m_szPass = p; }
+	void setIp(const QString & i) { m_szIp = i; }
+	void setHostname(const QString & h) { m_szHostname = h; }
 };
 
 #endif // _KVIPROXY_H_
diff --git a/src/kvilib/ext/KviProxyDataBase.cpp b/src/kvilib/ext/KviProxyDataBase.cpp
index 4ba770276..aaef9d4f5 100644
--- a/src/kvilib/ext/KviProxyDataBase.cpp
+++ b/src/kvilib/ext/KviProxyDataBase.cpp
@@ -33,9 +33,9 @@ void KviProxyDataBase::updateProxyIp(const char * proxy, const char * ip)
 {
 	for(auto & prx : m_pProxyList)
 	{
-		if(QString::compare(proxy, prx->m_szHostname, Qt::CaseInsensitive))
+		if(QString::compare(proxy, prx->hostname(), Qt::CaseInsensitive))
 		{
-			prx->m_szIp = ip;
+			prx->setIp(ip);
 			return;
 		}
 	}
@@ -47,12 +47,12 @@ KviProxy * KviProxyDataBase::findProxy(const KviProxy * pProxy, bool bName)
 	{
 		if(bName)
 		{
-			if(QString::compare(p->m_szHostname, pProxy->m_szHostname, Qt::CaseInsensitive))
+			if(QString::compare(p->hostname(), pProxy->hostname(), Qt::CaseInsensitive))
 				return p.get();
 		}
 		else
 		{
-			if(QString::compare(p->m_szHostname, pProxy->m_szHostname, Qt::CaseInsensitive) && (p->m_uPort == pProxy->m_uPort) && (p->protocol() == pProxy->protocol()) && (p->isIPv6() == pProxy->isIPv6()))
+			if(QString::compare(p->hostname(), pProxy->hostname(), Qt::CaseInsensitive) && (p->port() == pProxy->port()) && (p->protocol() == pProxy->protocol()) && (p->isIPv6() == pProxy->isIPv6()))
 				return p.get();
 		}
 	}
@@ -76,22 +76,22 @@ void KviProxyDataBase::load(const QString & filename)
 	{
 		std::unique_ptr<KviProxy> p(new KviProxy());
 		KviCString tmp(KviCString::Format, "%u_Hostname", i);
-		p->m_szHostname = cfg.readEntry(tmp.ptr(), "proxy.example.net");
+		p->setHostname(cfg.readEntry(tmp.ptr(), "proxy.example.net"));
 		tmp.sprintf("%u_Port", i);
-		p->m_uPort = cfg.readUIntEntry(tmp.ptr(), 7000);
+		p->setPort(cfg.readUIntEntry(tmp.ptr(), 7000));
 		tmp.sprintf("%u_Ip", i);
-		p->m_szIp = cfg.readEntry(tmp.ptr(), "");
+		p->setIp(cfg.readEntry(tmp.ptr(), ""));
 		tmp.sprintf("%u_User", i);
-		p->m_szUser = cfg.readEntry(tmp.ptr(), "");
+		p->setUser(cfg.readEntry(tmp.ptr(), ""));
 		tmp.sprintf("%u_Pass", i);
-		p->m_szPass = cfg.readEntry(tmp.ptr(), "");
+		p->setPass(cfg.readEntry(tmp.ptr(), ""));
 
 		tmp.sprintf("%u_Protocol", i);
 		KviCString type = cfg.readEntry(tmp.ptr(), "SOCKSv4");
 		p->setNamedProtocol(type.ptr());
 
 		tmp.sprintf("%u_IsIPv6", i);
-		p->m_bIsIPv6 = cfg.readBoolEntry(tmp.ptr(), false);
+		p->setIPv6(cfg.readBoolEntry(tmp.ptr(), false));
 		tmp.sprintf("%u_Current", i);
 		if(cfg.readBoolEntry(tmp.ptr(), false))
 			m_pCurrentProxy = p.get();
@@ -115,34 +115,21 @@ void KviProxyDataBase::save(const QString & filename)
 	for(auto & p : m_pProxyList)
 	{
 		KviCString tmp(KviCString::Format, "%u_Hostname", i);
-		cfg.writeEntry(tmp.ptr(), p->m_szHostname);
+		cfg.writeEntry(tmp.ptr(), p->hostname());
 		tmp.sprintf("%u_Port", i);
-		cfg.writeEntry(tmp.ptr(), p->m_uPort);
+		cfg.writeEntry(tmp.ptr(), p->port());
 		tmp.sprintf("%u_Ip", i);
-		cfg.writeEntry(tmp.ptr(), p->m_szIp);
+		cfg.writeEntry(tmp.ptr(), p->ip());
 		tmp.sprintf("%u_User", i);
-		cfg.writeEntry(tmp.ptr(), p->m_szUser);
+		cfg.writeEntry(tmp.ptr(), p->user());
 		tmp.sprintf("%u_Pass", i);
-		cfg.writeEntry(tmp.ptr(), p->m_szPass);
+		cfg.writeEntry(tmp.ptr(), p->pass());
 
 		tmp.sprintf("%u_Protocol", i);
-		KviCString type;
-		switch(p->m_protocol)
-		{
-			case KviProxy::Socks5:
-				type = "SOCKSv5";
-				break;
-			case KviProxy::Http:
-				type = "HTTP";
-				break;
-			default:
-				type = "SOCKSv4";
-				break;
-		}
-		cfg.writeEntry(tmp.ptr(), type.ptr());
+		cfg.writeEntry(tmp.ptr(), p->protocolName());
 
 		tmp.sprintf("%u_IsIPv6", i);
-		cfg.writeEntry(tmp.ptr(), p->m_bIsIPv6);
+		cfg.writeEntry(tmp.ptr(), p->isIPv6());
 		tmp.sprintf("%u_Current", i);
 		if(m_pCurrentProxy == p.get())
 			cfg.writeEntry(tmp.ptr(), true);
diff --git a/src/kvirc/kernel/KviIrcConnectionTargetResolver.cpp b/src/kvirc/kernel/KviIrcConnectionTargetResolver.cpp
index 35071f27a..1bd1c890e 100644
--- a/src/kvirc/kernel/KviIrcConnectionTargetResolver.cpp
+++ b/src/kvirc/kernel/KviIrcConnectionTargetResolver.cpp
@@ -162,7 +162,7 @@ void KviIrcConnectionTargetResolver::asyncStartResolve()
 	{
 		m_pConsole->output(KVI_OUT_SYSTEMMESSAGE,
 		    __tr2qs("Attempting to 'bounce' on proxy %s on port %u (protocol %s)"),
-		    m_pTarget->proxy()->hostName().toUtf8().data(),
+		    m_pTarget->proxy()->hostname().toUtf8().data(),
 		    m_pTarget->proxy()->port(),
 		    m_pTarget->proxy()->protocolName().toUtf8().data());
 
@@ -207,18 +207,18 @@ void KviIrcConnectionTargetResolver::lookupProxyHostname()
 #ifdef COMPILE_IPV6_SUPPORT
 		if(m_pTarget->proxy()->isIPv6())
 		{
-			bValidIp = KviNetUtils::isValidStringIPv6(m_pTarget->proxy()->hostName());
+			bValidIp = KviNetUtils::isValidStringIPv6(m_pTarget->proxy()->hostname());
 		}
 		else
 		{
 #endif
-			bValidIp = KviNetUtils::isValidStringIp(m_pTarget->proxy()->hostName());
+			bValidIp = KviNetUtils::isValidStringIp(m_pTarget->proxy()->hostname());
 #ifdef COMPILE_IPV6_SUPPORT
 		}
 #endif
 		if(bValidIp)
 		{
-			m_pTarget->proxy()->setIp(m_pTarget->proxy()->hostName());
+			m_pTarget->proxy()->setIp(m_pTarget->proxy()->hostname());
 			if(m_pTarget->proxy()->protocol() != KviProxy::Http && m_pTarget->proxy()->protocol() != KviProxy::Socks5)
 			{
 				lookupServerHostname();
@@ -241,7 +241,7 @@ void KviIrcConnectionTargetResolver::lookupProxyHostname()
 			m_pProxyDns = new KviDnsResolver();
 			connect(m_pProxyDns, SIGNAL(lookupDone(KviDnsResolver *)), this, SLOT(proxyLookupTerminated(KviDnsResolver *)));
 
-			if(!m_pProxyDns->lookup(m_pTarget->proxy()->hostName(),
+			if(!m_pProxyDns->lookup(m_pTarget->proxy()->hostname(),
 			       m_pTarget->proxy()->isIPv6() ? KviDnsResolver::IPv6 : KviDnsResolver::IPv4))
 			{
 				m_pConsole->outputNoFmt(KVI_OUT_SYSTEMWARNING,
@@ -259,7 +259,7 @@ void KviIrcConnectionTargetResolver::lookupProxyHostname()
 				if(!_OUTPUT_MUTE)
 					m_pConsole->output(KVI_OUT_SYSTEMMESSAGE,
 					    __tr2qs("Looking up the proxy hostname (%s)..."),
-					    m_pTarget->proxy()->hostName().toUtf8().data());
+					    m_pTarget->proxy()->hostname().toUtf8().data());
 			}
 		}
 	}
diff --git a/src/kvirc/kernel/KviIrcLink.cpp b/src/kvirc/kernel/KviIrcLink.cpp
index 03de2979b..0ac7894e6 100644
--- a/src/kvirc/kernel/KviIrcLink.cpp
+++ b/src/kvirc/kernel/KviIrcLink.cpp
@@ -388,13 +388,13 @@ void KviIrcLink::socketStateChange()
 		case KviIrcSocket::Connecting:
 			m_pConsole->output(KVI_OUT_CONNECTION, __tr2qs("Contacting %Q %s (%s) on port %u"),
 			    connection()->target()->proxy() ? &(__tr2qs("proxy host")) : &(__tr2qs("IRC server")),
-			    connection()->target()->proxy() ? connection()->target()->proxy()->hostName().toUtf8().data() : connection()->target()->server()->hostName().toUtf8().data(),
+			    connection()->target()->proxy() ? connection()->target()->proxy()->hostname().toUtf8().data() : connection()->target()->server()->hostName().toUtf8().data(),
 			    connection()->target()->proxy() ? connection()->target()->proxy()->ip().toUtf8().data() : connection()->target()->server()->ip().toUtf8().data(),
 			    connection()->target()->proxy() ? connection()->target()->proxy()->port() : connection()->target()->server()->port());
 			break;
 		case KviIrcSocket::SSLHandshake:
 			m_pConsole->output(KVI_OUT_CONNECTION, __tr2qs("Low-level transport connection established [%s (%s:%u)]"),
-			    connection()->target()->proxy() ? connection()->target()->proxy()->hostName().toUtf8().data() : connection()->target()->server()->hostName().toUtf8().data(),
+			    connection()->target()->proxy() ? connection()->target()->proxy()->hostname().toUtf8().data() : connection()->target()->server()->hostName().toUtf8().data(),
 			    connection()->target()->proxy() ? connection()->target()->proxy()->ip().toUtf8().data() : connection()->target()->server()->ip().toUtf8().data(),
 			    connection()->target()->proxy() ? connection()->target()->proxy()->port() : connection()->target()->server()->port());
 			m_pConsole->outputNoFmt(KVI_OUT_CONNECTION, __tr2qs("Starting Secure Socket Layer handshake"));
@@ -402,7 +402,7 @@ void KviIrcLink::socketStateChange()
 		case KviIrcSocket::ProxyLogin:
 			m_pConsole->output(KVI_OUT_CONNECTION, __tr2qs("%Q established [%s (%s:%u)]"),
 			    connection()->link()->socket()->usingSSL() ? &(__tr2qs("Secure proxy connection")) : &(__tr2qs("Proxy connection")),
-			    connection()->target()->proxy()->hostName().toUtf8().data(),
+			    connection()->target()->proxy()->hostname().toUtf8().data(),
 			    connection()->target()->proxy()->ip().toUtf8().data(),
 			    connection()->target()->proxy()->port());
 			m_pConsole->outputNoFmt(KVI_OUT_CONNECTION, __tr2qs("Negotiating relay information"));
diff --git a/src/modules/options/OptionsWidget_proxy.cpp b/src/modules/options/OptionsWidget_proxy.cpp
index f05012f33..e6586c724 100644
--- a/src/modules/options/OptionsWidget_proxy.cpp
+++ b/src/modules/options/OptionsWidget_proxy.cpp
@@ -51,7 +51,7 @@ ProxyOptionsTreeWidgetItem::ProxyOptionsTreeWidgetItem(QTreeWidget * parent, con
     : QTreeWidgetItem(parent)
 {
 	qDebug("Creating item");
-	setText(0, prx->m_szHostname);
+	setText(0, prx->hostname());
 	setIcon(0, QIcon(pm));
 	m_pProxyData = new KviProxy(*prx);
 }
@@ -126,8 +126,7 @@ OptionsWidget_proxy::OptionsWidget_proxy(QWidget * parent)
 	m_pProtocolLabel = new QLabel(__tr2qs_ctx("Protocol:", "options"), gbox);
 	m_pProtocolBox = new QComboBox(gbox);
 
-	QStringList l;
-	KviProxy::getSupportedProtocolNames(l);
+	QStringList l = KviProxy::getSupportedProtocolNames();
 
 	m_pProtocolBox->addItems(l);
 
@@ -206,7 +205,7 @@ void OptionsWidget_proxy::currentItemChanged(QTreeWidgetItem * it, QTreeWidgetIt
 #endif
 	if(m_pLastEditedItem)
 	{
-		m_pProxyEdit->setText(m_pLastEditedItem->m_pProxyData->m_szHostname);
+		m_pProxyEdit->setText(m_pLastEditedItem->m_pProxyData->hostname());
 
 		for(int i = 0; i < m_pProtocolBox->count(); i++)
 		{
@@ -225,7 +224,7 @@ void OptionsWidget_proxy::currentItemChanged(QTreeWidgetItem * it, QTreeWidgetIt
 		m_pIPv6Check->setChecked(false);
 		m_pIpEditor->setAddressType(KviIpEditor::IPv4);
 #endif
-		if(!m_pIpEditor->setAddress(m_pLastEditedItem->m_pProxyData->m_szIp))
+		if(!m_pIpEditor->setAddress(m_pLastEditedItem->m_pProxyData->ip()))
 		{
 #ifdef COMPILE_IPV6_SUPPORT
 			m_pIpEditor->setAddress(m_pLastEditedItem->m_pProxyData->isIPv6() ? "0:0:0:0:0:0:0:0" : "0.0.0.0");
@@ -234,9 +233,9 @@ void OptionsWidget_proxy::currentItemChanged(QTreeWidgetItem * it, QTreeWidgetIt
 #endif
 		}
 
-		m_pUserEdit->setText(m_pLastEditedItem->m_pProxyData->m_szUser);
-		m_pPassEdit->setText(m_pLastEditedItem->m_pProxyData->m_szPass);
-		KviCString tmp(KviCString::Format, "%u", m_pLastEditedItem->m_pProxyData->m_uPort);
+		m_pUserEdit->setText(m_pLastEditedItem->m_pProxyData->user());
+		m_pPassEdit->setText(m_pLastEditedItem->m_pProxyData->pass());
+		KviCString tmp(KviCString::Format, "%u", m_pLastEditedItem->m_pProxyData->port());
 		m_pPortEdit->setText(tmp.ptr());
 	}
 	else
@@ -255,18 +254,18 @@ void OptionsWidget_proxy::saveLastItem()
 {
 	if(m_pLastEditedItem)
 	{
-		KviCString tmp = m_pProxyEdit->text();
+		QString tmp = m_pProxyEdit->text();
 		if(tmp.isEmpty())
 			tmp = "irc.unknown.net";
 
-		m_pLastEditedItem->setText(0, tmp.ptr());
-		m_pLastEditedItem->m_pProxyData->m_szHostname = tmp;
+		m_pLastEditedItem->setText(0, tmp);
+		m_pLastEditedItem->m_pProxyData->setHostname(tmp);
 #ifdef COMPILE_IPV6_SUPPORT
-		m_pLastEditedItem->m_pProxyData->m_bIsIPv6 = m_pIPv6Check->isChecked();
+		m_pLastEditedItem->m_pProxyData->setIPv6(m_pIPv6Check->isChecked());
 #else
-		m_pLastEditedItem->m_pProxyData->m_bIsIPv6 = false;
+		m_pLastEditedItem->m_pProxyData->setIPv6(false);
 #endif
-		m_pLastEditedItem->m_pProxyData->m_szIp = "";
+		m_pLastEditedItem->m_pProxyData->setIp("");
 
 		if(m_pIpEditor->isValid())
 		{
@@ -275,27 +274,26 @@ void OptionsWidget_proxy::saveLastItem()
 			if(m_pIPv6Check->isChecked())
 			{
 				if(tmpAddr != "::" && KviNetUtils::isValidStringIPv6(tmpAddr))
-					m_pLastEditedItem->m_pProxyData->m_szIp = tmpAddr;
+					m_pLastEditedItem->m_pProxyData->setIp(tmpAddr);
 			}
 			else
 			{
 #endif
 				if(tmpAddr != "0.0.0.0" && KviNetUtils::isValidStringIp(tmpAddr))
-					m_pLastEditedItem->m_pProxyData->m_szIp = tmpAddr;
+					m_pLastEditedItem->m_pProxyData->setIp(tmpAddr);
 #ifdef COMPILE_IPV6_SUPPORT
 			}
 #endif
 		}
-		m_pLastEditedItem->m_pProxyData->m_szPass = m_pPassEdit->text();
-		m_pLastEditedItem->m_pProxyData->m_szUser = m_pUserEdit->text();
+		m_pLastEditedItem->m_pProxyData->setPass(m_pPassEdit->text());
+		m_pLastEditedItem->m_pProxyData->setUser(m_pUserEdit->text());
 		tmp = m_pPortEdit->text();
 		bool bOk;
 		kvi_u32_t uPort = tmp.toUInt(&bOk);
 		if(!bOk)
 			uPort = 1080;
-		m_pLastEditedItem->m_pProxyData->m_uPort = uPort;
-		tmp = m_pProtocolBox->currentText();
-		m_pLastEditedItem->m_pProxyData->setNamedProtocol(tmp.ptr());
+		m_pLastEditedItem->m_pProxyData->setPort(uPort);
+		m_pLastEditedItem->m_pProxyData->setNamedProtocol(m_pProtocolBox->currentText());
 	}
 }
 
diff --git a/src/modules/options/OptionsWidget_servers.cpp b/src/modules/options/OptionsWidget_servers.cpp
index d884d046c..af11bb343 100644
--- a/src/modules/options/OptionsWidget_servers.cpp
+++ b/src/modules/options/OptionsWidget_servers.cpp
@@ -800,9 +800,7 @@ IrcServerDetailsWidget::IrcServerDetailsWidget(QWidget * par, KviIrcServer * s)
 	std::vector<std::unique_ptr<KviProxy>> & proxylist = g_pProxyDataBase->proxyList();
 
 	for(auto & p : proxylist)
-	{
-		m_pProxyEditor->insertItem(m_pProxyEditor->count(), QString("%1:%2").arg(p->hostName()).arg(p->port()));
-	}
+		m_pProxyEditor->insertItem(m_pProxyEditor->count(), QString("%1:%2").arg(p->hostname()).arg(p->port()));
 
 	if(m_pProxyEditor->count() > (s->proxy() + 2))
 		m_pProxyEditor->setCurrentIndex(s->proxy() + 2);
diff --git a/src/modules/proxydb/libkviproxydb.cpp b/src/modules/proxydb/libkviproxydb.cpp
index bf95df93b..44923f1e2 100644
--- a/src/modules/proxydb/libkviproxydb.cpp
+++ b/src/modules/proxydb/libkviproxydb.cpp
@@ -54,7 +54,7 @@ extern KVIRC_API KviProxyDataBase * g_pProxyDataBase;
 
 static bool proxydb_kvs_fnc_protocol(KviKvsModuleFunctionCall * c)
 {
-	QString szProxy, szProtocol;
+	QString szProxy;
 
 	KVSM_PARAMETERS_BEGIN(c)
 	KVSM_PARAMETER("proxy", KVS_PT_STRING, 0, szProxy)
@@ -76,6 +76,8 @@ static bool proxydb_kvs_fnc_protocol(KviKvsModuleFunctionCall * c)
 		return false;
 	}
 
+	QString szProtocol;
+
 	switch(pRecord->protocol())
 	{
 		case KviProxy::Socks4:
@@ -158,7 +160,7 @@ static KviProxy * proxydb_get_helper(KviKvsModuleFunctionCall * c)
 		[module:serverdb]ServerDB module documentation[/module]
 */
 
-PROXYDB_GET_PROPERTY(proxydb_kvs_fnc_hostname, hostName, setString)
+PROXYDB_GET_PROPERTY(proxydb_kvs_fnc_hostname, hostname, setString)
 
 /*
 	@doc: proxydb.ip