diff options
| author | elfmz <fenix1905@tut.by> | 2022-02-20 02:02:21 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-02-20 02:02:21 +0300 |
| commit | e0f3f14fb3d648ba640e75cf25e257ac8fde4865 (patch) | |
| tree | a88b1d0d075cd8a951a757e45114cf64a8cd6fb3 /far2l/src/fileattr.cpp | |
| parent | dc2f6de4c2f438046b4d31cf4c2078b6ad65a5ce (diff) | |
Language refactor (#1271)
optimized and refactored language files loader
got rid of MSG() macro and use Msg:: namespace instead
Diffstat (limited to 'far2l/src/fileattr.cpp')
| -rw-r--r-- | far2l/src/fileattr.cpp | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/far2l/src/fileattr.cpp b/far2l/src/fileattr.cpp index 64efd58a..79f6fe9b 100644 --- a/far2l/src/fileattr.cpp +++ b/far2l/src/fileattr.cpp @@ -36,7 +36,6 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "fileattr.hpp" #include "lang.hpp" -#include "language.hpp" #include "message.hpp" #include "pathmix.hpp" #include "fileowner.hpp" @@ -56,8 +55,8 @@ int ESetFileMode(const wchar_t *Name, DWORD Mode, int SkipMode) if (SkipMode!=-1) Code=SkipMode; else - Code=Message(MSG_WARNING|MSG_ERRORTYPE,4,MError, - MSetAttrCannotFor,Name,MHRetry,MHSkip,MHSkipAll,MHCancel); + Code=Message(MSG_WARNING|MSG_ERRORTYPE,4,Msg::Error, + Msg::SetAttrCannotFor,Name,Msg::HRetry,Msg::HSkip,Msg::HSkipAll,Msg::HCancel); switch (Code) { case -2: @@ -100,9 +99,9 @@ int ESetFileTime(const wchar_t *Name, FILETIME *AccessTime, FILETIME *ModifyTime if (SkipMode!=-1) Code=SkipMode; else - Code=Message(MSG_WARNING|MSG_ERRORTYPE,4,MError, - MSetAttrTimeCannotFor,Name,MHRetry, //BUGBUG - MHSkip,MHSkipAll,MHCancel); + Code=Message(MSG_WARNING|MSG_ERRORTYPE,4,Msg::Error, + Msg::SetAttrTimeCannotFor,Name,Msg::HRetry, //BUGBUG + Msg::HSkip,Msg::HSkipAll,Msg::HCancel); switch (Code) { @@ -130,7 +129,7 @@ int ESetFileOwner(LPCWSTR Name,LPCWSTR Owner,int SkipMode) if (SkipMode!=-1) Code=SkipMode; else - Code=Message(MSG_WARNING|MSG_ERRORTYPE,4,MError,MSetAttrOwnerCannotFor,Name,MHRetry,MHSkip,MHSkipAll,MHCancel); + Code=Message(MSG_WARNING|MSG_ERRORTYPE,4,Msg::Error,Msg::SetAttrOwnerCannotFor,Name,Msg::HRetry,Msg::HSkip,Msg::HSkipAll,Msg::HCancel); if (Code==1 || Code<0) { @@ -161,7 +160,7 @@ int ESetFileGroup(LPCWSTR Name,LPCWSTR Group,int SkipMode) if (SkipMode!=-1) Code=SkipMode; else - Code=Message(MSG_WARNING|MSG_ERRORTYPE,4,MError,MSetAttrGroupCannotFor,Name,MHRetry,MHSkip,MHSkipAll,MHCancel); + Code=Message(MSG_WARNING|MSG_ERRORTYPE,4,Msg::Error,Msg::SetAttrGroupCannotFor,Name,Msg::HRetry,Msg::HSkip,Msg::HSkipAll,Msg::HCancel); if (Code==1 || Code<0) { |