tastytea
/
mastodon-cpp
Archived
1
0
Fork 0
Code Issues 2 Pull Requests Releases 26 Wiki Activity

Removed inclusion of easy.hpp from entities. 

Also added override to valid().
This commit is contained in:
tastytea 2019-03-31 21:43:57 +02:00
parent 6f11116b1c
commit 86dccaf2d7
Signed by: tastytea
GPG Key ID: CFC39497F1B26E07
16 changed files with 24 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/easy/entities/account.hpp
View File

@ -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 <mastodon-cpp/mastodon-cpp.hpp>
#include <mastodon-cpp/easy/easy.hpp>
#include <mastodon-cpp/easy/entity.hpp>
#endif
@ -57,7 +55,7 @@ namespace Easy
*/
using fields_pair = std::pair<const string, const string>;
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

4
src/easy/entities/application.hpp
View File

@ -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 <mastodon-cpp/mastodon-cpp.hpp>
#include <mastodon-cpp/easy/easy.hpp>
#include <mastodon-cpp/easy/entity.hpp>
#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

4
src/easy/entities/attachment.hpp
View File

@ -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 <mastodon-cpp/mastodon-cpp.hpp>
#include <mastodon-cpp/easy/easy.hpp>
#include <mastodon-cpp/easy/entity.hpp>
#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

4
src/easy/entities/card.hpp
View File

@ -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 <mastodon-cpp/mastodon-cpp.hpp>
#include <mastodon-cpp/easy/easy.hpp>
#include <mastodon-cpp/easy/entity.hpp>
#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

8
src/easy/entities/context.hpp
View File

@ -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 <mastodon-cpp/mastodon-cpp.hpp>
#include <mastodon-cpp/easy/easy.hpp>
#include <mastodon-cpp/easy/entities/status.hpp>
#include <mastodon-cpp/easy/entity.hpp>
#include <mastodon-cpp/easy/entities/status.hpp>
#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

4
src/easy/entities/emoji.hpp
View File

@ -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 <mastodon-cpp/mastodon-cpp.hpp>
#include <mastodon-cpp/easy/easy.hpp>
#include <mastodon-cpp/easy/entity.hpp>
#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

4
src/easy/entities/instance.hpp
View File

@ -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 <mastodon-cpp/mastodon-cpp.hpp>
#include <mastodon-cpp/easy/easy.hpp>
#include <mastodon-cpp/easy/entities/account.hpp>
#include <mastodon-cpp/easy/entity.hpp>
#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

4
src/easy/entities/list.hpp
View File

@ -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 <mastodon-cpp/mastodon-cpp.hpp>
#include <mastodon-cpp/easy/easy.hpp>
#include <mastodon-cpp/easy/entity.hpp>
#endif
@ -49,7 +47,7 @@ namespace Easy
public:
using Entity::Entity;
virtual bool valid() const;
virtual bool valid() const override;
/*!
* @brief Returns list-ID

4
src/easy/entities/mention.hpp
View File

@ -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 <mastodon-cpp/mastodon-cpp.hpp>
#include <mastodon-cpp/easy/easy.hpp>
#include <mastodon-cpp/easy/entity.hpp>
#endif
@ -49,7 +47,7 @@ namespace Easy
public:
using Entity::Entity;
virtual bool valid() const;
virtual bool valid() const override;
/*!
* @brief Returns acct

4
src/easy/entities/notification.hpp
View File

@ -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 <mastodon-cpp/mastodon-cpp.hpp>
#include <mastodon-cpp/easy/easy.hpp>
#include <mastodon-cpp/easy/entities/account.hpp>
#include <mastodon-cpp/easy/entities/status.hpp>
#include <mastodon-cpp/easy/entity.hpp>
@ -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

4
src/easy/entities/pushsubscription.hpp
View File

@ -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 <mastodon-cpp/mastodon-cpp.hpp>
#include <mastodon-cpp/easy/easy.hpp>
#include <mastodon-cpp/easy/entity.hpp>
#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

4
src/easy/entities/relationship.hpp
View File

@ -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 <mastodon-cpp/mastodon-cpp.hpp>
#include <mastodon-cpp/easy/easy.hpp>
#include <mastodon-cpp/easy/entity.hpp>
#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

4
src/easy/entities/report.hpp
View File

@ -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 <mastodon-cpp/mastodon-cpp.hpp>
#include <mastodon-cpp/easy/easy.hpp>
#include <mastodon-cpp/easy/entity.hpp>
#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

8
src/easy/entities/results.hpp
View File

@ -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 <mastodon-cpp/mastodon-cpp.hpp>
#include <mastodon-cpp/easy/easy.hpp>
#include <mastodon-cpp/easy/entity.hpp>
#include <mastodon-cpp/easy/entities/account.hpp>
#include <mastodon-cpp/easy/entities/status.hpp>
#include <mastodon-cpp/easy/entities/tag.hpp>
#include <mastodon-cpp/easy/entity.hpp>
#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

8
src/easy/entities/status.hpp
View File

@ -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 <mastodon-cpp/mastodon-cpp.hpp>
#include <mastodon-cpp/easy/easy.hpp>
#include <mastodon-cpp/easy/entity.hpp>
#include <mastodon-cpp/easy/entities/account.hpp>
#include <mastodon-cpp/easy/entities/emoji.hpp>
#include <mastodon-cpp/easy/entities/attachment.hpp>
@ -43,7 +42,6 @@
#include <mastodon-cpp/easy/entities/tag.hpp>
#include <mastodon-cpp/easy/entities/application.hpp>
#include <mastodon-cpp/easy/entities/card.hpp>
#include <mastodon-cpp/easy/entity.hpp>
#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.

6
src/easy/entities/tag.hpp
View File

@ -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 <mastodon-cpp/mastodon-cpp.hpp>
#include <mastodon-cpp/easy/easy.hpp>
#include <mastodon-cpp/easy/entity.hpp>
#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