continue MSG() macro cleanup

4 files changed, 5 insertions, 5 deletions

diff --git a/far2l/src/plug/PluginA.cpp b/far2l/src/plug/PluginA.cpp
index 76ca5b49..f6870ca7 100644
--- a/far2l/src/plug/PluginA.cpp
+++ b/far2l/src/plug/PluginA.cpp
@@ -491,7 +491,7 @@ static void ShowMessageAboutIllegalPluginVersion(const wchar_t* plg,int required
 	FARString strMsg1, strMsg2;
 	strMsg1.Format(MSG(MPlgRequired),(WORD)HIWORD(required),(WORD)LOWORD(required));
 	strMsg2.Format(MSG(MPlgRequired2),(WORD)HIWORD(FAR_VERSION),(WORD)LOWORD(FAR_VERSION));
-	Message(MSG_WARNING,1,MSG(MError),MSG(MPlgBadVers),plg,strMsg1,strMsg2,MSG(MOk));
+	Message(MSG_WARNING,1,MError,MPlgBadVers,plg,strMsg1,strMsg2,MOk);
 }
 
 
diff --git a/far2l/src/plug/plclass.cpp b/far2l/src/plug/plclass.cpp
index 5ded795f..9ed1e2f2 100644
--- a/far2l/src/plug/plclass.cpp
+++ b/far2l/src/plug/plclass.cpp
@@ -80,7 +80,7 @@ bool Plugin::OpenModule()
 		{
 			SetMessageHelp(L"ErrLoadPlugin module");
 			//|MSG_ERRORTYPE
-			Message(MSG_WARNING, 1, MSG(MError), strerr.c_str(), MSG(MPlgLoadPluginError), m_strModuleName, MSG(MOk));
+			Message(MSG_WARNING, 1, MError, strerr.c_str(), MPlgLoadPluginError, m_strModuleName, MOk);
 		}
 	}
 
diff --git a/far2l/src/plug/plugapi.cpp b/far2l/src/plug/plugapi.cpp
index adf938b3..6b529ec7 100644
--- a/far2l/src/plug/plugapi.cpp
+++ b/far2l/src/plug/plugapi.cpp
@@ -1650,7 +1650,7 @@ void WINAPI FarRestoreScreen(HANDLE hScreen)
 
 static void PR_FarGetDirListMsg()
 {
-	Message(0,0,L"",MSG(MPreparingList));
+	Message(0,0,L"",MPreparingList);
 }
 
 static int FarGetDirListSynched(const wchar_t *Dir,FAR_FIND_DATA **pPanelItem,int *pItemsNumber)
@@ -1731,7 +1731,7 @@ static int PluginSearchMsgOut;
 
 static void FarGetPluginDirListMsg(const wchar_t *Name,DWORD Flags)
 {
-	Message(Flags,0,L"",MSG(MPreparingList),Name);
+	Message(Flags,0,L"",MPreparingList,Name);
 	PreRedrawItem preRedrawItem=PreRedraw.Peek();
 	preRedrawItem.Param.Flags=Flags;
 	preRedrawItem.Param.Param1=(void*)Name;
diff --git a/far2l/src/plug/plugins.cpp b/far2l/src/plug/plugins.cpp
index b2c0300f..bac44164 100644
--- a/far2l/src/plug/plugins.cpp
+++ b/far2l/src/plug/plugins.cpp
@@ -535,7 +535,7 @@ HANDLE PluginManager::OpenFilePlugin(
 				if(!OpMode)
 				{
 					Message(MSG_WARNING|MSG_ERRORTYPE, 1, MB2Wide(e.what()).c_str(),
-						MSG(MOpenPluginCannotOpenFile), Name, MSG(MOk));
+						MOpenPluginCannotOpenFile, Name, MOk);
 				}
 				break;
 			}