Fixed remaining cpplint warnings

This commit is contained in:
Benoit Blanchon
2014-11-06 14:08:53 +01:00
parent d8e595907b
commit ac9b776aa1
9 changed files with 207 additions and 204 deletions

View File

@ -14,6 +14,8 @@
// This class reproduces Arduino's Print // This class reproduces Arduino's Print
class Print { class Print {
public: public:
virtual ~Print() {}
virtual size_t write(uint8_t) = 0; virtual size_t write(uint8_t) = 0;
size_t print(const char[]); size_t print(const char[]);

View File

@ -16,7 +16,7 @@ namespace Internals {
// for your own purpose, like logging. // for your own purpose, like logging.
class IndentedPrint : public Print { class IndentedPrint : public Print {
public: public:
IndentedPrint(Print &p) : sink(&p) { explicit IndentedPrint(Print &p) : sink(&p) {
level = 0; level = 0;
tabSize = 2; tabSize = 2;
isNewLine = true; isNewLine = true;

View File

@ -21,7 +21,7 @@ class List {
typedef ListIterator<T> iterator; typedef ListIterator<T> iterator;
typedef ListConstIterator<T> const_iterator; typedef ListConstIterator<T> const_iterator;
List(JsonBuffer *buffer) : _buffer(buffer), _firstNode(NULL) {} explicit List(JsonBuffer *buffer) : _buffer(buffer), _firstNode(NULL) {}
bool success() const { return _buffer != NULL; } bool success() const { return _buffer != NULL; }
int size() const; int size() const;

View File

@ -48,7 +48,7 @@ class JsonArray : public Internals::JsonPrintable<JsonArray>,
private: private:
// constructor is private: instance must be created via a JsonBuffer // constructor is private: instance must be created via a JsonBuffer
JsonArray(JsonBuffer *buffer) : List(buffer) {} explicit JsonArray(JsonBuffer *buffer) : List(buffer) {}
static JsonArray _invalid; static JsonArray _invalid;
}; };

View File

@ -52,7 +52,7 @@ class JsonObject : public Internals::JsonPrintable<JsonObject>,
private: private:
// constructor is private, instance must be created via JsonBuffer // constructor is private, instance must be created via JsonBuffer
JsonObject(JsonBuffer *buffer) : List(buffer) {} explicit JsonObject(JsonBuffer *buffer) : List(buffer) {}
JsonVariant &add(key_type key) { return (*this)[key]; } JsonVariant &add(key_type key) { return (*this)[key]; }

View File

@ -83,8 +83,8 @@ class JsonVariant : public Internals::JsonPrintable<JsonVariant> {
operator JsonObject &() const; operator JsonObject &() const;
const char *asString() const { return this->as<const char *>(); } const char *asString() const { return this->as<const char *>(); }
JsonArray &asArray() const { return this->as<JsonArray &>(); }; JsonArray &asArray() const { return this->as<JsonArray &>(); }
JsonObject &asObject() const { return this->as<JsonObject &>(); }; JsonObject &asObject() const { return this->as<JsonObject &>(); }
template <typename T> template <typename T>
T as() const { T as() const {
@ -111,7 +111,7 @@ class JsonVariant : public Internals::JsonPrintable<JsonVariant> {
JsonVariant &operator[](const char *key); JsonVariant &operator[](const char *key);
private: private:
JsonVariant(Internals::JsonVariantType type) : _type(type) {} explicit JsonVariant(Internals::JsonVariantType type) : _type(type) {}
Internals::JsonVariantType _type; Internals::JsonVariantType _type;
Internals::JsonVariantContent _content; Internals::JsonVariantContent _content;

View File

@ -1,5 +1,5 @@
CPPLINT="python third-party/cpplint/cpplint.py" CPPLINT="python third-party/cpplint/cpplint.py"
FLAGS="--filter=-runtime/printf,-runtime/int,-readability/todo,-build/namespace,-runtime/references" FLAGS="--filter=-runtime/printf,-runtime/int,-readability/todo,-build/namespace,-runtime/references,-readability/streams"
cd .. cd ..
$CPPLINT $FLAGS $(find include src test -regex ".*\.[hc]pp$") $CPPLINT $FLAGS $(find include src test -regex ".*\.[hc]pp$")

View File

@ -1,7 +1,8 @@
/* // Copyright Benoit Blanchon 2014
* Arduino JSON library // MIT License
* Benoit Blanchon 2014 - MIT License //
*/ // Arduino JSON library
// https://github.com/bblanchon/ArduinoJson
#include <gtest/gtest.h> #include <gtest/gtest.h>
#include <ArduinoJson/StaticJsonBuffer.hpp> #include <ArduinoJson/StaticJsonBuffer.hpp>

View File

@ -9,10 +9,10 @@
class StreamPrintAdapter : public Print { class StreamPrintAdapter : public Print {
public: public:
StreamPrintAdapter(std::ostream& os) : _os(os) {} explicit StreamPrintAdapter(std::ostream& os) : _os(os) {}
virtual size_t write(uint8_t c) { virtual size_t write(uint8_t c) {
_os << (char)c; _os << static_cast<char>(c);
return 1; return 1;
} }