diff options
Diffstat (limited to 'protocols')
-rw-r--r-- | protocols/IRCG/src/commandmonitor.cpp | 6 | ||||
-rw-r--r-- | protocols/IRCG/src/ircproto.cpp | 4 | ||||
-rw-r--r-- | protocols/IRCG/src/options.cpp | 8 | ||||
-rw-r--r-- | protocols/IcqOscarJ/src/icq_servlist.cpp | 10 | ||||
-rw-r--r-- | protocols/MinecraftDynmap/src/chat.cpp | 2 | ||||
-rw-r--r-- | protocols/MinecraftDynmap/src/communication.cpp | 2 | ||||
-rw-r--r-- | protocols/MinecraftDynmap/src/dialogs.cpp | 2 | ||||
-rw-r--r-- | protocols/Omegle/src/dialogs.cpp | 2 | ||||
-rw-r--r-- | protocols/Tox/src/tox_bootstrap.cpp | 6 | ||||
-rw-r--r-- | protocols/Tox/src/tox_options.cpp | 8 |
10 files changed, 25 insertions, 25 deletions
diff --git a/protocols/IRCG/src/commandmonitor.cpp b/protocols/IRCG/src/commandmonitor.cpp index 1e7b262430..08a2839c37 100644 --- a/protocols/IRCG/src/commandmonitor.cpp +++ b/protocols/IRCG/src/commandmonitor.cpp @@ -1394,7 +1394,7 @@ bool CIrcProto::OnIrc_ENDNAMES(const CIrcMessage *pmsg) else Chat_Control(m_szModuleName, sID, SESSION_INITDONE);
if (save.IsEmpty())
- db_unset(NULL, m_szModuleName, "JTemp");
+ db_unset(0, m_szModuleName, "JTemp");
else
setWString("JTemp", save);
db_free(&dbv);
@@ -1828,7 +1828,7 @@ bool CIrcProto::OnIrc_JOINERROR(const CIrcMessage *pmsg) db_free(&dbv);
if (save.IsEmpty())
- db_unset(NULL, m_szModuleName, "JTemp");
+ db_unset(0, m_szModuleName, "JTemp");
else
setWString("JTemp", save);
}
@@ -2278,7 +2278,7 @@ void CIrcProto::OnIrcDefault(const CIrcMessage *pmsg) void CIrcProto::OnIrcDisconnected()
{
m_statusMessage = L"";
- db_unset(NULL, m_szModuleName, "JTemp");
+ db_unset(0, m_szModuleName, "JTemp");
bTempDisableCheck = false;
bTempForceCheck = false;
m_iTempCheckTime = 0;
diff --git a/protocols/IRCG/src/ircproto.cpp b/protocols/IRCG/src/ircproto.cpp index 3fa02e20b1..380984a4f9 100644 --- a/protocols/IRCG/src/ircproto.cpp +++ b/protocols/IRCG/src/ircproto.cpp @@ -180,7 +180,7 @@ void CIrcProto::OnModulesLoaded() wchar_t name[128];
mir_snwprintf(name, TranslateT("%s server connection"), m_tszUserName);
- db_unset(NULL, m_szModuleName, "JTemp");
+ db_unset(0, m_szModuleName, "JTemp");
NETLIBUSER nlu = {};
nlu.flags = NUF_OUTGOING | NUF_INCOMING | NUF_HTTPCONNS | NUF_UNICODE;
@@ -245,7 +245,7 @@ void CIrcProto::OnModulesLoaded() for (auto &it : performToConvert) {
DBVARIANT dbv;
if (!getWString(*it, &dbv)) {
- db_unset(NULL, m_szModuleName, *it);
+ db_unset(0, m_szModuleName, *it);
it->MakeUpper();
setWString(*it, dbv.pwszVal);
db_free(&dbv);
diff --git a/protocols/IRCG/src/options.cpp b/protocols/IRCG/src/options.cpp index 0e10ae9ead..14b3c4ae8c 100644 --- a/protocols/IRCG/src/options.cpp +++ b/protocols/IRCG/src/options.cpp @@ -1167,7 +1167,7 @@ bool COtherPrefsDlg::OnApply() if (!pPerf->mText.IsEmpty())
m_proto->setWString(pPerf->mSetting.c_str(), pPerf->mText.c_str());
else
- db_unset(NULL, m_proto->m_szModuleName, pPerf->mSetting.c_str());
+ db_unset(0, m_proto->m_szModuleName, pPerf->mSetting.c_str());
}
}
m_proto->WriteSettings(OtherSettings, _countof(OtherSettings));
@@ -1383,7 +1383,7 @@ void CIrcProto::RewriteIgnoreSettings(void) int i = 0;
for (;;) {
mir_snprintf(settingName, "IGNORE:%d", i++);
- if (db_unset(NULL, m_szModuleName, settingName))
+ if (db_unset(0, m_szModuleName, settingName))
break;
}
@@ -1688,11 +1688,11 @@ void CIrcProto::InitPrefs(void) int x = getDword("SizeOfListBottom", -1);
if (x != -1) {
- db_unset(NULL, m_szModuleName, "SizeOfListBottom");
+ db_unset(0, m_szModuleName, "SizeOfListBottom");
setDword("channelList_height", x);
}
if ((x = getDword("SizeOfListWidth", -1)) != -1) {
- db_unset(NULL, m_szModuleName, "SizeOfListWidth");
+ db_unset(0, m_szModuleName, "SizeOfListWidth");
setDword("channelList_width", x);
}
diff --git a/protocols/IcqOscarJ/src/icq_servlist.cpp b/protocols/IcqOscarJ/src/icq_servlist.cpp index 62f45998ee..ee70e8de8a 100644 --- a/protocols/IcqOscarJ/src/icq_servlist.cpp +++ b/protocols/IcqOscarJ/src/icq_servlist.cpp @@ -1268,7 +1268,7 @@ void CIcqProto::removeGroupPathLinks(WORD wGroupID) while (list) {
void* bet;
- db_unset(NULL, szModule, list[1]);
+ db_unset(0, szModule, list[1]);
SAFE_FREE((void**)&list[1]);
bet = list;
list = (char**)list[0];
@@ -1292,7 +1292,7 @@ char* CIcqProto::getServListGroupName(WORD wGroupID) if (!CheckServerID(wGroupID, 0)) { // check if valid id, if not give empty and remove
debugLogA("Removing group %u from cache...", wGroupID);
- db_unset(NULL, szModule, szGroup);
+ db_unset(0, szModule, szGroup);
return nullptr;
}
@@ -1315,7 +1315,7 @@ void CIcqProto::setServListGroupName(WORD wGroupID, const char *szGroupName) if (szGroupName)
db_set_utf(NULL, szModule, szGroup, szGroupName);
else {
- db_unset(NULL, szModule, szGroup);
+ db_unset(0, szModule, szGroup);
removeGroupPathLinks(wGroupID);
}
}
@@ -1329,7 +1329,7 @@ WORD CIcqProto::getServListGroupLinkID(const char *szPath) if (wGroupId && !CheckServerID(wGroupId, 0)) { // known, check if still valid, if not remove
debugLogA("Removing group \"%s\" from cache...", szPath);
- db_unset(NULL, szModule, szPath);
+ db_unset(0, szModule, szPath);
wGroupId = 0;
}
@@ -1344,7 +1344,7 @@ void CIcqProto::setServListGroupLinkID(const char *szPath, WORD wGroupID) if (wGroupID)
db_set_w(0, szModule, szPath, wGroupID);
else
- db_unset(NULL, szModule, szPath);
+ db_unset(0, szModule, szPath);
}
// determine if the specified clist group path exists
diff --git a/protocols/MinecraftDynmap/src/chat.cpp b/protocols/MinecraftDynmap/src/chat.cpp index 4b6d8b0c46..0027ba3e44 100644 --- a/protocols/MinecraftDynmap/src/chat.cpp +++ b/protocols/MinecraftDynmap/src/chat.cpp @@ -162,7 +162,7 @@ void MinecraftDynmapProto::SetChatStatus(int status) if (status == ID_STATUS_ONLINE) { // Load actual name from database - ptrA nick(db_get_sa(NULL, m_szModuleName, MINECRAFTDYNMAP_KEY_NAME)); + ptrA nick(db_get_sa(0, m_szModuleName, MINECRAFTDYNMAP_KEY_NAME)); if (!nick) { nick = mir_strdup(Translate("You")); db_set_s(0, m_szModuleName, MINECRAFTDYNMAP_KEY_NAME, nick); diff --git a/protocols/MinecraftDynmap/src/communication.cpp b/protocols/MinecraftDynmap/src/communication.cpp index 2124715301..35f74f0818 100644 --- a/protocols/MinecraftDynmap/src/communication.cpp +++ b/protocols/MinecraftDynmap/src/communication.cpp @@ -353,7 +353,7 @@ void MinecraftDynmapProto::SignOnWorker(void*) int old_status = m_iStatus; // Load server from database - ptrA str(db_get_sa(NULL, m_szModuleName, MINECRAFTDYNMAP_KEY_SERVER)); + ptrA str(db_get_sa(0, m_szModuleName, MINECRAFTDYNMAP_KEY_SERVER)); if (!str || !str[0]) { MessageBox(nullptr, TranslateT("Set server address to connect."), m_tszUserName, MB_OK); SetStatus(ID_STATUS_OFFLINE); diff --git a/protocols/MinecraftDynmap/src/dialogs.cpp b/protocols/MinecraftDynmap/src/dialogs.cpp index 633ea10671..f682fd5c7b 100644 --- a/protocols/MinecraftDynmap/src/dialogs.cpp +++ b/protocols/MinecraftDynmap/src/dialogs.cpp @@ -61,7 +61,7 @@ static void StoreDBText(MinecraftDynmapProto* ppro, HWND hwnd, int idCtrl, const if (tstr[0] != '\0') { db_set_ws(0, ppro->m_szModuleName, szSetting, tstr); } else { - db_unset(NULL, ppro->m_szModuleName, szSetting); + db_unset(0, ppro->m_szModuleName, szSetting); } } diff --git a/protocols/Omegle/src/dialogs.cpp b/protocols/Omegle/src/dialogs.cpp index 06e4504721..4a4b069813 100644 --- a/protocols/Omegle/src/dialogs.cpp +++ b/protocols/Omegle/src/dialogs.cpp @@ -51,7 +51,7 @@ static void StoreDBText(OmegleProto* ppro, HWND hwnd, int idCtrl, const char* sz if (tstr[0] != '\0')
db_set_ws(0, ppro->m_szModuleName, szSetting, tstr);
else
- db_unset(NULL, ppro->m_szModuleName, szSetting);
+ db_unset(0, ppro->m_szModuleName, szSetting);
}
INT_PTR CALLBACK OmegleAccountProc(HWND hwnd, UINT message, WPARAM wparam, LPARAM lparam)
diff --git a/protocols/Tox/src/tox_bootstrap.cpp b/protocols/Tox/src/tox_bootstrap.cpp index 103f9a5fcf..638d3aadfe 100644 --- a/protocols/Tox/src/tox_bootstrap.cpp +++ b/protocols/Tox/src/tox_bootstrap.cpp @@ -33,16 +33,16 @@ void CToxProto::BootstrapNodesFromDb(Tox *tox, bool isIPv6) char setting[MAX_PATH]; for (int i = 0; i < nodeCount; i++) { mir_snprintf(setting, TOX_SETTINGS_NODE_IPV4, i); - ptrA address(db_get_sa(NULL, module, setting)); + ptrA address(db_get_sa(0, module, setting)); mir_snprintf(setting, TOX_SETTINGS_NODE_PORT, i); int port = db_get_w(0, module, setting, 33445); mir_snprintf(setting, TOX_SETTINGS_NODE_PKEY, i); - ptrA pubKey(db_get_sa(NULL, module, setting)); + ptrA pubKey(db_get_sa(0, module, setting)); BootstrapUdpNode(tox, address, port, pubKey); BootstrapTcpRelay(tox, address, port, pubKey); if (isIPv6) { mir_snprintf(setting, TOX_SETTINGS_NODE_IPV6, i); - address = db_get_sa(NULL, module, setting); + address = db_get_sa(0, module, setting); BootstrapUdpNode(tox, address, port, pubKey); BootstrapTcpRelay(tox, address, port, pubKey); } diff --git a/protocols/Tox/src/tox_options.cpp b/protocols/Tox/src/tox_options.cpp index cd3a8357cd..2d5c570b45 100644 --- a/protocols/Tox/src/tox_options.cpp +++ b/protocols/Tox/src/tox_options.cpp @@ -539,13 +539,13 @@ bool CToxOptionsNodeList::OnApply() int nodeCount = db_get_b(0, module, TOX_SETTINGS_NODE_COUNT, 0);
for (iItem = itemCount; iItem < nodeCount; iItem++) {
mir_snprintf(setting, TOX_SETTINGS_NODE_IPV4, iItem);
- db_unset(NULL, module, setting);
+ db_unset(0, module, setting);
mir_snprintf(setting, TOX_SETTINGS_NODE_IPV6, iItem);
- db_unset(NULL, module, setting);
+ db_unset(0, module, setting);
mir_snprintf(setting, TOX_SETTINGS_NODE_PORT, iItem);
- db_unset(NULL, module, setting);
+ db_unset(0, module, setting);
mir_snprintf(setting, TOX_SETTINGS_NODE_PKEY, iItem);
- db_unset(NULL, module, setting);
+ db_unset(0, module, setting);
}
db_set_b(0, module, TOX_SETTINGS_NODE_COUNT, itemCount);
return true;
|