diff options
| author | Kitsune Ral <Kitsune-Ral@users.sf.net> | 2017-12-25 17:20:27 +0900 |
|---|---|---|
| committer | Kitsune Ral <Kitsune-Ral@users.sf.net> | 2017-12-25 17:20:27 +0900 |
| commit | 7ef5d0b10ae214f7c58aa77fb84547be1388f2d6 (patch) | |
| tree | 1b488fed4106dde1f0248da402fdd40bf89de9c9 /room.h | |
| parent | a4a1129385731c3999a6d5986a24fc069938245c (diff) | |
| download | libquotient-7ef5d0b10ae214f7c58aa77fb84547be1388f2d6.tar.gz libquotient-7ef5d0b10ae214f7c58aa77fb84547be1388f2d6.zip | |
Now really switching to the new toolchain: C++14, GCC/Clang 5, Qt 5.6
Also a bit of code tightening with some C++14 (but not only) things.
Diffstat (limited to 'room.h')
| -rw-r--r-- | room.h | 14 |
1 files changed, 7 insertions, 7 deletions
@@ -18,8 +18,9 @@ #pragma once -#include <memory> -#include <deque> +#include "jobs/syncjob.h" +#include "events/roommessageevent.h" +#include "joinstate.h" #include <QtCore/QList> #include <QtCore/QStringList> @@ -27,9 +28,9 @@ #include <QtCore/QJsonObject> #include <QtGui/QPixmap> -#include "jobs/syncjob.h" -#include "events/roommessageevent.h" -#include "joinstate.h" +#include <memory> +#include <deque> +#include <utility> namespace QMatrixClient { @@ -58,8 +59,7 @@ namespace QMatrixClient // Used for event redaction RoomEventPtr replaceEvent(RoomEventPtr&& other) { - evt.swap(other); - return move(other); + return std::exchange(evt, std::move(other)); } private: |