- 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

2 files changed, 81 insertions, 81 deletions

diff --git a/plugins/HistoryLinkListPlus/src/linklist_dlg.cpp b/plugins/HistoryLinkListPlus/src/linklist_dlg.cpp
index bde839a30c..17ebfa7af0 100644
--- a/plugins/HistoryLinkListPlus/src/linklist_dlg.cpp
+++ b/plugins/HistoryLinkListPlus/src/linklist_dlg.cpp
@@ -49,23 +49,23 @@ INT_PTR WINAPI MainDlgProc( HWND hDlg, UINT msg, WPARAM wParam, LPARAM lParam )
 			TranslateDialogDefault(hDlg);

 			TranslateMenu(listMenu);

 

-			if ( DBGetContactSettingByte(NULL, LINKLIST_MODULE, LINKLIST_SAVESPECIAL, 0x00) == 0x00 )

+			if ( db_get_b(NULL, LINKLIST_MODULE, LINKLIST_SAVESPECIAL, 0x00) == 0x00 )

 				hContact = NULL;

 			else 

 				hContact = DlgParam->hContact;

 			

-			if ( DBGetContactSettingByte(hContact, LINKLIST_MODULE, LINKLIST_FIRST, 0) == 0 )

+			if ( db_get_b(hContact, LINKLIST_MODULE, LINKLIST_FIRST, 0) == 0 )

 			{

 				// First use of this plugin! Set default size!

-				DBWriteContactSettingDword(hContact, LINKLIST_MODULE, "LinklistWidth", 400);

-				DBWriteContactSettingDword(hContact, LINKLIST_MODULE, "LinklistHeight", 450);

-				DBWriteContactSettingDword(hContact, LINKLIST_MODULE, "LinklistX", 0);

-				DBWriteContactSettingDword(hContact, LINKLIST_MODULE, "LinklistY", 0);

+				db_set_dw(hContact, LINKLIST_MODULE, "LinklistWidth", 400);

+				db_set_dw(hContact, LINKLIST_MODULE, "LinklistHeight", 450);

+				db_set_dw(hContact, LINKLIST_MODULE, "LinklistX", 0);

+				db_set_dw(hContact, LINKLIST_MODULE, "LinklistY", 0);

 				

-				DBWriteContactSettingByte(hContact, LINKLIST_MODULE, LINKLIST_FIRST, 1);

+				db_set_b(hContact, LINKLIST_MODULE, LINKLIST_FIRST, 1);

 			}

 

-			DlgParam->splitterPosNew = (int)DBGetContactSettingDword(hContact, LINKLIST_MODULE, LINKLIST_SPLITPOS, -1);

+			DlgParam->splitterPosNew = (int)db_get_dw(hContact, LINKLIST_MODULE, LINKLIST_SPLITPOS, -1);

 

 			GetWindowRect(GetDlgItem(hDlg, IDC_MAIN), &rc);

 			DlgParam->minSize.cx = rc.right - rc.left;

@@ -122,7 +122,7 @@ INT_PTR WINAPI MainDlgProc( HWND hDlg, UINT msg, WPARAM wParam, LPARAM lParam )
 

 				pENLink = (ENLINK*)lpNmhdr;

 

-				mouseEvent = DBGetContactSettingByte(NULL, LINKLIST_MODULE, LINKLIST_MOUSE_EVENT, 0xFF);

