diff options
| author | Kitsune Ral <Kitsune-Ral@users.sf.net> | 2017-05-07 20:02:34 +0900 |
|---|---|---|
| committer | Kitsune Ral <Kitsune-Ral@users.sf.net> | 2017-05-09 05:28:55 +0900 |
| commit | 5038ae0a0099c2a5c6ffdd08734b597d92edac70 (patch) | |
| tree | 71cd52d90d566fb1b3671806b6e3b57da73f43bf /events | |
| parent | 098a3855650c16f08df1e24139cd0cbac9b112c2 (diff) | |
| download | libquotient-5038ae0a0099c2a5c6ffdd08734b597d92edac70.tar.gz libquotient-5038ae0a0099c2a5c6ffdd08734b597d92edac70.zip | |
Code cleanup and tweaking (partially driven by clang-tidy)
Mainly it's about const-ification (in particular, passing const-refs instead of values) and deleting unneeded declarations/#includes. Since the changes alter the external interface, this is submitted as a PR for peer review.
One of unneeded declarations/definitions is a virtual destructor in BaseJob descendants. Since a job object should be deleted through QObject::deleteLater() anyway (and it's the only correct way of disposing of the object), all deletions will call the stack of destructors through virtual QObject::~QObject(). Therefore even BaseJob could get on with a non-virtual destructor but for the sake of clarity BaseJob::~BaseJob() is still declared virtual.
Diffstat (limited to 'events')
| -rw-r--r-- | events/receiptevent.h | 2 | ||||
| -rw-r--r-- | events/roommemberevent.h | 5 | ||||
| -rw-r--r-- | events/roommessageevent.h | 4 | ||||
| -rw-r--r-- | events/roomnameevent.cpp | 4 | ||||
| -rw-r--r-- | events/roomnameevent.h | 24 | ||||
| -rw-r--r-- | events/roomtopicevent.h | 2 | ||||
| -rw-r--r-- | events/typingevent.h | 4 |
7 files changed, 19 insertions, 26 deletions
diff --git a/events/receiptevent.h b/events/receiptevent.h index a7e1debf..40c0384f 100644 --- a/events/receiptevent.h +++ b/events/receiptevent.h @@ -20,8 +20,6 @@ #include "event.h" -#include <QtCore/QStringList> - namespace QMatrixClient { class Receipt diff --git a/events/roommemberevent.h b/events/roommemberevent.h index f37cdc04..a33c2982 100644 --- a/events/roommemberevent.h +++ b/events/roommemberevent.h @@ -18,11 +18,10 @@ #pragma once -#include <QtCore/QJsonObject> -#include <QtCore/QUrl> - #include "event.h" +#include <QtCore/QUrl> + namespace QMatrixClient { enum class MembershipType {Invite, Join, Knock, Leave, Ban}; diff --git a/events/roommessageevent.h b/events/roommessageevent.h index 67789ef7..5d5336aa 100644 --- a/events/roommessageevent.h +++ b/events/roommessageevent.h @@ -18,12 +18,12 @@ #pragma once +#include "event.h" + #include <QtCore/QUrl> #include <QtCore/QMimeType> #include <QtCore/QSize> -#include "event.h" - namespace QMatrixClient { enum class MessageEventType diff --git a/events/roomnameevent.cpp b/events/roomnameevent.cpp index c5bcf011..c94cb2c3 100644 --- a/events/roomnameevent.cpp +++ b/events/roomnameevent.cpp @@ -22,8 +22,8 @@ using namespace QMatrixClient; class RoomNameEvent::Private
{
-public:
- QString name;
+ public:
+ QString name;
};
RoomNameEvent::RoomNameEvent() :
diff --git a/events/roomnameevent.h b/events/roomnameevent.h index 0997ad9c..8748c4be 100644 --- a/events/roomnameevent.h +++ b/events/roomnameevent.h @@ -22,20 +22,18 @@ namespace QMatrixClient
{
+ class RoomNameEvent : public Event
+ {
+ public:
+ RoomNameEvent();
+ virtual ~RoomNameEvent();
-class RoomNameEvent : public Event
-{
-public:
- RoomNameEvent();
- virtual ~RoomNameEvent();
-
- QString name() const;
-
- static RoomNameEvent* fromJson(const QJsonObject& obj);
+ QString name() const;
-private:
- class Private;
- Private *d;
-};
+ static RoomNameEvent* fromJson(const QJsonObject& obj);
+ private:
+ class Private;
+ Private *d;
+ };
}
diff --git a/events/roomtopicevent.h b/events/roomtopicevent.h index d4347953..4b0a24b0 100644 --- a/events/roomtopicevent.h +++ b/events/roomtopicevent.h @@ -18,8 +18,6 @@ #pragma once -#include <QtCore/QJsonObject> - #include "event.h" namespace QMatrixClient diff --git a/events/typingevent.h b/events/typingevent.h index 5a8b045c..da57a389 100644 --- a/events/typingevent.h +++ b/events/typingevent.h @@ -18,10 +18,10 @@ #pragma once -#include <QtCore/QStringList> - #include "event.h" +#include <QtCore/QStringList> + namespace QMatrixClient { class TypingEvent: public Event |