Skip to content

Commit 115668e

Browse files
authored
Merge pull request #564 from vizzuhq/clang-tidy-fixes
Fix clang-tidy(-18) issues
2 parents ef7a0e4 + cdd4dde commit 115668e

File tree

139 files changed

+1238
-457
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

139 files changed

+1238
-457
lines changed

project/cmake/common.txt

+3-2
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ set(sourceDir ${root}/src)
33

44
set(CMAKE_CXX_STANDARD 23)
55
set(CMAKE_CXX_STANDARD_REQUIRED ON)
6+
set(CMAKE_CXX_EXTENSIONS OFF)
67

78
if (NOT CMAKE_BUILD_TYPE OR CMAKE_BUILD_TYPE STREQUAL "")
89
set(CMAKE_BUILD_TYPE "Release" CACHE STRING "" FORCE)
@@ -63,11 +64,11 @@ if (cpplint)
6364
endif()
6465

6566
if (WIN32)
66-
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /std:c++20 /Zi /GR-")
67+
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /Zi /GR-")
6768
add_definitions(-D_USE_MATH_DEFINES)
6869
set(CMAKE_SHARED_LINKER_FLAGS "/INCREMENTAL:NO /Debug")
6970
else()
70-
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++20 \
71+
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} \
7172
-Wpedantic \
7273
-Wall \
7374
-Wextra \

src/.clang-tidy

+9-3
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ Checks: >
2727
-cppcoreguidelines-pro-type-vararg,
2828
-cppcoreguidelines-special-member-functions,
2929
fuchsia-statically-constructed-objects,
30-
fuchsia-trailing-return,
3130
google-build-using-namespace,
3231
google-default-arguments,
3332
google-explicit-constructor,
@@ -48,10 +47,10 @@ Checks: >
4847
-readability-identifier-length,
4948
-readability-implicit-bool-conversion,
5049
-readability-magic-numbers,
51-
-readability-named-parameter
50+
-readability-named-parameter,
51+
-readability-redundant-member-init
5252
WarningsAsErrors: '*,-readability-function-size,-readability-function-cognitive-complexity,-misc-no-recursion'
5353
HeaderFilterRegex: '.*'
54-
AnalyzeTemporaryDtors: false
5554
FormatStyle: none
5655
User: simon
5756
CheckOptions:
@@ -375,5 +374,12 @@ CheckOptions:
375374
value: '0'
376375
- key: readability-simplify-subscript-expr.Types
377376
value: '::std::basic_string;::std::basic_string_view;::std::vector;::std::array'
377+
- key: cppcoreguidelines-rvalue-reference-param-not-moved.IgnoreUnnamedParams
378+
value: 'true'
379+
- key: cppcoreguidelines-rvalue-reference-param-not-moved.AllowPartialMove
380+
value: 'true'
381+
- key: misc-include-cleaner.IgnoreHeaders
382+
value: (.*\.tpp)
383+
378384
...
379385

src/apps/weblib/cinterface.cpp

+46-40
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,18 @@
11
#include "cinterface.h"
22

3+
#include <cstddef>
4+
#include <cstdint>
5+
#include <exception>
6+
#include <functional>
7+
#include <limits>
8+
#include <new>
9+
#include <optional>
10+
#include <stdexcept>
11+
#include <string>
12+
#include <string_view>
13+
#include <typeinfo>
14+
#include <variant>
15+
316
#include "interface.h"
417

518
using Vizzu::Interface;
@@ -17,7 +30,8 @@ constexpr std::uint_fast32_t hash(std::string_view s) noexcept
1730

1831
for (size_t i = 0; i < s.size(); ++i)
1932
val ^= static_cast<std::uint_fast32_t>(s[i])
20-
<< ((i % sizeof(std::uint_fast32_t)) * CHAR_BIT);
33+
<< ((i % sizeof(std::uint_fast32_t))
34+
* std::numeric_limits<unsigned char>::digits);
2135

2236
return val;
2337
}
@@ -90,6 +104,7 @@ const char *vizzu_errorMessage(APIHandles::Exception exceptionPtr,
90104
static_cast<const std::bad_variant_access *>(
91105
exceptionPtr);
92106
break;
107+
default: break;
93108
}
94109

