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

14 files changed, 69 insertions, 66 deletions

diff --git a/ChangeLog b/ChangeLog
index 618fdd50b..ce8c881f0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,14 +1,14 @@
-buh :) - 25 June 2008
+buh :) - 5 July 2008
    [KVIrc Development Team]
    - Qt4 porting (wip)
    - Fixed many bugs
    - New build system: removed autotools in favour of CMake (thanks to all people who aid reaching this point :)
 
    [HelLViS69]
-   - finally updated this file :)
+   - Finally updated this file :)
+   - Improved About module
    - New StatusBar applet: Update Indicator
    - New KVS command: added 'continue'
-   - Improved About module
    - New KVS function: added $objects.name
    - New KVS module: with serverdb you can manipulate the server list DB (wip)
 
diff --git a/TODO-cmake b/TODO-cmake
index 8fc0c77b2..27d73db13 100644
--- a/TODO-cmake
+++ b/TODO-cmake
@@ -1,9 +1,6 @@
 This file contains all the things that have to be done to complete the
 transition autotools -> cmake.
 
-* Missing targets:
-- create and test build and install rules for the win32 target
-
 * Missing or broken rules
 - header installation (useful?)
 - uninstall: delete userdocs (generated by gendoc.pl)
diff --git a/src/kvilib/irc/kvi_avatar.cpp b/src/kvilib/irc/kvi_avatar.cpp
index f361daa31..e2c03ba30 100644
--- a/src/kvilib/irc/kvi_avatar.cpp
+++ b/src/kvilib/irc/kvi_avatar.cpp
@@ -153,7 +153,7 @@ QPixmap * KviAvatar::scaledPixmap(unsigned int w,unsigned int h)
 		scaleW = (scaleH * curW) / curH;
 	}
 
-	m_pScaledPixmap = new QPixmap(m_pPixmap->scaled(scaleW,scaleH));
+	m_pScaledPixmap = new QPixmap(m_pPixmap->scaled(scaleW,scaleH, Qt::IgnoreAspectRatio, Qt::SmoothTransformation));
 
 	return m_pScaledPixmap;
 }
diff --git a/src/kvilib/irc/kvi_ircserverdb.cpp b/src/kvilib/irc/kvi_ircserverdb.cpp
index 8e83468f1..9d72d60f8 100644
--- a/src/kvilib/irc/kvi_ircserverdb.cpp
+++ b/src/kvilib/irc/kvi_ircserverdb.cpp
@@ -55,14 +55,19 @@ void KviServerDataBaseRecord::insertServer(KviServer *srv)
 	m_pServerList->append(srv);
 }
 
-KviServer * KviServerDataBaseRecord::findServer(const KviServer * pServer)
+KviServer * KviServerDataBaseRecord::findServer(const KviServer * pServer, bool bName)
 {
 	for(KviServer *s=m_pServerList->first();s;s=m_pServerList->next())
 	{
-		if(KviQString::equalCI(s->m_szHostname,pServer->m_szHostname) &&
-			(s->m_uPort == pServer->m_uPort) &&
-			(s->useSSL() == pServer->useSSL()) &&
-			(s->isIPv6() == pServer->isIPv6()))return s;
+		if(bName)
+		{
+			if(KviQString::equalCI(s->m_szHostname,pServer->m_szHostname)) return s;
+		} else {
+			if(KviQString::equalCI(s->m_szHostname,pServer->m_szHostname) &&
+				(s->m_uPort == pServer->m_uPort) &&
+				(s->useSSL() == pServer->useSSL()) &&
+				(s->isIPv6() == pServer->isIPv6())) return s;
+		}
 	}
 	return 0;
 }
diff --git a/src/kvilib/irc/kvi_ircserverdb.h b/src/kvilib/irc/kvi_ircserverdb.h
index 42b80a821..ba636441c 100644
--- a/src/kvilib/irc/kvi_ircserverdb.h
+++ b/src/kvilib/irc/kvi_ircserverdb.h
@@ -61,7 +61,7 @@ public:
 	KviPointerList<KviServer> * serverList(){ return m_pServerList; };
 	KviServer * currentServer();
 	void insertServer(KviServer *srv);
-	KviServer * findServer(const KviServer * pServer);
+	KviServer * findServer(const KviServer * pServer, bool bName=0);
 	void setCurrentServer(KviServer *srv);
 };
 
diff --git a/src/kvirc/kernel/kvi_app.cpp b/src/kvirc/kernel/kvi_app.cpp
index 9f7533f1c..a7510f7ef 100644
--- a/src/kvirc/kernel/kvi_app.cpp
+++ b/src/kvirc/kernel/kvi_app.cpp
@@ -106,38 +106,37 @@
 #include <stdlib.h> // rand & srand
 #include <time.h> // time() in srand()
 
