Skip to content

Commit e2b3cd2

Browse files
danmardanmar
committed
formatting
1 parent 3459e2f commit e2b3cd2

10 files changed

Lines changed: 30 additions & 36 deletions

File tree

‎samples/passedByValue_1/bad.cpp‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,8 @@ class C
22
{
33
public:
44
explicit C(std::string s)
5-
: _s(s)
6-
{
7-
}
5+
: _s(s)
6+
{}
87
void foo();
98
private:
109
std::string _s;

‎samples/passedByValue_1/good.cpp‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,8 @@ class C
22
{
33
public:
44
explicit C(std::string s)
5-
: _s(std::move(s))
6-
{
7-
}
5+
: _s(std::move(s))
6+
{}
87
void foo();
98
private:
109
std::string _s;

‎test/cfg/boost.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -145,8 +145,8 @@ void test_BOOST_FOREACH_3(std::vector<int> data)
145145
void test_BOOST_FOREACH_4(std::vector<int> data)
146146
{
147147
BOOST_FOREACH(const int& i, data)
148-
// cppcheck-suppress invalidContainerLoop
149-
data.clear();
148+
// cppcheck-suppress invalidContainerLoop
149+
data.clear();
150150
}
151151

152152
// Container returned as result of a function -> Be quiet
@@ -155,7 +155,7 @@ void test_BOOST_FOREACH_5()
155155
{
156156
std::set<int> data;
157157
BOOST_FOREACH(const int& i, get_data())
158-
data.insert(i);
158+
data.insert(i);
159159
}
160160

161161
// Break after modification (#4788)

‎test/cfg/googletest.cpp‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,13 +33,11 @@ namespace ExampleNamespace {
3333

3434
// syntaxError when TYPED_TEST is not known
3535
TYPED_TEST (ExampleTypedTest, cppcheck_test)
36-
{
37-
}
36+
{}
3837

3938
// syntaxError when TYPED_TEST_P is not known
4039
TYPED_TEST_P (ExampleTypedTestP, cppcheck)
41-
{
42-
}
40+
{}
4341
}
4442

4543
TEST(ASSERT, ASSERT)

‎test/cfg/kde.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ class PluginWithoutMetaData : public QObject
4949
public:
5050
// Add a default arg to make sure we do not get an ambiguity compiler error
5151
explicit PluginWithoutMetaData(const QObject *, const QVariantList &args = {})
52-
: QObject()
52+
: QObject()
5353
{
5454
Q_UNUSED(args)
5555
};
@@ -64,7 +64,7 @@ class StaticSimplePluginClass : public QObject
6464
public:
6565
// Next to the assertion below, ensure that we have no ambiguity!
6666
explicit StaticSimplePluginClass(QObject *parent, const QString &data = {})
67-
: QObject(parent)
67+
: QObject(parent)
6868
{
6969
// We have added a default arg, but KPluginFactory should still provide the valid metadata instead of the default one
7070
data = QString("foo");

‎test/cfg/posix.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1043,7 +1043,7 @@ void* f_returns_NULL(void* arg)
10431043
void nullPointer_pthread_create() // #12396
10441044
{
10451045
pthread_t thread;
1046-
pthread_create(&thread, NULL, (void* (*)(void*))f_returns_NULL, NULL);
1046+
pthread_create(&thread, NULL, (void* (*)(void*)) f_returns_NULL, NULL);
10471047
}
10481048

10491049
void memleak_getaddrinfo() // #6994

‎test/cfg/qt.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -860,5 +860,5 @@ int qdateIsValid()
860860
{
861861
QDate qd(1,1,2025);
862862
Q_ASSERT(qd.isValid()); // Should not warn here with assertWithSideEffect
863-
return qd.month();
863+
return qd.month();
864864
}

‎test/cfg/std.c‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3161,11 +3161,11 @@ void uninitvar_vwprintf(const wchar_t *Format, va_list Arg)
31613161
void nullPointer_bsearch(const void* key, const void* base, size_t num, size_t size)
31623162
{
31633163
// cppcheck-suppress nullPointer
3164-
(void)bsearch(NULL,base,num,size,(int (*)(const void*,const void*))strcmp);
3164+
(void)bsearch(NULL,base,num,size,(int (*)(const void*,const void*)) strcmp);
31653165
// cppcheck-suppress nullPointer
3166-
(void)bsearch(key,NULL,num,size,(int (*)(const void*,const void*))strcmp);
3166+
(void)bsearch(key,NULL,num,size,(int (*)(const void*,const void*)) strcmp);
31673167
// No warning is expected
3168-
(void)bsearch(key,base,num,size,(int (*)(const void*,const void*))strcmp);
3168+
(void)bsearch(key,base,num,size,(int (*)(const void*,const void*)) strcmp);
31693169
}
31703170

31713171
void uninitvar_bsearch(void)
@@ -3175,7 +3175,7 @@ void uninitvar_bsearch(void)
31753175
size_t num;
31763176
size_t size;
31773177
// cppcheck-suppress uninitvar
3178-
(void)bsearch(key,base,num,size,(int (*)(const void*,const void*))strcmp);
3178+
(void)bsearch(key,base,num,size,(int (*)(const void*,const void*)) strcmp);
31793179
}
31803180

31813181
void uninitvar_qsort(void)
@@ -3184,7 +3184,7 @@ void uninitvar_qsort(void)
31843184
size_t n;
31853185
size_t size;
31863186
// cppcheck-suppress uninitvar
3187-
(void)qsort(base,n,size, (int (*)(const void*,const void*))strcmp);
3187+
(void)qsort(base,n,size, (int (*)(const void*,const void*)) strcmp);
31883188
}
31893189

31903190
void uninitvar_putc(void)

‎test/cfg/std.cpp‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -90,12 +90,12 @@ int ignoredReturnValue_std_clamp(const int x)
9090
void knownConditionTrueFalse_std_clamp(const int x)
9191
{
9292
// cppcheck-suppress knownConditionTrueFalse
93-
if(std::clamp(-2, -1, 1) == -1){}
93+
if (std::clamp(-2, -1, 1) == -1) {}
9494
// cppcheck-suppress knownConditionTrueFalse
95-
if(std::clamp(2, -1, 1) == 1){}
95+
if (std::clamp(2, -1, 1) == 1) {}
9696
// cppcheck-suppress knownConditionTrueFalse
97-
if(std::clamp(0, -1, 1) == 0){}
98-
if(std::clamp(x, 0, 2)){}
97+
if (std::clamp(0, -1, 1) == 0) {}
98+
if (std::clamp(x, 0, 2)) {}
9999
}
100100
#endif // __cpp_lib_clamp
101101

@@ -3263,7 +3263,7 @@ void uninivar_bsearch(void)
32633263
size_t num;
32643264
size_t size;
32653265
// cppcheck-suppress [uninitvar, cstyleCast]
3266-
(void)std::bsearch(key,base,num,size,(int (*)(const void*,const void*))strcmp);
3266+
(void)std::bsearch(key,base,num,size,(int (*)(const void*,const void*)) strcmp);
32673267
}
32683268