95110
if (realException) return realException->what();
@@ -106,10 +121,7 @@ const char *vizzu_errorMessage(APIHandles::Exception exceptionPtr,
106121

107122
const char *vizzu_version() { return Interface::version(); }
108123

109-
void vizzu_setLogging(bool enable)
110-
{
111-
return Interface::setLogging(enable);
112-
}
124+
void vizzu_setLogging(bool enable) { Interface::setLogging(enable); }
113125

114126
APIHandles::Chart vizzu_createChart()
115127
{
@@ -127,7 +139,7 @@ void vizzu_pointerMove(APIHandles::Chart chart,
127139
double x,
128140
double y)
129141
{
130-
return Interface::getInstance().pointerMove(chart,
142+
Interface::getInstance().pointerMove(chart,
131143
canvas,
132144
pointerId,
133145
x,
@@ -140,7 +152,7 @@ void vizzu_pointerDown(APIHandles::Chart chart,
140152
double x,
141153
double y)
142154
{
143-
return Interface::getInstance().pointerDown(chart,
155+
Interface::getInstance().pointerDown(chart,
144156
canvas,
145157
pointerId,
146158
x,
@@ -153,7 +165,7 @@ void vizzu_pointerUp(APIHandles::Chart chart,
153165
double x,
154166
double y)
155167
{
156-
return Interface::getInstance().pointerUp(chart,
168+
Interface::getInstance().pointerUp(chart,
157169
canvas,
158170
pointerId,
159171
x,
@@ -164,16 +176,14 @@ void vizzu_pointerLeave(APIHandles::Chart chart,
164176
APIHandles::Canvas canvas,
165177
int pointerId)
166178
{
167-
return Interface::getInstance().pointerLeave(chart,
168-
canvas,
169-
pointerId);
179+
Interface::getInstance().pointerLeave(chart, canvas, pointerId);
170180
}
171181

172182
void vizzu_wheel(APIHandles::Chart chart,
173183
APIHandles::Canvas canvas,
174184
double delta)
175185
{
176-
return Interface::getInstance().wheel(chart, canvas, delta);
186+
Interface::getInstance().wheel(chart, canvas, delta);
177187
}
178188

179189
void vizzu_update(APIHandles::Chart chart, double timeInMSecs)
@@ -186,10 +196,7 @@ void vizzu_render(APIHandles::Chart chart,
186196
double width,
187197
double height)
188198
{
189-
return Interface::getInstance().render(chart,
190-
canvas,
191-
width,
192-
height);
199+
Interface::getInstance().render(chart, canvas, width, height);
193200
}
194201

195202
void vizzu_setLineResolution(APIHandles::Canvas canvas,
@@ -207,7 +214,7 @@ void style_setValue(APIHandles::Chart chart,
207214
const char *path,
208215
const char *value)
209216
{
210-
return Interface::getInstance().setStyleValue(chart, path, value);
217+
Interface::getInstance().setStyleValue(chart, path, value);
211218
}
212219

213220
const char *style_getValue(APIHandles::Chart chart,
@@ -227,7 +234,7 @@ APIHandles::Snapshot chart_store(APIHandles::Chart chart)
227234
void chart_restore(APIHandles::Chart chart,
228235
APIHandles::Snapshot snapshot)
229236
{
230-
return Interface::getInstance().restoreChart(chart, snapshot);
237+
Interface::getInstance().restoreChart(chart, snapshot);
231238
}
232239

233240
APIHandles::Animation chart_anim_store(APIHandles::Chart chart)
@@ -238,12 +245,12 @@ APIHandles::Animation chart_anim_store(APIHandles::Chart chart)
238245
void chart_anim_restore(APIHandles::Chart chart,
239246
APIHandles::Animation anim)
240247
{
241-
return Interface::getInstance().restoreAnim(chart, anim);
248+
Interface::getInstance().restoreAnim(chart, anim);
242249
}
243250

244251
void object_free(APIHandles::Any handle)
245252
{
246-
return Interface::getInstance().freeObj(handle);
253+
Interface::getInstance().freeObj(handle);
247254
}
248255

249256
const char *chart_getList() { return Interface::getChartParamList(); }
@@ -257,29 +264,32 @@ void chart_setValue(APIHandles::Chart chart,
257264
const char *path,
258265
const char *value)
259266
{
260-
return Interface::getInstance().setChartValue(chart, path, value);
267+
Interface::getInstance().setChartValue(chart, path, value);
261268
}
262269

263270
void chart_setFilter(APIHandles::Chart chart,
264271
bool (*filter)(const Vizzu::Data::RowWrapper *),
265272
void (*deleter)(bool (*)(const Vizzu::Data::RowWrapper *)))
266273
{
267-
return Interface::getInstance().setChartFilter(chart,
268-
{filter, deleter});
274+
Interface::getInstance().setChartFilter(chart, {filter, deleter});
269275
}
270276

271277
const Value *record_getValue(const Vizzu::Data::RowWrapper *record,
272278
const char *column)
273279
{
274280
thread_local Value val{{}, {}};
275281
if (auto &&cval = Interface::getRecordValue(*record, column);
276-
(val.dimension = cval.index())) {
282+
cval.index()) {
283+
val.dimension = true;
277284
auto &&dim = *std::get_if<const std::string *>(&cval);
278-
new (&val.dimensionValue)
285+
new (
286+
&val.dimensionValue) // NOLINT(bugprone-multi-level-implicit-pointer-conversion)
279287
const char *{dim ? dim->c_str() : nullptr};
280288
}
281-
else
289+
else {
290+
val.dimension = false;
282291
new (&val.measureValue) double{*std::get_if<double>(&cval)};
292+
}
283293
return &val;
284294
}
285295

@@ -290,7 +300,7 @@ void data_addDimension(APIHandles::Chart chart,
290300
const std::uint32_t *categoryIndices,
291301
std::uint32_t categoryIndicesCount)
292302
{
293-
return Interface::getInstance().addDimension(chart,
303+
Interface::getInstance().addDimension(chart,
294304
name,
295305
categories,
296306
categoriesCount,
@@ -304,7 +314,7 @@ void data_addMeasure(APIHandles::Chart chart,
304314
const double *values,
305315
std::uint32_t count)
306316
{
307-
return Interface::getInstance().addMeasure(chart,
317+
Interface::getInstance().addMeasure(chart,
308318
name,
309319
unit,
310320
values,
@@ -315,7 +325,7 @@ void data_addRecord(APIHandles::Chart chart,
315325
const char *const *cells,
316326
std::uint32_t count)
317327
{
318-
return Interface::getInstance().addRecord(chart, cells, count);
328+
Interface::getInstance().addRecord(chart, cells, count);
319329
}
320330

321331
const char *data_metaInfo(APIHandles::Chart chart)
@@ -327,28 +337,26 @@ void addEventListener(APIHandles::Chart chart,
327337
const char *name,
328338
void (*callback)(APIHandles::Event event, const char *))
329339
{
330-
return Interface::getInstance().addEventListener(chart,
331-
name,
332-
callback);
340+
Interface::getInstance().addEventListener(chart, name, callback);
333341
}
334342

335343
void removeEventListener(APIHandles::Chart chart,
336344
const char *name,
337345
void (*callback)(APIHandles::Event event, const char *))
338346
{
339-
return Interface::getInstance().removeEventListener(chart,
347+
Interface::getInstance().removeEventListener(chart,
340348
name,
341349
callback);
342350
}
343351

344352
void event_preventDefault(APIHandles::Event event)
345353
{
346-
return Interface::preventDefaultEvent(event);
354+
Interface::preventDefaultEvent(event);
347355
}
348356

349357
void chart_animate(APIHandles::Chart chart, void (*callback)(bool))
350358
{
351-
return Interface::getInstance().animate(chart, callback);
359+
Interface::getInstance().animate(chart, callback);
352360
}
353361

354362
const Point *
@@ -377,16 +385,14 @@ chart_canvasToRelCoords(APIHandles::Chart chart, double x, double y)
377385

378386
void chart_setKeyframe(APIHandles::Chart chart)
379387
{
380-
return Interface::getInstance().setKeyframe(chart);
388+
Interface::getInstance().setKeyframe(chart);
381389
}
382390

383391
void anim_control_setValue(APIHandles::Chart chart,
384392
const char *path,
385393
const char *value)
386394
{
387-
return Interface::getInstance().setAnimControlValue(chart,
388-
path,
389-
value);
395+
Interface::getInstance().setAnimControlValue(chart, path, value);
390396
}
391397

392398
const char *anim_control_getValue(APIHandles::Chart chart,
@@ -399,5 +405,5 @@ void anim_setValue(APIHandles::Chart chart,
399405
const char *path,
400406
const char *value)
401407
{
402-
return Interface::getInstance().setAnimValue(chart, path, value);
408+
Interface::getInstance().setAnimValue(chart, path, value);
403409
}

0 commit comments

Comments
 (0)