-KVIRC_API KviApp                       * g_pApp                    = 0; // global application pointer
+// Global application pointer
+KVIRC_API KviApp                        * g_pApp                        = 0;
 
-KviConfig                              * g_pWinPropertiesConfig    = 0;
-KVIRC_API KviServerDataBase         * g_pIrcServerDataBase      = 0;
-KVIRC_API KviProxyDataBase             * g_pProxyDataBase          = 0;
+KviConfig                               * g_pWinPropertiesConfig        = 0;
+KVIRC_API KviServerDataBase             * g_pServerDataBase             = 0;
+KVIRC_API KviProxyDataBase              * g_pProxyDataBase              = 0;
 
 // Global windows
+KVIRC_API KviColorWindow                * g_pColorWindow                = 0;
+KVIRC_API KviTextIconWindowWidget       * g_pTextIconWindow             = 0;
+KVIRC_API KviTalPopupMenu               * g_pInputPopup                 = 0;
+KVIRC_API QStringList                   * g_pRecentTopicList            = 0;
+KVIRC_API KviPointerHashTable<QString,KviWindow>  * g_pGlobalWindowDict = 0;
+KVIRC_API KviMediaManager               * g_pMediaManager               = 0;
+KVIRC_API KviSharedFilesManager         * g_pSharedFilesManager         = 0;
+KVIRC_API KviNickServRuleSet            * g_pNickServRuleSet            = 0;
+KVIRC_API KviGarbageCollector           * g_pGarbageCollector           = 0;
+KVIRC_API KviCtcpPageDialog             * g_pCtcpPageDialog             = 0;
+KVIRC_API KviRegisteredChannelDataBase  * g_pRegisteredChannelDataBase  = 0;
+KVIRC_API KviInputHistory               * g_pInputHistory               = 0;
+KVIRC_API KviHistoryWindowWidget        * g_pHistoryWindow              = 0;
 
-KVIRC_API KviColorWindow               * g_pColorWindow               = 0;
-KVIRC_API KviTextIconWindowWidget      * g_pTextIconWindow            = 0;
-KVIRC_API KviTalPopupMenu              * g_pInputPopup                = 0;
-KVIRC_API QStringList                  * g_pRecentTopicList           = 0;
-KVIRC_API KviPointerHashTable<QString,KviWindow> * g_pGlobalWindowDict = 0;
-KVIRC_API KviMediaManager              * g_pMediaManager              = 0;
-KVIRC_API KviSharedFilesManager        * g_pSharedFilesManager        = 0;
-KVIRC_API KviNickServRuleSet           * g_pNickServRuleSet           = 0;
-KVIRC_API KviGarbageCollector          * g_pGarbageCollector          = 0;
-KVIRC_API KviCtcpPageDialog            * g_pCtcpPageDialog            = 0;
-KVIRC_API KviRegisteredChannelDataBase * g_pRegisteredChannelDataBase = 0;
-KVIRC_API KviInputHistory              * g_pInputHistory              = 0;
-KVIRC_API KviHistoryWindowWidget       * g_pHistoryWindow             = 0;
+// this is eventually set by libkviident
+KVIRC_API int                             g_iIdentDaemonRunningUsers    = 0;
 
-
-KVIRC_API int                            g_iIdentDaemonRunningUsers   = 0; // this is eventually set by libkviident
-
-KVIRC_API KviSplashScreen       * g_pSplashScreen           = 0;
+KVIRC_API KviSplashScreen               * g_pSplashScreen               = 0;
 
 
 // Loaded and destroyed by KviIconManager
-QPixmap                             * g_pUserChanStatePixmap    = 0;
-QPixmap                             * g_pActivityMeterPixmap    = 0;
-
+QPixmap                                 * g_pUserChanStatePixmap        = 0;
+QPixmap                                 * g_pActivityMeterPixmap        = 0;
 
 #ifdef COMPILE_PSEUDO_TRANSPARENCY
 
@@ -149,7 +148,8 @@ QPixmap                             * g_pActivityMeterPixmap    = 0;
 		#include <qdatastream.h>
 		#include <qcstring.h>
 
-		KSharedPixmap         * g_pKdeDesktopBackground             = 0; // the shared pixmap that we get from KWin
+		// the shared pixmap that we get from KWin
+		KSharedPixmap           * g_pKdeDesktopBackground      = 0;
 	#endif
 
 	#include <QImage>
@@ -160,7 +160,8 @@ QPixmap                             * g_pActivityMeterPixmap    = 0;
 
 #ifdef COMPILE_CRYPT_SUPPORT
 	#include "kvi_crypt.h"
-	KVIRC_API KviCryptEngineManager * g_pCryptEngineManager = 0; // global crypt engine manager
+	// global crypt engine manager
+	KVIRC_API KviCryptEngineManager * g_pCryptEngineManager = 0;
 #endif
 
 KviApp::KviApp(int &argc,char ** argv)
