wip

Author: SineStriker

.clang-format

@@ -1,5 +1,11 @@
+# References:
+#   https://clang.llvm.org/docs/ClangFormatStyleOptions.html
+#   https://code.qt.io/cgit/qt/qt5.git/tree/_clang-format
+
 BasedOnStyle: LLVM
 
+Standard: c++17
+
 # 指针和引用的对齐方式。
 # 可能的值有：
 # PAS_Left (在配置中： Left) 指针左对齐。
@@ -103,16 +109,22 @@ AlignAfterOpenBracket: Align
 NamespaceIndentation: All
 
 # 一行最长列数
-ColumnLimit: 120
+ColumnLimit: 100
 
 # 按层次缩进宏定义
 IndentPPDirectives: AfterHash
 
+# 预处理语句缩进为 2
+PPIndentWidth: 2
+
 # 数组元素对齐
 AlignArrayOfStructures: Left
 
-# ContinuationIndentWidth: 0
+# 不对头文件排序
+SortIncludes: Never
 
 FixNamespaceComments: false
 
-StatementMacros: ['__qas_attr__', '__qas_exclude__', '__qas_include__']
+StatementMacros: ['__qas_attr__', '__qas_exclude__', '__qas_include__']
+
+ForEachMacros: [ foreach, Q_FOREACH, BOOST_FOREACH, forever, Q_FOREVER, QBENCHMARK, QBENCHMARK_ONCE ]

CMakeLists.txt

@@ -6,6 +6,7 @@ project(DiffScope VERSION 0.0.1.1 LANGUAGES CXX)
 # Build Options
 # ----------------------------------
 option(DIFFSCOPE_INSTALL "Install application" ON)
+option(DIFFSCOPE_ENABLE_BREAKPAD "Enable breakpad configuration" OFF)
 
 # ----------------------------------
 # CMake Settings
@@ -41,4 +42,4 @@ qm_init_directories()
 # ----------------------------------
 add_subdirectory(libs)
 
-# add_subdirectory(src)
+add_subdirectory(src)

libs/CMakeLists.txt

@@ -4,4 +4,6 @@ add_subdirectory(choruskit)
 
 add_subdirectory(svscraft)
 
-add_subdirectory(opendspx)
+add_subdirectory(opendspx)
+
+set(CK_CMAKE_MODULES_DIR ${CMAKE_CURRENT_LIST_DIR}/choruskit/cmake PARENT_SCOPE)

libs/choruskit

@@ -1,22 +1,30 @@
 # Add `ChorusKitAPI`
-if(BUILD_LIBRARIES_IN_PLACE)
-    include(../libs/choruskit/cmake/ChorusKitAPI.cmake)
-else()
+if(NOT TARGET ChorusKit::Loader)
     find_package(ChorusKit REQUIRED)
 endif()
 
-ck_init_build_system(${PROJECT_NAME}
-    ROOT ..
-    VENDOR "OpenVPI"
-)
+include(${CK_CMAKE_MODULES_DIR}/ChorusKitAPI.cmake)
 
 # ----------------------------------
-# Compile Definitions
+# Project Variables
 # ----------------------------------
-ck_add_definition(APP_NAME ${PROJECT_NAME})
-ck_add_definition(APP_VERSION ${PROJECT_VERSION})
+set(CK_APPLICATION_NAME ${PROJECT_NAME})
+set(CK_APPLICATION_DESCRIPTION ${PROJECT_NAME})
+set(CK_APPLICATION_VERSION ${PROJECT_VERSION})
+set(CK_APPLICATION_VENDOR OpenVPI)
+set(CK_DEV_START_YEAR 2019)
 
