Skip to content

Commit 1479e9c

Browse files
firewavefirewave
committed
deprecated platform types win32A and win32W in favor of win32a and win32w 
1 parent 39f94f3 commit 1479e9c

11 files changed

+375
-347
lines changed

‎cfg/windows.cfg

+328-328
Large diffs are not rendered by default.

‎cli/cmdlineparser.cpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -1046,7 +1046,7 @@ bool CmdLineParser::parseFromArgs(int argc, const char* const argv[])
10461046
printMessage("Windows 64-bit binaries currently default to the 'win64' platform. Starting with Cppcheck 2.13 they will default to 'native' instead. Please specify '--platform=win64' explicitly if you rely on this.");
10471047
#elif defined(_WIN32)
10481048
if (SHOW_DEF_PLATFORM_MSG && default_platform)
1049-
printMessage("Windows 32-bit binaries currently default to the 'win32A' platform. Starting with Cppcheck 2.13 they will default to 'native' instead. Please specify '--platform=win32A' explicitly if you rely on this.");
1049+
printMessage("Windows 32-bit binaries currently default to the 'win32a' platform. Starting with Cppcheck 2.13 they will default to 'native' instead. Please specify '--platform=win32a' explicitly if you rely on this.");
10501050
#endif
10511051

10521052
// Print error only if we have "real" command and expect files
@@ -1229,9 +1229,9 @@ void CmdLineParser::printHelp()
12291229
" 32 bit unix variant\n"
12301230
" * unix64\n"
12311231
" 64 bit unix variant\n"
1232-
" * win32A\n"
1232+
" * win32a\n"
12331233
" 32 bit Windows ASCII character encoding\n"
1234-
" * win32W\n"
1234+
" * win32w\n"
12351235
" 32 bit Windows UNICODE character encoding\n"
12361236
" * win64\n"
12371237
" 64 bit Windows\n"

