Merge #626(vkrause): Namespaced includes

CMakeLists.txt

@@ -68,11 +68,10 @@ if (WIN32)
     endif()
 else()
     include(GNUInstallDirs)
-    set(INCLUDEDIR_INIT ${PROJECT_NAME})
     set(CMakeFilesLocation "${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}")
 endif(WIN32)
 set(${PROJECT_NAME}_INSTALL_INCLUDEDIR
-        "${CMAKE_INSTALL_INCLUDEDIR}/${INCLUDEDIR_INIT}" CACHE PATH
+        "${CMAKE_INSTALL_INCLUDEDIR}/" CACHE PATH
         "directory to install ${PROJECT_NAME} include files to")
 
 # Instruct CMake to run moc automatically when needed.
@@ -112,86 +111,86 @@ endif()
 
 # Set up source files
 list(APPEND lib_SRCS
-    lib/quotient_common.h
-    lib/quotient_export.h
-    lib/function_traits.h lib/function_traits.cpp
-    lib/omittable.h
-    lib/expected.h
-    lib/networkaccessmanager.h lib/networkaccessmanager.cpp
-    lib/connectiondata.h lib/connectiondata.cpp
-    lib/connection.h lib/connection.cpp
-    lib/connection_p.h
-    lib/ssosession.h lib/ssosession.cpp
-    lib/logging.h lib/logging.cpp
-    lib/room.h lib/room.cpp
-    lib/roomstateview.h lib/roomstateview.cpp
-    lib/user.h lib/user.cpp
-    lib/avatar.h lib/avatar.cpp
-    lib/uri.h lib/uri.cpp
-    lib/uriresolver.h lib/uriresolver.cpp
-    lib/eventstats.h lib/eventstats.cpp
-    lib/syncdata.h lib/syncdata.cpp
-    lib/settings.h lib/settings.cpp
-    lib/networksettings.h lib/networksettings.cpp
-    lib/converters.h lib/converters.cpp
-    lib/util.h lib/util.cpp
-    lib/eventitem.h lib/eventitem.cpp
-    lib/accountregistry.h lib/accountregistry.cpp
-    lib/mxcreply.h lib/mxcreply.cpp
-    lib/e2ee/e2ee_common.h # because it's used by generated API
-    lib/events/event.h lib/events/event.cpp
-    lib/events/eventloader.h
-    lib/events/roomevent.h lib/events/roomevent.cpp
-    lib/events/stateevent.h lib/events/stateevent.cpp
-    lib/events/single_key_value.h
-    lib/events/simplestateevents.h
-    lib/events/eventcontent.h lib/events/eventcontent.cpp
-    lib/events/eventrelation.h lib/events/eventrelation.cpp
-    lib/events/roomcreateevent.h lib/events/roomcreateevent.cpp
-    lib/events/roomtombstoneevent.h lib/events/roomtombstoneevent.cpp
-    lib/events/roommessageevent.h lib/events/roommessageevent.cpp
-    lib/events/roommemberevent.h lib/events/roommemberevent.cpp
-    lib/events/roomcanonicalaliasevent.h
-    lib/events/roomavatarevent.h
-    lib/events/roompowerlevelsevent.h lib/events/roompowerlevelsevent.cpp
-    lib/events/typingevent.h
-    lib/events/accountdataevents.h
-    lib/events/receiptevent.h lib/events/receiptevent.cpp
-    lib/events/reactionevent.h
-    lib/events/callevents.h lib/events/callevents.cpp
-    lib/events/directchatevent.h lib/events/directchatevent.cpp
-    lib/events/encryptionevent.h lib/events/encryptionevent.cpp
-    lib/events/encryptedevent.h lib/events/encryptedevent.cpp
-    lib/events/roomkeyevent.h
-    lib/events/stickerevent.h
-    lib/events/filesourceinfo.h lib/events/filesourceinfo.cpp
-    lib/jobs/requestdata.h lib/jobs/requestdata.cpp
-    lib/jobs/basejob.h lib/jobs/basejob.cpp
-    lib/jobs/syncjob.h lib/jobs/syncjob.cpp
-    lib/jobs/mediathumbnailjob.h lib/jobs/mediathumbnailjob.cpp
-    lib/jobs/downloadfilejob.h lib/jobs/downloadfilejob.cpp
+    Quotient/quotient_common.h
+    Quotient/quotient_export.h
+    Quotient/function_traits.h Quotient/function_traits.cpp
+    Quotient/omittable.h
+    Quotient/expected.h
+    Quotient/networkaccessmanager.h Quotient/networkaccessmanager.cpp
+    Quotient/connectiondata.h Quotient/connectiondata.cpp
+    Quotient/connection.h Quotient/connection.cpp
+    Quotient/connection_p.h
+    Quotient/ssosession.h Quotient/ssosession.cpp
+    Quotient/logging.h Quotient/logging.cpp
+    Quotient/room.h Quotient/room.cpp
+    Quotient/roomstateview.h Quotient/roomstateview.cpp
+    Quotient/user.h Quotient/user.cpp
+    Quotient/avatar.h Quotient/avatar.cpp
+    Quotient/uri.h Quotient/uri.cpp
+    Quotient/uriresolver.h Quotient/uriresolver.cpp
+    Quotient/eventstats.h Quotient/eventstats.cpp
+    Quotient/syncdata.h Quotient/syncdata.cpp
+    Quotient/settings.h Quotient/settings.cpp
+    Quotient/networksettings.h Quotient/networksettings.cpp
+    Quotient/converters.h Quotient/converters.cpp
+    Quotient/util.h Quotient/util.cpp
+    Quotient/eventitem.h Quotient/eventitem.cpp
+    Quotient/accountregistry.h Quotient/accountregistry.cpp
+    Quotient/mxcreply.h Quotient/mxcreply.cpp
+    Quotient/e2ee/e2ee_common.h # because it's used by generated API
+    Quotient/events/event.h Quotient/events/event.cpp
+    Quotient/events/eventloader.h
+    Quotient/events/roomevent.h Quotient/events/roomevent.cpp
+    Quotient/events/stateevent.h Quotient/events/stateevent.cpp
+    Quotient/events/single_key_value.h
+    Quotient/events/simplestateevents.h
+    Quotient/events/eventcontent.h Quotient/events/eventcontent.cpp
+    Quotient/events/eventrelation.h Quotient/events/eventrelation.cpp
+    Quotient/events/roomcreateevent.h Quotient/events/roomcreateevent.cpp
+    Quotient/events/roomtombstoneevent.h Quotient/events/roomtombstoneevent.cpp
+    Quotient/events/roommessageevent.h Quotient/events/roommessageevent.cpp
+    Quotient/events/roommemberevent.h Quotient/events/roommemberevent.cpp
+    Quotient/events/roomcanonicalaliasevent.h
+    Quotient/events/roomavatarevent.h
+    Quotient/events/roompowerlevelsevent.h Quotient/events/roompowerlevelsevent.cpp
+    Quotient/events/typingevent.h
+    Quotient/events/accountdataevents.h
+    Quotient/events/receiptevent.h Quotient/events/receiptevent.cpp
+    Quotient/events/reactionevent.h
+    Quotient/events/callevents.h Quotient/events/callevents.cpp
+    Quotient/events/directchatevent.h Quotient/events/directchatevent.cpp
+    Quotient/events/encryptionevent.h Quotient/events/encryptionevent.cpp
+    Quotient/events/encryptedevent.h Quotient/events/encryptedevent.cpp
+    Quotient/events/roomkeyevent.h
+    Quotient/events/stickerevent.h
+    Quotient/events/filesourceinfo.h Quotient/events/filesourceinfo.cpp
+    Quotient/jobs/requestdata.h Quotient/jobs/requestdata.cpp
+    Quotient/jobs/basejob.h Quotient/jobs/basejob.cpp
+    Quotient/jobs/syncjob.h Quotient/jobs/syncjob.cpp
+    Quotient/jobs/mediathumbnailjob.h Quotient/jobs/mediathumbnailjob.cpp
+    Quotient/jobs/downloadfilejob.h Quotient/jobs/downloadfilejob.cpp
     libquotientemojis.qrc
 )
 if (${PROJECT_NAME}_ENABLE_E2EE)
     list(APPEND lib_SRCS
-        lib/database.h lib/database.cpp
-        lib/keyverificationsession.h lib/keyverificationsession.cpp
-        lib/e2ee/e2ee_common.cpp # .h is in the common sources list
-        lib/e2ee/qolmaccount.h lib/e2ee/qolmaccount.cpp
-        lib/e2ee/qolmsession.h lib/e2ee/qolmsession.cpp
-        lib/e2ee/qolminboundsession.h lib/e2ee/qolminboundsession.cpp
-        lib/e2ee/qolmoutboundsession.h lib/e2ee/qolmoutboundsession.cpp
-        lib/e2ee/qolmutility.h lib/e2ee/qolmutility.cpp
-        lib/e2ee/qolmsession.h lib/e2ee/qolmsession.cpp
-        lib/e2ee/qolmmessage.h lib/e2ee/qolmmessage.cpp
-        lib/events/keyverificationevent.h
+        Quotient/database.h Quotient/database.cpp
+        Quotient/keyverificationsession.h Quotient/keyverificationsession.cpp
+        Quotient/e2ee/e2ee_common.cpp # .h is in the common sources list
+        Quotient/e2ee/qolmaccount.h Quotient/e2ee/qolmaccount.cpp
+        Quotient/e2ee/qolmsession.h Quotient/e2ee/qolmsession.cpp
+        Quotient/e2ee/qolminboundsession.h Quotient/e2ee/qolminboundsession.cpp
+        Quotient/e2ee/qolmoutboundsession.h Quotient/e2ee/qolmoutboundsession.cpp
+        Quotient/e2ee/qolmutility.h Quotient/e2ee/qolmutility.cpp
+        Quotient/e2ee/qolmsession.h Quotient/e2ee/qolmsession.cpp
+        Quotient/e2ee/qolmmessage.h Quotient/e2ee/qolmmessage.cpp
+        Quotient/events/keyverificationevent.h
     )
 endif()
 
 # Configure API files generation
 
 set(CSAPI_DIR csapi)
