renamed global server database pointer; applied patch: thanks to BugSlayer

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

2 files changed, 9 insertions, 9 deletions

diff --git a/src/modules/options/optw_servers.cpp b/src/modules/options/optw_servers.cpp
index 8afb894f4..21cc8bc47 100644
--- a/src/modules/options/optw_servers.cpp
+++ b/src/modules/options/optw_servers.cpp
@@ -934,7 +934,7 @@ void KviServerDetailsWidget::useDefaultInitUModeToggled(bool b)
 }
 
 // kvi_app.cpp
-extern KVIRC_API KviServerDataBase * g_pIrcServerDataBase;
+extern KVIRC_API KviServerDataBase * g_pServerDataBase;
 
 KviServerOptionsTreeWidgetItem::KviServerOptionsTreeWidgetItem(KviTalTreeWidget *parent,const QPixmap &pm,const KviNetwork *n)
     : KviTalTreeWidgetItem(parent)
@@ -1231,13 +1231,13 @@ void KviServerOptionsWidget::fillServerList()
 	KviServerOptionsTreeWidgetItem * srv;
 	KviServerOptionsTreeWidgetItem * cur = 0;
 
-	KviPointerHashTableIterator<QString,KviServerDataBaseRecord> it(*(g_pIrcServerDataBase->recordDict()));
+	KviPointerHashTableIterator<QString,KviServerDataBaseRecord> it(*(g_pServerDataBase->recordDict()));
 
 	while(KviServerDataBaseRecord * r = it.current())
 	{
 		net = new KviServerOptionsTreeWidgetItem(m_pTreeWidget,*(g_pIconManager->getSmallIcon(KVI_SMALLICON_WORLD)),r->network());
 		KviPointerList<KviServer> * sl = r->serverList();
-		bool bCurrent = r->network()->name() == g_pIrcServerDataBase->currentNetworkName().toUtf8().data();
+		bool bCurrent = r->network()->name() == g_pServerDataBase->currentNetworkName().toUtf8().data();
 		net->setExpanded(bCurrent);
 		for(KviServer * s = sl->first();s;s = sl->next())
 		{
@@ -1315,7 +1315,7 @@ void KviServerOptionsWidget::saveLastItem()
 void KviServerOptionsWidget::commit()
 {
 	saveLastItem();
-	g_pIrcServerDataBase->clear();
+	g_pServerDataBase->clear();
 //	KviServerOptionsTreeWidgetItem * it = (KviServerOptionsTreeWidgetItem *)m_pTreeWidget->firstChild();
 	KviServerOptionsTreeWidgetItem * network;
 	for (int i=0;i<m_pTreeWidget->topLevelItemCount();i++)
@@ -1324,7 +1324,7 @@ void KviServerOptionsWidget::commit()
 		network=(KviServerOptionsTreeWidgetItem *) m_pTreeWidget->topLevelItem(i);
 		QString tmp = network->m_pNetworkData->name();
 		KviNetwork * net = 0;
-		KviServerDataBaseRecord * r = g_pIrcServerDataBase->findRecord(tmp);
+		KviServerDataBaseRecord * r = g_pServerDataBase->findRecord(tmp);
 		if(r)
 		{
 			net = r->network();
@@ -1332,9 +1332,9 @@ void KviServerOptionsWidget::commit()
 		} else {
 			net = new KviNetwork(tmp);
 			net->copyFrom(*(network->m_pNetworkData));
-			r = g_pIrcServerDataBase->insertNetwork(net);
+			r = g_pServerDataBase->insertNetwork(net);
 		}
-		if(network == m_pLastEditedItem)g_pIrcServerDataBase->setCurrentNetwork(net->name());
+		if(network == m_pLastEditedItem)g_pServerDataBase->setCurrentNetwork(net->name());
 
 		KviServerOptionsTreeWidgetItem * ch;
 		for (int j=0;j<network->childCount();j++)
@@ -1357,7 +1357,7 @@ void KviServerOptionsWidget::commit()
 					if(srv->id().isEmpty())srv->generateUniqueId();
 					if(ch == m_pLastEditedItem)
 					{
-						g_pIrcServerDataBase->setCurrentNetwork(net->name());
+						g_pServerDataBase->setCurrentNetwork(net->name());
 						r->setCurrentServer(srv);
 					}
 				}
diff --git a/src/modules/setup/libkvisetup.cpp b/src/modules/setup/libkvisetup.cpp
index df829915e..4962b9417 100644
--- a/src/modules/setup/libkvisetup.cpp
+++ b/src/modules/setup/libkvisetup.cpp
@@ -106,7 +106,7 @@ KVIMODULEEXPORTFUNC void setup_finish()
 		
 		if(!szMircServers.isEmpty())
 		{
-			g_pIrcServerDataBase->loadFromMircIni(szMircServers,szMircIni,
+			g_pServerDataBase->loadFromMircIni(szMircServers,szMircIni,
 				KVI_OPTION_STRINGLIST(KviOption_stringlistRecentServers));
 			g_pApp->saveIrcServerDataBase();
 		}