diff options
author | rtk0c <[email protected]> | 2022-06-27 00:14:58 +0000 |
---|---|---|
committer | rtk0c <[email protected]> | 2022-06-27 00:14:58 +0000 |
commit | 3250fc72f906797f113855cf9dde4e7803a66bd9 (patch) | |
tree | 2e270e38e6578738ffd9e91b7d5aaa9b4db545cb /ui.qt | |
parent | 8a23aa89a58d3a90d5851b449b5552e1fcdcaded (diff) |
(From git) Reformat qt ui project
git-svn-id: file:///home/arch/svn/epistmool/trunk@5 71f44415-077c-4ad7-a976-72ddbf76608f
Diffstat (limited to 'ui.qt')
-rw-r--r-- | ui.qt/CMakeLists.txt | 18 | ||||
-rw-r--r-- | ui.qt/CMakeLists.txt.user | 332 | ||||
-rw-r--r-- | ui.qt/source/DatabaseClient.cpp | 5 | ||||
-rw-r--r-- | ui.qt/source/DatabaseClient.hpp | 7 | ||||
-rw-r--r-- | ui.qt/source/DatabaseServer.cpp | 5 | ||||
-rw-r--r-- | ui.qt/source/DatabaseServer.hpp | 7 | ||||
-rw-r--r-- | ui.qt/source/Document.cpp (renamed from ui.qt/source/document.cpp) | 2 | ||||
-rw-r--r-- | ui.qt/source/Document.hpp (renamed from ui.qt/source/document.hpp) | 0 | ||||
-rw-r--r-- | ui.qt/source/Keyword.cpp (renamed from ui.qt/source/keyword.cpp) | 6 | ||||
-rw-r--r-- | ui.qt/source/Keyword.hpp (renamed from ui.qt/source/keyword.hpp) | 4 | ||||
-rw-r--r-- | ui.qt/source/KnowledgeFragment.cpp (renamed from ui.qt/source/knowledgefragment.cpp) | 6 | ||||
-rw-r--r-- | ui.qt/source/KnowledgeFragment.hpp (renamed from ui.qt/source/knowledgefragment.hpp) | 12 | ||||
-rw-r--r-- | ui.qt/source/fwd.hpp | 6 | ||||
-rw-r--r-- | ui.qt/source/main.cpp | 12 |
14 files changed, 58 insertions, 364 deletions
diff --git a/ui.qt/CMakeLists.txt b/ui.qt/CMakeLists.txt index c16e915..c235133 100644 --- a/ui.qt/CMakeLists.txt +++ b/ui.qt/CMakeLists.txt @@ -2,22 +2,25 @@ cmake_minimum_required(VERSION 3.16) project(EpistmoolUI VERSION 0.1 LANGUAGES CXX) set(CMAKE_AUTOMOC ON) +set(CMAKE_CXX_STANDARD 20) set(CMAKE_CXX_STANDARD_REQUIRED ON) -find_package(Qt6 6.2 COMPONENTS Widgets Quick REQUIRED) +find_package(Qt6 6.2 COMPONENTS Network Widgets Quick REQUIRED) qt_add_executable(appEpistmoolUI source/main.cpp source/fwd.hpp - source/knowledgefragment.hpp source/knowledgefragment.cpp - source/keyword.hpp source/keyword.cpp + source/DatabaseClient.hpp source/DatabaseClient.cpp + source/DatabaseServer.hpp source/DatabaseServer.cpp + source/KnowledgeFragment.hpp source/KnowledgeFragment.cpp + source/Keyword.hpp source/Keyword.cpp ) qt_add_qml_module(appEpistmoolUI URI EpistmoolUI VERSION 1.0 SOURCES - source/document.hpp source/document.cpp + source/Document.hpp source/Document.cpp QML_FILES source/qml/MainWindow.qml source/qml/Navigator.qml @@ -34,12 +37,11 @@ set_target_properties(appEpistmoolUI PROPERTIES ) target_include_directories(appEpistmoolUI PUBLIC source) -target_compile_definitions(appEpistmoolUI -PRIVATE +target_compile_definitions(appEpistmoolUI PRIVATE $<$<OR:$<CONFIG:Debug>,$<CONFIG:RelWithDebInfo>>:QT_QML_DEBUG> ) -target_link_libraries(appEpistmoolUI -PRIVATE +target_link_libraries(appEpistmoolUI PRIVATE + Qt6::Network Qt6::Widgets Qt6::Quick ) diff --git a/ui.qt/CMakeLists.txt.user b/ui.qt/CMakeLists.txt.user deleted file mode 100644 index 8611bff..0000000 --- a/ui.qt/CMakeLists.txt.user +++ /dev/null @@ -1,332 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE QtCreatorProject> -<!-- Written by QtCreator 6.0.2, 2022-02-20T21:54:01. --> -<qtcreator> - <data> - <variable>EnvironmentId</variable> - <value type="QByteArray">{f75faabe-ab95-4cc2-874a-48bde0690e72}</value> - </data> - <data> - <variable>ProjectExplorer.Project.ActiveTarget</variable> - <value type="qlonglong">0</value> - </data> - <data> - <variable>ProjectExplorer.Project.EditorSettings</variable> - <valuemap type="QVariantMap"> - <value type="bool" key="EditorConfiguration.AutoIndent">true</value> - <value type="bool" key="EditorConfiguration.AutoSpacesForTabs">false</value> - <value type="bool" key="EditorConfiguration.CamelCaseNavigation">true</value> - <valuemap type="QVariantMap" key="EditorConfiguration.CodeStyle.0"> - <value type="QString" key="language">Cpp</value> - <valuemap type="QVariantMap" key="value"> - <value type="QByteArray" key="CurrentPreferences">CppGlobal</value> - </valuemap> - </valuemap> - <valuemap type="QVariantMap" key="EditorConfiguration.CodeStyle.1"> - <value type="QString" key="language">QmlJS</value> - <valuemap type="QVariantMap" key="value"> - <value type="QByteArray" key="CurrentPreferences">QmlJSGlobal</value> - </valuemap> - </valuemap> - <value type="qlonglong" key="EditorConfiguration.CodeStyle.Count">2</value> - <value type="QByteArray" key="EditorConfiguration.Codec">UTF-8</value> - <value type="bool" key="EditorConfiguration.ConstrainTooltips">false</value> - <value type="int" key="EditorConfiguration.IndentSize">4</value> - <value type="bool" key="EditorConfiguration.KeyboardTooltips">false</value> - <value type="int" key="EditorConfiguration.MarginColumn">80</value> - <value type="bool" key="EditorConfiguration.MouseHiding">true</value> - <value type="bool" key="EditorConfiguration.MouseNavigation">true</value> - <value type="int" key="EditorConfiguration.PaddingMode">1</value> - <value type="bool" key="EditorConfiguration.PreferSingleLineComments">false</value> - <value type="bool" key="EditorConfiguration.ScrollWheelZooming">true</value> - <value type="bool" key="EditorConfiguration.ShowMargin">false</value> - <value type="int" key="EditorConfiguration.SmartBackspaceBehavior">0</value> - <value type="bool" key="EditorConfiguration.SmartSelectionChanging">true</value> - <value type="bool" key="EditorConfiguration.SpacesForTabs">true</value> - <value type="int" key="EditorConfiguration.TabKeyBehavior">0</value> - <value type="int" key="EditorConfiguration.TabSize">8</value> - <value type="bool" key="EditorConfiguration.UseGlobal">true</value> - <value type="bool" key="EditorConfiguration.UseIndenter">false</value> - <value type="int" key="EditorConfiguration.Utf8BomBehavior">1</value> - <value type="bool" key="EditorConfiguration.addFinalNewLine">true</value> - <value type="bool" key="EditorConfiguration.cleanIndentation">true</value> - <value type="bool" key="EditorConfiguration.cleanWhitespace">true</value> - <value type="QString" key="EditorConfiguration.ignoreFileTypes">*.md, *.MD, Makefile</value> - <value type="bool" key="EditorConfiguration.inEntireDocument">false</value> - <value type="bool" key="EditorConfiguration.skipTrailingWhitespace">true</value> - </valuemap> - </data> - <data> - <variable>ProjectExplorer.Project.PluginSettings</variable> - <valuemap type="QVariantMap"> - <valuemap type="QVariantMap" key="AutoTest.ActiveFrameworks"> - <value type="bool" key="AutoTest.Framework.Boost">true</value> - <value type="bool" key="AutoTest.Framework.CTest">false</value> - <value type="bool" key="AutoTest.Framework.Catch">true</value> - <value type="bool" key="AutoTest.Framework.GTest">true</value> - <value type="bool" key="AutoTest.Framework.QtQuickTest">true</value> - <value type="bool" key="AutoTest.Framework.QtTest">true</value> - </valuemap> - <valuemap type="QVariantMap" key="AutoTest.CheckStates"/> - <value type="int" key="AutoTest.RunAfterBuild">0</value> - <value type="bool" key="AutoTest.UseGlobal">true</value> - <valuelist type="QVariantList" key="ClangCodeModel.CustomCommandLineKey"/> - <value type="bool" key="ClangCodeModel.UseGlobalConfig">true</value> - <value type="QString" key="ClangCodeModel.WarningConfigId">Builtin.BuildSystem</value> - <valuemap type="QVariantMap" key="ClangTools"> - <value type="bool" key="ClangTools.AnalyzeOpenFiles">true</value> - <value type="bool" key="ClangTools.BuildBeforeAnalysis">true</value> - <value type="QString" key="ClangTools.DiagnosticConfig">Builtin.DefaultTidyAndClazy</value> - <value type="int" key="ClangTools.ParallelJobs">6</value> - <valuelist type="QVariantList" key="ClangTools.SelectedDirs"/> - <valuelist type="QVariantList" key="ClangTools.SelectedFiles"/> - <valuelist type="QVariantList" key="ClangTools.SuppressedDiagnostics"/> - <value type="bool" key="ClangTools.UseGlobalSettings">true</value> - </valuemap> - <valuemap type="QVariantMap" key="CppEditor.QuickFix"> - <value type="bool" key="UseGlobalSettings">true</value> - </valuemap> - </valuemap> - </data> - <data> - <variable>ProjectExplorer.Project.Target.0</variable> - <valuemap type="QVariantMap"> - <value type="QString" key="DeviceType">Desktop</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Desktop (Qt 6)</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Desktop (Qt 6)</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">{bb2c42c9-b15c-4e15-9289-35a041c6fb85}</value> - <value type="qlonglong" key="ProjectExplorer.Target.ActiveBuildConfiguration">0</value> - <value type="qlonglong" key="ProjectExplorer.Target.ActiveDeployConfiguration">0</value> - <value type="qlonglong" key="ProjectExplorer.Target.ActiveRunConfiguration">0</value> - <valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.0"> - <value type="QString" key="CMake.Build.Type">Debug</value> - <value type="QString" key="CMake.Initial.Parameters">-GNinja --DCMAKE_BUILD_TYPE:STRING=Debug --DCMAKE_PROJECT_INCLUDE_BEFORE:PATH=%{IDE:ResourcePath}/package-manager/auto-setup.cmake --DQT_QMAKE_EXECUTABLE:STRING=%{Qt:qmakeExecutable} --DCMAKE_PREFIX_PATH:STRING=%{Qt:QT_INSTALL_PREFIX} --DCMAKE_C_COMPILER:STRING=%{Compiler:Executable:C} --DCMAKE_CXX_COMPILER:STRING=%{Compiler:Executable:Cxx}</value> - <value type="int" key="EnableQmlDebugging">0</value> - <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">/home/rtk0c/Development/epistmool/ui.qt/build/Debug</value> - <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0"> - <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0"> - <valuelist type="QVariantList" key="CMakeProjectManager.MakeStep.BuildTargets"> - <value type="QString">all</value> - </valuelist> - <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Build</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">CMakeProjectManager.MakeStep</value> - </valuemap> - <value type="qlonglong" key="ProjectExplorer.BuildStepList.StepsCount">1</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Build</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Build</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Build</value> - </valuemap> - <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.1"> - <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0"> - <valuelist type="QVariantList" key="CMakeProjectManager.MakeStep.BuildTargets"> - <value type="QString">clean</value> - </valuelist> - <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Build</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">CMakeProjectManager.MakeStep</value> - </valuemap> - <value type="qlonglong" key="ProjectExplorer.BuildStepList.StepsCount">1</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Clean</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Clean</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Clean</value> - </valuemap> - <value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">2</value> - <value type="bool" key="ProjectExplorer.BuildConfiguration.ClearSystemEnvironment">false</value> - <valuelist type="QVariantList" key="ProjectExplorer.BuildConfiguration.CustomParsers"/> - <value type="bool" key="ProjectExplorer.BuildConfiguration.ParseStandardOutput">false</value> - <valuelist type="QVariantList" key="ProjectExplorer.BuildConfiguration.UserEnvironmentChanges"/> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Debug</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">CMakeProjectManager.CMakeBuildConfiguration</value> - </valuemap> - <valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.1"> - <value type="QString" key="CMake.Build.Type">Release</value> - <value type="QString" key="CMake.Initial.Parameters">-GNinja --DCMAKE_BUILD_TYPE:STRING=Release --DCMAKE_PROJECT_INCLUDE_BEFORE:PATH=%{IDE:ResourcePath}/package-manager/auto-setup.cmake --DQT_QMAKE_EXECUTABLE:STRING=%{Qt:qmakeExecutable} --DCMAKE_PREFIX_PATH:STRING=%{Qt:QT_INSTALL_PREFIX} --DCMAKE_C_COMPILER:STRING=%{Compiler:Executable:C} --DCMAKE_CXX_COMPILER:STRING=%{Compiler:Executable:Cxx}</value> - <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">/home/rtk0c/Development/epistmool/ui.qt/build-EpistmoolUI-Desktop_Qt_6-Release</value> - <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0"> - <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0"> - <valuelist type="QVariantList" key="CMakeProjectManager.MakeStep.BuildTargets"> - <value type="QString">all</value> - </valuelist> - <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Build</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">CMakeProjectManager.MakeStep</value> - </valuemap> - <value type="qlonglong" key="ProjectExplorer.BuildStepList.StepsCount">1</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Build</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Build</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Build</value> - </valuemap> - <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.1"> - <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0"> - <valuelist type="QVariantList" key="CMakeProjectManager.MakeStep.BuildTargets"> - <value type="QString">clean</value> - </valuelist> - <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Build</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">CMakeProjectManager.MakeStep</value> - </valuemap> - <value type="qlonglong" key="ProjectExplorer.BuildStepList.StepsCount">1</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Clean</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Clean</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Clean</value> - </valuemap> - <value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">2</value> - <value type="bool" key="ProjectExplorer.BuildConfiguration.ClearSystemEnvironment">false</value> - <valuelist type="QVariantList" key="ProjectExplorer.BuildConfiguration.CustomParsers"/> - <value type="bool" key="ProjectExplorer.BuildConfiguration.ParseStandardOutput">false</value> - <valuelist type="QVariantList" key="ProjectExplorer.BuildConfiguration.UserEnvironmentChanges"/> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Release</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">CMakeProjectManager.CMakeBuildConfiguration</value> - </valuemap> - <valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.2"> - <value type="QString" key="CMake.Build.Type">RelWithDebInfo</value> - <value type="QString" key="CMake.Initial.Parameters">-GNinja --DCMAKE_BUILD_TYPE:STRING=RelWithDebInfo --DCMAKE_PROJECT_INCLUDE_BEFORE:PATH=%{IDE:ResourcePath}/package-manager/auto-setup.cmake --DQT_QMAKE_EXECUTABLE:STRING=%{Qt:qmakeExecutable} --DCMAKE_PREFIX_PATH:STRING=%{Qt:QT_INSTALL_PREFIX} --DCMAKE_C_COMPILER:STRING=%{Compiler:Executable:C} --DCMAKE_CXX_COMPILER:STRING=%{Compiler:Executable:Cxx}</value> - <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">/home/rtk0c/Development/epistmool/ui.qt/build-EpistmoolUI-Desktop_Qt_6-RelWithDebInfo</value> - <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0"> - <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0"> - <valuelist type="QVariantList" key="CMakeProjectManager.MakeStep.BuildTargets"> - <value type="QString">all</value> - </valuelist> - <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Build</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">CMakeProjectManager.MakeStep</value> - </valuemap> - <value type="qlonglong" key="ProjectExplorer.BuildStepList.StepsCount">1</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Build</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Build</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Build</value> - </valuemap> - <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.1"> - <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0"> - <valuelist type="QVariantList" key="CMakeProjectManager.MakeStep.BuildTargets"> - <value type="QString">clean</value> - </valuelist> - <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Build</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">CMakeProjectManager.MakeStep</value> - </valuemap> - <value type="qlonglong" key="ProjectExplorer.BuildStepList.StepsCount">1</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Clean</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Clean</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Clean</value> - </valuemap> - <value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">2</value> - <value type="bool" key="ProjectExplorer.BuildConfiguration.ClearSystemEnvironment">false</value> - <valuelist type="QVariantList" key="ProjectExplorer.BuildConfiguration.CustomParsers"/> - <value type="bool" key="ProjectExplorer.BuildConfiguration.ParseStandardOutput">false</value> - <valuelist type="QVariantList" key="ProjectExplorer.BuildConfiguration.UserEnvironmentChanges"/> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Release with Debug Information</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">CMakeProjectManager.CMakeBuildConfiguration</value> - </valuemap> - <valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.3"> - <value type="QString" key="CMake.Build.Type">MinSizeRel</value> - <value type="QString" key="CMake.Initial.Parameters">-GNinja --DCMAKE_BUILD_TYPE:STRING=MinSizeRel --DCMAKE_PROJECT_INCLUDE_BEFORE:PATH=%{IDE:ResourcePath}/package-manager/auto-setup.cmake --DQT_QMAKE_EXECUTABLE:STRING=%{Qt:qmakeExecutable} --DCMAKE_PREFIX_PATH:STRING=%{Qt:QT_INSTALL_PREFIX} --DCMAKE_C_COMPILER:STRING=%{Compiler:Executable:C} --DCMAKE_CXX_COMPILER:STRING=%{Compiler:Executable:Cxx}</value> - <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">/home/rtk0c/Development/epistmool/ui.qt/build-EpistmoolUI-Desktop_Qt_6-MinSizeRel</value> - <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0"> - <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0"> - <valuelist type="QVariantList" key="CMakeProjectManager.MakeStep.BuildTargets"> - <value type="QString">all</value> - </valuelist> - <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Build</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">CMakeProjectManager.MakeStep</value> - </valuemap> - <value type="qlonglong" key="ProjectExplorer.BuildStepList.StepsCount">1</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Build</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Build</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Build</value> - </valuemap> - <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.1"> - <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0"> - <valuelist type="QVariantList" key="CMakeProjectManager.MakeStep.BuildTargets"> - <value type="QString">clean</value> - </valuelist> - <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Build</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">CMakeProjectManager.MakeStep</value> - </valuemap> - <value type="qlonglong" key="ProjectExplorer.BuildStepList.StepsCount">1</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Clean</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Clean</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Clean</value> - </valuemap> - <value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">2</value> - <value type="bool" key="ProjectExplorer.BuildConfiguration.ClearSystemEnvironment">false</value> - <valuelist type="QVariantList" key="ProjectExplorer.BuildConfiguration.CustomParsers"/> - <value type="bool" key="ProjectExplorer.BuildConfiguration.ParseStandardOutput">false</value> - <valuelist type="QVariantList" key="ProjectExplorer.BuildConfiguration.UserEnvironmentChanges"/> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Minimum Size Release</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">CMakeProjectManager.CMakeBuildConfiguration</value> - </valuemap> - <value type="qlonglong" key="ProjectExplorer.Target.BuildConfigurationCount">4</value> - <valuemap type="QVariantMap" key="ProjectExplorer.Target.DeployConfiguration.0"> - <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0"> - <value type="qlonglong" key="ProjectExplorer.BuildStepList.StepsCount">0</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Deploy</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Deploy</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Deploy</value> - </valuemap> - <value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">1</value> - <valuemap type="QVariantMap" key="ProjectExplorer.DeployConfiguration.CustomData"/> - <value type="bool" key="ProjectExplorer.DeployConfiguration.CustomDataEnabled">false</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.DefaultDeployConfiguration</value> - </valuemap> - <value type="qlonglong" key="ProjectExplorer.Target.DeployConfigurationCount">1</value> - <valuemap type="QVariantMap" key="ProjectExplorer.Target.RunConfiguration.0"> - <value type="bool" key="Analyzer.Perf.Settings.UseGlobalSettings">true</value> - <value type="bool" key="Analyzer.QmlProfiler.Settings.UseGlobalSettings">true</value> - <value type="bool" key="Analyzer.Valgrind.Settings.UseGlobalSettings">true</value> - <valuelist type="QVariantList" key="CustomOutputParsers"/> - <value type="int" key="PE.EnvironmentAspect.Base">2</value> - <valuelist type="QVariantList" key="PE.EnvironmentAspect.Changes"/> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">appEpistmoolUI</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">CMakeProjectManager.CMakeRunConfiguration.appEpistmoolUI</value> - <value type="QString" key="ProjectExplorer.RunConfiguration.BuildKey">appEpistmoolUI</value> - <value type="bool" key="RunConfiguration.UseCppDebugger">false</value> - <value type="bool" key="RunConfiguration.UseCppDebuggerAuto">true</value> - <value type="bool" key="RunConfiguration.UseLibrarySearchPath">true</value> - <value type="bool" key="RunConfiguration.UseQmlDebugger">false</value> - <value type="bool" key="RunConfiguration.UseQmlDebuggerAuto">true</value> - <value type="QString" key="RunConfiguration.WorkingDirectory.default">/home/rtk0c/Development/epistmool/ui.qt/build/Debug</value> - </valuemap> - <value type="qlonglong" key="ProjectExplorer.Target.RunConfigurationCount">1</value> - </valuemap> - </data> - <data> - <variable>ProjectExplorer.Project.TargetCount</variable> - <value type="qlonglong">1</value> - </data> - <data> - <variable>ProjectExplorer.Project.Updater.FileVersion</variable> - <value type="int">22</value> - </data> - <data> - <variable>Version</variable> - <value type="int">22</value> - </data> -</qtcreator> diff --git a/ui.qt/source/DatabaseClient.cpp b/ui.qt/source/DatabaseClient.cpp new file mode 100644 index 0000000..430fe79 --- /dev/null +++ b/ui.qt/source/DatabaseClient.cpp @@ -0,0 +1,5 @@ +#include "DatabaseClient.hpp" + +DatabaseClient::DatabaseClient() +{ +} diff --git a/ui.qt/source/DatabaseClient.hpp b/ui.qt/source/DatabaseClient.hpp new file mode 100644 index 0000000..17c6ed7 --- /dev/null +++ b/ui.qt/source/DatabaseClient.hpp @@ -0,0 +1,7 @@ +#pragma once + +class DatabaseClient +{ +public: + DatabaseClient(); +}; diff --git a/ui.qt/source/DatabaseServer.cpp b/ui.qt/source/DatabaseServer.cpp new file mode 100644 index 0000000..a850e63 --- /dev/null +++ b/ui.qt/source/DatabaseServer.cpp @@ -0,0 +1,5 @@ +#include "DatabaseServer.hpp" + +DatabaseServer::DatabaseServer() +{ +} diff --git a/ui.qt/source/DatabaseServer.hpp b/ui.qt/source/DatabaseServer.hpp new file mode 100644 index 0000000..0cd5039 --- /dev/null +++ b/ui.qt/source/DatabaseServer.hpp @@ -0,0 +1,7 @@ +#pragma once + +class DatabaseServer +{ +public: + DatabaseServer(); +}; diff --git a/ui.qt/source/document.cpp b/ui.qt/source/Document.cpp index 377913b..272ac4c 100644 --- a/ui.qt/source/document.cpp +++ b/ui.qt/source/Document.cpp @@ -1,4 +1,4 @@ -#include "document.hpp" +#include "Document.hpp" #include <QBrush> #include <QColor> diff --git a/ui.qt/source/document.hpp b/ui.qt/source/Document.hpp index 5ef1bba..5ef1bba 100644 --- a/ui.qt/source/document.hpp +++ b/ui.qt/source/Document.hpp diff --git a/ui.qt/source/keyword.cpp b/ui.qt/source/Keyword.cpp index f782437..f6c18be 100644 --- a/ui.qt/source/keyword.cpp +++ b/ui.qt/source/Keyword.cpp @@ -1,9 +1,9 @@ -#include "keyword.hpp" +#include "Keyword.hpp" -#include "knowledgefragment.hpp" +#include "KnowledgeFragment.hpp" Keyword::Keyword(const QString& name) - : name(name) + : mName(name) { } diff --git a/ui.qt/source/keyword.hpp b/ui.qt/source/Keyword.hpp index bc50473..481b5bb 100644 --- a/ui.qt/source/keyword.hpp +++ b/ui.qt/source/Keyword.hpp @@ -8,8 +8,8 @@ class Keyword { private: - QString name; - std::vector<KnowledgeId> associations; + QString mName; + std::vector<KnowledgeId> mAssociations; public: Keyword(const QString& name); diff --git a/ui.qt/source/knowledgefragment.cpp b/ui.qt/source/KnowledgeFragment.cpp index 4db09e7..3d08f6e 100644 --- a/ui.qt/source/knowledgefragment.cpp +++ b/ui.qt/source/KnowledgeFragment.cpp @@ -1,11 +1,11 @@ -#include "knowledgefragment.hpp" +#include "KnowledgeFragment.hpp" KnowledgeFragment::KnowledgeFragment(KnowledgeId id) - : id{ id } + : mId{ id } { } KnowledgeId KnowledgeFragment::getId() const { - return id; + return mId; } diff --git a/ui.qt/source/knowledgefragment.hpp b/ui.qt/source/KnowledgeFragment.hpp index 533d99f..9f4912d 100644 --- a/ui.qt/source/knowledgefragment.hpp +++ b/ui.qt/source/KnowledgeFragment.hpp @@ -14,9 +14,9 @@ struct KnowledgeId class KnowledgeFragment { private: - QDateTime createTime; - QDateTime modifyTime; - KnowledgeId id; + QDateTime mCreateTime; + QDateTime mModifyTime; + KnowledgeId mId; public: KnowledgeFragment(KnowledgeId id); @@ -27,9 +27,9 @@ public: class KnowledgeDatabase { private: - std::vector<KnowledgeFragment> storage; - std::vector<size_t> index; // Mapping from KnowledgeId (index) to `storage` index - KnowledgeId nextId; + std::vector<KnowledgeFragment> mStorage; + std::vector<size_t> mIndex; // Mapping from KnowledgeId (index) to `storage` index + KnowledgeId mNextId; public: KnowledgeId allocateFragment(); diff --git a/ui.qt/source/fwd.hpp b/ui.qt/source/fwd.hpp index 7a24ded..14e0033 100644 --- a/ui.qt/source/fwd.hpp +++ b/ui.qt/source/fwd.hpp @@ -1,13 +1,13 @@ #pragma once -// document.hpp +// Document.hpp class DocumentHandler; -// keyword.hpp +// Keyword.hpp class Keyword; class KeywordDatabase; -// knowledgefragment.cpp +// Knowledgefragment.cpp struct KnowledgeId; class KnowledgeFragment; class KnowledgeDatabase; diff --git a/ui.qt/source/main.cpp b/ui.qt/source/main.cpp index fab148c..863ee20 100644 --- a/ui.qt/source/main.cpp +++ b/ui.qt/source/main.cpp @@ -8,14 +8,14 @@ int main(int argc, char *argv[]) QApplication app(argc, argv); QTranslator translator; - const QStringList uiLanguages = QLocale::system().uiLanguages(); - for (const QString& locale : uiLanguages) { - const QString baseName = "EpistmoolUI_" + QLocale(locale).name(); - if (translator.load(":/i18n/" + baseName)) { + const QStringList uiLanguages = QLocale::system().uiLanguages(); + for (const QString& locale : uiLanguages) { + const QString baseName = "EpistmoolUI_" + QLocale(locale).name(); + if (translator.load(":/i18n/" + baseName)) { app.installTranslator(&translator); break; - } - } + } + } QQmlApplicationEngine engine; const QUrl url(u"qrc:/EpistmoolUI/source/qml/MainWindow.qml"_qs); |