Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 470f8fcb authored by Chih-Hung Hsieh's avatar Chih-Hung Hsieh
Browse files

Fix clang-tidy warnings in aapt and aapt2. 

* Add explicit keyword to conversion constructors.
* Add NOLINT(implicit) comments for implicit conversion constructors.
Bug: 28341362
* Use const reference type for read-only parameters.
Bug: 30407689
* Add NOLINT to suppress wrong clang-tidy warnings on macros.
Test: build with WITH_TIDY=1

Change-Id: Ibfafb23d9be463b4072745a51a6d9f1812dcac45
parent af34bd5c

tools/aapt2/Diagnostics.h

+3 −3
Original line number Diff line number Diff line
@@ -41,13 +41,13 @@ private: 
public:

    DiagMessage() = default;



    DiagMessage(const StringPiece& src) : mSource(src) {

    explicit DiagMessage(const StringPiece& src) : mSource(src) {

    }



    DiagMessage(const Source& src) : mSource(src) {

    explicit DiagMessage(const Source& src) : mSource(src) {

    }



    DiagMessage(size_t line) : mSource(Source().withLine(line)) {

    explicit DiagMessage(size_t line) : mSource(Source().withLine(line)) {

    }



    template <typename T>

tools/aapt2/NameMangler.h

+1 −1
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ private: 
    NameManglerPolicy mPolicy;



public:

    NameMangler(NameManglerPolicy policy) : mPolicy(policy) {

    explicit NameMangler(NameManglerPolicy policy) : mPolicy(policy) {

    }



    Maybe<ResourceName> mangleName(const ResourceName& name) {

tools/aapt2/Source.h

+1 −1
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ struct Source { 


    Source() = default;



    inline Source(const StringPiece& path) : path(path.toString()) {

    inline Source(const StringPiece& path) : path(path.toString()) {  // NOLINT(implicit)

    }



    inline Source(const StringPiece& path, size_t line) : path(path.toString()), line(line) {

tools/aapt2/ValueVisitor.h

+2 −1
Original line number Diff line number Diff line
@@ -45,8 +45,9 @@ struct RawValueVisitor { 
    virtual void visit(Styleable* value) {}

};



// NOLINT, do not add parentheses around T.

#define DECL_VISIT_COMPOUND_VALUE(T) \

    virtual void visit(T* value) { \

    virtual void visit(T* value) { /* NOLINT */ \

        visitSubValues(value); \

    }

tools/aapt2/compile/Png.h

+1 −1
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ struct PngOptions { 


class Png {

public:

    Png(IDiagnostics* diag) : mDiag(diag) {

    explicit Png(IDiagnostics* diag) : mDiag(diag) {

    }



    bool process(const Source& source, std::istream* input, BigBuffer* outBuffer,