fixes

git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@2312 17fca916-40b9-46aa-a4ea-0a15b648b75c

2 files changed, 11 insertions, 17 deletions

diff --git a/src/modules/options/optw_servers.cpp b/src/modules/options/optw_servers.cpp
index e3474dc8d..ee91bebd4 100644
--- a/src/modules/options/optw_servers.cpp
+++ b/src/modules/options/optw_servers.cpp
@@ -1296,7 +1296,7 @@ void KviServerOptionsWidget::fillServerList()
 
 	while(KviNetwork * r = it.current())
 	{
-		net = new KviServerOptionsTreeWidgetItem(m_pTreeWidget,*(g_pIconManager->getSmallIcon(KVI_SMALLICON_WORLD)),r->network());
+		net = new KviServerOptionsTreeWidgetItem(m_pTreeWidget,*(g_pIconManager->getSmallIcon(KVI_SMALLICON_WORLD)),r);
 		KviPointerList<KviServer> * sl = r->serverList();
 		bool bCurrent = r->name() == g_pServerDataBase->currentNetworkName().toUtf8().data();
 		net->setExpanded(bCurrent);
@@ -1389,16 +1389,16 @@ void KviServerOptionsWidget::commit()
 	{
 		network=(KviServerOptionsTreeWidgetItem *) m_pTreeWidget->topLevelItem(i);
 		QString tmp = network->m_pNetworkData->name();
-		KviNetwork * pNetwork = g_pServerDataBase->findRecord(tmp);
+		KviNetwork * pNetwork = g_pServerDataBase->findNetwork(tmp);
 		if(pNetwork)
 		{
 			pNetwork->copyFrom(*(network->m_pNetworkData));
 		} else {
 			pNetwork = new KviNetwork(tmp);
 			pNetwork->copyFrom(*(network->m_pNetworkData));
-			g_pServerDataBase->addNetwork(net);
+			g_pServerDataBase->addNetwork(pNetwork);
 		}
-		if(network == m_pLastEditedItem)g_pServerDataBase->setCurrentNetwork(net->name());
+		if(network == m_pLastEditedItem)g_pServerDataBase->setCurrentNetwork(pNetwork->name());
 
 		KviServerOptionsTreeWidgetItem * ch;
 		for (int j=0;j<network->childCount();j++)
@@ -1421,7 +1421,7 @@ void KviServerOptionsWidget::commit()
 					if(srv->id().isEmpty())srv->generateUniqueId();
 					if(ch == m_pLastEditedItem)
 					{
-						g_pServerDataBase->setCurrentNetwork(net->name());
+						g_pServerDataBase->setCurrentNetwork(pNetwork->name());
 						pNetwork->setCurrentServer(srv);
 					}
 				}
diff --git a/src/modules/serverdb/libkviserverdb.cpp b/src/modules/serverdb/libkviserverdb.cpp
index 9cd873943..61f7e939c 100644
--- a/src/modules/serverdb/libkviserverdb.cpp
+++ b/src/modules/serverdb/libkviserverdb.cpp
@@ -107,7 +107,7 @@ static bool serverdb_kvs_fnc_serverExists(KviKvsModuleFunctionCall * c)
 	if(!szNetwork.isEmpty())
 	{
 		// Check in the given network
-		KviServerDataBaseRecord * pRecord = g_pServerDataBase->findRecord(szNetwork);
+		KviNetwork * pRecord = g_pServerDataBase->findNetwork(szNetwork);
 		if(!pRecord)
 		{
 			c->returnValue()->setBoolean(false);
@@ -124,9 +124,9 @@ static bool serverdb_kvs_fnc_serverExists(KviKvsModuleFunctionCall * c)
 		c->returnValue()->setBoolean(true);
 	} else {
 		// Check through all networks
-		KviPointerHashTableIterator<QString,KviServerDataBaseRecord> it(*(g_pServerDataBase->recordDict()));
+		KviPointerHashTableIterator<QString,KviNetwork> it(*(g_pServerDataBase->recordDict()));
 
-		while(KviServerDataBaseRecord * r = it.current())
+		while(KviNetwork * r = it.current())
 		{
 			KviPointerList<KviServer> * sl = r->serverList();
 
@@ -688,13 +688,7 @@ static bool serverdb_kvs_cmd_addNetwork(KviKvsModuleCommandCall * c)
 	pNetwork = new KviNetwork(szNetName);
 	if(c->switches()->find('a',"autoconnect")) pNetwork->setAutoConnect(true);
 
-	KviServerDataBaseRecord * pRecord = g_pServerDataBase->addNetwork(pNetwork);
-	if(!pRecord)
-	{
-		c->error("Internal error: KVIrc author screwed up","serverdb");
-		return false;
-	}
-
+	g_pServerDataBase->addNetwork(pNetwork);
 	return true;
 }
 
@@ -760,7 +754,7 @@ static bool serverdb_kvs_cmd_addServer(KviKvsModuleCommandCall * c)
 		return false;
 	}
 
-	KviServerDataBaseRecord * pRecord = g_pServerDataBase->findRecord(szNetwork);
+	KviNetwork * pRecord = g_pServerDataBase->findNetwork(szNetwork);
 	if(!pRecord)
 	{
 		// FIXME: default to orphan servers
@@ -866,7 +860,7 @@ static bool serverdb_kvs_cmd_addServer(KviKvsModuleCommandCall * c)
 			return false; \
 		} \
 		\
-		KviServerDataBaseRecord * pRecord = g_pServerDataBase->findRecord(szNetName); \
+		KviNetwork * pRecord = g_pServerDataBase->findNetwork(szNetName); \
 		if(!pRecord) \
 		{ \
 			if(c->switches()->find('q',"quiet")) return true; \