diff options
| author |  Alexey Uzhva | 2008-08-25 17:58:13 +0000 |
|---|---|---|
| committer | Alexey Uzhva | 2008-08-25 17:58:13 +0000 |
| commit | c3bba6bc349c1fc6ad034788998d55742b6e63f2 (patch) | |
| tree | 1607a6dea839982df6f7d1bd718e6da1ceebb199 /src/modules | |
| parent | added itemdelegate for topicwidget (diff) | |
| download | KVIrc-c3bba6bc349c1fc6ad034788998d55742b6e63f2.tar.gz KVIrc-c3bba6bc349c1fc6ad034788998d55742b6e63f2.tar.bz2 KVIrc-c3bba6bc349c1fc6ad034788998d55742b6e63f2.zip | |
small changes
git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@2294 17fca916-40b9-46aa-a4ea-0a15b648b75c
Diffstat (limited to 'src/modules')
| -rw-r--r-- | src/modules/options/optw_servers.cpp | 2 | ||||
| -rw-r--r-- | src/modules/serverdb/libkviserverdb.cpp | 9 | ||||
| -rw-r--r-- | src/modules/setup/libkvisetup.cpp | 2 |
3 files changed, 5 insertions, 8 deletions
diff --git a/src/modules/options/optw_servers.cpp b/src/modules/options/optw_servers.cpp index 88da148a9..402adb977 100644 --- a/src/modules/options/optw_servers.cpp +++ b/src/modules/options/optw_servers.cpp @@ -1398,7 +1398,7 @@ void KviServerOptionsWidget::commit() } else { net = new KviNetwork(tmp); net->copyFrom(*(network->m_pNetworkData)); - r = g_pServerDataBase->insertNetwork(net); + r = g_pServerDataBase->addNetwork(net); } if(network == m_pLastEditedItem)g_pServerDataBase->setCurrentNetwork(net->name()); diff --git a/src/modules/serverdb/libkviserverdb.cpp b/src/modules/serverdb/libkviserverdb.cpp index 81d31c9ef..a84559e25 100644 --- a/src/modules/serverdb/libkviserverdb.cpp +++ b/src/modules/serverdb/libkviserverdb.cpp @@ -114,10 +114,7 @@ static bool serverdb_kvs_fnc_serverExists(KviKvsModuleFunctionCall * c) return true; } - KviServer * pServer = new KviServer(); - pServer->setHostName(szServer); - - KviServer * pCheckServer = pRecord->findServer(pServer,true); + KviServer * pCheckServer = pRecord->findServer(szServer); if(!pCheckServer) { c->returnValue()->setBoolean(false); @@ -128,7 +125,7 @@ static bool serverdb_kvs_fnc_serverExists(KviKvsModuleFunctionCall * c) } else { // Check through all networks KviPointerHashTableIterator<QString,KviServerDataBaseRecord> it(*(g_pServerDataBase->recordDict())); - + while(KviServerDataBaseRecord * r = it.current()) { KviPointerList<KviServer> * sl = r->serverList(); @@ -694,7 +691,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->insertNetwork(pNetwork); + KviServerDataBaseRecord * pRecord = g_pServerDataBase->addNetwork(pNetwork); if(!pRecord) { c->error("Internal error: KVIrc author screwed up","serverdb"); diff --git a/src/modules/setup/libkvisetup.cpp b/src/modules/setup/libkvisetup.cpp index 4962b9417..f5a4d084a 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_pServerDataBase->loadFromMircIni(szMircServers,szMircIni, + g_pServerDataBase->importFromMircIni(szMircServers,szMircIni, KVI_OPTION_STRINGLIST(KviOption_stringlistRecentServers)); g_pApp->saveIrcServerDataBase(); } |