Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/kornelski/7z.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIgor Pavlov <ipavlov@users.sourceforge.net>2017-04-30 03:00:00 +0300
committerKornel <kornel@geekhood.net>2017-05-05 20:56:20 +0300
commit2efa10565ac395d2ce9a679ead46e70fb2f963eb (patch)
tree84c8df4deb69ec44ea15af9378f24347db55c357 /CPP/7zip/UI/FileManager/PanelSplitFile.cpp
parent603abd5528c97346e9448c0ff47949f818fe558c (diff)
17.0017.00
Diffstat (limited to 'CPP/7zip/UI/FileManager/PanelSplitFile.cpp')
-rw-r--r--CPP/7zip/UI/FileManager/PanelSplitFile.cpp18
1 files changed, 9 insertions, 9 deletions
diff --git a/CPP/7zip/UI/FileManager/PanelSplitFile.cpp b/CPP/7zip/UI/FileManager/PanelSplitFile.cpp
index 7aaa97b1..604448e8 100644
--- a/CPP/7zip/UI/FileManager/PanelSplitFile.cpp
+++ b/CPP/7zip/UI/FileManager/PanelSplitFile.cpp
@@ -24,21 +24,21 @@ using namespace NWindows;
using namespace NFile;
using namespace NDir;
-static const wchar_t *g_Message_FileWriteError = L"File write error";
+static const char * const g_Message_FileWriteError = "File write error";
struct CVolSeqName
{
UString UnchangedPart;
UString ChangedPart;
- CVolSeqName(): ChangedPart(L"000") {};
+ CVolSeqName(): ChangedPart("000") {};
void SetNumDigits(UInt64 numVolumes)
{
- ChangedPart = L"000";
+ ChangedPart = "000";
while (numVolumes > 999)
{
numVolumes /= 10;
- ChangedPart += L'0';
+ ChangedPart += '0';
}
}
@@ -131,7 +131,7 @@ HRESULT CThreadSplit::ProcessVirt()
if (curVolSize == 0)
{
FString name = VolBasePath;
- name += FTEXT('.');
+ name += '.';
name += us2fs(seqName.GetNextName());
sync.Set_FilePath(fs2us(name));
sync.Set_NumFilesCur(numFiles++);
@@ -236,7 +236,7 @@ void CApp::Split()
CProgressDialog &progressDialog = spliter.ProgressDialog;
- UString progressWindowTitle = L"7-Zip"; // LangString(IDS_APP_TITLE, 0x03000000);
+ UString progressWindowTitle ("7-Zip"); // LangString(IDS_APP_TITLE, 0x03000000);
UString title = LangString(IDS_SPLITTING);
progressDialog.ShowCompressionInfo = false;
@@ -340,7 +340,7 @@ extern void AddValuePair2(UString &s, UINT resourceID, UInt64 num, UInt64 size);
static void AddInfoFileName(UString &dest, const UString &name)
{
- dest += L"\n ";
+ dest += "\n ";
dest += name;
}
@@ -450,7 +450,7 @@ void CApp::Combine()
outName.DeleteBack();
}
if (outName.IsEmpty())
- outName = L"file";
+ outName = "file";
NFind::CFileInfo fileInfo;
UString destFilePath = path + outName;
@@ -464,7 +464,7 @@ void CApp::Combine()
CProgressDialog &progressDialog = combiner.ProgressDialog;
progressDialog.ShowCompressionInfo = false;
- UString progressWindowTitle = L"7-Zip"; // LangString(IDS_APP_TITLE, 0x03000000);
+ UString progressWindowTitle ("7-Zip"); // LangString(IDS_APP_TITLE, 0x03000000);
UString title = LangString(IDS_COMBINING);
progressDialog.MainWindow = _window;