@@ -327,9 +328,9 @@ void KviApp::setup()
 	KVI_SPLASH_SET_PROGRESS(50)
 
 	// Load the server database
-	g_pIrcServerDataBase   = new KviServerDataBase();
+	g_pServerDataBase   = new KviServerDataBase();
 	if(getReadOnlyConfigPath(tmp,KVI_CONFIGFILE_SERVERDB))
-		g_pIrcServerDataBase->load(tmp);
+		g_pServerDataBase->load(tmp);
 
 	KVI_SPLASH_SET_PROGRESS(53)
 
@@ -566,7 +567,7 @@ KviApp::~KviApp()
 	if(m_pRecentChannelsDict) delete m_pRecentChannelsDict;
 	// now kill the stuff that the frame depends on
 	saveIrcServerDataBase();
-	delete g_pIrcServerDataBase;
+	delete g_pServerDataBase;
 	saveProxyDataBase();
 	delete g_pProxyDataBase;
 	delete g_pWinPropertiesConfig;
@@ -1446,7 +1447,7 @@ void KviApp::saveIrcServerDataBase()
 {
 	QString tmp;
 	getLocalKvircDirectory(tmp,Config,KVI_CONFIGFILE_SERVERDB);
-	g_pIrcServerDataBase->save(tmp);
+	g_pServerDataBase->save(tmp);
 }
 
 void KviApp::saveProxyDataBase()
@@ -1528,7 +1529,7 @@ void KviApp::saveConfiguration()
 
 void KviApp::autoConnectToServers()
 {
-	KviPointerList<KviServer> * l = g_pIrcServerDataBase->autoConnectOnStartupServers();
+	KviPointerList<KviServer> * l = g_pServerDataBase->autoConnectOnStartupServers();
 	if(l)
 	{
 		for(KviServer * s = l->first();s;s = l->next())
@@ -1539,10 +1540,10 @@ void KviApp::autoConnectToServers()
 			szCommand += "\"";
 			KviKvsScript::run(szCommand,activeConsole());
 		}
-		g_pIrcServerDataBase->clearAutoConnectOnStartupServers();
+		g_pServerDataBase->clearAutoConnectOnStartupServers();
 	}
 
-	KviPointerList<KviServerDataBaseRecord> * lr = g_pIrcServerDataBase->autoConnectOnStartupNetworks();
+	KviPointerList<KviServerDataBaseRecord> * lr = g_pServerDataBase->autoConnectOnStartupNetworks();
 	if(lr)
 	{
 		for(KviServerDataBaseRecord * r = lr->first();r;r = lr->next())
@@ -1552,7 +1553,7 @@ void KviApp::autoConnectToServers()
 			szCommandx += "\"";
 			KviKvsScript::run(szCommandx,activeConsole());
 		}
-		g_pIrcServerDataBase->clearAutoConnectOnStartupNetworks();
+		g_pServerDataBase->clearAutoConnectOnStartupNetworks();
 	}
 }
 
@@ -1570,7 +1571,7 @@ void KviApp::createFrame()
 	}
 
 	// auto connect to servers if needed
-	if(g_pIrcServerDataBase->autoConnectOnStartupServers() || g_pIrcServerDataBase->autoConnectOnStartupNetworks())
+	if(g_pServerDataBase->autoConnectOnStartupServers() || g_pServerDataBase->autoConnectOnStartupNetworks())
 	{
 		autoConnectToServers();
 	}
diff --git a/src/kvirc/kernel/kvi_app.h b/src/kvirc/kernel/kvi_app.h
index ce8307e1f..ca9539582 100644
--- a/src/kvirc/kernel/kvi_app.h
+++ b/src/kvirc/kernel/kvi_app.h
@@ -338,7 +338,7 @@ signals:
 
 #ifndef _KVI_APP_CPP_
 	extern KVIRC_API KviApp * g_pApp;
-	extern KVIRC_API KviServerDataBase * g_pIrcServerDataBase;
+	extern KVIRC_API KviServerDataBase * g_pServerDataBase;
 #endif
 
 #endif //_KVI_APP_H_
diff --git a/src/kvirc/kernel/kvi_ircconnection.cpp b/src/kvirc/kernel/kvi_ircconnection.cpp
index 3a3610c46..7c71b78ad 100644
--- a/src/kvirc/kernel/kvi_ircconnection.cpp
+++ b/src/kvirc/kernel/kvi_ircconnection.cpp
@@ -69,7 +69,7 @@
 #include <QTimer>
 #include <QTextCodec>
 
