- 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, 11 insertions, 11 deletions

diff --git a/plugins/MyDetails/src/data.cpp b/plugins/MyDetails/src/data.cpp
index e38c23ce7e..f88fb35acf 100644
--- a/plugins/MyDetails/src/data.cpp
+++ b/plugins/MyDetails/src/data.cpp
@@ -411,7 +411,7 @@ TCHAR * Protocol::GetListeningTo()
 	}

 

 	DBVARIANT dbv = {0};

-	if ( DBGetContactSettingTString(NULL, name, "ListeningTo", &dbv))

+	if ( db_get_ts(NULL, name, "ListeningTo", &dbv))

 	{

 		lcopystr(listening_to, _T(""), SIZEOF(listening_to));

 		return listening_to;

@@ -536,7 +536,7 @@ void ProtocolArray::SetNicks(const TCHAR *nick)
 

 	lstrcpyn(default_nick, nick, SIZEOF(default_nick));

 

-	DBWriteContactSettingTString(0, MODULE_NAME, SETTING_DEFAULT_NICK, nick);

+	db_set_ts(0, MODULE_NAME, SETTING_DEFAULT_NICK, nick);

 

 	for ( int i = 0 ; i < buffer_len ; i++ )

 		buffer[i]->SetNick(default_nick);

@@ -556,11 +556,11 @@ void ProtocolArray::SetStatusMsgs(const TCHAR *message)
 

 void ProtocolArray::SetStatusMsgs(int status, const TCHAR *message)

 {

-	DBWriteContactSettingTString(NULL,"SRAway",StatusModeToDbSetting(status,"Msg"),message);

+	db_set_ts(NULL,"SRAway",StatusModeToDbSetting(status,"Msg"),message);

 

 	// Save default also

 	if ( !db_get_b(NULL,"SRAway",StatusModeToDbSetting(status,"UsePrev"),0))

-		DBWriteContactSettingTString(NULL,"SRAway",StatusModeToDbSetting(status,"Default"),message);

+		db_set_ts(NULL,"SRAway",StatusModeToDbSetting(status,"Default"),message);

 

 	for ( int i = 0 ; i < buffer_len ; i++ )

 		if (buffer[i]->status == status)

@@ -570,7 +570,7 @@ void ProtocolArray::SetStatusMsgs(int status, const TCHAR *message)
 void ProtocolArray::GetDefaultNick()

 {

 	DBVARIANT dbv;

-	if ( !DBGetContactSettingTString(0, MODULE_NAME, SETTING_DEFAULT_NICK, &dbv)) {

+	if ( !db_get_ts(0, MODULE_NAME, SETTING_DEFAULT_NICK, &dbv)) {

 		lstrcpyn(default_nick, dbv.ptszVal, SIZEOF(default_nick));

 		db_free(&dbv);

 	}

@@ -580,7 +580,7 @@ void ProtocolArray::GetDefaultNick()
 void ProtocolArray::GetDefaultAvatar()

 {

 	DBVARIANT dbv;

-	if ( !DBGetContactSettingTString(0, "ContactPhoto", "File", &dbv)) {

+	if ( !db_get_ts(0, "ContactPhoto", "File", &dbv)) {

 		lstrcpyn(default_avatar_file, dbv.ptszVal, SIZEOF(default_avatar_file));

 		db_free(&dbv);

 	}

diff --git a/plugins/MyDetails/src/frame.cpp b/plugins/MyDetails/src/frame.cpp
index d71b93e4df..61b65eeb68 100644
--- a/plugins/MyDetails/src/frame.cpp
+++ b/plugins/MyDetails/src/frame.cpp
@@ -1559,7 +1559,7 @@ LRESULT CALLBACK FrameWindowProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lPar
 			data->get_status_messages = false;

 			data->showing_menu = false;

 

-			data->protocol_number = DBGetContactSettingWord(NULL,"MyDetails","ProtocolNumber",0);

+			data->protocol_number = db_get_w(NULL,"MyDetails","ProtocolNumber",0);

 			if (data->protocol_number >= protocols->GetSize())

 				data->protocol_number = 0;

 

@@ -2341,7 +2341,7 @@ void SetStatusMessageRefreshTime(HWND hwnd)
 {

 	KillTimer(hwnd, ID_STATUSMESSAGE_TIMER);

 

-	opts.refresh_status_message_timer = DBGetContactSettingWord(NULL,"MyDetails","RefreshStatusMessageTimer",12);

+	opts.refresh_status_message_timer = db_get_w(NULL,"MyDetails","RefreshStatusMessageTimer",12);

 	if (opts.refresh_status_message_timer > 0)

 		SetTimer(hwnd, ID_STATUSMESSAGE_TIMER, opts.refresh_status_message_timer * 1000, NULL);

 }

@@ -2357,7 +2357,7 @@ INT_PTR PluginCommand_ShowNextProtocol(WPARAM wParam,LPARAM lParam)
 	if (data->protocol_number >= protocols->GetSize())

 		data->protocol_number = 0;

 

-	DBWriteContactSettingWord(NULL,"MyDetails","ProtocolNumber",data->protocol_number);

+	db_set_w(NULL,"MyDetails","ProtocolNumber",data->protocol_number);

 

 	data->recalc_rectangles = true;

 

@@ -2379,7 +2379,7 @@ INT_PTR PluginCommand_ShowPreviousProtocol(WPARAM wParam,LPARAM lParam)
 	if (data->protocol_number < 0)

 		data->protocol_number = protocols->GetSize() - 1;

 

-	DBWriteContactSettingWord(NULL,"MyDetails","ProtocolNumber",data->protocol_number);

+	db_set_w(NULL,"MyDetails","ProtocolNumber",data->protocol_number);

 

 	data->recalc_rectangles = true;

 

@@ -2413,7 +2413,7 @@ INT_PTR PluginCommand_ShowProtocol(WPARAM wParam,LPARAM lParam)
 	MyDetailsFrameData *data = (MyDetailsFrameData *)GetWindowLong(hwnd_frame, GWLP_USERDATA);

 

 	data->protocol_number = proto_num;

-	DBWriteContactSettingWord(NULL,"MyDetails","ProtocolNumber",data->protocol_number);

+	db_set_w(NULL,"MyDetails","ProtocolNumber",data->protocol_number);

 

 	data->recalc_rectangles = true;