From f951ab8a931c68f61b9710a540b2c971bbf502ca Mon Sep 17 00:00:00 2001 From: Kitsune Ral Date: Wed, 3 Jan 2018 12:11:16 +0900 Subject: jobs/generated: Polish formatting; other minor cleanup --- jobs/generated/administrative_contact.cpp | 8 +------- jobs/generated/administrative_contact.h | 8 ++++---- jobs/generated/banning.cpp | 1 - jobs/generated/banning.h | 1 - jobs/generated/directory.cpp | 6 +----- jobs/generated/directory.h | 7 +++---- jobs/generated/inviting.cpp | 1 - jobs/generated/inviting.h | 1 - jobs/generated/kicking.cpp | 1 - jobs/generated/kicking.h | 1 - jobs/generated/leaving.cpp | 1 - jobs/generated/leaving.h | 1 - jobs/generated/list_public_rooms.cpp | 13 ++----------- jobs/generated/list_public_rooms.h | 13 ++++++------- jobs/generated/login.cpp | 6 +----- jobs/generated/login.h | 7 +++---- jobs/generated/logout.cpp | 1 - jobs/generated/logout.h | 1 - jobs/generated/profile.cpp | 16 +++------------- jobs/generated/profile.h | 19 +++++++++---------- jobs/generated/receipts.cpp | 1 - jobs/generated/receipts.h | 1 - jobs/generated/redaction.cpp | 6 +----- jobs/generated/redaction.h | 7 +++---- jobs/generated/third_party_membership.cpp | 1 - jobs/generated/third_party_membership.h | 1 - jobs/generated/typing.cpp | 1 - jobs/generated/typing.h | 1 - jobs/generated/versions.cpp | 6 +----- jobs/generated/versions.h | 7 +++---- jobs/generated/whoami.cpp | 6 +----- jobs/generated/whoami.h | 7 +++---- 32 files changed, 45 insertions(+), 113 deletions(-) (limited to 'jobs') diff --git a/jobs/generated/administrative_contact.cpp b/jobs/generated/administrative_contact.cpp index 705c5d54..ca029f58 100644 --- a/jobs/generated/administrative_contact.cpp +++ b/jobs/generated/administrative_contact.cpp @@ -2,11 +2,8 @@ * THIS FILE IS GENERATED - ANY EDITS WILL BE OVERWRITTEN */ - #include "administrative_contact.h" -#include "converters.h" - #include using namespace QMatrixClient; @@ -52,10 +49,7 @@ GetAccount3PIDsJob::GetAccount3PIDsJob() ), d(new Private) { } -GetAccount3PIDsJob::~GetAccount3PIDsJob() -{ - delete d; -} +GetAccount3PIDsJob::~GetAccount3PIDsJob() = default; const QVector& GetAccount3PIDsJob::threepids() const { diff --git a/jobs/generated/administrative_contact.h b/jobs/generated/administrative_contact.h index fa6beba9..a5f04781 100644 --- a/jobs/generated/administrative_contact.h +++ b/jobs/generated/administrative_contact.h @@ -2,12 +2,12 @@ * THIS FILE IS GENERATED - ANY EDITS WILL BE OVERWRITTEN */ - #pragma once #include "../basejob.h" #include +#include #include "converters.h" @@ -34,13 +34,13 @@ namespace QMatrixClient ~GetAccount3PIDsJob() override; const QVector& threepids() const; - + protected: Status parseJson(const QJsonDocument& data) override; - + private: class Private; - Private* d; + QScopedPointer d; }; class Post3PIDsJob : public BaseJob diff --git a/jobs/generated/banning.cpp b/jobs/generated/banning.cpp index 96f80ea8..d7708cc6 100644 --- a/jobs/generated/banning.cpp +++ b/jobs/generated/banning.cpp @@ -2,7 +2,6 @@ * THIS FILE IS GENERATED - ANY EDITS WILL BE OVERWRITTEN */ - #include "banning.h" #include "converters.h" diff --git a/jobs/generated/banning.h b/jobs/generated/banning.h index 6db096ee..930020a5 100644 --- a/jobs/generated/banning.h +++ b/jobs/generated/banning.h @@ -2,7 +2,6 @@ * THIS FILE IS GENERATED - ANY EDITS WILL BE OVERWRITTEN */ - #pragma once #include "../basejob.h" diff --git a/jobs/generated/directory.cpp b/jobs/generated/directory.cpp index dcec75ac..1fd1e443 100644 --- a/jobs/generated/directory.cpp +++ b/jobs/generated/directory.cpp @@ -2,7 +2,6 @@ * THIS FILE IS GENERATED - ANY EDITS WILL BE OVERWRITTEN */ - #include "directory.h" #include "converters.h" @@ -39,10 +38,7 @@ GetRoomIdByAliasJob::GetRoomIdByAliasJob(const QString& roomAlias) ), d(new Private) { } -GetRoomIdByAliasJob::~GetRoomIdByAliasJob() -{ - delete d; -} +GetRoomIdByAliasJob::~GetRoomIdByAliasJob() = default; const QString& GetRoomIdByAliasJob::roomId() const { diff --git a/jobs/generated/directory.h b/jobs/generated/directory.h index 1dd4e7ed..8290a2b5 100644 --- a/jobs/generated/directory.h +++ b/jobs/generated/directory.h @@ -2,7 +2,6 @@ * THIS FILE IS GENERATED - ANY EDITS WILL BE OVERWRITTEN */ - #pragma once #include "../basejob.h" @@ -29,13 +28,13 @@ namespace QMatrixClient const QString& roomId() const; const QVector& servers() const; - + protected: Status parseJson(const QJsonDocument& data) override; - + private: class Private; - Private* d; + QScopedPointer d; }; class DeleteRoomAliasJob : public BaseJob diff --git a/jobs/generated/inviting.cpp b/jobs/generated/inviting.cpp index 5f89adf7..bdf257dd 100644 --- a/jobs/generated/inviting.cpp +++ b/jobs/generated/inviting.cpp @@ -2,7 +2,6 @@ * THIS FILE IS GENERATED - ANY EDITS WILL BE OVERWRITTEN */ - #include "inviting.h" #include "converters.h" diff --git a/jobs/generated/inviting.h b/jobs/generated/inviting.h index 225cb516..7ed49637 100644 --- a/jobs/generated/inviting.h +++ b/jobs/generated/inviting.h @@ -2,7 +2,6 @@ * THIS FILE IS GENERATED - ANY EDITS WILL BE OVERWRITTEN */ - #pragma once #include "../basejob.h" diff --git a/jobs/generated/kicking.cpp b/jobs/generated/kicking.cpp index 86dde629..3488b387 100644 --- a/jobs/generated/kicking.cpp +++ b/jobs/generated/kicking.cpp @@ -2,7 +2,6 @@ * THIS FILE IS GENERATED - ANY EDITS WILL BE OVERWRITTEN */ - #include "kicking.h" #include "converters.h" diff --git a/jobs/generated/kicking.h b/jobs/generated/kicking.h index 7c834e45..84d88945 100644 --- a/jobs/generated/kicking.h +++ b/jobs/generated/kicking.h @@ -2,7 +2,6 @@ * THIS FILE IS GENERATED - ANY EDITS WILL BE OVERWRITTEN */ - #pragma once #include "../basejob.h" diff --git a/jobs/generated/leaving.cpp b/jobs/generated/leaving.cpp index 2cf7fda3..604fcc73 100644 --- a/jobs/generated/leaving.cpp +++ b/jobs/generated/leaving.cpp @@ -2,7 +2,6 @@ * THIS FILE IS GENERATED - ANY EDITS WILL BE OVERWRITTEN */ - #include "leaving.h" #include "converters.h" diff --git a/jobs/generated/leaving.h b/jobs/generated/leaving.h index 28ba3d92..f006ce19 100644 --- a/jobs/generated/leaving.h +++ b/jobs/generated/leaving.h @@ -2,7 +2,6 @@ * THIS FILE IS GENERATED - ANY EDITS WILL BE OVERWRITTEN */ - #pragma once #include "../basejob.h" diff --git a/jobs/generated/list_public_rooms.cpp b/jobs/generated/list_public_rooms.cpp index 8a96966f..d15e9de3 100644 --- a/jobs/generated/list_public_rooms.cpp +++ b/jobs/generated/list_public_rooms.cpp @@ -2,11 +2,8 @@ * THIS FILE IS GENERATED - ANY EDITS WILL BE OVERWRITTEN */ - #include "list_public_rooms.h" -#include "converters.h" - #include using namespace QMatrixClient; @@ -80,10 +77,7 @@ GetPublicRoomsJob::GetPublicRoomsJob(double limit, const QString& since, const Q ), d(new Private) { } -GetPublicRoomsJob::~GetPublicRoomsJob() -{ - delete d; -} +GetPublicRoomsJob::~GetPublicRoomsJob() = default; const QVector& GetPublicRoomsJob::chunk() const { @@ -213,10 +207,7 @@ QueryPublicRoomsJob::QueryPublicRoomsJob(const QString& server, double limit, co setRequestData(_data); } -QueryPublicRoomsJob::~QueryPublicRoomsJob() -{ - delete d; -} +QueryPublicRoomsJob::~QueryPublicRoomsJob() = default; const QVector& QueryPublicRoomsJob::chunk() const { diff --git a/jobs/generated/list_public_rooms.h b/jobs/generated/list_public_rooms.h index 74dd8626..f6467a21 100644 --- a/jobs/generated/list_public_rooms.h +++ b/jobs/generated/list_public_rooms.h @@ -2,7 +2,6 @@ * THIS FILE IS GENERATED - ANY EDITS WILL BE OVERWRITTEN */ - #pragma once #include "../basejob.h" @@ -45,13 +44,13 @@ namespace QMatrixClient const QString& nextBatch() const; const QString& prevBatch() const; double totalRoomCountEstimate() const; - + protected: Status parseJson(const QJsonDocument& data) override; - + private: class Private; - Private* d; + QScopedPointer d; }; class QueryPublicRoomsJob : public BaseJob @@ -90,12 +89,12 @@ namespace QMatrixClient const QString& nextBatch() const; const QString& prevBatch() const; double totalRoomCountEstimate() const; - + protected: Status parseJson(const QJsonDocument& data) override; - + private: class Private; - Private* d; + QScopedPointer d; }; } // namespace QMatrixClient diff --git a/jobs/generated/login.cpp b/jobs/generated/login.cpp index 4c159517..bbfff0da 100644 --- a/jobs/generated/login.cpp +++ b/jobs/generated/login.cpp @@ -2,7 +2,6 @@ * THIS FILE IS GENERATED - ANY EDITS WILL BE OVERWRITTEN */ - #include "login.h" #include "converters.h" @@ -47,10 +46,7 @@ LoginJob::LoginJob(const QString& type, const QString& user, const QString& medi setRequestData(_data); } -LoginJob::~LoginJob() -{ - delete d; -} +LoginJob::~LoginJob() = default; const QString& LoginJob::userId() const { diff --git a/jobs/generated/login.h b/jobs/generated/login.h index 1c017877..0f68a13b 100644 --- a/jobs/generated/login.h +++ b/jobs/generated/login.h @@ -2,7 +2,6 @@ * THIS FILE IS GENERATED - ANY EDITS WILL BE OVERWRITTEN */ - #pragma once #include "../basejob.h" @@ -24,12 +23,12 @@ namespace QMatrixClient const QString& accessToken() const; const QString& homeServer() const; const QString& deviceId() const; - + protected: Status parseJson(const QJsonDocument& data) override; - + private: class Private; - Private* d; + QScopedPointer d; }; } // namespace QMatrixClient diff --git a/jobs/generated/logout.cpp b/jobs/generated/logout.cpp index c250bddf..b6904070 100644 --- a/jobs/generated/logout.cpp +++ b/jobs/generated/logout.cpp @@ -2,7 +2,6 @@ * THIS FILE IS GENERATED - ANY EDITS WILL BE OVERWRITTEN */ - #include "logout.h" #include "converters.h" diff --git a/jobs/generated/logout.h b/jobs/generated/logout.h index ae9e54b8..d2b85db5 100644 --- a/jobs/generated/logout.h +++ b/jobs/generated/logout.h @@ -2,7 +2,6 @@ * THIS FILE IS GENERATED - ANY EDITS WILL BE OVERWRITTEN */ - #pragma once #include "../basejob.h" diff --git a/jobs/generated/profile.cpp b/jobs/generated/profile.cpp index 6ec566f7..27bab0b8 100644 --- a/jobs/generated/profile.cpp +++ b/jobs/generated/profile.cpp @@ -2,7 +2,6 @@ * THIS FILE IS GENERATED - ANY EDITS WILL BE OVERWRITTEN */ - #include "profile.h" #include "converters.h" @@ -38,10 +37,7 @@ GetDisplayNameJob::GetDisplayNameJob(const QString& userId) ), d(new Private) { } -GetDisplayNameJob::~GetDisplayNameJob() -{ - delete d; -} +GetDisplayNameJob::~GetDisplayNameJob() = default; const QString& GetDisplayNameJob::displayname() const { @@ -80,10 +76,7 @@ GetAvatarUrlJob::GetAvatarUrlJob(const QString& userId) ), d(new Private) { } -GetAvatarUrlJob::~GetAvatarUrlJob() -{ - delete d; -} +GetAvatarUrlJob::~GetAvatarUrlJob() = default; const QString& GetAvatarUrlJob::avatarUrl() const { @@ -111,10 +104,7 @@ GetUserProfileJob::GetUserProfileJob(const QString& userId) ), d(new Private) { } -GetUserProfileJob::~GetUserProfileJob() -{ - delete d; -} +GetUserProfileJob::~GetUserProfileJob() = default; const QString& GetUserProfileJob::avatarUrl() const { diff --git a/jobs/generated/profile.h b/jobs/generated/profile.h index 30e858de..9cbf3865 100644 --- a/jobs/generated/profile.h +++ b/jobs/generated/profile.h @@ -2,7 +2,6 @@ * THIS FILE IS GENERATED - ANY EDITS WILL BE OVERWRITTEN */ - #pragma once #include "../basejob.h" @@ -27,13 +26,13 @@ namespace QMatrixClient ~GetDisplayNameJob() override; const QString& displayname() const; - + protected: Status parseJson(const QJsonDocument& data) override; - + private: class Private; - Private* d; + QScopedPointer d; }; class SetAvatarUrlJob : public BaseJob @@ -49,13 +48,13 @@ namespace QMatrixClient ~GetAvatarUrlJob() override; const QString& avatarUrl() const; - + protected: Status parseJson(const QJsonDocument& data) override; - + private: class Private; - Private* d; + QScopedPointer d; }; class GetUserProfileJob : public BaseJob @@ -66,12 +65,12 @@ namespace QMatrixClient const QString& avatarUrl() const; const QString& displayname() const; - + protected: Status parseJson(const QJsonDocument& data) override; - + private: class Private; - Private* d; + QScopedPointer d; }; } // namespace QMatrixClient diff --git a/jobs/generated/receipts.cpp b/jobs/generated/receipts.cpp index 2820b583..1c8bd80f 100644 --- a/jobs/generated/receipts.cpp +++ b/jobs/generated/receipts.cpp @@ -2,7 +2,6 @@ * THIS FILE IS GENERATED - ANY EDITS WILL BE OVERWRITTEN */ - #include "receipts.h" #include "converters.h" diff --git a/jobs/generated/receipts.h b/jobs/generated/receipts.h index 6f36d7fc..e4065ddb 100644 --- a/jobs/generated/receipts.h +++ b/jobs/generated/receipts.h @@ -2,7 +2,6 @@ * THIS FILE IS GENERATED - ANY EDITS WILL BE OVERWRITTEN */ - #pragma once #include "../basejob.h" diff --git a/jobs/generated/redaction.cpp b/jobs/generated/redaction.cpp index a9b8ed7e..9207f344 100644 --- a/jobs/generated/redaction.cpp +++ b/jobs/generated/redaction.cpp @@ -2,7 +2,6 @@ * THIS FILE IS GENERATED - ANY EDITS WILL BE OVERWRITTEN */ - #include "redaction.h" #include "converters.h" @@ -31,10 +30,7 @@ RedactEventJob::RedactEventJob(const QString& roomId, const QString& eventId, co setRequestData(_data); } -RedactEventJob::~RedactEventJob() -{ - delete d; -} +RedactEventJob::~RedactEventJob() = default; const QString& RedactEventJob::eventId() const { diff --git a/jobs/generated/redaction.h b/jobs/generated/redaction.h index 600e0daa..0a68f8cd 100644 --- a/jobs/generated/redaction.h +++ b/jobs/generated/redaction.h @@ -2,7 +2,6 @@ * THIS FILE IS GENERATED - ANY EDITS WILL BE OVERWRITTEN */ - #pragma once #include "../basejob.h" @@ -21,12 +20,12 @@ namespace QMatrixClient ~RedactEventJob() override; const QString& eventId() const; - + protected: Status parseJson(const QJsonDocument& data) override; - + private: class Private; - Private* d; + QScopedPointer d; }; } // namespace QMatrixClient diff --git a/jobs/generated/third_party_membership.cpp b/jobs/generated/third_party_membership.cpp index 7a2aa4f4..dbb3ebee 100644 --- a/jobs/generated/third_party_membership.cpp +++ b/jobs/generated/third_party_membership.cpp @@ -2,7 +2,6 @@ * THIS FILE IS GENERATED - ANY EDITS WILL BE OVERWRITTEN */ - #include "third_party_membership.h" #include "converters.h" diff --git a/jobs/generated/third_party_membership.h b/jobs/generated/third_party_membership.h index 6c1193ed..b1669795 100644 --- a/jobs/generated/third_party_membership.h +++ b/jobs/generated/third_party_membership.h @@ -2,7 +2,6 @@ * THIS FILE IS GENERATED - ANY EDITS WILL BE OVERWRITTEN */ - #pragma once #include "../basejob.h" diff --git a/jobs/generated/typing.cpp b/jobs/generated/typing.cpp index 44bbb131..a6817cb9 100644 --- a/jobs/generated/typing.cpp +++ b/jobs/generated/typing.cpp @@ -2,7 +2,6 @@ * THIS FILE IS GENERATED - ANY EDITS WILL BE OVERWRITTEN */ - #include "typing.h" #include "converters.h" diff --git a/jobs/generated/typing.h b/jobs/generated/typing.h index e20bca1a..6eb3ddf4 100644 --- a/jobs/generated/typing.h +++ b/jobs/generated/typing.h @@ -2,7 +2,6 @@ * THIS FILE IS GENERATED - ANY EDITS WILL BE OVERWRITTEN */ - #pragma once #include "../basejob.h" diff --git a/jobs/generated/versions.cpp b/jobs/generated/versions.cpp index 66b31290..8ff58365 100644 --- a/jobs/generated/versions.cpp +++ b/jobs/generated/versions.cpp @@ -2,7 +2,6 @@ * THIS FILE IS GENERATED - ANY EDITS WILL BE OVERWRITTEN */ - #include "versions.h" #include "converters.h" @@ -26,10 +25,7 @@ GetVersionsJob::GetVersionsJob() ), d(new Private) { } -GetVersionsJob::~GetVersionsJob() -{ - delete d; -} +GetVersionsJob::~GetVersionsJob() = default; const QVector& GetVersionsJob::versions() const { diff --git a/jobs/generated/versions.h b/jobs/generated/versions.h index eab8cf9e..a7add8ba 100644 --- a/jobs/generated/versions.h +++ b/jobs/generated/versions.h @@ -2,7 +2,6 @@ * THIS FILE IS GENERATED - ANY EDITS WILL BE OVERWRITTEN */ - #pragma once #include "../basejob.h" @@ -22,12 +21,12 @@ namespace QMatrixClient ~GetVersionsJob() override; const QVector& versions() const; - + protected: Status parseJson(const QJsonDocument& data) override; - + private: class Private; - Private* d; + QScopedPointer d; }; } // namespace QMatrixClient diff --git a/jobs/generated/whoami.cpp b/jobs/generated/whoami.cpp index dce091ec..d4da99d4 100644 --- a/jobs/generated/whoami.cpp +++ b/jobs/generated/whoami.cpp @@ -2,7 +2,6 @@ * THIS FILE IS GENERATED - ANY EDITS WILL BE OVERWRITTEN */ - #include "whoami.h" #include "converters.h" @@ -26,10 +25,7 @@ GetTokenOwnerJob::GetTokenOwnerJob() ), d(new Private) { } -GetTokenOwnerJob::~GetTokenOwnerJob() -{ - delete d; -} +GetTokenOwnerJob::~GetTokenOwnerJob() = default; const QString& GetTokenOwnerJob::userId() const { diff --git a/jobs/generated/whoami.h b/jobs/generated/whoami.h index 1b04f337..21cb1a17 100644 --- a/jobs/generated/whoami.h +++ b/jobs/generated/whoami.h @@ -2,7 +2,6 @@ * THIS FILE IS GENERATED - ANY EDITS WILL BE OVERWRITTEN */ - #pragma once #include "../basejob.h" @@ -21,12 +20,12 @@ namespace QMatrixClient ~GetTokenOwnerJob() override; const QString& userId() const; - + protected: Status parseJson(const QJsonDocument& data) override; - + private: class Private; - Private* d; + QScopedPointer d; }; } // namespace QMatrixClient -- cgit v1.2.3