xevion/easy7zip
1
0
Fork 0
mirror of https://github.com/Xevion/easy7zip.git synced 2025-12-13 22:11:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

4.28 beta

Browse Source
This commit is contained in:
Igor Pavlov
2005-09-26 00:00:00 +00:00
committed by Kornel Lesiński
parent d66cf2fcf3
commit 32c73adef4
35 changed files with 108 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
7zip/FileManager/AppState.h
View File

@@ -9,7 +9,7 @@ void inline AddUniqueStringToHead(UStringVector &list,
const UString &string)
{
for(int i = 0; i < list.Size();)
if (string.CollateNoCase(list[i]) == 0)
if (string.CompareNoCase(list[i]) == 0)
list.Delete(i);
else
i++;

8
7zip/FileManager/FSFolderCopy.cpp
View File

@@ -171,7 +171,7 @@ static HRESULT MyCopyFile(
UINT64 &completedSize)
{
UString destPath = destPathSpec;
if (destPath.CollateNoCase(srcPath) == 0)
if (destPath.CompareNoCase(srcPath) == 0)
{
UString message = UString(L"can not move file \'") +
GetUnicodeString(destPath, fileCodePage) + UString(L"\' onto itself");
@@ -217,7 +217,7 @@ static HRESULT CopyFolder(
UString destPath = destPathSpec;
int len = srcPath.Length();
if (destPath.Length() >= len && srcPath.CollateNoCase(destPath.Left(len)) == 0)
if (destPath.Length() >= len && srcPath.CompareNoCase(destPath.Left(len)) == 0)
{
if (destPath.Length() == len || destPath[len] == L'\\')
{
@@ -330,7 +330,7 @@ HRESULT MyMoveFile(
UINT64 &completedSize)
{
UString destPath = destPathSpec;
if (destPath.CollateNoCase(srcPath) == 0)
if (destPath.CompareNoCase(srcPath) == 0)
{
UString message = UString(L"can not move file \'")
+ GetUnicodeString(destPath, fileCodePage) +
@@ -373,7 +373,7 @@ HRESULT MyMoveFolder(
{
UString destPath = destPathSpec;
int len = srcPath.Length();
if (destPath.Length() >= len && srcPath.CollateNoCase(destPath.Left(len)) == 0)
if (destPath.Length() >= len && srcPath.CompareNoCase(destPath.Left(len)) == 0)
{
if (destPath.Length() == len || destPath[len] == L'\\')
{

2
7zip/FileManager/PanelDrag.cpp
View File

@@ -532,7 +532,7 @@ bool CDropTarget::IsItSameDrive() const
for (int i = 0; i < m_SourcePaths.Size(); i++)
{
const UString &path = m_SourcePaths[i];
if (drive.CollateNoCase(path.Left(drive.Length())) != 0)
if (drive.CompareNoCase(path.Left(drive.Length())) != 0)
return false;
}
return true;

4
7zip/FileManager/RegistryAssociations.cpp
View File

@@ -122,7 +122,7 @@ static bool CheckShellExtensionInfo2(const CSysString &extension)
if (extKey.QueryValue(NULL, programNameValue) != ERROR_SUCCESS)
return false;
CSysString extProgramKeyName = GetExtProgramKeyName(extension);
return (programNameValue.CollateNoCase(extProgramKeyName) == 0);
return (programNameValue.CompareNoCase(extProgramKeyName) == 0);
}
bool CheckShellExtensionInfo(const CSysString &extension)
@@ -237,7 +237,7 @@ static bool CheckContextMenuHandlerCommon(const CSysString &aKeyName)
CSysString aValue;
if (aKey.QueryValue(NULL, aValue) != ERROR_SUCCESS)
return false;
return (aValue.CollateNoCase(kContextMenuHandlerCLASSIDValue) == 0);
return (aValue.CompareNoCase(kContextMenuHandlerCLASSIDValue) == 0);
}
bool CheckContextMenuHandler()

2
7zip/FileManager/Resource/LangPage/LangPage.cpp
View File

@@ -58,7 +58,7 @@ bool CLangPage::OnInit()
index = _langCombo.AddString(GetSystemString(name));
_langCombo.SetItemData(index, _paths.Size());
_paths.Add(GetSystemString(lang.ShortName));
if (g_LangID.CollateNoCase(GetSystemString(lang.ShortName)) == 0)
if (g_LangID.CompareNoCase(GetSystemString(lang.ShortName)) == 0)
_langCombo.SetCurSel(index);
}
return CPropertyPage::OnInit();

2
7zip/FileManager/TextPairs.cpp
View File

@@ -116,7 +116,7 @@ UString GetTextConfigValue(const CObjectVector<CTextPair> &pairs, const UString
}
static int ComparePairIDs(const UString &s1, const UString &s2)
{ return s1.CollateNoCase(s2); }
{ return s1.CompareNoCase(s2); }
static int ComparePairItems(const CTextPair &p1, const CTextPair &p2)
{ return ComparePairIDs(p1.ID, p2.ID); }

2
7zip/FileManager/ViewSettings.cpp
View File

@@ -419,7 +419,7 @@ void AddUniqueStringToHeadOfList(UStringVector &list,
const UString &string)
{
for(int i = 0; i < list.Size();)
if (string.CollateNoCase(list[i]) == 0)
if (string.CompareNoCase(list[i]) == 0)
list.Delete(i);
else
i++;