From 93b3814c7bbdd6dba0b30c5ac53577a3210ceade Mon Sep 17 00:00:00 2001 From: Krzysztof Kowalczyk Date: Thu, 23 May 2024 00:06:34 +0200 Subject: [PATCH] StrVec => StrVec2 --- src/ExternalViewers.cpp | 2 +- src/tools/plugin-test.cpp | 2 +- src/tools/signfile.cpp | 2 +- src/utils/CmdLineArgsIter.cpp | 2 +- src/utils/CmdLineArgsIter.h | 4 ++-- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/ExternalViewers.cpp b/src/ExternalViewers.cpp index a903d6bc0f6..9f92853422a 100644 --- a/src/ExternalViewers.cpp +++ b/src/ExternalViewers.cpp @@ -433,7 +433,7 @@ bool ViewWithExternalViewer(WindowTab* tab, size_t idx) { return false; } - StrVec args; + StrVec2 args; ParseCmdLine(ToWStrTemp(ev->commandLine), args); int nArgs = args.Size(); if (nArgs == 0) { diff --git a/src/tools/plugin-test.cpp b/src/tools/plugin-test.cpp index c8baa590446..bb1eecafc9b 100644 --- a/src/tools/plugin-test.cpp +++ b/src/tools/plugin-test.cpp @@ -88,7 +88,7 @@ WCHAR* GetSumatraExePath() { } int APIENTRY WinMain(HINSTANCE hInstance, HINSTANCE, LPSTR, int nCmdShow) { - StrVec argList; + StrVec2 argList; ParseCmdLine(GetCommandLine(), argList); if (argList.Size() == 1) { diff --git a/src/tools/signfile.cpp b/src/tools/signfile.cpp index af35e560691..7a6063a729b 100644 --- a/src/tools/signfile.cpp +++ b/src/tools/signfile.cpp @@ -59,7 +59,7 @@ void ShowUsage(const char* exeName) { } int main() { - StrVec args; + StrVec2 args; ParseCmdLine(GetCommandLineW(), args); const char* filePath = nullptr; diff --git a/src/utils/CmdLineArgsIter.cpp b/src/utils/CmdLineArgsIter.cpp index 16cb1a10503..369b17a1d88 100644 --- a/src/utils/CmdLineArgsIter.cpp +++ b/src/utils/CmdLineArgsIter.cpp @@ -46,7 +46,7 @@ TempStr QuoteCmdLineArgTemp(char* arg) { return res.StealData(); } -void ParseCmdLine(const WCHAR* cmdLine, StrVec& argsOut) { +void ParseCmdLine(const WCHAR* cmdLine, StrVec2& argsOut) { int nArgs; WCHAR** argsArr = CommandLineToArgvW(cmdLine, &nArgs); for (int i = 0; i < nArgs; i++) { diff --git a/src/utils/CmdLineArgsIter.h b/src/utils/CmdLineArgsIter.h index b5f38ad007a..60c2d100d03 100644 --- a/src/utils/CmdLineArgsIter.h +++ b/src/utils/CmdLineArgsIter.h @@ -3,11 +3,11 @@ bool CouldBeArg(const char*); -void ParseCmdLine(const WCHAR* cmdLine, StrVec& argsOut); +void ParseCmdLine(const WCHAR* cmdLine, StrVec2& argsOut); TempStr QuoteCmdLineArgTemp(char* arg); struct CmdLineArgsIter { - StrVec args; + StrVec2 args; int curr = 1; // first argument is exe path, which we skip int nArgs = 0; const char* currArg = nullptr;