+				mouseEvent = db_get_b(NULL, LINKLIST_MODULE, LINKLIST_MOUSE_EVENT, 0xFF);

 

 				if ( pENLink->msg == WM_MOUSEMOVE && mouseEvent == 0x01 )

 				{

@@ -140,7 +140,7 @@ INT_PTR WINAPI MainDlgProc( HWND hDlg, UINT msg, WPARAM wParam, LPARAM lParam )
 						ShellExecute(HWND_TOP, NULL, link, NULL, NULL, SW_SHOWNORMAL); 

 					else

 					{

-						openNewWindow = DBGetContactSettingByte(NULL, LINKLIST_MODULE, LINKLIST_OPEN_WINDOW, 0xFF);

+						openNewWindow = db_get_b(NULL, LINKLIST_MODULE, LINKLIST_OPEN_WINDOW, 0xFF);

 						if ( openNewWindow == 0xFF )

 							openNewWindow = 0;

 	

@@ -156,7 +156,7 @@ INT_PTR WINAPI MainDlgProc( HWND hDlg, UINT msg, WPARAM wParam, LPARAM lParam )
 					hSubMenu = GetSubMenu(hPopup, 0);

 

 					// Disable Menuoption if "mouse over" events are active

-					mouseEvent = DBGetContactSettingByte(NULL, LINKLIST_MODULE, LINKLIST_MOUSE_EVENT, 0xFF);

+					mouseEvent = db_get_b(NULL, LINKLIST_MODULE, LINKLIST_MOUSE_EVENT, 0xFF);

 					if (mouseEvent == 0x01 )

 						EnableMenuItem(hSubMenu, IDM_SHOWMESSAGE, MF_BYCOMMAND | MF_DISABLED | MF_GRAYED);

 					

@@ -442,12 +442,12 @@ INT_PTR WINAPI MainDlgProc( HWND hDlg, UINT msg, WPARAM wParam, LPARAM lParam )
 		case WM_DESTROY:

 		{

 			HANDLE hContact;

-			if ( DBGetContactSettingByte(NULL, LINKLIST_MODULE, LINKLIST_SAVESPECIAL, 0x00) == 0x00 )

+			if ( db_get_b(NULL, LINKLIST_MODULE, LINKLIST_SAVESPECIAL, 0x00) == 0x00 )

 				hContact = NULL;

 			else

 				hContact = DlgParam->hContact;

 			Utils_SaveWindowPosition(hDlg, hContact, LINKLIST_MODULE, "Linklist");

-			DBWriteContactSettingDword(NULL, LINKLIST_MODULE, LINKLIST_SPLITPOS, DlgParam->splitterPosNew);

+			db_set_dw(NULL, LINKLIST_MODULE, LINKLIST_SPLITPOS, DlgParam->splitterPosNew);

 			RemoveList(DlgParam->listStart);

 			free(DlgParam);

 			// Remove entry from Window list

@@ -548,7 +548,7 @@ INT_PTR CALLBACK OptionsDlgProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM l
 		case WM_INITDIALOG:

 		{

 			TranslateDialogDefault(hDlg);

-			useDefault = DBGetContactSettingByte(NULL, LINKLIST_MODULE, LINKLIST_USE_DEF, 0xFF);

+			useDefault = db_get_b(NULL, LINKLIST_MODULE, LINKLIST_USE_DEF, 0xFF);

 			if ( useDefault == 0x01 )

 			{

 				mCol = GetMirandaColour(&colourSet);

@@ -838,7 +838,7 @@ INT_PTR CALLBACK OptionsDlgProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM l
 					options.showTime = 1;	

 				

 				WriteOptionExample(hDlg, colourSet.incoming, colourSet.outgoing, colourSet.background, colourSet.text, &options);

-				//DBWriteContactSettingByte(NULL, LINKLIST_MODULE, LINKLIST_SHOW_TIME, 0x01);

+				//db_set_b(NULL, LINKLIST_MODULE, LINKLIST_SHOW_TIME, 0x01);

 

 				WriteOptionExample(hDlg, colourSet.incoming, colourSet.outgoing, colourSet.background, colourSet.text, &options);

 				break;		

@@ -853,7 +853,7 @@ INT_PTR CALLBACK OptionsDlgProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM l
 					options.showDirection = 1;	

 				

 				WriteOptionExample(hDlg, colourSet.incoming, colourSet.outgoing, colourSet.background, colourSet.text, &options);

-				//DBWriteContactSettingByte(NULL, LINKLIST_MODULE, LINKLIST_SHOW_DIRECTION, 0x01);

+				//db_set_b(NULL, LINKLIST_MODULE, LINKLIST_SHOW_DIRECTION, 0x01);

 

 				WriteOptionExample(hDlg, colourSet.incoming, colourSet.outgoing, colourSet.background, colourSet.text, &options);

 				break;		

@@ -868,7 +868,7 @@ INT_PTR CALLBACK OptionsDlgProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM l
 					options.showType = 1;

 

 				WriteOptionExample(hDlg, colourSet.incoming, colourSet.outgoing, colourSet.background, colourSet.text, &options);

-				//DBWriteContactSettingByte(NULL, LINKLIST_MODULE, LINKLIST_SHOW_TYPE, 0x01);

+				//db_set_b(NULL, LINKLIST_MODULE, LINKLIST_SHOW_TYPE, 0x01);

 				

 				WriteOptionExample(hDlg, colourSet.incoming, colourSet.outgoing, colourSet.background, colourSet.text, &options);

 				break;		

@@ -882,10 +882,10 @@ INT_PTR CALLBACK OptionsDlgProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM l
 			{

 				// Write Settings to Database

 				if ( SendDlgItemMessage(hDlg, IDC_CHECK1, BM_GETCHECK, 0, 0) == BST_CHECKED )

-					DBWriteContactSettingByte(NULL, LINKLIST_MODULE, LINKLIST_USE_DEF, 0x01);

+					db_set_b(NULL, LINKLIST_MODULE, LINKLIST_USE_DEF, 0x01);

 				else

 				{

-					DBWriteContactSettingByte(NULL, LINKLIST_MODULE, LINKLIST_USE_DEF, 0x00);

+					db_set_b(NULL, LINKLIST_MODULE, LINKLIST_USE_DEF, 0x00);

 					colourSet.incoming = SendDlgItemMessage(hDlg, IDC_INCOMING, CPM_GETCOLOUR, 0, 0);

 					colourSet.outgoing = SendDlgItemMessage(hDlg, IDC_OUTGOING, CPM_GETCOLOUR, 0, 0);

 					colourSet.background = SendDlgItemMessage(hDlg, IDC_BACKGROUND, CPM_GETCOLOUR, 0, 0);

diff --git a/plugins/HistoryLinkListPlus/src/linklist_fct.cpp b/plugins/HistoryLinkListPlus/src/linklist_fct.cpp
index bc5c5abe61..3e12ced1ef 100644
--- a/plugins/HistoryLinkListPlus/src/linklist_fct.cpp
+++ b/plugins/HistoryLinkListPlus/src/linklist_fct.cpp
@@ -842,77 +842,77 @@ void GetListInfo(BYTE params, LISTELEMENT *listStart,  LPCTSTR searchString, siz
 void GetListOptions(LISTOPTIONS *options)

 {

 

-	options->openNewWindow = DBGetContactSettingByte(NULL, LINKLIST_MODULE, LINKLIST_OPEN_WINDOW, 0xFF);

+	options->openNewWindow = db_get_b(NULL, LINKLIST_MODULE, LINKLIST_OPEN_WINDOW, 0xFF);

 	if(options->openNewWindow == 0xFF)

 	{

 		// No DB entry for this Plugin

-		DBWriteContactSettingByte(NULL, LINKLIST_MODULE, LINKLIST_OPEN_WINDOW, 0x00);

+		db_set_b(NULL, LINKLIST_MODULE, LINKLIST_OPEN_WINDOW, 0x00);

 		options->openNewWindow = 0x00;

 	}

 

 	

-	options->updateWindow = DBGetContactSettingByte(NULL, LINKLIST_MODULE, LINKLIST_UPDATE_WINDOW, 0xFF);

+	options->updateWindow = db_get_b(NULL, LINKLIST_MODULE, LINKLIST_UPDATE_WINDOW, 0xFF);

 	if(options->updateWindow == 0xFF)

 	{

 		// No DB entry for this Plugin

-		DBWriteContactSettingByte(NULL, LINKLIST_MODULE, LINKLIST_UPDATE_WINDOW, 0x00);

+		db_set_b(NULL, LINKLIST_MODULE, LINKLIST_UPDATE_WINDOW, 0x00);

 		options->updateWindow = 0x00;

 	}

 

-	options->mouseEvent = DBGetContactSettingByte(NULL, LINKLIST_MODULE, LINKLIST_MOUSE_EVENT, 0xFF);

+	options->mouseEvent = db_get_b(NULL, LINKLIST_MODULE, LINKLIST_MOUSE_EVENT, 0xFF);

 	if(options->mouseEvent == 0xFF)

 	{

 		// No DB entry for this Plugin

-		DBWriteContactSettingByte(NULL, LINKLIST_MODULE, LINKLIST_MOUSE_EVENT, 0x00);

+		db_set_b(NULL, LINKLIST_MODULE, LINKLIST_MOUSE_EVENT, 0x00);

 		options->mouseEvent = 0x00;

 	}

 

-	options->saveSpecial = DBGetContactSettingByte(NULL, LINKLIST_MODULE, LINKLIST_SAVESPECIAL, 0xFF);

+	options->saveSpecial = db_get_b(NULL, LINKLIST_MODULE, LINKLIST_SAVESPECIAL, 0xFF);

 	if(options->saveSpecial == 0xFF)

 	{

 		// No DB entry for this Plugin

-		DBWriteContactSettingByte(NULL, LINKLIST_MODULE, LINKLIST_SAVESPECIAL, 0x00);

+		db_set_b(NULL, LINKLIST_MODULE, LINKLIST_SAVESPECIAL, 0x00);

 		options->saveSpecial = 0x00;

 	}

 

 

-	options->showDate = DBGetContactSettingByte(NULL, LINKLIST_MODULE, LINKLIST_SHOW_DATE, 0xFF);

+	options->showDate = db_get_b(NULL, LINKLIST_MODULE, LINKLIST_SHOW_DATE, 0xFF);

 	if(options->showDate == 0xFF)

 	{

 		// No DB entry for this Plugin

-		DBWriteContactSettingByte(NULL, LINKLIST_MODULE, LINKLIST_SHOW_DATE, 0x01);

+		db_set_b(NULL, LINKLIST_MODULE, LINKLIST_SHOW_DATE, 0x01);

 		options->showDate = 0x01;

 	}

 

-	options->showLine = DBGetContactSettingByte(NULL, LINKLIST_MODULE, LINKLIST_SHOW_LINE, 0xFF);

+	options->showLine = db_get_b(NULL, LINKLIST_MODULE, LINKLIST_SHOW_LINE, 0xFF);

 	if(options->showLine == 0xFF)

 	{

 		// No DB entry for this Plugin

-		DBWriteContactSettingByte(NULL, LINKLIST_MODULE, LINKLIST_SHOW_LINE, 0x01);

+		db_set_b(NULL, LINKLIST_MODULE, LINKLIST_SHOW_LINE, 0x01);

 		options->showLine = 0x01;

 	}

 

-	options->showTime = DBGetContactSettingByte(NULL, LINKLIST_MODULE, LINKLIST_SHOW_TIME, 0xFF);

+	options->showTime = db_get_b(NULL, LINKLIST_MODULE, LINKLIST_SHOW_TIME, 0xFF);

 	if(options->showTime == 0xFF)

 	{

 		// No DB entry for this Plugin

-		DBWriteContactSettingByte(NULL, LINKLIST_MODULE, LINKLIST_SHOW_TIME, 0x01);

+		db_set_b(NULL, LINKLIST_MODULE, LINKLIST_SHOW_TIME, 0x01);

 		options->showTime = 0x01;

 	}

 

-	options->showDirection = DBGetContactSettingByte(NULL, LINKLIST_MODULE, LINKLIST_SHOW_DIRECTION, 0xFF);

+	options->showDirection = db_get_b(NULL, LINKLIST_MODULE, LINKLIST_SHOW_DIRECTION, 0xFF);

 	if(options->showDirection == 0xFF)

 	{

 		// No DB entry for this Plugin

-		DBWriteContactSettingByte(NULL, LINKLIST_MODULE, LINKLIST_SHOW_DIRECTION, 0x01);

+		db_set_b(NULL, LINKLIST_MODULE, LINKLIST_SHOW_DIRECTION, 0x01);

 		options->showDirection = 0x01;

 	}

 

-	options->showType = DBGetContactSettingByte(NULL, LINKLIST_MODULE, LINKLIST_SHOW_TYPE, 0xFF);

+	options->showType = db_get_b(NULL, LINKLIST_MODULE, LINKLIST_SHOW_TYPE, 0xFF);

 	if(options->showType == 0xFF)

 	{

 		// No DB entry for this Plugin

-		DBWriteContactSettingByte(NULL, LINKLIST_MODULE, LINKLIST_SHOW_TYPE, 0x01);

+		db_set_b(NULL, LINKLIST_MODULE, LINKLIST_SHOW_TYPE, 0x01);

 		options->showType = 0x01;

 	}

 

@@ -921,15 +921,15 @@ void GetListOptions(LISTOPTIONS *options)
 

 void SetListOptions(LISTOPTIONS *options)

 {

-	DBWriteContactSettingByte(NULL, LINKLIST_MODULE, LINKLIST_OPEN_WINDOW, options->openNewWindow);

-	DBWriteContactSettingByte(NULL, LINKLIST_MODULE, LINKLIST_UPDATE_WINDOW, options->updateWindow);

-	DBWriteContactSettingByte(NULL, LINKLIST_MODULE, LINKLIST_MOUSE_EVENT, options->mouseEvent);

-	DBWriteContactSettingByte(NULL, LINKLIST_MODULE, LINKLIST_SAVESPECIAL, options->saveSpecial);

-	DBWriteContactSettingByte(NULL, LINKLIST_MODULE, LINKLIST_SHOW_DATE, options->showDate);

-	DBWriteContactSettingByte(NULL, LINKLIST_MODULE, LINKLIST_SHOW_LINE, options->showLine);

-	DBWriteContactSettingByte(NULL, LINKLIST_MODULE, LINKLIST_SHOW_TIME, options->showTime);

-	DBWriteContactSettingByte(NULL, LINKLIST_MODULE, LINKLIST_SHOW_DIRECTION, options->showDirection);

-	DBWriteContactSettingByte(NULL, LINKLIST_MODULE, LINKLIST_SHOW_TYPE, options->showType);

+	db_set_b(NULL, LINKLIST_MODULE, LINKLIST_OPEN_WINDOW, options->openNewWindow);

+	db_set_b(NULL, LINKLIST_MODULE, LINKLIST_UPDATE_WINDOW, options->updateWindow);

+	db_set_b(NULL, LINKLIST_MODULE, LINKLIST_MOUSE_EVENT, options->mouseEvent);

+	db_set_b(NULL, LINKLIST_MODULE, LINKLIST_SAVESPECIAL, options->saveSpecial);

+	db_set_b(NULL, LINKLIST_MODULE, LINKLIST_SHOW_DATE, options->showDate);

+	db_set_b(NULL, LINKLIST_MODULE, LINKLIST_SHOW_LINE, options->showLine);

+	db_set_b(NULL, LINKLIST_MODULE, LINKLIST_SHOW_TIME, options->showTime);

+	db_set_b(NULL, LINKLIST_MODULE, LINKLIST_SHOW_DIRECTION, options->showDirection);

+	db_set_b(NULL, LINKLIST_MODULE, LINKLIST_SHOW_TYPE, options->showType);

 }

 

 /*

@@ -977,11 +977,11 @@ void GetColour(MYCOLOURSET *colourSet)
 	DWORD colour;

 	BYTE useDefault;

 

-	useDefault = DBGetContactSettingByte(NULL, LINKLIST_MODULE, LINKLIST_USE_DEF, 0xFF);

+	useDefault = db_get_b(NULL, LINKLIST_MODULE, LINKLIST_USE_DEF, 0xFF);

 	if ( useDefault == 0xFF )

 	{

 		// No DB entry for this Plugin

-		DBWriteContactSettingByte(NULL, LINKLIST_MODULE, LINKLIST_USE_DEF, 0x01);

+		db_set_b(NULL, LINKLIST_MODULE, LINKLIST_USE_DEF, 0x01);

 		useDefault = 0x01;

 	}

 

@@ -990,51 +990,51 @@ void GetColour(MYCOLOURSET *colourSet)
 		// Use Miranda-IM Default colours

 		// CHANGED AT MIRANDA 0.4!!!!

 		// Use SRMM... if it is not there try SRMsg (older Miranda Versions)

-		colour = DBGetContactSettingDword(NULL, "SRMM", "SRMFont1Col", 0xFF000000);

+		colour = db_get_dw(NULL, "SRMM", "SRMFont1Col", 0xFF000000);

 		if ( colour != 0xFF000000 )

 			colourSet->incoming = colour;

 		else

 		{

-			colour = DBGetContactSettingDword(NULL, "SRMsg", "Font3Col", 0xFF000000);

+			colour = db_get_dw(NULL, "SRMsg", "Font3Col", 0xFF000000);

 			if ( colour != 0xFF000000 )

 				colourSet->incoming = colour;

 			else

 			{

-				DBWriteContactSettingByte(NULL, LINKLIST_MODULE, LINKLIST_USE_DEF, 0x00);

+				db_set_b(NULL, LINKLIST_MODULE, LINKLIST_USE_DEF, 0x00);

 				useDefault = 0x00;

 			}

 		}

 		

 		// SRMM

-		colour = DBGetContactSettingDword(NULL, "SRMM", "SRMFont0Col", 0xFF000000);

+		colour = db_get_dw(NULL, "SRMM", "SRMFont0Col", 0xFF000000);

 		if ( colour != 0xFF000000 )

 			colourSet->outgoing = colour;

 		else

 		{

 			// SRMsg

-			colour = DBGetContactSettingDword(NULL, "SRMsg", "Font0Col", 0xFF000000);

+			colour = db_get_dw(NULL, "SRMsg", "Font0Col", 0xFF000000);

 			if ( colour != 0xFF000000 )

 				colourSet->outgoing = colour;

 			else

 			{

-				DBWriteContactSettingByte(NULL, LINKLIST_MODULE, LINKLIST_USE_DEF, 0x00);

+				db_set_b(NULL, LINKLIST_MODULE, LINKLIST_USE_DEF, 0x00);

 				useDefault = 0x00;

 			}

 		}

 

 		// SRMM

-		colour = DBGetContactSettingDword(NULL, "SRMM", "BkgColour", 0xFF000000);

+		colour = db_get_dw(NULL, "SRMM", "BkgColour", 0xFF000000);

 		if ( colour != 0xFF000000 )

 			colourSet->background = colour;

 		else

 		{	

 			// SRMsg

-			colour = DBGetContactSettingDword(NULL, "SRMsg", "BkgColour", 0xFF000000);

+			colour = db_get_dw(NULL, "SRMsg", "BkgColour", 0xFF000000);

 			if ( colour != 0xFF000000 )

 				colourSet->background = colour;

 			else

 			{

-				DBWriteContactSettingByte(NULL, LINKLIST_MODULE, LINKLIST_USE_DEF, 0x00);

+				db_set_b(NULL, LINKLIST_MODULE, LINKLIST_USE_DEF, 0x00);

 				useDefault = 0x00;

 			}

 		}

@@ -1044,25 +1044,25 @@ void GetColour(MYCOLOURSET *colourSet)
 	if ( useDefault == 0x00 )

 	{

 		// Use Plugin user defined or default colours

-		colour = DBGetContactSettingDword(NULL, LINKLIST_MODULE, LINKLIST_IN_COL, 0xFF000000);

+		colour = db_get_dw(NULL, LINKLIST_MODULE, LINKLIST_IN_COL, 0xFF000000);

 		if ( colour != 0xFF000000 )

 			colourSet->incoming = colour;

 		else

 			colourSet->incoming = IN_COL_DEF;

 	

-		colour = DBGetContactSettingDword(NULL, LINKLIST_MODULE, LINKLIST_OUT_COL, 0xFF000000);

+		colour = db_get_dw(NULL, LINKLIST_MODULE, LINKLIST_OUT_COL, 0xFF000000);

 		if ( colour != 0xFF000000 )

 			colourSet->outgoing = colour;

 		else

 			colourSet->outgoing = OUT_COL_DEF;

 	

-		colour = DBGetContactSettingDword(NULL, LINKLIST_MODULE, LINKLIST_BG_COL, 0xFF000000);

+		colour = db_get_dw(NULL, LINKLIST_MODULE, LINKLIST_BG_COL, 0xFF000000);

 		if ( colour != 0xFF000000 )

 			colourSet->background = colour;

 		else

 			colourSet->background = BG_COL_DEF;

 

-		colour = DBGetContactSettingDword(NULL, LINKLIST_MODULE, LINKLIST_TXT_COL, 0xFF000000);

+		colour = db_get_dw(NULL, LINKLIST_MODULE, LINKLIST_TXT_COL, 0xFF000000);

 		if ( colour != 0xFF000000 )

 			colourSet->text = colour;

 		else

@@ -1079,39 +1079,39 @@ void GetDBColour(MYCOLOURSET *colourSet)
 	DWORD colour;

 

 	// Use Plugin user defined or default colours

-	colour = DBGetContactSettingDword(NULL, LINKLIST_MODULE, LINKLIST_IN_COL, 0xFF000000);

+	colour = db_get_dw(NULL, LINKLIST_MODULE, LINKLIST_IN_COL, 0xFF000000);

 	if(colour != 0xFF000000)

 		colourSet->incoming = colour;

 	else

 	{

-		DBWriteContactSettingDword(NULL, LINKLIST_MODULE, LINKLIST_IN_COL, IN_COL_DEF);

+		db_set_dw(NULL, LINKLIST_MODULE, LINKLIST_IN_COL, IN_COL_DEF);

 		colourSet->incoming = IN_COL_DEF;

 	}

 

-	colour = DBGetContactSettingDword(NULL, LINKLIST_MODULE, LINKLIST_OUT_COL, 0xFF000000);

+	colour = db_get_dw(NULL, LINKLIST_MODULE, LINKLIST_OUT_COL, 0xFF000000);

 	if(colour != 0xFF000000)

 		colourSet->outgoing = colour;

 	else

 	{	

-		DBWriteContactSettingDword(NULL, LINKLIST_MODULE, LINKLIST_OUT_COL, OUT_COL_DEF);

+		db_set_dw(NULL, LINKLIST_MODULE, LINKLIST_OUT_COL, OUT_COL_DEF);

 		colourSet->outgoing = OUT_COL_DEF;

 	}

 

-	colour = DBGetContactSettingDword(NULL, LINKLIST_MODULE, LINKLIST_BG_COL, 0xFF000000);

+	colour = db_get_dw(NULL, LINKLIST_MODULE, LINKLIST_BG_COL, 0xFF000000);

 	if(colour != 0xFF000000)

 		colourSet->background = colour;

 	else

 	{

-		DBWriteContactSettingDword(NULL, LINKLIST_MODULE, LINKLIST_BG_COL, BG_COL_DEF);

+		db_set_dw(NULL, LINKLIST_MODULE, LINKLIST_BG_COL, BG_COL_DEF);

 		colourSet->background = BG_COL_DEF;

 	}

 

-	colour = DBGetContactSettingDword(NULL, LINKLIST_MODULE, LINKLIST_TXT_COL, 0xFF000000);

+	colour = db_get_dw(NULL, LINKLIST_MODULE, LINKLIST_TXT_COL, 0xFF000000);

 	if(colour != 0xFF000000)

 		colourSet->text = colour;

 	else

 	{

-		DBWriteContactSettingDword(NULL, LINKLIST_MODULE, LINKLIST_TXT_COL, TXT_COL_DEF);

+		db_set_dw(NULL, LINKLIST_MODULE, LINKLIST_TXT_COL, TXT_COL_DEF);

 		colourSet->text = TXT_COL_DEF;

 	}

 }

@@ -1125,12 +1125,12 @@ int GetMirandaColour(MYCOLOURSET *colourSet)
 

 	// Use Miranda-IM Default colours

 	// Try SRMM (Miranda 0.4) .... or SRMsg... for older versions

-	colour = DBGetContactSettingDword(NULL, "SRMM", "SRMFont1Col", 0xFF000000);

+	colour = db_get_dw(NULL, "SRMM", "SRMFont1Col", 0xFF000000);

 	if(colour != 0xFF000000)

 		colourSet->incoming = colour;

 	else

 	{

-		colour = DBGetContactSettingDword(NULL, "SRMsg", "Font3Col", 0xFF000000);

+		colour = db_get_dw(NULL, "SRMsg", "Font3Col", 0xFF000000);

 		if(colour != 0xFF000000)

 			colourSet->incoming = colour;

 		else

@@ -1138,24 +1138,24 @@ int GetMirandaColour(MYCOLOURSET *colourSet)
 	}

 		

 

-	colour = DBGetContactSettingDword(NULL, "SRMM", "SRMFont0Col", 0xFF000000);

+	colour = db_get_dw(NULL, "SRMM", "SRMFont0Col", 0xFF000000);

 	if(colour != 0xFF000000)

 		colourSet->outgoing = colour;

 	else

 	{

-		colour = DBGetContactSettingDword(NULL, "SRMsg", "Font0Col", 0xFF000000);

+		colour = db_get_dw(NULL, "SRMsg", "Font0Col", 0xFF000000);

 		if(colour != 0xFF000000)

 			colourSet->outgoing = colour;

 		else

 			return 1;

 	}

 

-	colour = DBGetContactSettingDword(NULL, "SRMM", "BkgColour", 0xFF000000);

+	colour = db_get_dw(NULL, "SRMM", "BkgColour", 0xFF000000);

 	if(colour != 0xFF000000)

 		colourSet->background = colour;

 	else

 	{	

-		colour = DBGetContactSettingDword(NULL, "SRMsg", "BkgColour", 0xFF000000);

+		colour = db_get_dw(NULL, "SRMsg", "BkgColour", 0xFF000000);

 		if(colour != 0xFF000000)

 			colourSet->background = colour;

 		else

@@ -1172,21 +1172,21 @@ Write user defined colours to the database
 */

 void SetDBColour(MYCOLOURSET *colourSet)

 {

-	DBWriteContactSettingDword(NULL, LINKLIST_MODULE, LINKLIST_IN_COL, colourSet->incoming);

-	DBWriteContactSettingDword(NULL, LINKLIST_MODULE, LINKLIST_OUT_COL, colourSet->outgoing);

-	DBWriteContactSettingDword(NULL, LINKLIST_MODULE, LINKLIST_BG_COL, colourSet->background);

-	DBWriteContactSettingDword(NULL, LINKLIST_MODULE, LINKLIST_TXT_COL, colourSet->text);

+	db_set_dw(NULL, LINKLIST_MODULE, LINKLIST_IN_COL, colourSet->incoming);

+	db_set_dw(NULL, LINKLIST_MODULE, LINKLIST_OUT_COL, colourSet->outgoing);

+	db_set_dw(NULL, LINKLIST_MODULE, LINKLIST_BG_COL, colourSet->background);

+	db_set_dw(NULL, LINKLIST_MODULE, LINKLIST_TXT_COL, colourSet->text);

 }

 

 BYTE GetUpdateSetting(void)

 {

 	BYTE updateWindow;

 	

-	updateWindow = DBGetContactSettingByte(NULL, LINKLIST_MODULE, LINKLIST_UPDATE_WINDOW, 0xFF);

+	updateWindow = db_get_b(NULL, LINKLIST_MODULE, LINKLIST_UPDATE_WINDOW, 0xFF);

 	if ( updateWindow == 0xFF )

 	{

 		// No DB entry for this Plugin

-		DBWriteContactSettingByte(NULL, LINKLIST_MODULE, LINKLIST_UPDATE_WINDOW, 0x00);

+		db_set_b(NULL, LINKLIST_MODULE, LINKLIST_UPDATE_WINDOW, 0x00);

 		return 0;

 	}

 	if ( updateWindow == 0x00 )