109 files changed, 243 insertions, 350 deletions

diff --git a/.travis.yml b/.travis.yml
index 2a03267e..c0008af0 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -29,10 +29,10 @@ script:
 - cmake -DCMAKE_INSTALL_PREFIX=../install ..
 - cmake --build . --target all
 - cmake --build . --target install
+- cd ../examples
+- $CC qmc-example.cpp -I../install/include -l../install/lib/libqmatrixclient.a -o qmc-example-lib-installed
 - cd ..
-- ls -R install
-- mv lib lib.back # Force the below script to use the installed copy instead
-- qmake qmc-example.pro "CONFIG += debug" "CONFIG -= app_bundle" "QMAKE_CC = $CC" "QMAKE_CXX = $CXX" "INCLUDES += -I./install/include" "LIBS += -L./install/lib"
+- qmake qmc-example.pro "CONFIG += debug" "CONFIG -= app_bundle" "QMAKE_CC = $CC" "QMAKE_CXX = $CXX"
 - make all
 - if [ "$QMC_TEST_USER" != "" ]; then $VALGRIND ./qmc-example "$QMC_TEST_USER" "$QMC_TEST_PWD" qmc-example-travis '#qmc-test:matrix.org' "Travis CI job $TRAVIS_JOB_NUMBER"; fi
 
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3ee2200d..c5511935 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -8,7 +8,7 @@ if (NOT WIN32)
 endif(NOT WIN32)
 
 # Find includes in corresponding build directories
-set(CMAKE_INCLUDE_CURRENT_DIR ON)
+#set(CMAKE_INCLUDE_CURRENT_DIR ON)
 # Instruct CMake to run moc automatically when needed.
 set(CMAKE_AUTOMOC ON)
 
@@ -21,6 +21,18 @@ if(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES)
     "MinSizeRel" "RelWithDebInfo")
 endif()
 
+if (NOT CMAKE_INSTALL_LIBDIR)
+    set(CMAKE_INSTALL_LIBDIR ".")
+endif()
+
+if (NOT CMAKE_INSTALL_BINDIR)
+    set(CMAKE_INSTALL_BINDIR ".")
+endif()
+
+if (NOT CMAKE_INSTALL_INCLUDEDIR)
+    set(CMAKE_INSTALL_INCLUDEDIR "include")
+endif()
+
 set(CMAKE_CXX_STANDARD 14)
 
 foreach (FLAG all "" pedantic extra error=return-type no-unused-parameter no-gnu-zero-variadic-macro-arguments)
@@ -47,36 +59,36 @@ message( STATUS )
 
 # Set up source files
 set(libqmatrixclient_SRCS
-    networkaccessmanager.cpp
-    connectiondata.cpp
-    connection.cpp
-    logging.cpp
-    room.cpp
-    user.cpp
-    avatar.cpp
-    settings.cpp
-    networksettings.cpp
-    events/event.cpp
-    events/eventcontent.cpp
-    events/roommessageevent.cpp
-    events/roommemberevent.cpp
-    events/roomavatarevent.cpp
-    events/typingevent.cpp
-    events/receiptevent.cpp
-    events/directchatevent.cpp
-    jobs/requestdata.cpp
-    jobs/basejob.cpp
-    jobs/checkauthmethods.cpp
-    jobs/sendeventjob.cpp
-    jobs/setroomstatejob.cpp
-    jobs/joinroomjob.cpp
-    jobs/roommessagesjob.cpp
-    jobs/syncjob.cpp
-    jobs/mediathumbnailjob.cpp
-    jobs/downloadfilejob.cpp
+    lib/networkaccessmanager.cpp
+    lib/connectiondata.cpp
+    lib/connection.cpp
+    lib/logging.cpp
+    lib/room.cpp
+    lib/user.cpp
+    lib/avatar.cpp
+    lib/settings.cpp
+    lib/networksettings.cpp
+    lib/events/event.cpp
+    lib/events/eventcontent.cpp
+    lib/events/roommessageevent.cpp
+    lib/events/roommemberevent.cpp
+    lib/events/roomavatarevent.cpp
+    lib/events/typingevent.cpp
+    lib/events/receiptevent.cpp
+    lib/events/directchatevent.cpp
+    lib/jobs/requestdata.cpp
+    lib/jobs/basejob.cpp
+    lib/jobs/checkauthmethods.cpp
+    lib/jobs/sendeventjob.cpp
+    lib/jobs/setroomstatejob.cpp
+    lib/jobs/joinroomjob.cpp
+    lib/jobs/roommessagesjob.cpp
+    lib/jobs/syncjob.cpp
+    lib/jobs/mediathumbnailjob.cpp
+    lib/jobs/downloadfilejob.cpp
 )
 
-aux_source_directory(jobs/generated libqmatrixclient_job_SRCS)
+aux_source_directory(lib/jobs/generated libqmatrixclient_job_SRCS)
 
 set(example_SRCS examples/qmc-example.cpp)
 
@@ -84,34 +96,31 @@ add_library(qmatrixclient ${libqmatrixclient_SRCS} ${libqmatrixclient_job_SRCS})
 set_property(TARGET qmatrixclient PROPERTY VERSION "0.2.0")
 set_property(TARGET qmatrixclient PROPERTY SOVERSION 0 )
 
+target_include_directories(qmatrixclient PUBLIC
+  $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/lib>
+  $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>
+)
+target_include_directories(qmatrixclient PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/lib)
 target_link_libraries(qmatrixclient Qt5::Core Qt5::Network Qt5::Gui)
 
 add_executable(qmc-example ${example_SRCS})
+target_include_directories(qmc-example PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/lib)
 target_link_libraries(qmc-example Qt5::Core qmatrixclient)
 
 # Installation
 
