From f6071f61e433c333e2b34458314a263921ad5fa7 Mon Sep 17 00:00:00 2001 From: Albert Astals Cid Date: Mon, 2 Dec 2019 22:25:42 +0100 Subject: enable modernize-redundant-void-arg No copyright, it's a mechanical change --- .gitlab-ci.yml | 2 +- glib/poppler.cc | 2 +- poppler/CairoFontEngine.cc | 2 +- poppler/CairoFontEngine.h | 2 +- poppler/TextOutputDev.cc | 4 ++-- test/pdf-inspector.cc | 6 +++--- test/perf-test-preview-dummy.cc | 8 ++++---- test/perf-test.cc | 12 ++++++------ 8 files changed, 19 insertions(+), 19 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d3566b21..9b17c0ef 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -40,7 +40,7 @@ build_clang_libcpp: script: - git clone --branch ${CI_COMMIT_REF_NAME} --depth 1 ${TEST_DATA_URL} test-data || git clone --depth 1 ${UPSTREAM_TEST_DATA_URL} test-data - mkdir -p build && cd build - - CC=clang CXX=clang++ cmake -G Ninja -DCMAKE_CXX_FLAGS=-stdlib=libc++ -DTESTDATADIR=$PWD/../test-data -DCMAKE_CXX_CLANG_TIDY="clang-tidy;-header-filter=.;-checks=-*,performance-*,,bugprone-*,readability-inconsistent-declaration-parameter-name,readability-string-compare,modernize-deprecated-headers,modernize-make-unique,modernize-make-shared,modernize-use-override,modernize-use-equals-delete,modernize-use-emplace,modernize-use-bool-literals,-bugprone-narrowing-conversions,-bugprone-macro-parentheses,-bugprone-suspicious-string-compare,-bugprone-incorrect-roundings,-bugprone-undefined-memory-manipulation;-warnings-as-errors=*" .. + - CC=clang CXX=clang++ cmake -G Ninja -DCMAKE_CXX_FLAGS=-stdlib=libc++ -DTESTDATADIR=$PWD/../test-data -DCMAKE_CXX_CLANG_TIDY="clang-tidy;-header-filter=.;-checks=-*,performance-*,,bugprone-*,readability-inconsistent-declaration-parameter-name,readability-string-compare,modernize-deprecated-headers,modernize-make-unique,modernize-make-shared,modernize-use-override,modernize-use-equals-delete,modernize-use-emplace,modernize-use-bool-literals,modernize-redundant-void-arg,-bugprone-narrowing-conversions,-bugprone-macro-parentheses,-bugprone-suspicious-string-compare,-bugprone-incorrect-roundings,-bugprone-undefined-memory-manipulation;-warnings-as-errors=*" .. - ninja - ctest --output-on-failure diff --git a/glib/poppler.cc b/glib/poppler.cc index 01c3ae88..55347c2d 100644 --- a/glib/poppler.cc +++ b/glib/poppler.cc @@ -112,7 +112,7 @@ error_cb (void *data G_GNUC_UNUSED, } static void __attribute__((__constructor__)) -poppler_constructor (void) +poppler_constructor () { setErrorCallback (error_cb, nullptr); } diff --git a/poppler/CairoFontEngine.cc b/poppler/CairoFontEngine.cc index 48b2521c..1f637cf5 100644 --- a/poppler/CairoFontEngine.cc +++ b/poppler/CairoFontEngine.cc @@ -85,7 +85,7 @@ CairoFont::matches(Ref &other, bool printingA) { } cairo_font_face_t * -CairoFont::getFontFace(void) { +CairoFont::getFontFace() { return cairo_font_face; } diff --git a/poppler/CairoFontEngine.h b/poppler/CairoFontEngine.h index 0a9ce8be..89a2f4da 100644 --- a/poppler/CairoFontEngine.h +++ b/poppler/CairoFontEngine.h @@ -53,7 +53,7 @@ public: CairoFont& operator=(const CairoFont &other) = delete; virtual bool matches(Ref &other, bool printing); - cairo_font_face_t *getFontFace(void); + cairo_font_face_t *getFontFace(); unsigned long getGlyph(CharCode code, const Unicode *u, int uLen); double getSubstitutionCorrection(GfxFont *gfxFont); diff --git a/poppler/TextOutputDev.cc b/poppler/TextOutputDev.cc index 7848cb38..b9e71561 100644 --- a/poppler/TextOutputDev.cc +++ b/poppler/TextOutputDev.cc @@ -4458,7 +4458,7 @@ public: const PDFRectangle *selection) override; void endPage(); - GooString *getText(void); + GooString *getText(); std::vector **takeWordList(int *nLines); private: @@ -4564,7 +4564,7 @@ void TextSelectionDumper::endPage() finishLine(); } -GooString *TextSelectionDumper::getText (void) +GooString *TextSelectionDumper::getText () { GooString *text; int i; diff --git a/test/pdf-inspector.cc b/test/pdf-inspector.cc index 17f5fc69..e41802b5 100644 --- a/test/pdf-inspector.cc +++ b/test/pdf-inspector.cc @@ -42,11 +42,11 @@ enum { class PdfInspector { public: - PdfInspector(void); + PdfInspector(); void set_file_name (const char *file_name); void load (const char *file_name); - void run (void); + void run (); void error_dialog (const char *error_message); void analyze_page (int page); @@ -63,7 +63,7 @@ private: -PdfInspector::PdfInspector(void) +PdfInspector::PdfInspector() { GtkWidget *widget; GError* error = nullptr; diff --git a/test/perf-test-preview-dummy.cc b/test/perf-test-preview-dummy.cc index adc4d2e8..ab007278 100644 --- a/test/perf-test-preview-dummy.cc +++ b/test/perf-test-preview-dummy.cc @@ -8,19 +8,19 @@ get any visual feedback during testing. #include "splash/SplashBitmap.h" -void PreviewBitmapInit(void); -void PreviewBitmapDestroy(void); +void PreviewBitmapInit(); +void PreviewBitmapDestroy(); void PreviewBitmapSplash(SplashBitmap *bmpSplash); void PreviewBitmapSplash(SplashBitmap *bmpSplash) { } -void PreviewBitmapDestroy(void) +void PreviewBitmapDestroy() { } -void PreviewBitmapInit(void) +void PreviewBitmapInit() { } diff --git a/test/perf-test.cc b/test/perf-test.cc index 1988d705..70220cd3 100644 --- a/test/perf-test.cc +++ b/test/perf-test.cc @@ -74,8 +74,8 @@ They can be no-ops. An implementation for windows is in perf-test-preview-win.cc */ -extern void PreviewBitmapInit(void); -extern void PreviewBitmapDestroy(void); +extern void PreviewBitmapInit(); +extern void PreviewBitmapDestroy(); extern void PreviewBitmapSplash(SplashBitmap *bmpSplash); class PdfEnginePoppler { @@ -86,14 +86,14 @@ public: PdfEnginePoppler(const PdfEnginePoppler &) = delete; PdfEnginePoppler& operator=(const PdfEnginePoppler &) = delete; - const char *fileName(void) const { return _fileName; }; + const char *fileName() const { return _fileName; }; void setFileName(const char *fileName) { assert(!_fileName); _fileName = (char*)strdup(fileName); } - int pageCount(void) const { return _pageCount; } + int pageCount() const { return _pageCount; } bool load(const char *fileName); SplashBitmap *renderBitmap(int pageNo, double zoomReal, int rotation); @@ -394,7 +394,7 @@ static void splashColorSet(SplashColorPtr col, unsigned char red, unsigned char } } -static void SplashColorsInit(void) +static void SplashColorsInit() { splashColorSet(SPLASH_COL_RED_PTR, 0xff, 0, 0, 0); splashColorSet(SPLASH_COL_GREEN_PTR, 0, 0xff, 0, 0); @@ -818,7 +818,7 @@ static void PrintUsageAndExit(int argc, char **argv) exit(0); } -static bool ShowPreview(void) +static bool ShowPreview() { if (gfPreview || gfSlowPreview) return true; -- cgit v1.2.3