‎gui/projectfile.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,7 @@ class ProjectFile : public QObject {
159159

160160
/**
161161
* @brief Get platform.
162-
* @return Current platform. If it ends with .xml then it is a file. Otherwise it must match one of the return values from @sa cppcheck::Platform::toString() ("win32A", "unix32", ..)
162+
* @return Current platform. If it ends with .xml then it is a file. Otherwise it must match one of the return values from @sa cppcheck::Platform::toString() ("win32a", "unix32", ..)
163163
*/
164164
QString getPlatform() const {
165165
return mPlatform;

‎lib/platform.cpp

+10-2
Original file line numberDiff line numberDiff line change
@@ -159,9 +159,17 @@ bool cppcheck::Platform::set(Type t)
159159

160160
bool cppcheck::Platform::set(const std::string& platformstr, std::string& errstr, const std::vector<std::string>& paths, bool verbose)
161161
{
162-
if (platformstr == "win32A")
162+
if (platformstr == "win32A") {
163+
std::cout << "Platform 'win32A' is deprecated and will be removed in Cppcheck 2.14. Please use 'win32a' instead." << std::endl;
163164
set(Type::Win32A);
164-
else if (platformstr == "win32W")
165+
}
166+
else if (platformstr == "win32a")
167+
set(Type::Win32A);
168+
else if (platformstr == "win32W") {
169+
std::cout << "Platform 'win32W' is deprecated and will be removed in Cppcheck 2.14. Please use 'win32w' instead." << std::endl;
170+
set(Type::Win32W);
171+
}
172+
else if (platformstr == "win32w")
165173
set(Type::Win32W);
166174
else if (platformstr == "win64")
167175
set(Type::Win64);

‎lib/platform.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -153,9 +153,9 @@ namespace cppcheck {
153153
case Type::Native:
154154
return "native";
155155
case Type::Win32A:
156-
return "win32A";
156+
return "win32a";
157157
case Type::Win32W:
158-
return "win32W";
158+
return "win32w";
159159
case Type::Win64:
160160
return "win64";
161161
case Type::Unix32:

‎man/cppcheck.1.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -486,7 +486,7 @@ There are false positives with this option. Each result must be carefully invest
486486
</term>
487487
<listitem>
488488
<para>Specifies platform specific types and sizes.The available platforms are:
489-
<glosslist><glossentry><glossterm>unix32</glossterm><glossdef><para>32 bit unix variant</para></glossdef></glossentry><glossentry><glossterm>unix64</glossterm><glossdef><para>64 bit unix variant</para></glossdef></glossentry><glossentry><glossterm>win32A</glossterm><glossdef><para>32 bit Windows ASCII character encoding</para></glossdef></glossentry><glossentry><glossterm>win32W</glossterm><glossdef><para>32 bit Windows UNICODE character encoding</para></glossdef></glossentry><glossentry><glossterm>win64</glossterm><glossdef><para>64 bit Windows</para></glossdef></glossentry></glosslist>
489+
<glosslist><glossentry><glossterm>unix32</glossterm><glossdef><para>32 bit unix variant</para></glossdef></glossentry><glossentry><glossterm>unix64</glossterm><glossdef><para>64 bit unix variant</para></glossdef></glossentry><glossentry><glossterm>win32a</glossterm><glossdef><para>32 bit Windows ASCII character encoding</para></glossdef></glossentry><glossentry><glossterm>win32w</glossterm><glossdef><para>32 bit Windows UNICODE character encoding</para></glossdef></glossentry><glossentry><glossterm>win64</glossterm><glossdef><para>64 bit Windows</para></glossdef></glossentry></glosslist>
490490
By default the platform which was used to compile Cppcheck is used.
491491
</para>
492492
</listitem>

‎releasenotes.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,4 @@ release notes for cppcheck-2.11
1212
- `constVariable`
1313
- `constVariableReference`
1414
- `constVariablePointer`
15-
15+
- The platform types 'Win32A' and 'Win32W' has been deprecated and will be removed in Cppcheck 2.14. Please use 'win32a' and 'win32w' respectively.

‎test/CMakeLists.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -151,8 +151,8 @@ if (BUILD_TESTS)
151151
add_cfg(sqlite3.c)
152152
add_cfg(std.c)
153153
add_cfg(std.cpp)
154-
add_cfg(windows.cpp NAME windows32A PLATFORM win32A)
155-
add_cfg(windows.cpp NAME windows32W PLATFORM win32W)
154+
add_cfg(windows.cpp NAME windows32A PLATFORM win32a)
155+
add_cfg(windows.cpp NAME windows32W PLATFORM win32w)
156156
add_cfg(windows.cpp NAME windows64 PLATFORM win64)
157157
add_cfg(wxwidgets.cpp)
158158

‎test/cfg/runtests.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -500,8 +500,8 @@ function check_file {
500500
;;
501501
windows.cpp)
502502
windows_fn
503-
${CPPCHECK} ${CPPCHECK_OPT} --platform=win32A --library=$lib ${DIR}$f
504-
${CPPCHECK} ${CPPCHECK_OPT} --platform=win32W --library=$lib ${DIR}$f
503+
${CPPCHECK} ${CPPCHECK_OPT} --platform=win32a --library=$lib ${DIR}$f
504+
${CPPCHECK} ${CPPCHECK_OPT} --platform=win32w --library=$lib ${DIR}$f
505505
${CPPCHECK} ${CPPCHECK_OPT} --platform=win64 --library=$lib ${DIR}$f
506506
;;
507507
wxwidgets.cpp)

‎test/testcmdlineparser.cpp

+21-1
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,9 @@ class TestCmdlineParser : public TestFixture {
136136
TEST_CASE(stdunknown);
137137
TEST_CASE(platformWin64);
138138
TEST_CASE(platformWin32A);
139+
TEST_CASE(platformWin32a);
139140
TEST_CASE(platformWin32W);
141+
TEST_CASE(platformWin32w);
140142
TEST_CASE(platformUnix32);
141143
TEST_CASE(platformUnix32Unsigned);
142144
TEST_CASE(platformUnix64);
@@ -1031,6 +1033,15 @@ class TestCmdlineParser : public TestFixture {
10311033
ASSERT(settings.platform.set(cppcheck::Platform::Type::Unspecified));
10321034
ASSERT(defParser.parseFromArgs(3, argv));
10331035
ASSERT_EQUALS(cppcheck::Platform::Type::Win32A, settings.platform.type);
1036+
ASSERT_EQUALS("Platform 'win32A' is deprecated and will be removed in Cppcheck 2.14. Please use 'win32a' instead.\n", GET_REDIRECT_OUTPUT);
1037+
}
1038+
1039+
void platformWin32a() {
1040+
REDIRECT;
1041+
const char * const argv[] = {"cppcheck", "--platform=win32a", "file.cpp"};
1042+
ASSERT(settings.platform.set(cppcheck::Platform::Type::Unspecified));
1043+
ASSERT(defParser.parseFromArgs(3, argv));
1044+
ASSERT_EQUALS(cppcheck::Platform::Type::Win32A, settings.platform.type);
10341045
ASSERT_EQUALS("", GET_REDIRECT_OUTPUT);
10351046
}
10361047

@@ -1040,6 +1051,15 @@ class TestCmdlineParser : public TestFixture {
10401051
ASSERT(settings.platform.set(cppcheck::Platform::Type::Unspecified));
10411052
ASSERT(defParser.parseFromArgs(3, argv));
10421053
ASSERT_EQUALS(cppcheck::Platform::Type::Win32W, settings.platform.type);
1054+
ASSERT_EQUALS("Platform 'win32W' is deprecated and will be removed in Cppcheck 2.14. Please use 'win32w' instead.\n", GET_REDIRECT_OUTPUT);
1055+
}
1056+
1057+
void platformWin32w() {
1058+
REDIRECT;
1059+
const char * const argv[] = {"cppcheck", "--platform=win32w", "file.cpp"};
1060+
ASSERT(settings.platform.set(cppcheck::Platform::Type::Unspecified));
1061+
ASSERT(defParser.parseFromArgs(3, argv));
1062+
ASSERT_EQUALS(cppcheck::Platform::Type::Win32W, settings.platform.type);
10431063
ASSERT_EQUALS("", GET_REDIRECT_OUTPUT);
10441064
}
10451065

@@ -1127,7 +1147,7 @@ class TestCmdlineParser : public TestFixture {
11271147
ASSERT_EQUALS("cppcheck: Windows 64-bit binaries currently default to the 'win64' platform. Starting with Cppcheck 2.13 they will default to 'native' instead. Please specify '--platform=win64' explicitly if you rely on this.\n", GET_REDIRECT_OUTPUT);
11281148
#elif defined(_WIN32)
11291149
ASSERT_EQUALS(cppcheck::Platform::Type::Win32A, settings.platform.type);
1130-
ASSERT_EQUALS("cppcheck: Windows 32-bit binaries currently default to the 'win32A' platform. Starting with Cppcheck 2.13 they will default to 'native' instead. Please specify '--platform=win32A' explicitly if you rely on this.\n", GET_REDIRECT_OUTPUT);
1150+
ASSERT_EQUALS("cppcheck: Windows 32-bit binaries currently default to the 'win32a' platform. Starting with Cppcheck 2.13 they will default to 'native' instead. Please specify '--platform=win32a' explicitly if you rely on this.\n", GET_REDIRECT_OUTPUT);
11311151
#endif
11321152

11331153
CmdLineParser::SHOW_DEF_PLATFORM_MSG = false;

‎test/testtokenize.cpp

+4-4
Original file line numberDiff line numberDiff line change
@@ -5442,10 +5442,10 @@ class TestTokenizer : public TestFixture {
54425442
"float * ptrToFloat ;";
54435443

54445444
// These types should be defined the same on all Windows platforms
5445-
const std::string win32A = tokenizeAndStringifyWindows(code, true, cppcheck::Platform::Type::Win32A);
5446-
ASSERT_EQUALS(expected, win32A);
5447-
ASSERT_EQUALS(win32A, tokenizeAndStringifyWindows(code, true, cppcheck::Platform::Type::Win32W));
5448-
ASSERT_EQUALS(win32A, tokenizeAndStringifyWindows(code, true, cppcheck::Platform::Type::Win64));
5445+
const std::string win32a = tokenizeAndStringifyWindows(code, true, cppcheck::Platform::Type::Win32A);
5446+
ASSERT_EQUALS(expected, win32a);
5447+
ASSERT_EQUALS(win32a, tokenizeAndStringifyWindows(code, true, cppcheck::Platform::Type::Win32W));
5448+
ASSERT_EQUALS(win32a, tokenizeAndStringifyWindows(code, true, cppcheck::Platform::Type::Win64));
54495449
}
54505450

54515451
void platformWin32A() {

0 commit comments

Comments
 (0)