-ck_add_definition(CONFIG_ENABLE_BREAKPAD ${DIFFSCOPE_ENABLE_BREAKPAD})
+# ----------------------------------
+# Initializations
+# ----------------------------------
+ck_init_buildsystem()
+
+# ----------------------------------
+# Compile Definitions
+# ----------------------------------
+qm_add_definition(APP_NAME ${PROJECT_NAME} STRING_LITERAL)
+qm_add_definition(APP_VERSION ${PROJECT_VERSION} STRING_LITERAL)
+qm_add_definition(CONFIG_ENABLE_BREAKPAD CONDITION DIFFSCOPE_ENABLE_BREAKPAD)
 
 # ----------------------------------
 # Main Project
@@ -29,8 +37,7 @@ add_subdirectory(plugins)
 
 add_subdirectory(share)
 
-# if(DIFFSCOPE_BUILD_TESTS)
-#     add_subdirectory(tests)
-# endif()
-
-ck_finish_build_system()
+# ----------------------------------
+# Finale
+# ----------------------------------
+ck_finish_buildsystem()

libs/qtmediate

@@ -1,18 +1,20 @@
 ck_configure_application(
     ICO app.ico
     ICNS app.icns
-    NAME ${PROJECT_NAME}
-    VERSION ${PROJECT_VERSION}
-    DESCRIPTION ${PROJECT_NAME}
 )
 