-set(FULL_CSAPI_DIR lib/${CSAPI_DIR})
+set(FULL_CSAPI_DIR Quotient/${CSAPI_DIR})
 set(ASAPI_DEF_DIR application-service/definitions)
 set(ISAPI_DEF_DIR identity/definitions)
 
@@ -242,7 +241,7 @@ if (API_GENERATION_ENABLED)
             key_backup.yaml- # immature and buggy in terms of API definition
             sync.yaml- # we have a better handcrafted implementation
             ${GTAD_ARGS}
-        WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}/lib
+        WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}/Quotient
         SOURCES gtad/gtad.yaml
                 gtad/data.h.mustache
                 gtad/operation.h.mustache
@@ -263,7 +262,7 @@ add_feature_info(EnableApiCodeGeneration "${API_GENERATION_ENABLED}"
 # which would trigger the reconfiguration specifically before the next build.
 # For now CONFIGURE_DEPENDS is the best approximation of that.
 file(GLOB_RECURSE api_ALL_SRCS CONFIGURE_DEPENDS
-     ${FULL_CSAPI_DIR}/*.* lib/${ASAPI_DEF_DIR}/*.* lib/${ISAPI_DEF_DIR}/*.*)
+     ${FULL_CSAPI_DIR}/*.* Quotient/${ASAPI_DEF_DIR}/*.* Quotient/${ISAPI_DEF_DIR}/*.*)
 
 add_compile_options(
     -DQT_NO_CAST_TO_ASCII
@@ -310,11 +309,12 @@ endif()
 
 # Don't use PCH w/GCC (https://bugzilla.redhat.com/show_bug.cgi?id=1721553#c34)
 if (NOT CMAKE_CXX_COMPILER_ID STREQUAL GNU)
-    target_precompile_headers(${PROJECT_NAME} PRIVATE lib/converters.h)
+    target_precompile_headers(${PROJECT_NAME} PRIVATE Quotient/converters.h)
 endif ()
 
 target_include_directories(${PROJECT_NAME} PUBLIC
-    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/lib>
+    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
+    $<BUILD_INTERFACE:$<$<NOT:$<BOOL:${QUOTIENT_FORCE_NAMESPACED_INCLUDES}>>:${CMAKE_CURRENT_SOURCE_DIR}/Quotient>>
     $<INSTALL_INTERFACE:${${PROJECT_NAME}_INSTALL_INCLUDEDIR}>
 )
 
@@ -353,9 +353,8 @@ endif()
 install(TARGETS ${PROJECT_NAME} EXPORT ${PROJECT_NAME}Targets
         LIBRARY RUNTIME
         ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
-        INCLUDES DESTINATION ${${PROJECT_NAME}_INSTALL_INCLUDEDIR}
 )
-install(DIRECTORY lib/ DESTINATION ${${PROJECT_NAME}_INSTALL_INCLUDEDIR}
+install(DIRECTORY Quotient/ DESTINATION ${${PROJECT_NAME}_INSTALL_INCLUDEDIR}/Quotient
         FILES_MATCHING PATTERN "*.h")
 
 include(CMakePackageConfigHelpers)

CONTRIBUTING.md

@@ -383,7 +383,7 @@ preprocessor symbol (i.e. passing `-DPROFILE_LOG_USECS=<usecs>` to the compiler
 if you're on Linux/macOS).
 
 ### Generated C++ code for CS API
-The code in `lib/csapi`, `lib/identity` and `lib/application-service`, although
+The code in `Quotient/csapi`, `Quotient/identity` and `Quotient/application-service`, although
 stored in Git, is actually generated from the official Matrix Client-Server API
 definition files. If you're unhappy with something in there and want to improve
 that, you have to understand the way these files are produced and setup some
@@ -438,7 +438,7 @@ that also briefly touches on GTAD - the tool written for the purpose.
    an additional build target called `update-api` will be configured.
 2. Generate the code: `cmake --build <your build dir> --target update-api`.
    Building this target will create (overwriting without warning) source files
-   in `lib/csapi`, `lib/identity`, `lib/application-service` for all YAML files
+   in `Quotient/csapi`, `Quotient/identity`, `Quotient/application-service` for all YAML files
    it can find in `/path/to/matrix-spec/data/api/client-server` and their
    dependencies.
 

lib/application-service/definitions/location.h → Quotient/application-service/definitions/location.h

@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include "converters.h"
+#include <Quotient/converters.h>
 
 namespace Quotient {
 

lib/application-service/definitions/protocol.h → Quotient/application-service/definitions/protocol.h

@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include "converters.h"
+#include <Quotient/converters.h>
 
 namespace Quotient {
 /// Definition of valid values for a field.

lib/application-service/definitions/user.h → Quotient/application-service/definitions/user.h

@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include "converters.h"
+#include <Quotient/converters.h>
 
 namespace Quotient {
 

lib/csapi/account-data.h → Quotient/csapi/account-data.h

@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include "jobs/basejob.h"
+#include <Quotient/jobs/basejob.h>
 
 namespace Quotient {
 

lib/csapi/admin.h → Quotient/csapi/admin.h

@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include "jobs/basejob.h"
+#include <Quotient/jobs/basejob.h>
 
 namespace Quotient {
 

lib/csapi/administrative_contact.h → Quotient/csapi/administrative_contact.h

@@ -4,12 +4,11 @@
 
 #pragma once
 
-#include "csapi/definitions/auth_data.h"
-#include "csapi/definitions/request_email_validation.h"
-#include "csapi/definitions/request_msisdn_validation.h"
-#include "csapi/definitions/request_token_response.h"
-
-#include "jobs/basejob.h"
+#include <Quotient/csapi/definitions/auth_data.h>
+#include <Quotient/csapi/definitions/request_email_validation.h>
+#include <Quotient/csapi/definitions/request_msisdn_validation.h>
+#include <Quotient/csapi/definitions/request_token_response.h>
+#include <Quotient/jobs/basejob.h>
 
 namespace Quotient {
 

lib/csapi/appservice_room_directory.h → Quotient/csapi/appservice_room_directory.h

@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include "jobs/basejob.h"
+#include <Quotient/jobs/basejob.h>
 
 namespace Quotient {
 

lib/csapi/banning.h → Quotient/csapi/banning.h

@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include "jobs/basejob.h"
+#include <Quotient/jobs/basejob.h>
 
 namespace Quotient {
 

lib/csapi/capabilities.h → Quotient/csapi/capabilities.h

@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include "jobs/basejob.h"
+#include <Quotient/jobs/basejob.h>
 
 namespace Quotient {
 

lib/csapi/content-repo.h → Quotient/csapi/content-repo.h

@@ -4,11 +4,11 @@
 
 #pragma once
 
-#include "jobs/basejob.h"
-
 #include <QtCore/QIODevice>
 #include <QtNetwork/QNetworkReply>
 
+#include <Quotient/jobs/basejob.h>
+
 namespace Quotient {
 
 /*! \brief Upload some content to the content repository.

lib/csapi/create_room.h → Quotient/csapi/create_room.h

@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include "jobs/basejob.h"
+#include <Quotient/jobs/basejob.h>
 
 namespace Quotient {
 

lib/csapi/cross_signing.h → Quotient/csapi/cross_signing.h

@@ -4,10 +4,9 @@
 
 #pragma once
 
-#include "csapi/definitions/auth_data.h"
-#include "csapi/definitions/cross_signing_key.h"
-
-#include "jobs/basejob.h"
+#include <Quotient/csapi/definitions/auth_data.h>
+#include <Quotient/csapi/definitions/cross_signing_key.h>
+#include <Quotient/jobs/basejob.h>
 
 namespace Quotient {
 

lib/csapi/definitions/auth_data.h → Quotient/csapi/definitions/auth_data.h

@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include "converters.h"
+#include <Quotient/converters.h>
 
 namespace Quotient {
 /// Used by clients to submit authentication information to the

lib/csapi/definitions/client_device.h → Quotient/csapi/definitions/client_device.h

@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include "converters.h"
+#include <Quotient/converters.h>
 
 namespace Quotient {
 /// A client device

lib/csapi/definitions/cross_signing_key.h → Quotient/csapi/definitions/cross_signing_key.h

@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include "converters.h"
+#include <Quotient/converters.h>
 
 namespace Quotient {
 /// Cross signing key

lib/csapi/definitions/device_keys.h → Quotient/csapi/definitions/device_keys.h

@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include "converters.h"
+#include <Quotient/converters.h>
 
 namespace Quotient {
 /// Device identity keys