more effective constructor for temporary formatted string

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

3 files changed, 6 insertions, 6 deletions

diff --git a/plugins/DbEditorPP/src/Version.h b/plugins/DbEditorPP/src/Version.h
index 9f194e06fa..c3ab2e36fd 100644
--- a/plugins/DbEditorPP/src/Version.h
+++ b/plugins/DbEditorPP/src/Version.h
@@ -1,7 +1,7 @@
 #define __MAJOR_VERSION				3

 #define __MINOR_VERSION				2

 #define __RELEASE_NUM				0

-#define __BUILD_NUM					0

+#define __BUILD_NUM					1

 

 #define __FILEVERSION_STRING		__MAJOR_VERSION,__MINOR_VERSION,__RELEASE_NUM,__BUILD_NUM

 

diff --git a/plugins/StatusPlugins/AdvancedAutoAway/options.cpp b/plugins/StatusPlugins/AdvancedAutoAway/options.cpp
index b77e1b8036..be59461c0c 100644
--- a/plugins/StatusPlugins/AdvancedAutoAway/options.cpp
+++ b/plugins/StatusPlugins/AdvancedAutoAway/options.cpp
@@ -213,7 +213,7 @@ static INT_PTR CALLBACK DlgProcAutoAwayRulesOpts(HWND hwndDlg, UINT msg, WPARAM
 						SendDlgItemMessage(hwndDlg, IDC_LV2STATUS, CB_SETITEMDATA, item, (LPARAM)statusModeList[i]);

 						if (statusModeList[i] == setting->lv1Status) {

 							SendDlgItemMessage(hwndDlg, IDC_LV1STATUS, CB_SETCURSEL, (WPARAM)item, 0);

-							SetDlgItemText(hwndDlg, IDC_SETNASTR, CMString().Format(TranslateT("minutes of %s mode"), statusMode));

+							SetDlgItemText(hwndDlg, IDC_SETNASTR, CMString(FORMAT, TranslateT("minutes of %s mode"), statusMode));

 						}

 						if (statusModeList[i] == setting->lv2Status)

 							SendDlgItemMessage(hwndDlg, IDC_LV2STATUS, CB_SETCURSEL, (WPARAM)item, 0);

@@ -228,7 +228,7 @@ static INT_PTR CALLBACK DlgProcAutoAwayRulesOpts(HWND hwndDlg, UINT msg, WPARAM
 				SendMessage(GetParent(hwndDlg),PSM_CHANGED,0,0);

 

 			setting->lv1Status = (int)SendDlgItemMessage(hwndDlg, IDC_LV1STATUS, CB_GETITEMDATA, SendDlgItemMessage(hwndDlg, IDC_LV1STATUS, CB_GETCURSEL, 0, 0), 0);

-			SetDlgItemText(hwndDlg, IDC_SETNASTR, CMString().Format(TranslateT("minutes of %s mode"), pcli->pfnGetStatusModeDescription(setting->lv1Status, 0)));

+			SetDlgItemText(hwndDlg, IDC_SETNASTR, CMString(FORMAT, TranslateT("minutes of %s mode"), pcli->pfnGetStatusModeDescription(setting->lv1Status, 0)));

 			break;

 

 		case IDC_LV2STATUS:

diff --git a/plugins/UserInfoEx/src/dlg_propsheet.cpp b/plugins/UserInfoEx/src/dlg_propsheet.cpp
index 9f6f8eb700..b206b7561f 100644
--- a/plugins/UserInfoEx/src/dlg_propsheet.cpp
+++ b/plugins/UserInfoEx/src/dlg_propsheet.cpp
@@ -124,7 +124,7 @@ private:
 		// check if icq is online

 		if (!IsProtoOnline((*_pPd)->szModuleName))

 			MsgBox(_pPs->hDlg, MB_ICON_WARNING, TranslateT("Upload Details"),

-				CMString().Format(TranslateT("Protocol '%s' is offline"), _A2T((*_pPd)->szModuleName)),

+				CMString(FORMAT, TranslateT("Protocol '%s' is offline"), _A2T((*_pPd)->szModuleName)),

 				TranslateT("You are not currently connected to the ICQ network.\nYou must be online in order to update your information on the server.\n\nYour changes will be saved to database only."));

 

 		// start uploading process

@@ -1138,8 +1138,8 @@ static INT_PTR CALLBACK DlgProc(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lPar
 

 		HWND hName = GetDlgItem(hDlg, TXT_NAME);

 		SetWindowText(hName, pszName);

-		SetWindowText(hDlg, CMString().Format(_T("%s - %s"), pszName, TranslateT("Edit Contact Information")));

-		SetDlgItemText(hDlg, IDC_HEADERBAR, CMString().Format(_T("%s\n%s"), TranslateT("Edit Contact Information"), pszName));

+		SetWindowText(hDlg, CMString(FORMAT, _T("%s - %s"), pszName, TranslateT("Edit Contact Information")));

+		SetDlgItemText(hDlg, IDC_HEADERBAR, CMString(FORMAT, _T("%s\n%s"), TranslateT("Edit Contact Information"), pszName));

 

 		// redraw the name control

 		POINT	pt = { 0, 0 };