-extern KVIRC_API KviServerDataBase           * g_pIrcServerDataBase;
+extern KVIRC_API KviServerDataBase           * g_pServerDataBase;
 extern KVIRC_API KviProxyDataBase               * g_pProxyDataBase;
 extern KVIRC_API KviGarbageCollector            * g_pGarbageCollector;
 
diff --git a/src/kvirc/kernel/kvi_ircconnectiontargetresolver.cpp b/src/kvirc/kernel/kvi_ircconnectiontargetresolver.cpp
index e2a2bd91d..d04dbcdbe 100644
--- a/src/kvirc/kernel/kvi_ircconnectiontargetresolver.cpp
+++ b/src/kvirc/kernel/kvi_ircconnectiontargetresolver.cpp
@@ -54,7 +54,7 @@
 
 #include <QTimer>
 
-extern KVIRC_API KviServerDataBase           * g_pIrcServerDataBase;
+extern KVIRC_API KviServerDataBase           * g_pServerDataBase;
 extern KVIRC_API KviProxyDataBase               * g_pProxyDataBase;
 extern KVIRC_API KviGarbageCollector            * g_pGarbageCollector;
 
@@ -417,7 +417,7 @@ void KviIrcConnectionTargetResolver::serverLookupTerminated(KviDns *)
 		m_pConsole->output(KVI_OUT_SYSTEMMESSAGE,
 			__tr2qs("Server hostname resolved to %Q"),
 			&szIpAddress);
-	g_pIrcServerDataBase->updateServerIp(m_pTarget->server(),szIpAddress);
+	g_pServerDataBase->updateServerIp(m_pTarget->server(),szIpAddress);
 
 	QString szFirstHostname = m_pServerDns->firstHostname();
 
diff --git a/src/kvirc/kernel/kvi_irccontext.cpp b/src/kvirc/kernel/kvi_irccontext.cpp
index ab8dcff2c..7f6b7b61a 100644
--- a/src/kvirc/kernel/kvi_irccontext.cpp
+++ b/src/kvirc/kernel/kvi_irccontext.cpp
@@ -61,7 +61,7 @@
 // the irc context identifiers start from 1
 static unsigned int g_uNextIrcContextId = 1;
 
-extern KVIRC_API KviServerDataBase * g_pIrcServerDataBase;
+extern KVIRC_API KviServerDataBase * g_pServerDataBase;
 extern KVIRC_API KviProxyDataBase * g_pProxyDataBase;
 
 
@@ -459,7 +459,7 @@ void KviIrcContext::connectToCurrentServer()
 			d.szNick = m_pAsynchronousConnectionData->szNick;
 			d.szInitUMode = m_pAsynchronousConnectionData->szInitUMode;
 			QString szError;
-			if(!g_pIrcServerDataBase->makeCurrentServer(&d,szError))
+			if(!g_pServerDataBase->makeCurrentServer(&d,szError))
 			{
 				m_pConsole->outputNoFmt(KVI_OUT_SYSTEMERROR,szError);
 				destroyAsynchronousConnectionData();
@@ -468,7 +468,7 @@ void KviIrcContext::connectToCurrentServer()
 		} // else we just connect to the globally selected irc server in the options dialog
 	}
 
-	KviServerDataBaseRecord * rec = g_pIrcServerDataBase->currentRecord();
+	KviServerDataBaseRecord * rec = g_pServerDataBase->currentRecord();
 	
 	KviNetwork * net;
 	KviServer  * srv;
diff --git a/src/kvirc/kernel/kvi_irclink.cpp b/src/kvirc/kernel/kvi_irclink.cpp
index a5193a34e..53ab45731 100644
--- a/src/kvirc/kernel/kvi_irclink.cpp
+++ b/src/kvirc/kernel/kvi_irclink.cpp
@@ -52,7 +52,7 @@
 
 #include <QTimer>
 
-extern KVIRC_API KviServerDataBase           * g_pIrcServerDataBase;
+extern KVIRC_API KviServerDataBase           * g_pServerDataBase;
 extern KVIRC_API KviProxyDataBase               * g_pProxyDataBase;
 extern KVIRC_API KviGarbageCollector            * g_pGarbageCollector;
 
diff --git a/src/kvirc/ui/kvi_console.cpp b/src/kvirc/ui/kvi_console.cpp
index ae27a8195..c9d921a9f 100644
--- a/src/kvirc/ui/kvi_console.cpp
+++ b/src/kvirc/ui/kvi_console.cpp
@@ -96,7 +96,7 @@
 #include "kvi_debug.h"
 
 
-extern KVIRC_API KviServerDataBase           * g_pIrcServerDataBase;
+extern KVIRC_API KviServerDataBase           * g_pServerDataBase;
 extern KVIRC_API KviProxyDataBase               * g_pProxyDataBase;
 extern KVIRC_API KviGarbageCollector            * g_pGarbageCollector;
 
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();
 		}