-if (NOT CMAKE_INSTALL_LIBDIR)
-    set(CMAKE_INSTALL_LIBDIR ".")
-endif()
-
-if (NOT CMAKE_INSTALL_BINDIR)
-    set(CMAKE_INSTALL_BINDIR ".")
-endif()
-
-if (NOT CMAKE_INSTALL_INCLUDEDIR)
-    set(CMAKE_INSTALL_INCLUDEDIR "include")
-endif()
-
 install (TARGETS qmatrixclient EXPORT QMatrixClient
          ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
          LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
          INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
-install (DIRECTORY . DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
+install (DIRECTORY lib/ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
          FILES_MATCHING PATTERN "*.h")
 
 install (TARGETS qmc-example RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
 
+#export(TARGETS qmatrixclient FILE QMatrixClientConfig.cmake EXPORT_LINK_INTERFACE_LIBRARIES)
+export(EXPORT QMatrixClient)
+export(PACKAGE QMatrixClient)
 install (EXPORT QMatrixClient DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/qmatrixclient)
 
 if (WIN32)
diff --git a/avatar.cpp b/lib/avatar.cpp
index 1ff2aae1..1ff2aae1 100644
--- a/avatar.cpp
+++ b/lib/avatar.cpp
diff --git a/avatar.h b/lib/avatar.h
index 0166ae9e..0166ae9e 100644
--- a/avatar.h
+++ b/lib/avatar.h
diff --git a/connection.cpp b/lib/connection.cpp
index 2d7235b9..2d7235b9 100644
--- a/connection.cpp
+++ b/lib/connection.cpp
diff --git a/connection.h b/lib/connection.h
index c6d543ec..c6d543ec 100644
--- a/connection.h
+++ b/lib/connection.h
diff --git a/connectiondata.cpp b/lib/connectiondata.cpp
index 4e9bc77e..4e9bc77e 100644
--- a/connectiondata.cpp
+++ b/lib/connectiondata.cpp
diff --git a/connectiondata.h b/lib/connectiondata.h
index 7a2f2e90..7a2f2e90 100644
--- a/connectiondata.h
+++ b/lib/connectiondata.h
diff --git a/converters.h b/lib/converters.h
index bba298e0..bba298e0 100644
--- a/converters.h
+++ b/lib/converters.h
diff --git a/events/accountdataevents.h b/lib/events/accountdataevents.h
index f3ba27bb..f3ba27bb 100644
--- a/events/accountdataevents.h
+++ b/lib/events/accountdataevents.h
diff --git a/events/directchatevent.cpp b/lib/events/directchatevent.cpp
index 7049d967..7049d967 100644
--- a/events/directchatevent.cpp
+++ b/lib/events/directchatevent.cpp
diff --git a/events/directchatevent.h b/lib/events/directchatevent.h
index 2b0ad0a0..2b0ad0a0 100644
--- a/events/directchatevent.h
+++ b/lib/events/directchatevent.h
diff --git a/events/event.cpp b/lib/events/event.cpp
index 8ddf3945..8ddf3945 100644
--- a/events/event.cpp
+++ b/lib/events/event.cpp
diff --git a/events/event.h b/lib/events/event.h
index eccfec41..eccfec41 100644
--- a/events/event.h
+++ b/lib/events/event.h
diff --git a/events/eventcontent.cpp b/lib/events/eventcontent.cpp
index f5974b46..f5974b46 100644
--- a/events/eventcontent.cpp
+++ b/lib/events/eventcontent.cpp
diff --git a/events/eventcontent.h b/lib/events/eventcontent.h
index 9d44aec0..9d44aec0 100644
--- a/events/eventcontent.h
+++ b/lib/events/eventcontent.h
diff --git a/events/receiptevent.cpp b/lib/events/receiptevent.cpp
index 7555db82..7555db82 100644
--- a/events/receiptevent.cpp
+++ b/lib/events/receiptevent.cpp
diff --git a/events/receiptevent.h b/lib/events/receiptevent.h
index 5b99ae3f..5b99ae3f 100644
--- a/events/receiptevent.h
+++ b/lib/events/receiptevent.h
diff --git a/events/redactionevent.cpp b/lib/events/redactionevent.cpp
index bf467718..bf467718 100644
--- a/events/redactionevent.cpp
+++ b/lib/events/redactionevent.cpp
diff --git a/events/redactionevent.h b/lib/events/redactionevent.h
index fa6902ab..fa6902ab 100644
--- a/events/redactionevent.h
+++ b/lib/events/redactionevent.h
diff --git a/events/roomavatarevent.cpp b/lib/events/roomavatarevent.cpp
index 7a5f82a1..7a5f82a1 100644
--- a/events/roomavatarevent.cpp
+++ b/lib/events/roomavatarevent.cpp
diff --git a/events/roomavatarevent.h b/lib/events/roomavatarevent.h
index ccfe8fbf..ccfe8fbf 100644
--- a/events/roomavatarevent.h
+++ b/lib/events/roomavatarevent.h
diff --git a/events/roommemberevent.cpp b/lib/events/roommemberevent.cpp
index 76b003c2..76b003c2 100644
--- a/events/roommemberevent.cpp
+++ b/lib/events/roommemberevent.cpp
diff --git a/events/roommemberevent.h b/lib/events/roommemberevent.h
index 89b970c9..89b970c9 100644
--- a/events/roommemberevent.h
+++ b/lib/events/roommemberevent.h
diff --git a/events/roommessageevent.cpp b/lib/events/roommessageevent.cpp
index dec0ca50..dec0ca50 100644
--- a/events/roommessageevent.cpp
+++ b/lib/events/roommessageevent.cpp
diff --git a/events/roommessageevent.h b/lib/events/roommessageevent.h
index a55564ed..a55564ed 100644
--- a/events/roommessageevent.h
+++ b/lib/events/roommessageevent.h
diff --git a/events/simplestateevents.h b/lib/events/simplestateevents.h
index 6b0cd51a..6b0cd51a 100644
--- a/events/simplestateevents.h
+++ b/lib/events/simplestateevents.h
diff --git a/events/typingevent.cpp b/lib/events/typingevent.cpp
index a4d3bae4..a4d3bae4 100644
--- a/events/typingevent.cpp
+++ b/lib/events/typingevent.cpp
diff --git a/events/typingevent.h b/lib/events/typingevent.h
index 8c9551a4..8c9551a4 100644
--- a/events/typingevent.h
+++ b/lib/events/typingevent.h
diff --git a/jobs/basejob.cpp b/lib/jobs/basejob.cpp
index 3cde7c50..3cde7c50 100644
--- a/jobs/basejob.cpp
+++ b/lib/jobs/basejob.cpp
diff --git a/jobs/basejob.h b/lib/jobs/basejob.h
index ed630a67..ed630a67 100644
--- a/jobs/basejob.h
+++ b/lib/jobs/basejob.h
diff --git a/jobs/checkauthmethods.cpp b/lib/jobs/checkauthmethods.cpp
index 117def89..117def89 100644
--- a/jobs/checkauthmethods.cpp
+++ b/lib/jobs/checkauthmethods.cpp
diff --git a/jobs/checkauthmethods.h b/lib/jobs/checkauthmethods.h
index 647f3db6..647f3db6 100644
--- a/jobs/checkauthmethods.h
+++ b/lib/jobs/checkauthmethods.h
diff --git a/jobs/downloadfilejob.cpp b/lib/jobs/downloadfilejob.cpp
index 6a3d8483..6a3d8483 100644
--- a/jobs/downloadfilejob.cpp
+++ b/lib/jobs/downloadfilejob.cpp
diff --git a/jobs/downloadfilejob.h b/lib/jobs/downloadfilejob.h
index 1815a7c8..1815a7c8 100644
--- a/jobs/downloadfilejob.h
+++ b/lib/jobs/downloadfilejob.h
diff --git a/jobs/generated/account-data.cpp b/lib/jobs/generated/account-data.cpp
index 35ee94c0..35ee94c0 100644
--- a/jobs/generated/account-data.cpp
+++ b/lib/jobs/generated/account-data.cpp
diff --git a/jobs/generated/account-data.h b/lib/jobs/generated/account-data.h
index 69ad9fb4..69ad9fb4 100644
--- a/jobs/generated/account-data.h
+++ b/lib/jobs/generated/account-data.h
diff --git a/jobs/generated/administrative_contact.cpp b/lib/jobs/generated/administrative_contact.cpp
index 1af57941..1af57941 100644
--- a/jobs/generated/administrative_contact.cpp
+++ b/lib/jobs/generated/administrative_contact.cpp
diff --git a/jobs/generated/administrative_contact.h b/lib/jobs/generated/administrative_contact.h
index c8429d39..c8429d39 100644
--- a/jobs/generated/administrative_contact.h
+++ b/lib/jobs/generated/administrative_contact.h
diff --git a/jobs/generated/banning.cpp b/lib/jobs/generated/banning.cpp
index f66b27b6..f66b27b6 100644
--- a/jobs/generated/banning.cpp
+++ b/lib/jobs/generated/banning.cpp
diff --git a/jobs/generated/banning.h b/lib/jobs/generated/banning.h
index 2d6fbd9b..2d6fbd9b 100644
--- a/jobs/generated/banning.h
+++ b/lib/jobs/generated/banning.h
diff --git a/jobs/generated/content-repo.cpp b/lib/jobs/generated/content-repo.cpp
index 51011251..51011251 100644
--- a/jobs/generated/content-repo.cpp
+++ b/lib/jobs/generated/content-repo.cpp
diff --git a/jobs/generated/content-repo.h b/lib/jobs/generated/content-repo.h
index b4ea562f..b4ea562f 100644
--- a/jobs/generated/content-repo.h
+++ b/lib/jobs/generated/content-repo.h
diff --git a/jobs/generated/create_room.cpp b/lib/jobs/generated/create_room.cpp
index de7807b5..de7807b5 100644
--- a/jobs/generated/create_room.cpp
+++ b/lib/jobs/generated/create_room.cpp
diff --git a/jobs/generated/create_room.h b/lib/jobs/generated/create_room.h
index b479615a..b479615a 100644
--- a/jobs/generated/create_room.h
+++ b/lib/jobs/generated/create_room.h
diff --git a/jobs/generated/directory.cpp b/lib/jobs/generated/directory.cpp
index 9428dcee..9428dcee 100644
--- a/jobs/generated/directory.cpp
+++ b/lib/jobs/generated/directory.cpp
diff --git a/jobs/generated/directory.h b/lib/jobs/generated/directory.h
index 87591240..87591240 100644
--- a/jobs/generated/directory.h
+++ b/lib/jobs/generated/directory.h
diff --git a/jobs/generated/inviting.cpp b/lib/jobs/generated/inviting.cpp
index d2ee2107..d2ee2107 100644
--- a/jobs/generated/inviting.cpp
+++ b/lib/jobs/generated/inviting.cpp
diff --git a/jobs/generated/inviting.h b/lib/jobs/generated/inviting.h
index eaa884df..eaa884df 100644
--- a/jobs/generated/inviting.h
+++ b/lib/jobs/generated/inviting.h
diff --git a/jobs/generated/kicking.cpp b/lib/jobs/generated/kicking.cpp
index bf2490b7..bf2490b7 100644
--- a/jobs/generated/kicking.cpp
+++ b/lib/jobs/generated/kicking.cpp
diff --git a/jobs/generated/kicking.h b/lib/jobs/generated/kicking.h
index 3814bef7..3814bef7 100644
--- a/jobs/generated/kicking.h
+++ b/lib/jobs/generated/kicking.h
diff --git a/jobs/generated/leaving.cpp b/lib/jobs/generated/leaving.cpp
index fbc40d11..fbc40d11 100644
--- a/jobs/generated/leaving.cpp
+++ b/lib/jobs/generated/leaving.cpp
diff --git a/jobs/generated/leaving.h b/lib/jobs/generated/leaving.h
index 9bae2363..9bae2363 100644
--- a/jobs/generated/leaving.h
+++ b/lib/jobs/generated/leaving.h
diff --git a/jobs/generated/list_public_rooms.cpp b/lib/jobs/generated/list_public_rooms.cpp
index 39653300..39653300 100644
--- a/jobs/generated/list_public_rooms.cpp
+++ b/lib/jobs/generated/list_public_rooms.cpp
diff --git a/jobs/generated/list_public_rooms.h b/lib/jobs/generated/list_public_rooms.h
index 5c281de3..5c281de3 100644
--- a/jobs/generated/list_public_rooms.h
+++ b/lib/jobs/generated/list_public_rooms.h
diff --git a/jobs/generated/login.cpp b/lib/jobs/generated/login.cpp
index a4dab428..a4dab428 100644
--- a/jobs/generated/login.cpp
+++ b/lib/jobs/generated/login.cpp
diff --git a/jobs/generated/login.h b/lib/jobs/generated/login.h
index 3ac955d4..3ac955d4 100644
--- a/jobs/generated/login.h
+++ b/lib/jobs/generated/login.h
diff --git a/jobs/generated/logout.cpp b/lib/jobs/generated/logout.cpp
index 83139842..83139842 100644
--- a/jobs/generated/logout.cpp
+++ b/lib/jobs/generated/logout.cpp
diff --git a/jobs/generated/logout.h b/lib/jobs/generated/logout.h
index 7640ba55..7640ba55 100644
--- a/jobs/generated/logout.h
+++ b/lib/jobs/generated/logout.h
diff --git a/jobs/generated/profile.cpp b/lib/jobs/generated/profile.cpp
index 1f7092d7..1f7092d7 100644
--- a/jobs/generated/profile.cpp
+++ b/lib/jobs/generated/profile.cpp
diff --git a/jobs/generated/profile.h b/lib/jobs/generated/profile.h
index 024130f5..024130f5 100644
--- a/jobs/generated/profile.h
+++ b/lib/jobs/generated/profile.h
diff --git a/jobs/generated/receipts.cpp b/lib/jobs/generated/receipts.cpp
index 83c38b6f..83c38b6f 100644
--- a/jobs/generated/receipts.cpp
+++ b/lib/jobs/generated/receipts.cpp
diff --git a/jobs/generated/receipts.h b/lib/jobs/generated/receipts.h
index 9eb7a489..9eb7a489 100644
--- a/jobs/generated/receipts.h
+++ b/lib/jobs/generated/receipts.h
diff --git a/jobs/generated/redaction.cpp b/lib/jobs/generated/redaction.cpp
index 0da35dfc..0da35dfc 100644
--- a/jobs/generated/redaction.cpp
+++ b/lib/jobs/generated/redaction.cpp
diff --git a/jobs/generated/redaction.h b/lib/jobs/generated/redaction.h
index e3b3ff4f..e3b3ff4f 100644
--- a/jobs/generated/redaction.h
+++ b/lib/jobs/generated/redaction.h
diff --git a/jobs/generated/third_party_membership.cpp b/lib/jobs/generated/third_party_membership.cpp
index b637d481..b637d481 100644
--- a/jobs/generated/third_party_membership.cpp
+++ b/lib/jobs/generated/third_party_membership.cpp
diff --git a/jobs/generated/third_party_membership.h b/lib/jobs/generated/third_party_membership.h
index c7b5214e..c7b5214e 100644
--- a/jobs/generated/third_party_membership.h
+++ b/lib/jobs/generated/third_party_membership.h
diff --git a/jobs/generated/typing.cpp b/lib/jobs/generated/typing.cpp
index fa700290..fa700290 100644
--- a/jobs/generated/typing.cpp
+++ b/lib/jobs/generated/typing.cpp
diff --git a/jobs/generated/typing.h b/lib/jobs/generated/typing.h
index 0495ed0a..0495ed0a 100644
--- a/jobs/generated/typing.h
+++ b/lib/jobs/generated/typing.h
diff --git a/jobs/generated/versions.cpp b/lib/jobs/generated/versions.cpp
index b12594ca..b12594ca 100644
--- a/jobs/generated/versions.cpp
+++ b/lib/jobs/generated/versions.cpp
diff --git a/jobs/generated/versions.h b/lib/jobs/generated/versions.h
index 18f6bb44..18f6bb44 100644
--- a/jobs/generated/versions.h
+++ b/lib/jobs/generated/versions.h
diff --git a/jobs/generated/whoami.cpp b/lib/jobs/generated/whoami.cpp
index cc38fa4d..cc38fa4d 100644
--- a/jobs/generated/whoami.cpp
+++ b/lib/jobs/generated/whoami.cpp
diff --git a/jobs/generated/whoami.h b/lib/jobs/generated/whoami.h
index 835232ee..835232ee 100644
--- a/jobs/generated/whoami.h
+++ b/lib/jobs/generated/whoami.h
diff --git a/jobs/joinroomjob.cpp b/lib/jobs/joinroomjob.cpp
index 66a75089..66a75089 100644
--- a/jobs/joinroomjob.cpp
+++ b/lib/jobs/joinroomjob.cpp
diff --git a/jobs/joinroomjob.h b/lib/jobs/joinroomjob.h
index f3ba216f..f3ba216f 100644
--- a/jobs/joinroomjob.h
+++ b/lib/jobs/joinroomjob.h
diff --git a/jobs/mediathumbnailjob.cpp b/lib/jobs/mediathumbnailjob.cpp
index dda1cdb4..dda1cdb4 100644
--- a/jobs/mediathumbnailjob.cpp
+++ b/lib/jobs/mediathumbnailjob.cpp
diff --git a/jobs/mediathumbnailjob.h b/lib/jobs/mediathumbnailjob.h
index 6e0b94f3..6e0b94f3 100644
--- a/jobs/mediathumbnailjob.h
+++ b/lib/jobs/mediathumbnailjob.h
diff --git a/jobs/passwordlogin.cpp b/lib/jobs/passwordlogin.cpp
index 8abfe66a..8abfe66a 100644
--- a/jobs/passwordlogin.cpp
+++ b/lib/jobs/passwordlogin.cpp
diff --git a/jobs/passwordlogin.h b/lib/jobs/passwordlogin.h
index fb8777a3..fb8777a3 100644
--- a/jobs/passwordlogin.h
+++ b/lib/jobs/passwordlogin.h
diff --git a/jobs/postreadmarkersjob.h b/lib/jobs/postreadmarkersjob.h
index d0198821..d0198821 100644
--- a/jobs/postreadmarkersjob.h
+++ b/lib/jobs/postreadmarkersjob.h
diff --git a/jobs/postreceiptjob.cpp b/lib/jobs/postreceiptjob.cpp
index 4572d74c..4572d74c 100644
--- a/jobs/postreceiptjob.cpp
+++ b/lib/jobs/postreceiptjob.cpp
diff --git a/jobs/postreceiptjob.h b/lib/jobs/postreceiptjob.h
index 23df7c05..23df7c05 100644
--- a/jobs/postreceiptjob.h
+++ b/lib/jobs/postreceiptjob.h
diff --git a/jobs/requestdata.cpp b/lib/jobs/requestdata.cpp
index 5cb62221..5cb62221 100644
--- a/jobs/requestdata.cpp
+++ b/lib/jobs/requestdata.cpp
diff --git a/jobs/requestdata.h b/lib/jobs/requestdata.h
index aa03b744..aa03b744 100644
--- a/jobs/requestdata.h
+++ b/lib/jobs/requestdata.h
diff --git a/jobs/roommessagesjob.cpp b/lib/jobs/roommessagesjob.cpp
index e5568f17..e5568f17 100644
--- a/jobs/roommessagesjob.cpp
+++ b/lib/jobs/roommessagesjob.cpp
diff --git a/jobs/roommessagesjob.h b/lib/jobs/roommessagesjob.h
index 7b3fd9c9..7b3fd9c9 100644
--- a/jobs/roommessagesjob.h
+++ b/lib/jobs/roommessagesjob.h
diff --git a/jobs/sendeventjob.cpp b/lib/jobs/sendeventjob.cpp
index f5190d4b..f5190d4b 100644
--- a/jobs/sendeventjob.cpp
+++ b/lib/jobs/sendeventjob.cpp
diff --git a/jobs/sendeventjob.h b/lib/jobs/sendeventjob.h
index 3a11eb6a..3a11eb6a 100644
--- a/jobs/sendeventjob.h
+++ b/lib/jobs/sendeventjob.h
diff --git a/jobs/setroomstatejob.cpp b/lib/jobs/setroomstatejob.cpp
index c2beb87b..c2beb87b 100644
--- a/jobs/setroomstatejob.cpp
+++ b/lib/jobs/setroomstatejob.cpp
diff --git a/jobs/setroomstatejob.h b/lib/jobs/setroomstatejob.h
index b7e6d4a1..b7e6d4a1 100644
--- a/jobs/setroomstatejob.h
+++ b/lib/jobs/setroomstatejob.h
diff --git a/jobs/syncjob.cpp b/lib/jobs/syncjob.cpp
index 435dfd0e..435dfd0e 100644
--- a/jobs/syncjob.cpp
+++ b/lib/jobs/syncjob.cpp
diff --git a/jobs/syncjob.h b/lib/jobs/syncjob.h
index 919060be..919060be 100644
--- a/jobs/syncjob.h
+++ b/lib/jobs/syncjob.h
diff --git a/joinstate.h b/lib/joinstate.h
index 42613895..42613895 100644
--- a/joinstate.h
+++ b/lib/joinstate.h
diff --git a/logging.cpp b/lib/logging.cpp
index 7476781f..7476781f 100644
--- a/logging.cpp
+++ b/lib/logging.cpp
diff --git a/logging.h b/lib/logging.h
index 8dbfdf30..8dbfdf30 100644
--- a/logging.h
+++ b/lib/logging.h
diff --git a/networkaccessmanager.cpp b/lib/networkaccessmanager.cpp
index 89967a8a..89967a8a 100644
--- a/networkaccessmanager.cpp
+++ b/lib/networkaccessmanager.cpp
diff --git a/networkaccessmanager.h b/lib/networkaccessmanager.h
index ae847582..ae847582 100644
--- a/networkaccessmanager.h
+++ b/lib/networkaccessmanager.h
diff --git a/networksettings.cpp b/lib/networksettings.cpp
index 48bd09f3..48bd09f3 100644
--- a/networksettings.cpp
+++ b/lib/networksettings.cpp
diff --git a/networksettings.h b/lib/networksettings.h
index 83613060..83613060 100644
--- a/networksettings.h
+++ b/lib/networksettings.h
diff --git a/room.cpp b/lib/room.cpp
index 25669889..25669889 100644
--- a/room.cpp
+++ b/lib/room.cpp
diff --git a/room.h b/lib/room.h
index bdef04ee..bdef04ee 100644
--- a/room.h
+++ b/lib/room.h
diff --git a/settings.cpp b/lib/settings.cpp
index bf369c58..852e19cb 100644
--- a/settings.cpp
+++ b/lib/settings.cpp
@@ -1,123 +1,123 @@
-#include "settings.h"

-

-#include "logging.h"

-

-#include <QtCore/QUrl>

-

-using namespace QMatrixClient;

-

-QString Settings::legacyOrganizationName {};

-QString Settings::legacyApplicationName {};

-

-void Settings::setLegacyNames(const QString& organizationName,

-                              const QString& applicationName)

-{

-    legacyOrganizationName = organizationName;

-    legacyApplicationName = applicationName;

-}

-

-void Settings::setValue(const QString& key, const QVariant& value)

-{

-//    qCDebug() << "Setting" << key << "to" << value;

-    QSettings::setValue(key, value);

-    if (legacySettings.contains(key))

-        legacySettings.remove(key);

-}

-

-QVariant Settings::value(const QString& key, const QVariant& defaultValue) const

-{

-    auto value = QSettings::value(key, legacySettings.value(key, defaultValue));

-    // QML's Qt.labs.Settings stores boolean values as strings, which, if loaded

-    // through the usual QSettings interface, confuses QML

-    // (QVariant("false") == true in JavaScript). Since we have a mixed

-    // environment where both QSettings and Qt.labs.Settings may potentially

-    // work with same settings, better ensure compatibility.

-    return value.toString() == QStringLiteral("false") ? QVariant(false) : value;

-}

-

-bool Settings::contains(const QString& key) const

-{

-    return QSettings::contains(key) || legacySettings.contains(key);

-}

-

-QStringList Settings::childGroups() const

-{

-    auto l = QSettings::childGroups();

-    return !l.isEmpty() ? l : legacySettings.childGroups();

-}

-

-void SettingsGroup::setValue(const QString& key, const QVariant& value)

-{

-    Settings::setValue(groupPath + '/' + key, value);

-}

-

-bool SettingsGroup::contains(const QString& key) const

-{

-    return Settings::contains(groupPath + '/' + key);

-}

-

-QVariant SettingsGroup::value(const QString& key, const QVariant& defaultValue) const

-{

-    return Settings::value(groupPath + '/' + key, defaultValue);

-}

-

-QString SettingsGroup::group() const

-{

-    return groupPath;

-}

-

-QStringList SettingsGroup::childGroups() const

-{

-    const_cast<SettingsGroup*>(this)->beginGroup(groupPath);

-    const_cast<QSettings&>(legacySettings).beginGroup(groupPath);

-    QStringList l = Settings::childGroups();

-    const_cast<SettingsGroup*>(this)->endGroup();

-    const_cast<QSettings&>(legacySettings).endGroup();

-    return l;

-}

-

-void SettingsGroup::remove(const QString& key)

-{

-    QString fullKey { groupPath };

-    if (!key.isEmpty())

-        fullKey += "/" + key;

-    Settings::remove(fullKey);

-}

-

-QMC_DEFINE_SETTING(AccountSettings, QString, deviceId, "device_id", "", setDeviceId)

-QMC_DEFINE_SETTING(AccountSettings, QString, deviceName, "device_name", "", setDeviceName)

-QMC_DEFINE_SETTING(AccountSettings, bool, keepLoggedIn, "keep_logged_in", false, setKeepLoggedIn)

-

-QUrl AccountSettings::homeserver() const

-{

-    return QUrl::fromUserInput(value("homeserver").toString());

-}

-

-void AccountSettings::setHomeserver(const QUrl& url)

-{

-    setValue("homeserver", url.toString());

-}

-

-QString AccountSettings::userId() const

-{

-    return group().section('/', -1);

-}

-

-QString AccountSettings::accessToken() const

-{

-    return value("access_token").toString();

-}

-

-void AccountSettings::setAccessToken(const QString& accessToken)

-{

-    qCWarning(MAIN) << "Saving access_token to QSettings is insecure."

-                       " Developers, please save access_token separately.";

-    setValue("access_token", accessToken);

-}

-

-void AccountSettings::clearAccessToken()

-{

-    legacySettings.remove("access_token");

-    legacySettings.remove("device_id"); // Force the server to re-issue it

-    remove("access_token");

-}

+#include "settings.h"
+
+#include "logging.h"
+
+#include <QtCore/QUrl>
+
+using namespace QMatrixClient;
+
+QString Settings::legacyOrganizationName {};
+QString Settings::legacyApplicationName {};
+
+void Settings::setLegacyNames(const QString& organizationName,
+                              const QString& applicationName)
+{
+    legacyOrganizationName = organizationName;
+    legacyApplicationName = applicationName;
+}
+
+void Settings::setValue(const QString& key, const QVariant& value)
+{
+//    qCDebug() << "Setting" << key << "to" << value;
+    QSettings::setValue(key, value);
+    if (legacySettings.contains(key))
+        legacySettings.remove(key);
+}
+
+QVariant Settings::value(const QString& key, const QVariant& defaultValue) const
+{
+    auto value = QSettings::value(key, legacySettings.value(key, defaultValue));
+    // QML's Qt.labs.Settings stores boolean values as strings, which, if loaded
+    // through the usual QSettings interface, confuses QML
+    // (QVariant("false") == true in JavaScript). Since we have a mixed
+    // environment where both QSettings and Qt.labs.Settings may potentially
+    // work with same settings, better ensure compatibility.
+    return value.toString() == QStringLiteral("false") ? QVariant(false) : value;
+}
+
+bool Settings::contains(const QString& key) const
+{
+    return QSettings::contains(key) || legacySettings.contains(key);
+}
+
+QStringList Settings::childGroups() const
+{
+    auto l = QSettings::childGroups();
+    return !l.isEmpty() ? l : legacySettings.childGroups();
+}
+
+void SettingsGroup::setValue(const QString& key, const QVariant& value)
+{
+    Settings::setValue(groupPath + '/' + key, value);
+}
+
+bool SettingsGroup::contains(const QString& key) const
+{
+    return Settings::contains(groupPath + '/' + key);
+}
+
+QVariant SettingsGroup::value(const QString& key, const QVariant& defaultValue) const
+{
+    return Settings::value(groupPath + '/' + key, defaultValue);
+}
+
+QString SettingsGroup::group() const
+{
+    return groupPath;
+}
+
+QStringList SettingsGroup::childGroups() const
+{
+    const_cast<SettingsGroup*>(this)->beginGroup(groupPath);
+    const_cast<QSettings&>(legacySettings).beginGroup(groupPath);
+    QStringList l = Settings::childGroups();
+    const_cast<SettingsGroup*>(this)->endGroup();
+    const_cast<QSettings&>(legacySettings).endGroup();
+    return l;
+}
+
+void SettingsGroup::remove(const QString& key)
+{
+    QString fullKey { groupPath };
+    if (!key.isEmpty())
+        fullKey += "/" + key;
+    Settings::remove(fullKey);
+}
+
+QMC_DEFINE_SETTING(AccountSettings, QString, deviceId, "device_id", "", setDeviceId)
+QMC_DEFINE_SETTING(AccountSettings, QString, deviceName, "device_name", "", setDeviceName)
+QMC_DEFINE_SETTING(AccountSettings, bool, keepLoggedIn, "keep_logged_in", false, setKeepLoggedIn)
+
+QUrl AccountSettings::homeserver() const
+{
+    return QUrl::fromUserInput(value("homeserver").toString());
+}
+
+void AccountSettings::setHomeserver(const QUrl& url)
+{
+    setValue("homeserver", url.toString());
+}
+
+QString AccountSettings::userId() const
+{
+    return group().section('/', -1);
+}
+
+QString AccountSettings::accessToken() const
+{
+    return value("access_token").toString();
+}
+
+void AccountSettings::setAccessToken(const QString& accessToken)
+{
+    qCWarning(MAIN) << "Saving access_token to QSettings is insecure."
+                       " Developers, please save access_token separately.";
+    setValue("access_token", accessToken);
+}
+
+void AccountSettings::clearAccessToken()
+{
+    legacySettings.remove("access_token");
+    legacySettings.remove("device_id"); // Force the server to re-issue it
+    remove("access_token");
+}
diff --git a/settings.h b/lib/settings.h
index 27ec9ba5..27ec9ba5 100644
--- a/settings.h
+++ b/lib/settings.h
diff --git a/user.cpp b/lib/user.cpp
index 7a6dbc73..7a6dbc73 100644
--- a/user.cpp
+++ b/lib/user.cpp
diff --git a/user.h b/lib/user.h
index f76f9e0a..f76f9e0a 100644
--- a/user.h
+++ b/lib/user.h
diff --git a/util.h b/lib/util.h
index 65de0610..65de0610 100644
--- a/util.h
+++ b/lib/util.h
diff --git a/libqmatrixclient.pri b/libqmatrixclient.pri
index 144c9dbc..646af4b1 100644
--- a/libqmatrixclient.pri
+++ b/libqmatrixclient.pri
@@ -1,5 +1,5 @@
 QT += network
-CONFIG += c++14 warn_on rtti_off
+CONFIG += c++14 warn_on rtti_off create_prl
 
 win32-msvc* {
     QMAKE_CXXFLAGS_WARN_ON += -wd4100
@@ -7,72 +7,72 @@ win32-msvc* {
     QMAKE_CXXFLAGS_WARN_ON += -Wno-unused-parameter
 }
 
-INCLUDEPATH += $$PWD
+INCLUDEPATH += $$PWD/lib
 
 HEADERS += \
-    $$PWD/connectiondata.h \
-    $$PWD/connection.h \
-    $$PWD/room.h \
-    $$PWD/user.h \
-    $$PWD/avatar.h \
-    $$PWD/util.h \
-    $$PWD/events/event.h \
-    $$PWD/events/eventcontent.h \
-    $$PWD/events/roommessageevent.h \
-    $$PWD/events/simplestateevents.h \
-    $$PWD/events/roommemberevent.h \
-    $$PWD/events/roomavatarevent.h \
-    $$PWD/events/typingevent.h \
-    $$PWD/events/receiptevent.h \
-    $$PWD/events/accountdataevents.h \
-    $$PWD/events/directchatevent.h \
-    $$PWD/events/redactionevent.h \
-    $$PWD/jobs/requestdata.h \
-    $$PWD/jobs/basejob.h \
-    $$PWD/jobs/checkauthmethods.h \
-    $$PWD/jobs/passwordlogin.h \
-    $$PWD/jobs/sendeventjob.h \
-    $$PWD/jobs/postreceiptjob.h \
-    $$PWD/jobs/joinroomjob.h \
-    $$PWD/jobs/roommessagesjob.h \
-    $$PWD/jobs/syncjob.h \
-    $$PWD/jobs/mediathumbnailjob.h \
-    $$PWD/jobs/setroomstatejob.h \
-    $$files($$PWD/jobs/generated/*.h, false) \
-    $$PWD/logging.h \
-    $$PWD/settings.h \
-    $$PWD/networksettings.h \
-    $$PWD/networkaccessmanager.h \
-    $$PWD/jobs/downloadfilejob.h \
-    $$PWD/jobs/postreadmarkersjob.h
+    $$PWD/lib/connectiondata.h \
+    $$PWD/lib/connection.h \
+    $$PWD/lib/room.h \
+    $$PWD/lib/user.h \
+    $$PWD/lib/avatar.h \
+    $$PWD/lib/util.h \
+    $$PWD/lib/events/event.h \
+    $$PWD/lib/events/eventcontent.h \
+    $$PWD/lib/events/roommessageevent.h \
+    $$PWD/lib/events/simplestateevents.h \
+    $$PWD/lib/events/roommemberevent.h \
+    $$PWD/lib/events/roomavatarevent.h \
+    $$PWD/lib/events/typingevent.h \
+    $$PWD/lib/events/receiptevent.h \
+    $$PWD/lib/events/accountdataevents.h \
+    $$PWD/lib/events/directchatevent.h \
+    $$PWD/lib/events/redactionevent.h \
+    $$PWD/lib/jobs/requestdata.h \
+    $$PWD/lib/jobs/basejob.h \
+    $$PWD/lib/jobs/checkauthmethods.h \
+    $$PWD/lib/jobs/passwordlogin.h \
+    $$PWD/lib/jobs/sendeventjob.h \
+    $$PWD/lib/jobs/postreceiptjob.h \
+    $$PWD/lib/jobs/joinroomjob.h \
+    $$PWD/lib/jobs/roommessagesjob.h \
+    $$PWD/lib/jobs/syncjob.h \
+    $$PWD/lib/jobs/mediathumbnailjob.h \
+    $$PWD/lib/jobs/setroomstatejob.h \
+    $$PWD/lib/jobs/downloadfilejob.h \
+    $$PWD/lib/jobs/postreadmarkersjob.h \
+    $$files($$PWD/lib/jobs/generated/*.h, false) \
+    $$PWD/lib/logging.h \
+    $$PWD/lib/settings.h \
+    $$PWD/lib/networksettings.h \
+    $$PWD/lib/networkaccessmanager.h
 
 SOURCES += \
-    $$PWD/connectiondata.cpp \
-    $$PWD/connection.cpp \
-    $$PWD/room.cpp \
-    $$PWD/user.cpp \
-    $$PWD/avatar.cpp \
-    $$PWD/events/event.cpp \
-    $$PWD/events/eventcontent.cpp \
-    $$PWD/events/roommessageevent.cpp \
-    $$PWD/events/roommemberevent.cpp \
-    $$PWD/events/typingevent.cpp \
-    $$PWD/events/receiptevent.cpp \
-    $$PWD/events/directchatevent.cpp \
-    $$PWD/jobs/requestdata.cpp \
-    $$PWD/jobs/basejob.cpp \
-    $$PWD/jobs/checkauthmethods.cpp \
-    $$PWD/jobs/passwordlogin.cpp \
-    $$PWD/jobs/sendeventjob.cpp \
-    $$PWD/jobs/postreceiptjob.cpp \
-    $$PWD/jobs/joinroomjob.cpp \
-    $$PWD/jobs/roommessagesjob.cpp \
-    $$PWD/jobs/syncjob.cpp \
-    $$PWD/jobs/mediathumbnailjob.cpp \
-    $$PWD/jobs/setroomstatejob.cpp \
-    $$files($$PWD/jobs/generated/*.cpp, false) \
-    $$PWD/logging.cpp \
-    $$PWD/settings.cpp \
-    $$PWD/networksettings.cpp \
-    $$PWD/networkaccessmanager.cpp \
-    $$PWD/jobs/downloadfilejob.cpp
+    $$PWD/lib/connectiondata.cpp \
+    $$PWD/lib/connection.cpp \
+    $$PWD/lib/room.cpp \
+    $$PWD/lib/user.cpp \
+    $$PWD/lib/avatar.cpp \
+    $$PWD/lib/events/event.cpp \
+    $$PWD/lib/events/eventcontent.cpp \
+    $$PWD/lib/events/roommessageevent.cpp \
+    $$PWD/lib/events/roommemberevent.cpp \
+    $$PWD/lib/events/typingevent.cpp \
+    $$PWD/lib/events/receiptevent.cpp \
+    $$PWD/lib/events/directchatevent.cpp \
+    $$PWD/lib/jobs/requestdata.cpp \
+    $$PWD/lib/jobs/basejob.cpp \
+    $$PWD/lib/jobs/checkauthmethods.cpp \
+    $$PWD/lib/jobs/passwordlogin.cpp \
+    $$PWD/lib/jobs/sendeventjob.cpp \
+    $$PWD/lib/jobs/postreceiptjob.cpp \
+    $$PWD/lib/jobs/joinroomjob.cpp \
+    $$PWD/lib/jobs/roommessagesjob.cpp \
+    $$PWD/lib/jobs/syncjob.cpp \
+    $$PWD/lib/jobs/mediathumbnailjob.cpp \
+    $$PWD/lib/jobs/setroomstatejob.cpp \
+    $$PWD/lib/jobs/downloadfilejob.cpp \
+    $$files($$PWD/lib/jobs/generated/*.cpp, false) \
+    $$PWD/lib/logging.cpp \
+    $$PWD/lib/settings.cpp \
+    $$PWD/lib/networksettings.cpp \
+    $$PWD/lib/networkaccessmanager.cpp
diff --git a/state.cpp b/state.cpp
deleted file mode 100644
index 59a3b007..00000000
--- a/state.cpp
+++ /dev/null
@@ -1,69 +0,0 @@
-/******************************************************************************
- * Copyright (C) 2015 Felix Rohrbach <kde@fxrh.de>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- */
-
-#include "state.h"
-
-#include "events/event.h"
-
-using namespace QMatrixClient;
-
-class State::Private
-{
-    public:
-        Event* event;
-        QString stateKey;
-        QString replacesState;
-};
-
-
-State::State(Event* event)
-    : d(new Private)
-{
-    d->event = event;
-}
-
-State::~State()
-{
-    delete d;
-}
-
-Event* State::event() const
-{
-    return d->event;
-}
-
-QString State::stateKey() const
-{
-    return d->stateKey;
-}
-
-QString State::replacesState() const
-{
-    return d->replacesState;
-}
-
-State* State::fromJson(const QJsonObject& obj)
-{
-    Event* event = Event::fromJson(obj);
-    if( !event )
-        return nullptr;
-    State* state = new State(event);
-    state->d->stateKey = obj.value("state_key").toString();
-    state->d->replacesState = obj.value("replaces_state").toString();
-    return state;
-}
diff --git a/state.h b/state.h
deleted file mode 100644
index b059ea92..00000000
--- a/state.h
+++ /dev/null
@@ -1,47 +0,0 @@
-/******************************************************************************
- * Copyright (C) 2015 Felix Rohrbach <kde@fxrh.de>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- */
-
-#pragma once
-
-#include <QtCore/QString>
-#include <QtCore/QJsonObject>
-
-namespace QMatrixClient
-{
-    class Event;
-
-    /**
-     * Wraps an event that is a state
-     */
-    class State
-    {
-        public:
-            State(Event* event);
-            virtual ~State();
-
-            Event* event() const;
-            QString stateKey() const;
-            QString replacesState() const;
-
-            static State* fromJson(const QJsonObject& obj);
-
-        private:
-            class Private;
-            Private* d;
-    };
-}