Skip to content

Commit a22c181

Browse files
firewavefirewave
authored
fixed "Redundant elaborated type specifier" Rider warnings (#5517)
1 parent 3ba53c6 commit a22c181

32 files changed

+115
-115
lines changed

‎cli/filelister.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,7 @@ static std::string addFiles2(std::map<std::string, std::size_t> &files,
188188
std::string new_path = path;
189189
new_path += '/';
190190

191-
while (const struct dirent* dir_result = readdir(dir)) {
191+
while (const dirent* dir_result = readdir(dir)) {
192192
if ((std::strcmp(dir_result->d_name, ".") == 0) ||
193193
(std::strcmp(dir_result->d_name, "..") == 0))
194194
continue;

‎cli/processexecutor.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -307,7 +307,7 @@ unsigned int ProcessExecutor::check()
307307
FD_ZERO(&rfds);
308308
for (std::list<int>::const_iterator rp = rpipes.cbegin(); rp != rpipes.cend(); ++rp)
309309
FD_SET(*rp, &rfds);
310-
struct timeval tv; // for every second polling of load average condition
310+
timeval tv; // for every second polling of load average condition
311311
tv.tv_sec = 1;
312312
tv.tv_usec = 0;
313313
const int r = select(*std::max_element(rpipes.cbegin(), rpipes.cend()) + 1, &rfds, nullptr, nullptr, &tv);

‎gui/cppchecklibrarydata.cpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ static CppcheckLibraryData::Container loadContainer(QXmlStreamReader &xmlReader)
8282
break;
8383
if (type != QXmlStreamReader::StartElement)
8484
continue;
85-
struct CppcheckLibraryData::Container::Function function;
85+
CppcheckLibraryData::Container::Function function;
8686
function.name = xmlReader.attributes().value("name").toString();
8787
function.action = xmlReader.attributes().value("action").toString();
8888
function.yields = xmlReader.attributes().value("yields").toString();
@@ -91,7 +91,7 @@ static CppcheckLibraryData::Container loadContainer(QXmlStreamReader &xmlReader)
9191
else if (elementName == "access")
9292
container.accessFunctions.append(function);
9393
else if (elementName == "rangeItemRecordType") {
94-
struct CppcheckLibraryData::Container::RangeItemRecordType rangeItemRecordType;
94+
CppcheckLibraryData::Container::RangeItemRecordType rangeItemRecordType;
9595
rangeItemRecordType.name = xmlReader.attributes().value("name").toString();
9696
rangeItemRecordType.templateParameter = xmlReader.attributes().value("templateParameter").toString();
9797
container.rangeItemRecordTypeList.append(rangeItemRecordType);
@@ -518,7 +518,7 @@ QString CppcheckLibraryData::open(QIODevice &file)
518518
return QString();
519519
}
520520

521-
static void writeContainerFunctions(QXmlStreamWriter &xmlWriter, const QString &name, int extra, const QList<struct CppcheckLibraryData::Container::Function> &functions)
521+
static void writeContainerFunctions(QXmlStreamWriter &xmlWriter, const QString &name, int extra, const QList<CppcheckLibraryData::Container::Function> &functions)
522522
{
523523
if (functions.isEmpty() && extra < 0)
524524
return;
@@ -541,7 +541,7 @@ static void writeContainerFunctions(QXmlStreamWriter &xmlWriter, const QString &
541541
xmlWriter.writeEndElement();
542542
}
543543

544-
static void writeContainerRangeItemRecords(QXmlStreamWriter &xmlWriter, const QList<struct CppcheckLibraryData::Container::RangeItemRecordType> &rangeItemRecords)
544+
static void writeContainerRangeItemRecords(QXmlStreamWriter &xmlWriter, const QList<CppcheckLibraryData::Container::RangeItemRecordType> &rangeItemRecords)
545545
{
546546
if (rangeItemRecords.isEmpty())
547547
return;

‎gui/cppchecklibrarydata.h‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -58,10 +58,10 @@ class CppcheckLibraryData {
5858
QString yields;
5959
QString action;
6060
};
61-
QList<struct Function> accessFunctions;
62-
QList<struct Function> otherFunctions;
63-
QList<struct Function> sizeFunctions;
64-
QList<struct RangeItemRecordType> rangeItemRecordTypeList;
61+
QList<Function> accessFunctions;
62+
QList<Function> otherFunctions;
63+
QList<Function> sizeFunctions;
64+
QList<RangeItemRecordType> rangeItemRecordTypeList;
6565
};
6666

6767
struct Define {
@@ -106,13 +106,13 @@ class CppcheckLibraryData {
106106
QString arg;
107107
QString arg2;
108108
};
109-
QList<struct MinSize> minsizes;
109+
QList<MinSize> minsizes;
110110
struct Iterator {
111111
int container = -1;
112112
QString type;
113113
} iterator;
114114
};
115-
QList<struct Arg> args;
115+
QList<Arg> args;
116116

117117
struct {
118118
QString severity;
@@ -149,8 +149,8 @@ class CppcheckLibraryData {
149149
QString name;
150150
};
151151

152-
QList<struct Alloc> alloc;
153-
QList<struct Dealloc> dealloc;
152+
QList<Alloc> alloc;
153+
QList<Dealloc> dealloc;
154154
QStringList use;
155155
};
156156

@@ -176,7 +176,7 @@ class CppcheckLibraryData {
176176
QString name;
177177
};
178178

179-
QList<struct Call> calls;
179+
QList<Call> calls;
180180
};
181181

182182
struct Markup {
@@ -244,18 +244,18 @@ class CppcheckLibraryData {
244244
QString open(QIODevice &file);
245245
QString toString() const;
246246

247-
QList<struct Container> containers;
248-
QList<struct Define> defines;
249-
QList<struct Function> functions;
250-
QList<struct MemoryResource> memoryresource;
251-
QList<struct PodType> podtypes;
247+
QList<Container> containers;
248+
QList<Define> defines;
249+
QList<Function> functions;
250+
QList<MemoryResource> memoryresource;
251+
QList<PodType> podtypes;
252252
QList<TypeChecks> typeChecks;
253-
QList<struct PlatformType> platformTypes;
253+
QList<PlatformType> platformTypes;
254254
QStringList undefines;
255-
QList<struct SmartPointer> smartPointers;
256-
QList<struct Reflection> reflections;
257-
QList<struct Markup> markups;
258-
QList<struct Entrypoint> entrypoints;
255+
QList<SmartPointer> smartPointers;
256+
QList<Reflection> reflections;
257+
QList<Markup> markups;
258+
QList<Entrypoint> entrypoints;
259259
};
260260

261261
#endif // CPPCHECKLIBRARYDATA_H

‎lib/check64bit.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,8 @@
3333
//---------------------------------------------------------------------------
3434

3535
// CWE ids used
36-
static const struct CWE CWE398(398U); // Indicator of Poor Code Quality
37-
static const struct CWE CWE758(758U); // Reliance on Undefined, Unspecified, or Implementation-Defined Behavior
36+
static const CWE CWE398(398U); // Indicator of Poor Code Quality
37+
static const CWE CWE758(758U); // Reliance on Undefined, Unspecified, or Implementation-Defined Behavior
3838

3939
// Register this check class (by creating a static instance of it)
4040
namespace {

‎lib/checkassert.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
//---------------------------------------------------------------------------
3333

3434
// CWE ids used
35-
static const struct CWE CWE398(398U); // Indicator of Poor Code Quality
35+
static const CWE CWE398(398U); // Indicator of Poor Code Quality
3636

3737
// Register this check class (by creating a static instance of it)
3838
namespace {

‎lib/checkclass.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2154,7 +2154,7 @@ void CheckClass::checkConst()
21542154
if (!scope->definedType->derivedFrom.empty() && func.isImplicitlyVirtual(true))
21552155
continue;
21562156

2157-
enum MemberAccess memberAccessed = MemberAccess::NONE;
2157+
MemberAccess memberAccessed = MemberAccess::NONE;
21582158
// if nothing non-const was found. write error..
21592159
if (!checkConstFunc(scope, &func, memberAccessed))
21602160
continue;

‎lib/checkcondition.cpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -43,10 +43,10 @@
4343
#include <vector>
4444

4545
// CWE ids used
46-
static const struct CWE uncheckedErrorConditionCWE(391U);
47-
static const struct CWE CWE398(398U); // Indicator of Poor Code Quality
48-
static const struct CWE CWE570(570U); // Expression is Always False
49-
static const struct CWE CWE571(571U); // Expression is Always True
46+
static const CWE uncheckedErrorConditionCWE(391U);
47+
static const CWE CWE398(398U); // Indicator of Poor Code Quality
48+
static const CWE CWE570(570U); // Expression is Always False
49+
static const CWE CWE571(571U); // Expression is Always True
5050

5151
//---------------------------------------------------------------------------
5252

‎lib/checkexceptionsafety.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,9 @@ namespace {
3737
CheckExceptionSafety instance;
3838
}
3939

40-
static const struct CWE CWE398(398U); // Indicator of Poor Code Quality
41-
static const struct CWE CWE703(703U); // Improper Check or Handling of Exceptional Conditions
42-
static const struct CWE CWE480(480U); // Use of Incorrect Operator
40+
static const CWE CWE398(398U); // Indicator of Poor Code Quality
41+
static const CWE CWE703(703U); // Improper Check or Handling of Exceptional Conditions
42+
static const CWE CWE480(480U); // Use of Incorrect Operator
4343

4444
//---------------------------------------------------------------------------
4545

‎lib/checknullpointer.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,8 @@
4040
//---------------------------------------------------------------------------
4141

4242
// CWE ids used:
43-
static const struct CWE CWE_NULL_POINTER_DEREFERENCE(476U);
44-
static const struct CWE CWE_INCORRECT_CALCULATION(682U);
43+
static const CWE CWE_NULL_POINTER_DEREFERENCE(476U);
44+
static const CWE CWE_INCORRECT_CALCULATION(682U);
4545

4646
// Register this check class (by creating a static instance of it)
4747
namespace {

0 commit comments

Comments
 (0)