From fd90113f1a40064a9a6dc670a60dd3b2a738a467 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Sat, 13 Oct 2012 22:28:28 +0000 Subject: code cleaning git-svn-id: http://svn.miranda-ng.org/main/trunk@1915 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- src/modules/clist/clcutils.cpp | 2 +- src/modules/clist/contact.cpp | 2 +- src/modules/clist/genmenuopt.cpp | 2 +- src/modules/clist/groups.cpp | 10 +++++----- 4 files changed, 8 insertions(+), 8 deletions(-) (limited to 'src/modules/clist') diff --git a/src/modules/clist/clcutils.cpp b/src/modules/clist/clcutils.cpp index 84ab62c86e..e59d16ffe3 100644 --- a/src/modules/clist/clcutils.cpp +++ b/src/modules/clist/clcutils.cpp @@ -427,7 +427,7 @@ void fnEndRename(HWND, struct ClcData *dat, int save) if ( !text[0] || !lstrcmp(otherName, text)) DBDeleteContactSetting(contact->hContact, "CList", "MyHandle"); else - DBWriteContactSettingTString(contact->hContact, "CList", "MyHandle", text); + db_set_ts(contact->hContact, "CList", "MyHandle", text); mir_free(otherName); } } diff --git a/src/modules/clist/contact.cpp b/src/modules/clist/contact.cpp index dd5afb8094..86b9625ece 100644 --- a/src/modules/clist/contact.cpp +++ b/src/modules/clist/contact.cpp @@ -165,7 +165,7 @@ INT_PTR ContactChangeGroup(WPARAM wParam, LPARAM lParam) DBDeleteContactSetting((HANDLE) wParam, "CList", "Group"); else { grpChg.pszNewName = cli.pfnGetGroupName(lParam, NULL); - DBWriteContactSettingTString((HANDLE) wParam, "CList", "Group", grpChg.pszNewName); + db_set_ts((HANDLE) wParam, "CList", "Group", grpChg.pszNewName); } CallService(MS_CLUI_CONTACTADDED, wParam, cli.pfnIconFromStatusMode((char *) CallService(MS_PROTO_GETCONTACTBASEPROTO, wParam, 0), GetContactStatus((HANDLE) wParam), (HANDLE) wParam)); diff --git a/src/modules/clist/genmenuopt.cpp b/src/modules/clist/genmenuopt.cpp index 96d44ff50f..004939591c 100644 --- a/src/modules/clist/genmenuopt.cpp +++ b/src/modules/clist/genmenuopt.cpp @@ -111,7 +111,7 @@ static int SaveTree(HWND hwndDlg) mir_snprintf(DBString, SIZEOF(DBString), "%s_name", menuItemName); if (lstrcmp(iod->name, iod->defname) != 0) - DBWriteContactSettingTString(NULL, MenuNameItems, DBString, iod->name); + db_set_ts(NULL, MenuNameItems, DBString, iod->name); else DBDeleteContactSetting(NULL, MenuNameItems, DBString); diff --git a/src/modules/clist/groups.cpp b/src/modules/clist/groups.cpp index 1cfc8b7a9d..905574c51b 100644 --- a/src/modules/clist/groups.cpp +++ b/src/modules/clist/groups.cpp @@ -99,7 +99,7 @@ static INT_PTR CreateGroup(WPARAM wParam, LPARAM lParam) const CLISTGROUPCHANGE grpChg = { sizeof(CLISTGROUPCHANGE), NULL, newName }; newName[0] = 1 | GROUPF_EXPANDED; //1 is required so we never get '\0' - DBWriteContactSettingTString(NULL, "CListGroups", str, newName); + db_set_ts(NULL, "CListGroups", str, newName); CallService(MS_CLUI_GROUPADDED, newId + 1, 1); NotifyEventHooks(hGroupChangeEvent, 0, (LPARAM)&grpChg); @@ -199,7 +199,7 @@ static INT_PTR DeleteGroup(WPARAM wParam, LPARAM) if (szNewParent[0]) { - DBWriteContactSettingTString(hContact, "CList", "Group", szNewParent); + db_set_ts(hContact, "CList", "Group", szNewParent); grpChg.pszNewName = szNewParent; } else @@ -270,14 +270,14 @@ static int RenameGroupWithMove(int groupId, const TCHAR *szName, int move) lstrcpyn(oldName, dbv.ptszVal + 1, SIZEOF(oldName)); DBFreeVariant(&dbv); lstrcpyn(str + 1, szName, SIZEOF(str) - 1); - DBWriteContactSettingTString(NULL, "CListGroups", idstr, str); + db_set_ts(NULL, "CListGroups", idstr, str); //must rename setting in all child contacts too hContact = db_find_first(); do { ClcCacheEntryBase* cache = cli.pfnGetCacheEntry(hContact); if ( !lstrcmp(cache->tszGroup, oldName)) { - DBWriteContactSettingTString(hContact, "CList", "Group", szName); + db_set_ts(hContact, "CList", "Group", szName); mir_free(cache->tszGroup); cache->tszGroup = 0; cli.pfnCheckCacheItem(cache); @@ -440,7 +440,7 @@ static INT_PTR MoveGroupBefore(WPARAM wParam, LPARAM lParam) } } _itoa(shuffleTo, str, 10); - DBWriteContactSettingTString(NULL, "CListGroups", str, szMoveName); + db_set_ts(NULL, "CListGroups", str, szMoveName); mir_free(szMoveName); return shuffleTo + 1; } -- cgit v1.2.3