diff options
| author | oldmud0 <oldmud0@users.noreply.github.com> | 2020-05-02 21:29:06 -0500 |
|---|---|---|
| committer | oldmud0 <oldmud0@users.noreply.github.com> | 2020-05-02 21:29:06 -0500 |
| commit | bbdad2a40d8f02fe738830d9cf66ad4ec2fa86cf (patch) | |
| tree | 8e8892d24684f005b0e18624677957791e1738b7 /include/discord_rich_presence.h | |
| parent | 1e2d71fb96ca85fa50c172c2f1cf22b2620bacd2 (diff) | |
| parent | 992c0b14e155059a7e22ad72c0309b620c850a46 (diff) | |
Merge branch '2.7-rc'
Includes full code reformat.
# Conflicts:
# src/aomusicplayer.cpp
# src/path_functions.cpp
Diffstat (limited to 'include/discord_rich_presence.h')
| -rw-r--r-- | include/discord_rich_presence.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/include/discord_rich_presence.h b/include/discord_rich_presence.h index 4115b51..71c85e2 100644 --- a/include/discord_rich_presence.h +++ b/include/discord_rich_presence.h @@ -1,11 +1,11 @@ #ifndef DISCORD_RICH_PRESENCE_H #define DISCORD_RICH_PRESENCE_H +#include <QCoreApplication> +#include <QDebug> #include <cstring> #include <ctime> -#include <QDebug> #include <string> -#include <QCoreApplication> #include <discord-rpc.h> @@ -16,14 +16,14 @@ namespace AttorneyOnline { -class Discord -{ +class Discord { Q_DECLARE_TR_FUNCTIONS(Discord) private: - const char* APPLICATION_ID = "399779271737868288"; + const char *APPLICATION_ID = "399779271737868288"; std::string server_name, server_id; int64_t timestamp; + public: Discord(); ~Discord(); @@ -34,5 +34,5 @@ public: void state_spectate(); }; -} +} // namespace AttorneyOnline #endif // DISCORD_RICH_PRESENCE_H |