-ck_target_components(${PROJECT_NAME}
+qm_configure_target(${PROJECT_NAME}
     SOURCES main.cpp
     QT_LINKS Core Widgets
-    LINKS_PRIVATE ChorusKit::Loader ChorusKit::AppCore ChorusKit::qBreakpad
+    LINKS_PRIVATE ChorusKit::Loader ChorusKit::AppCore
     INCLUDE_PRIVATE ${CK_BUILD_INCLUDE_DIR}
 )
 
+if(DIFFSCOPE_ENABLE_BREAKPAD)
+    find_package(qBreakpad REQUIRED)
+    target_link_libraries(${PROJECT_NAME} PRIVATE qBreakpad::qBreakpad)
+endif()
+
 # Set configration file variables
 set(APP_CONFIG_SPLASH_IMAGE "splash.svg")
 set(APP_CONFIG_PADDING 20)
@@ -32,31 +34,36 @@ endif()
 # Deploy docs
 ck_add_shared_files(
     SKIP_BUILD
-    SRC share/doc/* DEST ${_app_doc_dir}
+    SRC share/doc/ DEST ${_app_doc_dir}
 )
 
 # Deploy resources
 ck_add_shared_files(
-    SRC ${_config_file} ${APP_CONFIG_SPLASH_IMAGE} DEST ${_app_res_dir}
+    SRC ${_config_file} ${APP_CONFIG_SPLASH_IMAGE} DEST share/${_app_res_dir}
 )
 
 # Deploy config files
 ck_add_shared_files(
-    SRC conf/${CK_PLATFORM_LOWER}/* DEST ${CK_BUILD_QT_CONF_DIR}
+    SKIP_BUILD
+    SRC conf/${CK_PLATFORM_LOWER}/qt.conf DEST ${CK_BUILD_QT_CONF_DIR}
+)
+
+ck_add_shared_files(
+    SRC conf/${CK_PLATFORM_LOWER}/qtmediate.json DEST ${CK_BUILD_QT_CONF_DIR}
 )
 
 if(WIN32)
     # Deploy windows icons
     ck_add_shared_files(
         SKIP_BUILD
-        SRC share/win-icons/* DEST ${PROJECT_NAME}/icons
+        SRC share/win-icons/ DEST share/${PROJECT_NAME}/icons
     )
 elseif(APPLE)
 # TODO...
 else()
     # Add linux files
     ck_add_shared_files(
         SKIP_BUILD
-        SRC share/applications share/icons DEST ${PROJECT_NAME}
+        SRC share/applications share/icons DEST share/${PROJECT_NAME}
     )
 endif()

libs/svscraft

@@ -2,11 +2,8 @@
     "Prefix": "..",
     "Libraries": "lib",
     "Share": "share",
-    "Plugins": [
-        "lib/qtmediate/plugins"
-    ],
+    "Plugins": [],
     "Translations": [
-        "share/qtmediate/translations",
         "share/ChorusKit/translations"
     ],
     "Themes": [

src/CMakeLists.txt

@@ -2,11 +2,8 @@
     "Prefix": ".",
     "Libraries": "Frameworks",
     "Share": "Resources",
-    "Plugins": [
-        "Frameworks/qtmediate/plugins"
-    ],
+    "Plugins": [],
     "Translations": [
-        "Resources/qtmediate/translations",
         "Resources/ChorusKit/translations"
     ],
     "Themes": [

src/app/CMakeLists.txt

@@ -2,11 +2,8 @@
     "Prefix": "..",
     "Libraries": "lib",
     "Share": "share",
-    "Plugins": [
-        "lib/qtmediate/plugins"
-    ],
+    "Plugins": [],
     "Translations": [
-        "share/qtmediate/translations",
         "share/ChorusKit/translations"
     ],
     "Themes": [

src/app/conf/linux/qtmediate.json

@@ -4,21 +4,23 @@
 
 #include <extensionsystem/pluginmanager.h>
 
-#include <QBreakpadHandler.h>
+#ifdef CONFIG_ENABLE_BREAKPAD
+#  include <QBreakpadHandler.h>
+#endif
 
-#include <QMAppExtension.h>
-#include <QMDecoratorV2.h>
-#include <QMSystem.h>
+#include <QMCore/QMSystem.h>
+#include <QMWidgets/QMAppExtension.h>
+#include <QMWidgets/QMDecoratorV2.h>
 
-#include <CoreApi/ILoader.h>
+#include <CoreApi/iloader.h>
 
-#include <loaderconfig.h>
+#include <CkLoader/loaderconfig.h>
 
-#include "choruskit_config.h"
+#include <choruskit_config.h>
 
-static const char APP_PLUGIN_IID[] = "org.ChorusKit." APP_NAME ".Plugin";
+static const char APP_PLUGIN_IID[] = "org.OpenVPI." APP_NAME ".Plugin";
 
-class MyLoaderConfiguration : public LoaderConfiguration {
+class MyLoaderConfiguration : public Loader::LoaderConfiguration {
 public:
     MyLoaderConfiguration() {
         allowRoot = false;
@@ -76,10 +78,12 @@ class MyLoaderConfiguration : public LoaderConfiguration {
 
         // Set ILoader settings path
         Core::ILoader &loader = *Core::ILoader::instance();
-        loader.setSettingsPath(QSettings::UserScope,
-                               QString("%1/%2.settings.json").arg(userSettingsPath, qApp->applicationName()));
-        loader.setSettingsPath(QSettings::SystemScope,
-                               QString("%1/%2.settings.json").arg(systemSettingsPath, qApp->applicationName()));
+        loader.setSettingsPath(
+            QSettings::UserScope,
+            QString("%1/%2.settings.json").arg(userSettingsPath, qApp->applicationName()));
+        loader.setSettingsPath(
+            QSettings::SystemScope,
+            QString("%1/%2.settings.json").arg(systemSettingsPath, qApp->applicationName()));
 
         // Add initial routine to loader object pool
         auto initRoutine = new Core::InitialRoutine(screen);
@@ -97,18 +101,17 @@ class MyLoaderConfiguration : public LoaderConfiguration {
 
 int main(int argc, char *argv[]) {
     QApplication a(argc, argv);
-    QMAppExtension host;
-
     a.setApplicationName(APP_NAME);
     a.setApplicationVersion(APP_VERSION);
-    a.setOrganizationName("ChorusKit");
-    a.setOrganizationDomain("ChorusKit");
+    a.setOrganizationName("OpenVPI");
+    a.setOrganizationDomain("org.openvpi");
 
-    Core::ILoader loader;
+    QMAppExtension host;
 
 #ifdef CONFIG_ENABLE_BREAKPAD
     QBreakpadInstance.setDumpPath(host.appDataDir() + "/crashes");
 #endif
 
+    Core::ILoader loader;
     return MyLoaderConfiguration().run();
 }