32693269
void minsize_bsearch(const void* key, const void* base,
@@ -3272,11 +3272,11 @@ void minsize_bsearch(const void* key, const void* base,
32723272
{
32733273
const int Base[3] = {42, 43, 44};
32743274

3275-
(void)std::bsearch(key,Base,2,size,(int (*)(const void*,const void*))strcmp); // cppcheck-suppress cstyleCast
3276-
(void)std::bsearch(key,Base,3,size,(int (*)(const void*,const void*))strcmp); // cppcheck-suppress cstyleCast
3277-
(void)std::bsearch(key,Base,4,size,(int (*)(const void*,const void*))strcmp); // cppcheck-suppress cstyleCast
3275+
(void)std::bsearch(key,Base,2,size,(int (*)(const void*,const void*)) strcmp); // cppcheck-suppress cstyleCast
3276+
(void)std::bsearch(key,Base,3,size,(int (*)(const void*,const void*)) strcmp); // cppcheck-suppress cstyleCast
3277+
(void)std::bsearch(key,Base,4,size,(int (*)(const void*,const void*)) strcmp); // cppcheck-suppress cstyleCast
32783278

3279-
(void)std::bsearch(key,base,2,size,(int (*)(const void*,const void*))strcmp); // cppcheck-suppress cstyleCast
3279+
(void)std::bsearch(key,base,2,size,(int (*)(const void*,const void*)) strcmp); // cppcheck-suppress cstyleCast
32803280
}
32813281

32823282
void uninitvar_qsort(void)
@@ -3285,7 +3285,7 @@ void uninitvar_qsort(void)
32853285
size_t n;
32863286
size_t size;
32873287
// cppcheck-suppress uninitvar
3288-
(void)std::qsort(base,n,size, (int (*)(const void*,const void*))strcmp); // cppcheck-suppress cstyleCast
3288+
(void)std::qsort(base,n,size, (int (*)(const void*,const void*)) strcmp); // cppcheck-suppress cstyleCast
32893289
}
32903290

32913291
void uninitvar_stable_sort(std::vector<int>& v)

‎test/cfg/windows.cpp‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1211,8 +1211,6 @@ void SEH_knownConditionTrueFalse() { // #8434
12111211
}
12121212

12131213
void SEH_unusedLabel() { // #13233
1214-
__try {
1215-
}
1216-
__finally {
1217-
}
1214+
__try {}
1215+
__finally {}
12181216
}

0 commit comments

Comments
 (0)