From 18fe797ca5540f894a424bc7cbe0e6a7cd96be01 Mon Sep 17 00:00:00 2001 From: RaiKoHoff Date: Fri, 24 Jul 2020 10:32:26 +0200 Subject: [PATCH] + upd: current grepWin development --- grepWinNP3/src/SearchDlg.cpp | 4 ++-- grepWinNP3/src/last/version.h | 12 ++++++------ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/grepWinNP3/src/SearchDlg.cpp b/grepWinNP3/src/SearchDlg.cpp index 4149773c1..00338a0a2 100644 --- a/grepWinNP3/src/SearchDlg.cpp +++ b/grepWinNP3/src/SearchDlg.cpp @@ -3362,10 +3362,10 @@ int CSearchDlg::SearchFile(std::shared_ptr sinfoPtr, const std::wst if (searchFlags.bCaptureSearch) { auto out = whatc.format(replaceString, flags); - sinfoPtr->matchlines.push_back(out); + sinfoPtr->matchlines.push_back(std::move(out)); } else - sinfoPtr->matchlines.push_back(sLine.substr(0, 1024)); + sinfoPtr->matchlines.push_back(std::move(sLine)); sinfoPtr->matchlinesnumbers.push_back(l); } } diff --git a/grepWinNP3/src/last/version.h b/grepWinNP3/src/last/version.h index 9069e4b3d..4512c07a3 100644 --- a/grepWinNP3/src/last/version.h +++ b/grepWinNP3/src/last/version.h @@ -6,13 +6,13 @@ //#pragma message(__LOC__"Run the NAnt script to get proper version info") -#define FILEVER 2, 1, 3, 20 -#define PRODUCTVER 2, 1, 3, 20 -#define STRFILEVER "2.1.3.20\0" -#define STRPRODUCTVER "2.1.3.20\0" +#define FILEVER 2, 1, 3, 21 +#define PRODUCTVER 2, 1, 3, 21 +#define STRFILEVER "2.1.3.21\0" +#define STRPRODUCTVER "2.1.3.21\0" #define GREPWIN_VERMAJOR 2 #define GREPWIN_VERMINOR 1 #define GREPWIN_VERMICRO 3 -#define GREPWIN_VERBUILD 20 -#define GREPWIN_VERDATE "2020-07-21" +#define GREPWIN_VERBUILD 21 +#define GREPWIN_VERDATE "2020-07-24"