aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoman Plášil <me@rplasil.name>2017-02-13 18:26:33 +0800
committerRoman Plášil <me@rplasil.name>2017-06-02 16:23:43 +0800
commit6e80ef5b5776eb09f14b6815c2f4d6dbec69dffd (patch)
tree6430780d5200e7fdeda2efda83e2ad51ffe02736
parent36dbba9c543b819aec526f18c33f1d95b0ee61c7 (diff)
downloadlibquotient-6e80ef5b5776eb09f14b6815c2f4d6dbec69dffd.tar.gz
libquotient-6e80ef5b5776eb09f14b6815c2f4d6dbec69dffd.zip
Fix qmake compilation
-rw-r--r--libqmatrixclient.pri15
-rw-r--r--room.cpp2
2 files changed, 8 insertions, 9 deletions
diff --git a/libqmatrixclient.pri b/libqmatrixclient.pri
index b5155f96..d2d4c088 100644
--- a/libqmatrixclient.pri
+++ b/libqmatrixclient.pri
@@ -8,7 +8,6 @@ HEADERS += \
$$PWD/connection.h \
$$PWD/room.h \
$$PWD/user.h \
- $$PWD/logmessage.h \
$$PWD/state.h \
$$PWD/events/event.h \
$$PWD/events/roommessageevent.h \
@@ -19,7 +18,6 @@ HEADERS += \
$$PWD/events/roomtopicevent.h \
$$PWD/events/typingevent.h \
$$PWD/events/receiptevent.h \
- $$PWD/events/unknownevent.h \
$$PWD/jobs/basejob.h \
$$PWD/jobs/checkauthmethods.h \
$$PWD/jobs/passwordlogin.h \
@@ -27,19 +25,18 @@ HEADERS += \
$$PWD/jobs/postreceiptjob.h \
$$PWD/jobs/joinroomjob.h \
$$PWD/jobs/leaveroomjob.h \
- $$PWD/jobs/roommembersjob.h \
$$PWD/jobs/roommessagesjob.h \
$$PWD/jobs/syncjob.h \
$$PWD/jobs/mediathumbnailjob.h \
- $$PWD/jobs/logoutjob.h
+ $$PWD/jobs/logoutjob.h \
+ $$PWD/logging.h \
+ $$PWD/settings.h
SOURCES += \
$$PWD/connectiondata.cpp \
$$PWD/connection.cpp \
$$PWD/room.cpp \
$$PWD/user.cpp \
- $$PWD/logmessage.cpp \
- $$PWD/state.cpp \
$$PWD/events/event.cpp \
$$PWD/events/roommessageevent.cpp \
$$PWD/events/roomnameevent.cpp \
@@ -49,7 +46,6 @@ SOURCES += \
$$PWD/events/roomtopicevent.cpp \
$$PWD/events/typingevent.cpp \
$$PWD/events/receiptevent.cpp \
- $$PWD/events/unknownevent.cpp \
$$PWD/jobs/basejob.cpp \
$$PWD/jobs/checkauthmethods.cpp \
$$PWD/jobs/passwordlogin.cpp \
@@ -57,8 +53,9 @@ SOURCES += \
$$PWD/jobs/postreceiptjob.cpp \
$$PWD/jobs/joinroomjob.cpp \
$$PWD/jobs/leaveroomjob.cpp \
- $$PWD/jobs/roommembersjob.cpp \
$$PWD/jobs/roommessagesjob.cpp \
$$PWD/jobs/syncjob.cpp \
$$PWD/jobs/mediathumbnailjob.cpp \
- $$PWD/jobs/logoutjob.cpp
+ $$PWD/jobs/logoutjob.cpp \
+ $$PWD/logging.cpp \
+ $$PWD/settings.cpp
diff --git a/room.cpp b/room.cpp
index 6c22b338..9d501556 100644
--- a/room.cpp
+++ b/room.cpp
@@ -24,6 +24,8 @@
#include <QtCore/QJsonArray>
#include <QtCore/QStringBuilder> // for efficient string concats (operator%)
#include <QtCore/QElapsedTimer>
+#include <algorithm>
+#include <array>
#include "connection.h"
#include "state.h"