diff --git a/src/easy/entities/account.hpp b/src/easy/entities/account.hpp index 3c726c0..e394822 100644 --- a/src/easy/entities/account.hpp +++ b/src/easy/entities/account.hpp @@ -25,11 +25,9 @@ // If we are compiling mastodon-cpp, use another include path #ifdef MASTODON_CPP #include "mastodon-cpp.hpp" - #include "easy/easy.hpp" #include "easy/entity.hpp" #else #include - #include #include #endif @@ -57,7 +55,7 @@ namespace Easy */ using fields_pair = std::pair; - virtual bool valid() const; + virtual bool valid() const override; /*! * @brief Returns username @@ -259,7 +257,7 @@ namespace Easy */ Source(); - virtual bool valid() const; + virtual bool valid() const override; /*! * @brief Returns metadata fields diff --git a/src/easy/entities/application.hpp b/src/easy/entities/application.hpp index 374fc8b..a8b0b22 100644 --- a/src/easy/entities/application.hpp +++ b/src/easy/entities/application.hpp @@ -22,11 +22,9 @@ // If we are compiling mastodon-cpp, use another include path #ifdef MASTODON_CPP #include "mastodon-cpp.hpp" - #include "easy/easy.hpp" #include "easy/entity.hpp" #else #include - #include #include #endif @@ -46,7 +44,7 @@ namespace Easy public: using Entity::Entity; - virtual bool valid() const; + virtual bool valid() const override; /*! * @brief Returns the name of the application diff --git a/src/easy/entities/attachment.hpp b/src/easy/entities/attachment.hpp index e291329..142e15f 100644 --- a/src/easy/entities/attachment.hpp +++ b/src/easy/entities/attachment.hpp @@ -25,11 +25,9 @@ // If we are compiling mastodon-cpp, use another include path #ifdef MASTODON_CPP #include "mastodon-cpp.hpp" - #include "easy/easy.hpp" #include "easy/entity.hpp" #else #include - #include #include #endif @@ -50,7 +48,7 @@ namespace Easy public: using Entity::Entity; - virtual bool valid() const; + virtual bool valid() const override; /*! * @brief Aspect of original image diff --git a/src/easy/entities/card.hpp b/src/easy/entities/card.hpp index 85208b6..536c082 100644 --- a/src/easy/entities/card.hpp +++ b/src/easy/entities/card.hpp @@ -23,11 +23,9 @@ // If we are compiling mastodon-cpp, use another include path #ifdef MASTODON_CPP #include "mastodon-cpp.hpp" - #include "easy/easy.hpp" #include "easy/entity.hpp" #else #include - #include #include #endif @@ -48,7 +46,7 @@ namespace Easy public: using Entity::Entity; - virtual bool valid() const; + virtual bool valid() const override; /*! * @brief Returns the name of the author diff --git a/src/easy/entities/context.hpp b/src/easy/entities/context.hpp index c076797..034b1f2 100644 --- a/src/easy/entities/context.hpp +++ b/src/easy/entities/context.hpp @@ -23,14 +23,12 @@ // If we are compiling mastodon-cpp, use another include path #ifdef MASTODON_CPP #include "mastodon-cpp.hpp" - #include "easy/easy.hpp" - #include "easy/entities/status.hpp" #include "easy/entity.hpp" + #include "easy/entities/status.hpp" #else #include - #include - #include #include + #include #endif using std::string; @@ -49,7 +47,7 @@ namespace Easy public: using Entity::Entity; - virtual bool valid() const; + virtual bool valid() const override; /*! * @brief Returns the ancestors of the Status as vector of Statuses diff --git a/src/easy/entities/emoji.hpp b/src/easy/entities/emoji.hpp index 092f3ea..2b1c3ba 100644 --- a/src/easy/entities/emoji.hpp +++ b/src/easy/entities/emoji.hpp @@ -22,11 +22,9 @@ // If we are compiling mastodon-cpp, use another include path #ifdef MASTODON_CPP #include "mastodon-cpp.hpp" - #include "easy/easy.hpp" #include "easy/entity.hpp" #else #include - #include #include #endif @@ -46,7 +44,7 @@ namespace Easy public: using Entity::Entity; - virtual bool valid() const; + virtual bool valid() const override; /*! * @brief Returns the shortcode of the emoji diff --git a/src/easy/entities/instance.hpp b/src/easy/entities/instance.hpp index 5194a0f..849e4dc 100644 --- a/src/easy/entities/instance.hpp +++ b/src/easy/entities/instance.hpp @@ -25,12 +25,10 @@ using std::uint64_t; // If we are compiling mastodon-cpp, use another include path #ifdef MASTODON_CPP #include "mastodon-cpp.hpp" - #include "easy/easy.hpp" #include "easy/entities/account.hpp" #include "easy/entity.hpp" #else #include - #include #include #include #endif @@ -51,7 +49,7 @@ namespace Easy public: using Entity::Entity; - virtual bool valid() const; + virtual bool valid() const override; /*! * @brief Returns the Account of the admin or another contact person diff --git a/src/easy/entities/list.hpp b/src/easy/entities/list.hpp index 67a4a42..ce0378f 100644 --- a/src/easy/entities/list.hpp +++ b/src/easy/entities/list.hpp @@ -24,11 +24,9 @@ // If we are compiling mastodon-cpp, use another include path #ifdef MASTODON_CPP #include "mastodon-cpp.hpp" - #include "easy/easy.hpp" #include "easy/entity.hpp" #else #include - #include #include #endif @@ -49,7 +47,7 @@ namespace Easy public: using Entity::Entity; - virtual bool valid() const; + virtual bool valid() const override; /*! * @brief Returns list-ID diff --git a/src/easy/entities/mention.hpp b/src/easy/entities/mention.hpp index 17f30f1..58bac3a 100644 --- a/src/easy/entities/mention.hpp +++ b/src/easy/entities/mention.hpp @@ -23,11 +23,9 @@ // If we are compiling mastodon-cpp, use another include path #ifdef MASTODON_CPP #include "mastodon-cpp.hpp" - #include "easy/easy.hpp" #include "easy/entity.hpp" #else #include - #include #include #endif @@ -49,7 +47,7 @@ namespace Easy public: using Entity::Entity; - virtual bool valid() const; + virtual bool valid() const override; /*! * @brief Returns acct diff --git a/src/easy/entities/notification.hpp b/src/easy/entities/notification.hpp index 788bd69..4131c9c 100644 --- a/src/easy/entities/notification.hpp +++ b/src/easy/entities/notification.hpp @@ -23,13 +23,11 @@ // If we are compiling mastodon-cpp, use another include path #ifdef MASTODON_CPP #include "mastodon-cpp.hpp" - #include "easy/easy.hpp" #include "easy/entities/account.hpp" #include "easy/entities/status.hpp" #include "easy/entity.hpp" #else #include - #include #include #include #include @@ -52,7 +50,7 @@ namespace Easy public: using Entity::Entity; - virtual bool valid() const; + virtual bool valid() const override; /*! * @brief Returns the Account sending the notification to the user diff --git a/src/easy/entities/pushsubscription.hpp b/src/easy/entities/pushsubscription.hpp index 7cc3aa2..4707233 100644 --- a/src/easy/entities/pushsubscription.hpp +++ b/src/easy/entities/pushsubscription.hpp @@ -24,11 +24,9 @@ // If we are compiling mastodon-cpp, use another include path #ifdef MASTODON_CPP #include "mastodon-cpp.hpp" - #include "easy/easy.hpp" #include "easy/entity.hpp" #else #include - #include #include #endif @@ -48,7 +46,7 @@ namespace Easy public: using Entity::Entity; - virtual bool valid() const; + virtual bool valid() const override; /*! * @brief Returns push subscription ID diff --git a/src/easy/entities/relationship.hpp b/src/easy/entities/relationship.hpp index c07a54b..a367bbf 100644 --- a/src/easy/entities/relationship.hpp +++ b/src/easy/entities/relationship.hpp @@ -23,11 +23,9 @@ // If we are compiling mastodon-cpp, use another include path #ifdef MASTODON_CPP #include "mastodon-cpp.hpp" - #include "easy/easy.hpp" #include "easy/entity.hpp" #else #include - #include #include #endif @@ -48,7 +46,7 @@ namespace Easy public: using Entity::Entity; - virtual bool valid() const; + virtual bool valid() const override; /*! * @brief Returns true if the user is blocking the account diff --git a/src/easy/entities/report.hpp b/src/easy/entities/report.hpp index a7a6d52..aa10a84 100644 --- a/src/easy/entities/report.hpp +++ b/src/easy/entities/report.hpp @@ -23,11 +23,9 @@ // If we are compiling mastodon-cpp, use another include path #ifdef MASTODON_CPP #include "mastodon-cpp.hpp" - #include "easy/easy.hpp" #include "easy/entity.hpp" #else #include - #include #include #endif @@ -47,7 +45,7 @@ namespace Easy public: using Entity::Entity; - virtual bool valid() const; + virtual bool valid() const override; /*! * @brief Returns true if an action was taken in response to the diff --git a/src/easy/entities/results.hpp b/src/easy/entities/results.hpp index fc3fabd..dffbbe1 100644 --- a/src/easy/entities/results.hpp +++ b/src/easy/entities/results.hpp @@ -23,18 +23,16 @@ // If we are compiling mastodon-cpp, use another include path #ifdef MASTODON_CPP #include "mastodon-cpp.hpp" - #include "easy/easy.hpp" + #include "easy/entity.hpp" #include "easy/entities/account.hpp" #include "easy/entities/status.hpp" #include "easy/entities/tag.hpp" - #include "easy/entity.hpp" #else #include - #include + #include #include #include #include - #include #endif using std::string; @@ -53,7 +51,7 @@ namespace Easy public: using Entity::Entity; - virtual bool valid() const; + virtual bool valid() const override; /*! * @brief Returns an array of matched Accounts diff --git a/src/easy/entities/status.hpp b/src/easy/entities/status.hpp index f836f55..194e62a 100644 --- a/src/easy/entities/status.hpp +++ b/src/easy/entities/status.hpp @@ -24,7 +24,7 @@ // If we are compiling mastodon-cpp, use another include path #ifdef MASTODON_CPP #include "mastodon-cpp.hpp" - #include "easy/easy.hpp" + #include "easy/entity.hpp" #include "easy/entities/account.hpp" #include "easy/entities/emoji.hpp" #include "easy/entities/attachment.hpp" @@ -32,10 +32,9 @@ #include "easy/entities/tag.hpp" #include "easy/entities/application.hpp" #include "easy/entities/card.hpp" - #include "easy/entity.hpp" #else #include - #include + #include #include #include #include @@ -43,7 +42,6 @@ #include #include #include - #include #endif using std::string; @@ -63,7 +61,7 @@ namespace Easy public: using Entity::Entity; - virtual bool valid() const; + virtual bool valid() const override; /*! * @brief Returns an array of matched accounts. diff --git a/src/easy/entities/tag.hpp b/src/easy/entities/tag.hpp index cbfb53b..5c4f946 100644 --- a/src/easy/entities/tag.hpp +++ b/src/easy/entities/tag.hpp @@ -23,11 +23,9 @@ // If we are compiling mastodon-cpp, use another include path #ifdef MASTODON_CPP #include "mastodon-cpp.hpp" - #include "easy/easy.hpp" #include "easy/entity.hpp" #else #include - #include #include #endif @@ -56,7 +54,7 @@ namespace Easy public: using Entity::Entity; - virtual bool valid() const; + virtual bool valid() const override; /*! * @brief Returns the number of accounts using that hashtag. @@ -82,7 +80,7 @@ namespace Easy using Entity::Entity; - virtual bool valid() const; + virtual bool valid() const override; /*! * @brief Returns the name of the tag