- rest of menus cleared;

- old database macroses wiped out from all plugins (left in m_database.h for compatibility)

git-svn-id: http://svn.miranda-ng.org/main/trunk@4324 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c

1 files changed, 8 insertions, 8 deletions

diff --git a/plugins/DbEditorPP/src/moduletree.cpp b/plugins/DbEditorPP/src/moduletree.cpp
index ea520eacc2..4c6d4a0e47 100644
--- a/plugins/DbEditorPP/src/moduletree.cpp
+++ b/plugins/DbEditorPP/src/moduletree.cpp
@@ -379,7 +379,7 @@ void replaceTreeItem(HWND hwnd, HANDLE hContact, const char *module, const char
 

 void refreshTree(int restore)

 {

-	UseKnownModList = DBGetContactSettingByte(NULL,modname,"UseKnownModList",0);

+	UseKnownModList = db_get_b(NULL,modname,"UseKnownModList",0);

 	if (populating) return;

 	populating = 1;

 	forkthread(PopulateModuleTreeThreadFunc,0,(HWND)restore);

@@ -433,7 +433,7 @@ void __cdecl PopulateModuleTreeThreadFunc(LPVOID di)
 		}

 	case 2: // restore saved

 		if (GetValue(NULL,modname,"LastModule",SelectedModule,SIZEOF(SelectedModule))) {

-			hSelectedContact = (HANDLE)DBGetContactSettingDword(NULL,modname,"LastContact",(DWORD)INVALID_HANDLE_VALUE);

+			hSelectedContact = (HANDLE)db_get_dw(NULL,modname,"LastContact",(DWORD)INVALID_HANDLE_VALUE);

 			if (hSelectedContact != INVALID_HANDLE_VALUE)

 				Select = 1;

 			GetValue(NULL,modname,"LastSetting",SelectedSetting,SIZEOF(SelectedSetting));

@@ -527,7 +527,7 @@ void __cdecl PopulateModuleTreeThreadFunc(LPVOID di)
 			module = (struct ModSetLinkLinkItem *)module->next;

 		}

 

-		if (DBGetContactSettingByte(NULL,modname,"ExpandSettingsOnOpen",0))

+		if (db_get_b(NULL,modname,"ExpandSettingsOnOpen",0))

 			TreeView_Expand(hwnd2Tree,contact,TVE_EXPAND);

 

 		if (Select && hSelectedContact == NULL)

@@ -902,14 +902,14 @@ void moduleListRightClick(HWND hwnd, WPARAM wParam,LPARAM lParam) // hwnd here i
 									else strncat(moduletemp,&module[i],1);

 								}

 									

-								if ( !DBGetContactSetting(NULL,modname,"CoreModules",&dbv) && dbv.type == DBVT_ASCIIZ) {

+								if ( !db_get(NULL,modname,"CoreModules",&dbv) && dbv.type == DBVT_ASCIIZ) {

 									int len = (int)strlen(dbv.pszVal) + 10 + (int)strlen(moduletemp);

 									char* temp = (char*)_alloca(len);

 									mir_snprintf(temp, len, "%s, %s", dbv.pszVal, moduletemp);

-									DBWriteContactSettingString(NULL,modname,"CoreModules",temp);

-									DBFreeVariant(&dbv);

+									db_set_s(NULL,modname,"CoreModules",temp);

+									db_free(&dbv);

 								}

-								else DBWriteContactSettingString(NULL,modname,"CoreModules",moduletemp);

+								else db_set_s(NULL,modname,"CoreModules",moduletemp);

 								RegisterSingleModule((WPARAM)module,0);

 							}

 							break;

@@ -925,7 +925,7 @@ void moduleListRightClick(HWND hwnd, WPARAM wParam,LPARAM lParam) // hwnd here i
 						break;

 

 					case MENU_DELETE_CONTACT:

-						if (DBGetContactSettingByte(NULL,"CList", "ConfirmDelete",1)) {

+						if (db_get_b(NULL,"CList", "ConfirmDelete",1)) {

 							char msg[1024];

 							mir_snprintf(msg, SIZEOF(msg), Translate("Are you sure you want to delete contact \"%s\"?"), module);

 							if (MessageBox(0,msg, Translate("Confirm Contact Delete"), MB_YESNO|MB_ICONEXCLAMATION) == IDYES) {