Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

style: change two namespace on one line to dpp::event #925

Merged
merged 7 commits into from
Oct 6, 2023
Merged

style: change two namespace on one line to dpp::event #925

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
42f3c7a
style: change two namespace on one line to dpp::event
braindigitalis Oct 5, 2023
b2c303c
refactor: forward declaration of class not needed
braindigitalis Oct 5, 2023
2ec8f13
fix double namespace
braindigitalis Oct 5, 2023
00fcf60
Merge branch 'dev' of github.com:brainboxdotcc/DPP into deep_namespaces
braindigitalis Oct 5, 2023
fa3c3ad
refactor, style: unindent utility.h and utility.cpp and fix a broken …
braindigitalis Oct 5, 2023
aa34d14
fix codacy warnings
braindigitalis Oct 5, 2023
9fa7cb2
fix: new urlencoding failed unit test
braindigitalis Oct 5, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 3 additions & 8 deletions include/dpp/event.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,17 +25,13 @@
#include <dpp/json_fwd.h>

#define event_decl(x,wstype) /** @brief Internal event handler for wstype websocket events. Called for each websocket message of this type. @internal */ \
class x : public event { public: virtual void handle(dpp::discord_client* client, nlohmann::json &j, const std::string &raw); };

namespace dpp {

class discord_client;
class x : public event { public: virtual void handle(class dpp::discord_client* client, nlohmann::json &j, const std::string &raw); };

/**
* @brief The events namespace holds the internal event handlers for each websocket event.
* These are handled internally and also dispatched to the user code if the event is hooked.
*/
namespace events {
namespace dpp::events {

/**
* @brief An event object represents an event handled internally, passed from the websocket e.g. MESSAGE_CREATE.
Expand Down Expand Up @@ -152,5 +148,4 @@ event_decl(automod_rule_execute, AUTO_MODERATION_ACTION_EXECUTION);
/* Audit log */
event_decl(guild_audit_log_entry_create, GUILD_AUDIT_LOG_ENTRY_CREATE);

} // namespace events
} // namespace dpp
} // namespace dpp::events
Loading
Loading