diff --git a/CMakeLists.txt b/CMakeLists.txt index 35c8bddb..d7243eb1 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -16,6 +16,8 @@ include(cmake/licenses.cmake) set(PROJECT_NAME Coati) set(APP_PROJECT_NAME "${PROJECT_NAME}") +set(TRIAL_PROJECT_NAME "${PROJECT_NAME}_trial") +set(LIB_GUI_PROJECT_NAME "${PROJECT_NAME}_lib_gui") set(LIB_PROJECT_NAME "${PROJECT_NAME}_lib") set(TEST_PROJECT_NAME "${PROJECT_NAME}_test") @@ -35,19 +37,10 @@ if (UNIX) endif () # Project ---------------------------------------------------------------------- - project(${PROJECT_NAME}) -if (UNIX AND NOT APPLE) - #set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -m32" CACHE STRING "c++ flags") - #set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -m32" CACHE STRING "c flags") - #set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -m32" ) - #set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -m32" ) - #set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -m32" ) -endif () # Clang ------------------------------------------------------------------------ - if (UNIX) if ("${CMAKE_BUILD_TYPE}" STREQUAL "Release") find_package(LLVM REQUIRED PATHS "$ENV{CLANG_DIR}/build_release/share/llvm/cmake") @@ -86,14 +79,12 @@ set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_SOURCE_DIR}/bin/lib) add_subdirectory(src/lib) add_subdirectory(src/external) -set_source_files_properties(${CLANG_FILES} PROPERTIES COMPILE_FLAGS "-fno-rtti") set_source_files_properties(${EXTERNAL_FILES} PROPERTIES COMPILE_FLAGS "-w") set_source_files_properties(${EXTERNAL_C_FILES} PROPERTIES COMPILE_FLAGS "-std=gnu89 -w") -add_library(${LIB_PROJECT_NAME} ${LIB_FILES} ${CLANG_FILES} ${EXTERNAL_FILES} ${EXTERNAL_C_FILES}) +add_library(${LIB_PROJECT_NAME} ${LIB_FILES} ${EXTERNAL_FILES} ${EXTERNAL_C_FILES}) create_source_groups(${LIB_FILES}) -create_source_groups(${CLANG_FILES}) create_source_groups(${EXTERNAL_FILES}) create_source_groups(${EXTERNAL_C_FILES}) @@ -123,15 +114,12 @@ link_directories(${LLVM_LIBRARY_DIRS} ${CLANG_LIBRARY_DIRS} ${Boost_LIBRARY_DIRS target_link_libraries(${LIB_PROJECT_NAME} ${CLANG_LIBRARIES} ${LLVM_AVAILABLE_LIBS} ${Boost_LIBRARIES}) -# App -------------------------------------------------------------------------- +# Lib Gui -------------------------------------------------------------------------- -if (UNIX) - set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_SOURCE_DIR}/bin/app/${CMAKE_BUILD_TYPE}) -else () - set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_SOURCE_DIR}/bin/app/) -endif () +set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_SOURCE_DIR}/bin/lib_gui) +set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_SOURCE_DIR}/bin/lib_gui) -add_subdirectory(src/app) +add_subdirectory(src/lib_gui) # Find includes in corresponding build directories set(CMAKE_INCLUDE_CURRENT_DIR ON) @@ -162,14 +150,77 @@ add_custom_target( versionnumber ALL ) +add_library(${LIB_GUI_PROJECT_NAME} ${LIB_GUI_FILES} ${CMAKE_SOURCE_DIR}/build/src/lib_gui/version.h) + +# command for versioning script +add_custom_command( + TARGET versionnumber + PRE_BUILD + COMMAND ${CMAKE_COMMAND} -P ${CMAKE_SOURCE_DIR}/cmake/version.cmake + BYPRODUCTS ${PROJECT_SOURCE_DIR}/build/src/lib_gui/version.h + DEPENDS ${LIB_GUI_PROJECT_NAME} + WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} + COMMENT "check/update version number" +) +add_dependencies(${LIB_GUI_PROJECT_NAME} versionnumber) + +create_source_groups(${LIB_GUI_FILES}) + +set_property( + TARGET ${LIB_GUI_PROJECT_NAME} + PROPERTY INCLUDE_DIRECTORIES + "${CMAKE_SOURCE_DIR}/src/lib" + "${CMAKE_SOURCE_DIR}/src/lib_gui" + "${CMAKE_SOURCE_DIR}/build/src/lib_gui" +) + +# include external header without warnings +target_include_directories(${LIB_GUI_PROJECT_NAME} SYSTEM + PUBLIC "${CMAKE_SOURCE_DIR}/src/external" + PUBLIC ${Boost_INCLUDE_DIRS} +) + +# Use the Widgets module from Qt 5. +qt5_use_modules(${LIB_GUI_PROJECT_NAME} Widgets) +qt5_use_modules(${LIB_GUI_PROJECT_NAME} Network) + +# configure platform specific include file +configure_file( + "${PROJECT_SOURCE_DIR}/src/lib_gui/platform_includes/includes.h.in" + "${PROJECT_SOURCE_DIR}/build/src/lib_gui/includes.h" +) + +#configure the versioning file +configure_file( + ${CMAKE_SOURCE_DIR}/src/lib_gui/version.h.in + ${CMAKE_SOURCE_DIR}/build/src/lib_gui/version.h +) + +set(CMAKE_AUTOMOC OFF) + +# App -------------------------------------------------------------------------- + +if (UNIX) + set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_SOURCE_DIR}/bin/app/${CMAKE_BUILD_TYPE}) +else () + set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_SOURCE_DIR}/bin/app/) +endif () + +add_subdirectory(src/app) + +set_source_files_properties(${CLANG_FILES} PROPERTIES COMPILE_FLAGS "-fno-rtti") + +# Find includes in corresponding build directories +set(CMAKE_INCLUDE_CURRENT_DIR ON) + if (WIN32) file(WRITE ${CMAKE_SOURCE_DIR}/build/Coati.rc "// Icon with lowest ID value placed first to ensure application icon\n" "// remains consistent on all systems.\n" "IDI_ICON1 ICON \"${CMAKE_SOURCE_DIR}/build/coati.ico\"\n" ) - add_executable(${APP_PROJECT_NAME} ${APP_FILES} ${CMAKE_SOURCE_DIR}/build/Coati.rc ${CMAKE_SOURCE_DIR}/build/src/app/version.h) - + add_executable(${APP_PROJECT_NAME} ${APP_FILES} ${CLANG_FILES} ${CMAKE_SOURCE_DIR}/build/Coati.rc) + # hide the console when running a release build. set_target_properties(${APP_PROJECT_NAME} PROPERTIES LINK_FLAGS_DEBUG "/SUBSYSTEM:CONSOLE") set_target_properties(${APP_PROJECT_NAME} PROPERTIES COMPILE_DEFINITIONS_DEBUG "_CONSOLE") @@ -179,31 +230,21 @@ if (WIN32) set_target_properties(${APP_PROJECT_NAME} PROPERTIES LINK_FLAGS_MINSIZEREL "/SUBSYSTEM:WINDOWS") else () - add_executable(${APP_PROJECT_NAME} ${APP_FILES} ${CMAKE_SOURCE_DIR}/build/src/app/version.h) + add_executable(${APP_PROJECT_NAME} ${APP_FILES} ${CLANG_FILES}) endif () -# command for versioning script -add_custom_command( - TARGET versionnumber - PRE_BUILD - COMMAND ${CMAKE_COMMAND} -P ${CMAKE_SOURCE_DIR}/cmake/version.cmake - BYPRODUCTS ${PROJECT_SOURCE_DIR}/build/src/app/version.h - DEPENDS ${APP_PROJECT_NAME} - WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} - COMMENT "check/update version number" -) -add_dependencies(${APP_PROJECT_NAME} versionnumber) - create_source_groups(${APP_FILES}) +create_source_groups(${CLANG_FILES}) -target_link_libraries(${APP_PROJECT_NAME} ${LIB_PROJECT_NAME}) +target_link_libraries(${APP_PROJECT_NAME} ${LIB_GUI_PROJECT_NAME} ${LIB_PROJECT_NAME}) set_property( TARGET ${APP_PROJECT_NAME} PROPERTY INCLUDE_DIRECTORIES - "${CMAKE_SOURCE_DIR}/src/lib" "${CMAKE_SOURCE_DIR}/src/app" - "${CMAKE_SOURCE_DIR}/build/src/app" + "${CMAKE_SOURCE_DIR}/src/lib" + "${CMAKE_SOURCE_DIR}/src/lib_gui" + "${CMAKE_SOURCE_DIR}/build/src/lib_gui" ) target_include_directories(${APP_PROJECT_NAME} SYSTEM @@ -215,25 +256,72 @@ target_include_directories(${APP_PROJECT_NAME} SYSTEM qt5_use_modules(${APP_PROJECT_NAME} Widgets) qt5_use_modules(${APP_PROJECT_NAME} Network) -# configure platform specific include file -configure_file( - "${PROJECT_SOURCE_DIR}/src/app/platform_includes/includes.h.in" - "${PROJECT_SOURCE_DIR}/build/src/app/includes.h" -) - -#configure the versioning file -configure_file( - ${CMAKE_SOURCE_DIR}/src/app/version.h.in - ${CMAKE_SOURCE_DIR}/build/src/app/version.h -) - # add platform specific libraries if (APPLE) find_library(CORE_FOUNDATION CoreFoundation) target_link_libraries(${APP_PROJECT_NAME} ${CORE_FOUNDATION}) endif () -set(CMAKE_AUTOMOC OFF) +# Trial --------------------------------------------------------------------- + +if (UNIX) + set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_SOURCE_DIR}/bin/app/${CMAKE_BUILD_TYPE}) +else () + set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_SOURCE_DIR}/bin/app/) +endif () + +add_subdirectory(src/trial) + +# Find includes in corresponding build directories +set(CMAKE_INCLUDE_CURRENT_DIR ON) + +if (WIN32) + file(WRITE ${CMAKE_SOURCE_DIR}/build/Coati.rc + "// Icon with lowest ID value placed first to ensure application icon\n" + "// remains consistent on all systems.\n" + "IDI_ICON1 ICON \"${CMAKE_SOURCE_DIR}/build/coati.ico\"\n" + ) + add_executable(${TRIAL_PROJECT_NAME} ${TRIAL_FILES} ${CMAKE_SOURCE_DIR}/build/Coati.rc) + + # hide the console when running a release build. + set_target_properties(${TRIAL_PROJECT_NAME} PROPERTIES LINK_FLAGS_DEBUG "/SUBSYSTEM:CONSOLE") + set_target_properties(${TRIAL_PROJECT_NAME} PROPERTIES COMPILE_DEFINITIONS_DEBUG "_CONSOLE") + set_target_properties(${TRIAL_PROJECT_NAME} PROPERTIES LINK_FLAGS_RELWITHDEBINFO "/SUBSYSTEM:CONSOLE") + set_target_properties(${TRIAL_PROJECT_NAME} PROPERTIES COMPILE_DEFINITIONS_RELWITHDEBINFO "_CONSOLE") + set_target_properties(${TRIAL_PROJECT_NAME} PROPERTIES LINK_FLAGS_RELEASE "/ENTRY:\"mainCRTStartup\" /SUBSYSTEM:WINDOWS") + set_target_properties(${TRIAL_PROJECT_NAME} PROPERTIES LINK_FLAGS_MINSIZEREL "/SUBSYSTEM:WINDOWS") + +else () + add_executable(${TRIAL_PROJECT_NAME} ${TRIAL_FILES}) +endif () + +create_source_groups(${TRIAL_FILES}) + +target_link_libraries(${TRIAL_PROJECT_NAME} ${LIB_GUI_PROJECT_NAME} ${LIB_PROJECT_NAME}) + +set_property( + TARGET ${TRIAL_PROJECT_NAME} + PROPERTY INCLUDE_DIRECTORIES + "${CMAKE_SOURCE_DIR}/src/trial" + "${CMAKE_SOURCE_DIR}/src/lib" + "${CMAKE_SOURCE_DIR}/src/lib_gui" + "${CMAKE_SOURCE_DIR}/build/src/lib_gui" +) + +target_include_directories(${TRIAL_PROJECT_NAME} SYSTEM + PUBLIC "${CMAKE_SOURCE_DIR}/src/external" + PUBLIC ${Boost_INCLUDE_DIRS} +) + +# Use the Widgets module from Qt 5. +qt5_use_modules(${TRIAL_PROJECT_NAME} Widgets) +qt5_use_modules(${TRIAL_PROJECT_NAME} Network) + +# add platform specific libraries +if (APPLE) + find_library(CORE_FOUNDATION CoreFoundation) + target_link_libraries(${TRIAL_PROJECT_NAME} ${CORE_FOUNDATION}) +endif () # MacOSX Bundle ---------------------------------------------------------------- diff --git a/cmake/licenses.cmake b/cmake/licenses.cmake index c1ba9ce8..034ec99f 100644 --- a/cmake/licenses.cmake +++ b/cmake/licenses.cmake @@ -30,6 +30,6 @@ AddLicense("Eigen" "http://eigen.tuxfamily.org" "${LICENSEFOLDER}/eigen_LICENSE. set(LICENSE_ARRAY "${LICENSE_ARRAY}\n") configure_file( - ${CMAKE_SOURCE_DIR}/src/app/licenses.h.in - ${CMAKE_SOURCE_DIR}/build/src/app/licenses.h + ${CMAKE_SOURCE_DIR}/src/lib_gui/licenses.h.in + ${CMAKE_SOURCE_DIR}/build/src/lib_gui/licenses.h ) diff --git a/cmake/version.cmake b/cmake/version.cmake index 743403d6..99c34bc5 100644 --- a/cmake/version.cmake +++ b/cmake/version.cmake @@ -43,6 +43,6 @@ message(STATUS "Git commit time: ${GIT_COMMIT_TIME}") message(STATUS "Git version number:" ${GIT_VERSION_NUMBER} ) configure_file( - ${CMAKE_SOURCE_DIR}/src/app/version.h.in - ${CMAKE_SOURCE_DIR}/build/src/app/version.h + ${CMAKE_SOURCE_DIR}/src/lib_gui/version.h.in + ${CMAKE_SOURCE_DIR}/build/src/lib_gui/version.h ) diff --git a/script/build.sh b/script/build.sh index d70fa195..e178658f 100755 --- a/script/build.sh +++ b/script/build.sh @@ -13,6 +13,9 @@ then then #echo "release test" ninja -C build/Release Coati_test && cd bin/test && Release/Coati_test + elif [ "$2" = "trial" ] + then + ninja -C build/Release Coati_trial && cd bin/app && Release/Coati_trial else #echo "release app" ninja -C build/Release Coati && cd bin/app && Release/Coati @@ -23,6 +26,9 @@ then then #echo "debug test" ninja -C build/Debug Coati_test && cd bin/test && Debug/Coati_test + elif [ "$2" = "trial" ] + then + ninja -C build/Debug Coati_trial && cd bin/app && Debug/Coati_trial else #echo "debug app" ninja -C build/Debug Coati && cd bin/app && Debug/Coati diff --git a/src/app/CMakeLists.txt b/src/app/CMakeLists.txt index 877456fa..4332c9cf 100644 --- a/src/app/CMakeLists.txt +++ b/src/app/CMakeLists.txt @@ -1,119 +1,44 @@ add_files( APP_FILES - platform_includes/includesDefault.h - platform_includes/includesMac.h - platform_includes/includesWindows.h - - qt/element/QtAutocompletionList.cpp - qt/element/QtAutocompletionList.h - qt/element/QtCodeArea.cpp - qt/element/QtCodeArea.h - qt/element/QtCodeFile.cpp - qt/element/QtCodeFile.h - qt/element/QtCodeFileList.cpp - qt/element/QtCodeFileList.h - qt/element/QtCodeSnippet.cpp - qt/element/QtCodeSnippet.h - qt/element/QtDirectoryListBox.cpp - qt/element/QtDirectoryListBox.h - qt/element/QtLineEdit.cpp - qt/element/QtLineEdit.h - qt/element/QtRefreshBar.cpp - qt/element/QtRefreshBar.h - qt/element/QtSearchBar.cpp - qt/element/QtSearchBar.h - qt/element/QtSmartSearchBox.cpp - qt/element/QtSmartSearchBox.h - - qt/element/QtStatusBar.cpp - qt/element/QtStatusBar.h - qt/element/QtUndoRedo.cpp - qt/element/QtUndoRedo.h - - qt/graphics/QtAngledLineItem.cpp - qt/graphics/QtAngledLineItem.h - qt/graphics/QtCountCircleItem.cpp - qt/graphics/QtCountCircleItem.h - qt/graphics/QtRoundedRectItem.cpp - qt/graphics/QtRoundedRectItem.h - qt/graphics/QtStraightLineItem.cpp - qt/graphics/QtStraightLineItem.h - - qt/network/QtIDECommunicationController.cpp - qt/network/QtIDECommunicationController.h - qt/network/QtNetworkFactory.cpp - qt/network/QtNetworkFactory.h - qt/network/QtTcpWrapper.cpp - qt/network/QtTcpWrapper.h - - qt/utility/QtDeviceScaledPixmap.cpp - qt/utility/QtDeviceScaledPixmap.h - qt/utility/QtHighlighter.cpp - qt/utility/QtHighlighter.h - qt/utility/QtThreadedFunctor.h - qt/utility/utilityQt.cpp - qt/utility/utilityQt.h - - qt/view/graphElements/nodeComponents/QtGraphNodeComponent.cpp - qt/view/graphElements/nodeComponents/QtGraphNodeComponent.h - qt/view/graphElements/nodeComponents/QtGraphNodeComponentClickable.cpp - qt/view/graphElements/nodeComponents/QtGraphNodeComponentClickable.h - qt/view/graphElements/nodeComponents/QtGraphNodeComponentMoveable.cpp - qt/view/graphElements/nodeComponents/QtGraphNodeComponentMoveable.h - - qt/view/graphElements/QtGraphEdge.cpp - qt/view/graphElements/QtGraphEdge.h - qt/view/graphElements/QtGraphNode.cpp - qt/view/graphElements/QtGraphNode.h - qt/view/graphElements/QtGraphNodeAccess.cpp - qt/view/graphElements/QtGraphNodeAccess.h - qt/view/graphElements/QtGraphNodeBundle.cpp - qt/view/graphElements/QtGraphNodeBundle.h - qt/view/graphElements/QtGraphNodeData.cpp - qt/view/graphElements/QtGraphNodeData.h - qt/view/graphElements/QtGraphNodeExpandToggle.cpp - qt/view/graphElements/QtGraphNodeExpandToggle.h - - qt/view/QtCodeView.cpp - qt/view/QtCodeView.h - qt/view/QtCompositeView.cpp - qt/view/QtCompositeView.h - qt/view/QtGraphView.cpp - qt/view/QtGraphView.h - qt/view/QtGraphViewStyleImpl.cpp - qt/view/QtGraphViewStyleImpl.h - qt/view/QtMainView.cpp - qt/view/QtMainView.h - qt/view/QtRefreshView.cpp - qt/view/QtRefreshView.h - qt/view/QtSearchView.cpp - qt/view/QtSearchView.h - qt/view/QtStatusBarView.cpp - qt/view/QtStatusBarView.h - qt/view/QtUndoRedoView.cpp - qt/view/QtUndoRedoView.h - qt/view/QtViewFactory.cpp - qt/view/QtViewFactory.h - qt/view/QtViewWidgetWrapper.cpp - qt/view/QtViewWidgetWrapper.h - - qt/window/QtAbout.cpp - qt/window/QtAbout.h - qt/window/QtAboutLicense.cpp - qt/window/QtAboutLicense.h - qt/window/QtApplicationSettingsScreen.cpp - qt/window/QtApplicationSettingsScreen.h - qt/window/QtMainWindow.cpp - qt/window/QtMainWindow.h - qt/window/QtProjectSetupScreen.cpp - qt/window/QtProjectSetupScreen.h - qt/window/QtSettingsWindow.cpp - qt/window/QtSettingsWindow.h - qt/window/QtSplashScreen.cpp - qt/window/QtSplashScreen.h - qt/window/QtStartScreen.cpp - qt/window/QtStartScreen.h + data/parser/cxx/TaskParseCxx.cpp + isTrial.cpp main.cpp ) + +add_files( + CLANG_FILES + + data/parser/cxx/name_resolver/CxxDeclNameResolver.cpp + data/parser/cxx/name_resolver/CxxDeclNameResolver.h + data/parser/cxx/name_resolver/CxxNameResolver.cpp + data/parser/cxx/name_resolver/CxxNameResolver.h + data/parser/cxx/name_resolver/CxxTemplateArgumentNameResolver.cpp + data/parser/cxx/name_resolver/CxxTemplateArgumentNameResolver.h + data/parser/cxx/name_resolver/CxxTypeNameResolver.cpp + data/parser/cxx/name_resolver/CxxTypeNameResolver.h + + data/parser/cxx/ASTAction.cpp + data/parser/cxx/ASTAction.h + data/parser/cxx/ASTActionFactory.cpp + data/parser/cxx/ASTActionFactory.h + data/parser/cxx/ASTBodyVisitor.cpp + data/parser/cxx/ASTBodyVisitor.h + data/parser/cxx/ASTBodyVisitorClient.cpp + data/parser/cxx/ASTBodyVisitorClient.h + data/parser/cxx/ASTConsumer.cpp + data/parser/cxx/ASTConsumer.h + data/parser/cxx/ASTVisitor.cpp + data/parser/cxx/ASTVisitor.h + data/parser/cxx/CommentHandler.cpp + data/parser/cxx/CommentHandler.h + data/parser/cxx/CxxDiagnosticConsumer.cpp + data/parser/cxx/CxxDiagnosticConsumer.h + data/parser/cxx/CxxParser.cpp + data/parser/cxx/CxxParser.h + data/parser/cxx/PreprocessorCallbacks.cpp + data/parser/cxx/PreprocessorCallbacks.h + data/parser/cxx/utilityCxx.cpp + data/parser/cxx/utilityCxx.h +) \ No newline at end of file diff --git a/src/lib/data/parser/cxx/ASTAction.cpp b/src/app/data/parser/cxx/ASTAction.cpp similarity index 100% rename from src/lib/data/parser/cxx/ASTAction.cpp rename to src/app/data/parser/cxx/ASTAction.cpp diff --git a/src/lib/data/parser/cxx/ASTAction.h b/src/app/data/parser/cxx/ASTAction.h similarity index 100% rename from src/lib/data/parser/cxx/ASTAction.h rename to src/app/data/parser/cxx/ASTAction.h diff --git a/src/lib/data/parser/cxx/ASTActionFactory.cpp b/src/app/data/parser/cxx/ASTActionFactory.cpp similarity index 100% rename from src/lib/data/parser/cxx/ASTActionFactory.cpp rename to src/app/data/parser/cxx/ASTActionFactory.cpp diff --git a/src/lib/data/parser/cxx/ASTActionFactory.h b/src/app/data/parser/cxx/ASTActionFactory.h similarity index 100% rename from src/lib/data/parser/cxx/ASTActionFactory.h rename to src/app/data/parser/cxx/ASTActionFactory.h diff --git a/src/lib/data/parser/cxx/ASTBodyVisitor.cpp b/src/app/data/parser/cxx/ASTBodyVisitor.cpp similarity index 100% rename from src/lib/data/parser/cxx/ASTBodyVisitor.cpp rename to src/app/data/parser/cxx/ASTBodyVisitor.cpp diff --git a/src/lib/data/parser/cxx/ASTBodyVisitor.h b/src/app/data/parser/cxx/ASTBodyVisitor.h similarity index 100% rename from src/lib/data/parser/cxx/ASTBodyVisitor.h rename to src/app/data/parser/cxx/ASTBodyVisitor.h diff --git a/src/lib/data/parser/cxx/ASTBodyVisitorClient.cpp b/src/app/data/parser/cxx/ASTBodyVisitorClient.cpp similarity index 100% rename from src/lib/data/parser/cxx/ASTBodyVisitorClient.cpp rename to src/app/data/parser/cxx/ASTBodyVisitorClient.cpp diff --git a/src/lib/data/parser/cxx/ASTBodyVisitorClient.h b/src/app/data/parser/cxx/ASTBodyVisitorClient.h similarity index 100% rename from src/lib/data/parser/cxx/ASTBodyVisitorClient.h rename to src/app/data/parser/cxx/ASTBodyVisitorClient.h diff --git a/src/lib/data/parser/cxx/ASTConsumer.cpp b/src/app/data/parser/cxx/ASTConsumer.cpp similarity index 100% rename from src/lib/data/parser/cxx/ASTConsumer.cpp rename to src/app/data/parser/cxx/ASTConsumer.cpp diff --git a/src/lib/data/parser/cxx/ASTConsumer.h b/src/app/data/parser/cxx/ASTConsumer.h similarity index 100% rename from src/lib/data/parser/cxx/ASTConsumer.h rename to src/app/data/parser/cxx/ASTConsumer.h diff --git a/src/lib/data/parser/cxx/ASTVisitor.cpp b/src/app/data/parser/cxx/ASTVisitor.cpp similarity index 100% rename from src/lib/data/parser/cxx/ASTVisitor.cpp rename to src/app/data/parser/cxx/ASTVisitor.cpp diff --git a/src/lib/data/parser/cxx/ASTVisitor.h b/src/app/data/parser/cxx/ASTVisitor.h similarity index 100% rename from src/lib/data/parser/cxx/ASTVisitor.h rename to src/app/data/parser/cxx/ASTVisitor.h diff --git a/src/lib/data/parser/cxx/CommentHandler.cpp b/src/app/data/parser/cxx/CommentHandler.cpp similarity index 100% rename from src/lib/data/parser/cxx/CommentHandler.cpp rename to src/app/data/parser/cxx/CommentHandler.cpp diff --git a/src/lib/data/parser/cxx/CommentHandler.h b/src/app/data/parser/cxx/CommentHandler.h similarity index 100% rename from src/lib/data/parser/cxx/CommentHandler.h rename to src/app/data/parser/cxx/CommentHandler.h diff --git a/src/lib/data/parser/cxx/CxxDiagnosticConsumer.cpp b/src/app/data/parser/cxx/CxxDiagnosticConsumer.cpp similarity index 100% rename from src/lib/data/parser/cxx/CxxDiagnosticConsumer.cpp rename to src/app/data/parser/cxx/CxxDiagnosticConsumer.cpp diff --git a/src/lib/data/parser/cxx/CxxDiagnosticConsumer.h b/src/app/data/parser/cxx/CxxDiagnosticConsumer.h similarity index 100% rename from src/lib/data/parser/cxx/CxxDiagnosticConsumer.h rename to src/app/data/parser/cxx/CxxDiagnosticConsumer.h diff --git a/src/lib/data/parser/cxx/CxxParser.cpp b/src/app/data/parser/cxx/CxxParser.cpp similarity index 100% rename from src/lib/data/parser/cxx/CxxParser.cpp rename to src/app/data/parser/cxx/CxxParser.cpp diff --git a/src/lib/data/parser/cxx/CxxParser.h b/src/app/data/parser/cxx/CxxParser.h similarity index 100% rename from src/lib/data/parser/cxx/CxxParser.h rename to src/app/data/parser/cxx/CxxParser.h diff --git a/src/lib/data/parser/cxx/PreprocessorCallbacks.cpp b/src/app/data/parser/cxx/PreprocessorCallbacks.cpp similarity index 100% rename from src/lib/data/parser/cxx/PreprocessorCallbacks.cpp rename to src/app/data/parser/cxx/PreprocessorCallbacks.cpp diff --git a/src/lib/data/parser/cxx/PreprocessorCallbacks.h b/src/app/data/parser/cxx/PreprocessorCallbacks.h similarity index 100% rename from src/lib/data/parser/cxx/PreprocessorCallbacks.h rename to src/app/data/parser/cxx/PreprocessorCallbacks.h diff --git a/src/lib/data/parser/cxx/TaskParseCxx.cpp b/src/app/data/parser/cxx/TaskParseCxx.cpp similarity index 80% rename from src/lib/data/parser/cxx/TaskParseCxx.cpp rename to src/app/data/parser/cxx/TaskParseCxx.cpp index b0b93a72..d06a868e 100644 --- a/src/lib/data/parser/cxx/TaskParseCxx.cpp +++ b/src/app/data/parser/cxx/TaskParseCxx.cpp @@ -2,6 +2,7 @@ #include +#include "data/parser/cxx/CxxParser.h" #include "data/parser/ParserClient.h" #include "utility/file/FileRegister.h" #include "utility/messaging/type/MessageFinishedParsing.h" @@ -15,7 +16,7 @@ TaskParseCxx::TaskParseCxx( const std::vector& files ) : m_client(client) - , m_parser(client, fileManager) + , m_parser(std::make_shared(client, fileManager)) , m_arguments(arguments) , m_files(files) { @@ -25,9 +26,9 @@ void TaskParseCxx::enter() { m_start = utility::durationStart(); - m_parser.setupParsing(m_files, m_arguments); + m_parser->setupParsing(m_files, m_arguments); - for (const FilePath& path : m_parser.getFileRegister()->getUnparsedSourceFilePaths()) + for (const FilePath& path : m_parser->getFileRegister()->getUnparsedSourceFilePaths()) { m_sourcePaths.push(path.absolute()); } @@ -40,7 +41,7 @@ Task::TaskState TaskParseCxx::update() FilePath sourcePath; bool isSource = false; - FileRegister* fileRegister = m_parser.getFileRegister(); + FileRegister* fileRegister = m_parser->getFileRegister(); if (m_sourcePaths.size()) { @@ -71,7 +72,7 @@ Task::TaskState TaskParseCxx::update() m_client->prepareParsingFile(sourcePath); - m_parser.runTool(std::vector(1, sourcePath.str())); + m_parser->runTool(std::vector(1, sourcePath.str())); m_client->finishParsingFile(sourcePath); @@ -89,13 +90,13 @@ void TaskParseCxx::exit() m_client->finishParsing(); - FileRegister* fileRegister = m_parser.getFileRegister(); + FileRegister* fileRegister = m_parser->getFileRegister(); MessageFinishedParsing( fileRegister->getParsedFilesCount(), fileRegister->getFilesCount(), utility::duration(m_start), - m_parser.getParserClient()->getErrorCount() + m_parser->getParserClient()->getErrorCount() ).dispatch(); } diff --git a/src/lib/data/parser/cxx/name_resolver/CxxDeclNameResolver.cpp b/src/app/data/parser/cxx/name_resolver/CxxDeclNameResolver.cpp similarity index 100% rename from src/lib/data/parser/cxx/name_resolver/CxxDeclNameResolver.cpp rename to src/app/data/parser/cxx/name_resolver/CxxDeclNameResolver.cpp diff --git a/src/lib/data/parser/cxx/name_resolver/CxxDeclNameResolver.h b/src/app/data/parser/cxx/name_resolver/CxxDeclNameResolver.h similarity index 100% rename from src/lib/data/parser/cxx/name_resolver/CxxDeclNameResolver.h rename to src/app/data/parser/cxx/name_resolver/CxxDeclNameResolver.h diff --git a/src/lib/data/parser/cxx/name_resolver/CxxNameResolver.cpp b/src/app/data/parser/cxx/name_resolver/CxxNameResolver.cpp similarity index 100% rename from src/lib/data/parser/cxx/name_resolver/CxxNameResolver.cpp rename to src/app/data/parser/cxx/name_resolver/CxxNameResolver.cpp diff --git a/src/lib/data/parser/cxx/name_resolver/CxxNameResolver.h b/src/app/data/parser/cxx/name_resolver/CxxNameResolver.h similarity index 100% rename from src/lib/data/parser/cxx/name_resolver/CxxNameResolver.h rename to src/app/data/parser/cxx/name_resolver/CxxNameResolver.h diff --git a/src/lib/data/parser/cxx/name_resolver/CxxTemplateArgumentNameResolver.cpp b/src/app/data/parser/cxx/name_resolver/CxxTemplateArgumentNameResolver.cpp similarity index 100% rename from src/lib/data/parser/cxx/name_resolver/CxxTemplateArgumentNameResolver.cpp rename to src/app/data/parser/cxx/name_resolver/CxxTemplateArgumentNameResolver.cpp diff --git a/src/lib/data/parser/cxx/name_resolver/CxxTemplateArgumentNameResolver.h b/src/app/data/parser/cxx/name_resolver/CxxTemplateArgumentNameResolver.h similarity index 100% rename from src/lib/data/parser/cxx/name_resolver/CxxTemplateArgumentNameResolver.h rename to src/app/data/parser/cxx/name_resolver/CxxTemplateArgumentNameResolver.h diff --git a/src/lib/data/parser/cxx/name_resolver/CxxTypeNameResolver.cpp b/src/app/data/parser/cxx/name_resolver/CxxTypeNameResolver.cpp similarity index 100% rename from src/lib/data/parser/cxx/name_resolver/CxxTypeNameResolver.cpp rename to src/app/data/parser/cxx/name_resolver/CxxTypeNameResolver.cpp diff --git a/src/lib/data/parser/cxx/name_resolver/CxxTypeNameResolver.h b/src/app/data/parser/cxx/name_resolver/CxxTypeNameResolver.h similarity index 100% rename from src/lib/data/parser/cxx/name_resolver/CxxTypeNameResolver.h rename to src/app/data/parser/cxx/name_resolver/CxxTypeNameResolver.h diff --git a/src/lib/data/parser/cxx/utilityCxx.cpp b/src/app/data/parser/cxx/utilityCxx.cpp similarity index 100% rename from src/lib/data/parser/cxx/utilityCxx.cpp rename to src/app/data/parser/cxx/utilityCxx.cpp diff --git a/src/lib/data/parser/cxx/utilityCxx.h b/src/app/data/parser/cxx/utilityCxx.h similarity index 100% rename from src/lib/data/parser/cxx/utilityCxx.h rename to src/app/data/parser/cxx/utilityCxx.h diff --git a/src/app/isTrial.cpp b/src/app/isTrial.cpp new file mode 100644 index 00000000..17893654 --- /dev/null +++ b/src/app/isTrial.cpp @@ -0,0 +1,6 @@ +#include "isTrial.h" + +bool isTrail() +{ + return false; +} diff --git a/src/lib/CMakeLists.txt b/src/lib/CMakeLists.txt index 1deb01fd..c10b69d5 100644 --- a/src/lib/CMakeLists.txt +++ b/src/lib/CMakeLists.txt @@ -1,38 +1,3 @@ -add_files( - CLANG_FILES - - data/parser/cxx/name_resolver/CxxDeclNameResolver.cpp - data/parser/cxx/name_resolver/CxxDeclNameResolver.h - data/parser/cxx/name_resolver/CxxNameResolver.cpp - data/parser/cxx/name_resolver/CxxNameResolver.h - data/parser/cxx/name_resolver/CxxTemplateArgumentNameResolver.cpp - data/parser/cxx/name_resolver/CxxTemplateArgumentNameResolver.h - data/parser/cxx/name_resolver/CxxTypeNameResolver.cpp - data/parser/cxx/name_resolver/CxxTypeNameResolver.h - - data/parser/cxx/ASTAction.cpp - data/parser/cxx/ASTAction.h - data/parser/cxx/ASTActionFactory.cpp - data/parser/cxx/ASTActionFactory.h - data/parser/cxx/ASTBodyVisitor.cpp - data/parser/cxx/ASTBodyVisitor.h - data/parser/cxx/ASTBodyVisitorClient.cpp - data/parser/cxx/ASTBodyVisitorClient.h - data/parser/cxx/ASTConsumer.cpp - data/parser/cxx/ASTConsumer.h - data/parser/cxx/ASTVisitor.cpp - data/parser/cxx/ASTVisitor.h - data/parser/cxx/CommentHandler.cpp - data/parser/cxx/CommentHandler.h - data/parser/cxx/CxxDiagnosticConsumer.cpp - data/parser/cxx/CxxDiagnosticConsumer.h - data/parser/cxx/CxxParser.cpp - data/parser/cxx/CxxParser.h - data/parser/cxx/PreprocessorCallbacks.cpp - data/parser/cxx/PreprocessorCallbacks.h - data/parser/cxx/utilityCxx.cpp - data/parser/cxx/utilityCxx.h -) add_files( LIB_FILES @@ -154,7 +119,6 @@ add_files( data/name/NameHierarchy.cpp data/name/NameHierarchy.h - data/parser/cxx/TaskParseCxx.cpp data/parser/cxx/TaskParseCxx.h data/parser/ParseFunction.cpp @@ -321,6 +285,7 @@ add_files( Application.cpp Application.h + isTrial.h Project.cpp Project.h ) diff --git a/src/lib/data/parser/cxx/TaskParseCxx.h b/src/lib/data/parser/cxx/TaskParseCxx.h index 024e68cb..dc11651f 100644 --- a/src/lib/data/parser/cxx/TaskParseCxx.h +++ b/src/lib/data/parser/cxx/TaskParseCxx.h @@ -1,12 +1,16 @@ #ifndef TASK_PARSE_CXX_H #define TASK_PARSE_CXX_H +#include #include +#include "data/parser/Parser.h" #include "utility/scheduling/Task.h" #include "utility/TimePoint.h" -#include "data/parser/cxx/CxxParser.h" +class ParserClient; +class FileManager; +class CxxParser; class TaskParseCxx : public Task @@ -28,7 +32,7 @@ public: private: ParserClient* m_client; - CxxParser m_parser; + std::shared_ptr m_parser; const Parser::Arguments m_arguments; const std::vector m_files; diff --git a/src/lib/isTrial.h b/src/lib/isTrial.h new file mode 100644 index 00000000..e8d280d2 --- /dev/null +++ b/src/lib/isTrial.h @@ -0,0 +1,6 @@ +#ifndef IS_TRIAL_H +#define IS_TRIAL_H + +bool isTrial(); + +#endif // IS_TRIAL_H diff --git a/src/lib_gui/CMakeLists.txt b/src/lib_gui/CMakeLists.txt new file mode 100644 index 00000000..b79895f5 --- /dev/null +++ b/src/lib_gui/CMakeLists.txt @@ -0,0 +1,117 @@ +add_files( + LIB_GUI_FILES + + platform_includes/includesDefault.h + platform_includes/includesMac.h + platform_includes/includesWindows.h + + qt/element/QtAutocompletionList.cpp + qt/element/QtAutocompletionList.h + qt/element/QtCodeArea.cpp + qt/element/QtCodeArea.h + qt/element/QtCodeFile.cpp + qt/element/QtCodeFile.h + qt/element/QtCodeFileList.cpp + qt/element/QtCodeFileList.h + qt/element/QtCodeSnippet.cpp + qt/element/QtCodeSnippet.h + qt/element/QtDirectoryListBox.cpp + qt/element/QtDirectoryListBox.h + qt/element/QtLineEdit.cpp + qt/element/QtLineEdit.h + qt/element/QtRefreshBar.cpp + qt/element/QtRefreshBar.h + qt/element/QtSearchBar.cpp + qt/element/QtSearchBar.h + qt/element/QtSmartSearchBox.cpp + qt/element/QtSmartSearchBox.h + + qt/element/QtStatusBar.cpp + qt/element/QtStatusBar.h + qt/element/QtUndoRedo.cpp + qt/element/QtUndoRedo.h + + qt/graphics/QtAngledLineItem.cpp + qt/graphics/QtAngledLineItem.h + qt/graphics/QtCountCircleItem.cpp + qt/graphics/QtCountCircleItem.h + qt/graphics/QtRoundedRectItem.cpp + qt/graphics/QtRoundedRectItem.h + qt/graphics/QtStraightLineItem.cpp + qt/graphics/QtStraightLineItem.h + + qt/network/QtIDECommunicationController.cpp + qt/network/QtIDECommunicationController.h + qt/network/QtNetworkFactory.cpp + qt/network/QtNetworkFactory.h + qt/network/QtTcpWrapper.cpp + qt/network/QtTcpWrapper.h + + qt/utility/QtDeviceScaledPixmap.cpp + qt/utility/QtDeviceScaledPixmap.h + qt/utility/QtHighlighter.cpp + qt/utility/QtHighlighter.h + qt/utility/QtThreadedFunctor.h + qt/utility/utilityQt.cpp + qt/utility/utilityQt.h + + qt/view/graphElements/nodeComponents/QtGraphNodeComponent.cpp + qt/view/graphElements/nodeComponents/QtGraphNodeComponent.h + qt/view/graphElements/nodeComponents/QtGraphNodeComponentClickable.cpp + qt/view/graphElements/nodeComponents/QtGraphNodeComponentClickable.h + qt/view/graphElements/nodeComponents/QtGraphNodeComponentMoveable.cpp + qt/view/graphElements/nodeComponents/QtGraphNodeComponentMoveable.h + + qt/view/graphElements/QtGraphEdge.cpp + qt/view/graphElements/QtGraphEdge.h + qt/view/graphElements/QtGraphNode.cpp + qt/view/graphElements/QtGraphNode.h + qt/view/graphElements/QtGraphNodeAccess.cpp + qt/view/graphElements/QtGraphNodeAccess.h + qt/view/graphElements/QtGraphNodeBundle.cpp + qt/view/graphElements/QtGraphNodeBundle.h + qt/view/graphElements/QtGraphNodeData.cpp + qt/view/graphElements/QtGraphNodeData.h + qt/view/graphElements/QtGraphNodeExpandToggle.cpp + qt/view/graphElements/QtGraphNodeExpandToggle.h + + qt/view/QtCodeView.cpp + qt/view/QtCodeView.h + qt/view/QtCompositeView.cpp + qt/view/QtCompositeView.h + qt/view/QtGraphView.cpp + qt/view/QtGraphView.h + qt/view/QtGraphViewStyleImpl.cpp + qt/view/QtGraphViewStyleImpl.h + qt/view/QtMainView.cpp + qt/view/QtMainView.h + qt/view/QtRefreshView.cpp + qt/view/QtRefreshView.h + qt/view/QtSearchView.cpp + qt/view/QtSearchView.h + qt/view/QtStatusBarView.cpp + qt/view/QtStatusBarView.h + qt/view/QtUndoRedoView.cpp + qt/view/QtUndoRedoView.h + qt/view/QtViewFactory.cpp + qt/view/QtViewFactory.h + qt/view/QtViewWidgetWrapper.cpp + qt/view/QtViewWidgetWrapper.h + + qt/window/QtAbout.cpp + qt/window/QtAbout.h + qt/window/QtAboutLicense.cpp + qt/window/QtAboutLicense.h + qt/window/QtApplicationSettingsScreen.cpp + qt/window/QtApplicationSettingsScreen.h + qt/window/QtMainWindow.cpp + qt/window/QtMainWindow.h + qt/window/QtProjectSetupScreen.cpp + qt/window/QtProjectSetupScreen.h + qt/window/QtSettingsWindow.cpp + qt/window/QtSettingsWindow.h + qt/window/QtSplashScreen.cpp + qt/window/QtSplashScreen.h + qt/window/QtStartScreen.cpp + qt/window/QtStartScreen.h +) diff --git a/src/app/licenses.h.in b/src/lib_gui/licenses.h.in similarity index 100% rename from src/app/licenses.h.in rename to src/lib_gui/licenses.h.in diff --git a/src/app/platform_includes/includes.h.in b/src/lib_gui/platform_includes/includes.h.in similarity index 100% rename from src/app/platform_includes/includes.h.in rename to src/lib_gui/platform_includes/includes.h.in diff --git a/src/app/platform_includes/includesDefault.h b/src/lib_gui/platform_includes/includesDefault.h similarity index 100% rename from src/app/platform_includes/includesDefault.h rename to src/lib_gui/platform_includes/includesDefault.h diff --git a/src/app/platform_includes/includesMac.h b/src/lib_gui/platform_includes/includesMac.h similarity index 100% rename from src/app/platform_includes/includesMac.h rename to src/lib_gui/platform_includes/includesMac.h diff --git a/src/app/platform_includes/includesWindows.h b/src/lib_gui/platform_includes/includesWindows.h similarity index 100% rename from src/app/platform_includes/includesWindows.h rename to src/lib_gui/platform_includes/includesWindows.h diff --git a/src/app/qt/element/QtAutocompletionList.cpp b/src/lib_gui/qt/element/QtAutocompletionList.cpp similarity index 100% rename from src/app/qt/element/QtAutocompletionList.cpp rename to src/lib_gui/qt/element/QtAutocompletionList.cpp diff --git a/src/app/qt/element/QtAutocompletionList.h b/src/lib_gui/qt/element/QtAutocompletionList.h similarity index 100% rename from src/app/qt/element/QtAutocompletionList.h rename to src/lib_gui/qt/element/QtAutocompletionList.h diff --git a/src/app/qt/element/QtCodeArea.cpp b/src/lib_gui/qt/element/QtCodeArea.cpp similarity index 100% rename from src/app/qt/element/QtCodeArea.cpp rename to src/lib_gui/qt/element/QtCodeArea.cpp diff --git a/src/app/qt/element/QtCodeArea.h b/src/lib_gui/qt/element/QtCodeArea.h similarity index 100% rename from src/app/qt/element/QtCodeArea.h rename to src/lib_gui/qt/element/QtCodeArea.h diff --git a/src/app/qt/element/QtCodeFile.cpp b/src/lib_gui/qt/element/QtCodeFile.cpp similarity index 100% rename from src/app/qt/element/QtCodeFile.cpp rename to src/lib_gui/qt/element/QtCodeFile.cpp index 4ce23203..009fd1ae 100644 --- a/src/app/qt/element/QtCodeFile.cpp +++ b/src/lib_gui/qt/element/QtCodeFile.cpp @@ -19,9 +19,9 @@ QtCodeFile::QtCodeFile(const FilePath& filePath, QtCodeFileList* parent) : QFrame(parent) + , m_updateTitleBarFunctor(std::bind(&QtCodeFile::doUpdateTitleBar, this)) , m_parent(parent) , m_filePath(filePath) - , m_updateTitleBarFunctor(std::bind(&QtCodeFile::doUpdateTitleBar, this)) { setObjectName("code_file"); diff --git a/src/app/qt/element/QtCodeFile.h b/src/lib_gui/qt/element/QtCodeFile.h similarity index 100% rename from src/app/qt/element/QtCodeFile.h rename to src/lib_gui/qt/element/QtCodeFile.h diff --git a/src/app/qt/element/QtCodeFileList.cpp b/src/lib_gui/qt/element/QtCodeFileList.cpp similarity index 100% rename from src/app/qt/element/QtCodeFileList.cpp rename to src/lib_gui/qt/element/QtCodeFileList.cpp diff --git a/src/app/qt/element/QtCodeFileList.h b/src/lib_gui/qt/element/QtCodeFileList.h similarity index 100% rename from src/app/qt/element/QtCodeFileList.h rename to src/lib_gui/qt/element/QtCodeFileList.h diff --git a/src/app/qt/element/QtCodeSnippet.cpp b/src/lib_gui/qt/element/QtCodeSnippet.cpp similarity index 100% rename from src/app/qt/element/QtCodeSnippet.cpp rename to src/lib_gui/qt/element/QtCodeSnippet.cpp diff --git a/src/app/qt/element/QtCodeSnippet.h b/src/lib_gui/qt/element/QtCodeSnippet.h similarity index 100% rename from src/app/qt/element/QtCodeSnippet.h rename to src/lib_gui/qt/element/QtCodeSnippet.h diff --git a/src/app/qt/element/QtDirectoryListBox.cpp b/src/lib_gui/qt/element/QtDirectoryListBox.cpp similarity index 100% rename from src/app/qt/element/QtDirectoryListBox.cpp rename to src/lib_gui/qt/element/QtDirectoryListBox.cpp diff --git a/src/app/qt/element/QtDirectoryListBox.h b/src/lib_gui/qt/element/QtDirectoryListBox.h similarity index 100% rename from src/app/qt/element/QtDirectoryListBox.h rename to src/lib_gui/qt/element/QtDirectoryListBox.h diff --git a/src/app/qt/element/QtLineEdit.cpp b/src/lib_gui/qt/element/QtLineEdit.cpp similarity index 100% rename from src/app/qt/element/QtLineEdit.cpp rename to src/lib_gui/qt/element/QtLineEdit.cpp diff --git a/src/app/qt/element/QtLineEdit.h b/src/lib_gui/qt/element/QtLineEdit.h similarity index 100% rename from src/app/qt/element/QtLineEdit.h rename to src/lib_gui/qt/element/QtLineEdit.h diff --git a/src/app/qt/element/QtRefreshBar.cpp b/src/lib_gui/qt/element/QtRefreshBar.cpp similarity index 100% rename from src/app/qt/element/QtRefreshBar.cpp rename to src/lib_gui/qt/element/QtRefreshBar.cpp diff --git a/src/app/qt/element/QtRefreshBar.h b/src/lib_gui/qt/element/QtRefreshBar.h similarity index 100% rename from src/app/qt/element/QtRefreshBar.h rename to src/lib_gui/qt/element/QtRefreshBar.h diff --git a/src/app/qt/element/QtSearchBar.cpp b/src/lib_gui/qt/element/QtSearchBar.cpp similarity index 100% rename from src/app/qt/element/QtSearchBar.cpp rename to src/lib_gui/qt/element/QtSearchBar.cpp diff --git a/src/app/qt/element/QtSearchBar.h b/src/lib_gui/qt/element/QtSearchBar.h similarity index 100% rename from src/app/qt/element/QtSearchBar.h rename to src/lib_gui/qt/element/QtSearchBar.h diff --git a/src/app/qt/element/QtSmartSearchBox.cpp b/src/lib_gui/qt/element/QtSmartSearchBox.cpp similarity index 100% rename from src/app/qt/element/QtSmartSearchBox.cpp rename to src/lib_gui/qt/element/QtSmartSearchBox.cpp diff --git a/src/app/qt/element/QtSmartSearchBox.h b/src/lib_gui/qt/element/QtSmartSearchBox.h similarity index 100% rename from src/app/qt/element/QtSmartSearchBox.h rename to src/lib_gui/qt/element/QtSmartSearchBox.h diff --git a/src/app/qt/element/QtStatusBar.cpp b/src/lib_gui/qt/element/QtStatusBar.cpp similarity index 100% rename from src/app/qt/element/QtStatusBar.cpp rename to src/lib_gui/qt/element/QtStatusBar.cpp diff --git a/src/app/qt/element/QtStatusBar.h b/src/lib_gui/qt/element/QtStatusBar.h similarity index 100% rename from src/app/qt/element/QtStatusBar.h rename to src/lib_gui/qt/element/QtStatusBar.h diff --git a/src/app/qt/element/QtUndoRedo.cpp b/src/lib_gui/qt/element/QtUndoRedo.cpp similarity index 100% rename from src/app/qt/element/QtUndoRedo.cpp rename to src/lib_gui/qt/element/QtUndoRedo.cpp diff --git a/src/app/qt/element/QtUndoRedo.h b/src/lib_gui/qt/element/QtUndoRedo.h similarity index 100% rename from src/app/qt/element/QtUndoRedo.h rename to src/lib_gui/qt/element/QtUndoRedo.h diff --git a/src/app/qt/graphics/QtAngledLineItem.cpp b/src/lib_gui/qt/graphics/QtAngledLineItem.cpp similarity index 100% rename from src/app/qt/graphics/QtAngledLineItem.cpp rename to src/lib_gui/qt/graphics/QtAngledLineItem.cpp diff --git a/src/app/qt/graphics/QtAngledLineItem.h b/src/lib_gui/qt/graphics/QtAngledLineItem.h similarity index 100% rename from src/app/qt/graphics/QtAngledLineItem.h rename to src/lib_gui/qt/graphics/QtAngledLineItem.h diff --git a/src/app/qt/graphics/QtCountCircleItem.cpp b/src/lib_gui/qt/graphics/QtCountCircleItem.cpp similarity index 100% rename from src/app/qt/graphics/QtCountCircleItem.cpp rename to src/lib_gui/qt/graphics/QtCountCircleItem.cpp diff --git a/src/app/qt/graphics/QtCountCircleItem.h b/src/lib_gui/qt/graphics/QtCountCircleItem.h similarity index 100% rename from src/app/qt/graphics/QtCountCircleItem.h rename to src/lib_gui/qt/graphics/QtCountCircleItem.h diff --git a/src/app/qt/graphics/QtRoundedRectItem.cpp b/src/lib_gui/qt/graphics/QtRoundedRectItem.cpp similarity index 100% rename from src/app/qt/graphics/QtRoundedRectItem.cpp rename to src/lib_gui/qt/graphics/QtRoundedRectItem.cpp diff --git a/src/app/qt/graphics/QtRoundedRectItem.h b/src/lib_gui/qt/graphics/QtRoundedRectItem.h similarity index 100% rename from src/app/qt/graphics/QtRoundedRectItem.h rename to src/lib_gui/qt/graphics/QtRoundedRectItem.h diff --git a/src/app/qt/graphics/QtStraightLineItem.cpp b/src/lib_gui/qt/graphics/QtStraightLineItem.cpp similarity index 100% rename from src/app/qt/graphics/QtStraightLineItem.cpp rename to src/lib_gui/qt/graphics/QtStraightLineItem.cpp diff --git a/src/app/qt/graphics/QtStraightLineItem.h b/src/lib_gui/qt/graphics/QtStraightLineItem.h similarity index 100% rename from src/app/qt/graphics/QtStraightLineItem.h rename to src/lib_gui/qt/graphics/QtStraightLineItem.h diff --git a/src/app/qt/network/QtIDECommunicationController.cpp b/src/lib_gui/qt/network/QtIDECommunicationController.cpp similarity index 100% rename from src/app/qt/network/QtIDECommunicationController.cpp rename to src/lib_gui/qt/network/QtIDECommunicationController.cpp diff --git a/src/app/qt/network/QtIDECommunicationController.h b/src/lib_gui/qt/network/QtIDECommunicationController.h similarity index 100% rename from src/app/qt/network/QtIDECommunicationController.h rename to src/lib_gui/qt/network/QtIDECommunicationController.h diff --git a/src/app/qt/network/QtNetworkFactory.cpp b/src/lib_gui/qt/network/QtNetworkFactory.cpp similarity index 100% rename from src/app/qt/network/QtNetworkFactory.cpp rename to src/lib_gui/qt/network/QtNetworkFactory.cpp diff --git a/src/app/qt/network/QtNetworkFactory.h b/src/lib_gui/qt/network/QtNetworkFactory.h similarity index 100% rename from src/app/qt/network/QtNetworkFactory.h rename to src/lib_gui/qt/network/QtNetworkFactory.h diff --git a/src/app/qt/network/QtTcpWrapper.cpp b/src/lib_gui/qt/network/QtTcpWrapper.cpp similarity index 100% rename from src/app/qt/network/QtTcpWrapper.cpp rename to src/lib_gui/qt/network/QtTcpWrapper.cpp diff --git a/src/app/qt/network/QtTcpWrapper.h b/src/lib_gui/qt/network/QtTcpWrapper.h similarity index 100% rename from src/app/qt/network/QtTcpWrapper.h rename to src/lib_gui/qt/network/QtTcpWrapper.h diff --git a/src/app/qt/networkPrototype/SocketTest.cpp b/src/lib_gui/qt/networkPrototype/SocketTest.cpp similarity index 100% rename from src/app/qt/networkPrototype/SocketTest.cpp rename to src/lib_gui/qt/networkPrototype/SocketTest.cpp diff --git a/src/app/qt/networkPrototype/SocketTest.h b/src/lib_gui/qt/networkPrototype/SocketTest.h similarity index 100% rename from src/app/qt/networkPrototype/SocketTest.h rename to src/lib_gui/qt/networkPrototype/SocketTest.h diff --git a/src/app/qt/utility/QtDeviceScaledPixmap.cpp b/src/lib_gui/qt/utility/QtDeviceScaledPixmap.cpp similarity index 100% rename from src/app/qt/utility/QtDeviceScaledPixmap.cpp rename to src/lib_gui/qt/utility/QtDeviceScaledPixmap.cpp diff --git a/src/app/qt/utility/QtDeviceScaledPixmap.h b/src/lib_gui/qt/utility/QtDeviceScaledPixmap.h similarity index 100% rename from src/app/qt/utility/QtDeviceScaledPixmap.h rename to src/lib_gui/qt/utility/QtDeviceScaledPixmap.h diff --git a/src/app/qt/utility/QtHighlighter.cpp b/src/lib_gui/qt/utility/QtHighlighter.cpp similarity index 100% rename from src/app/qt/utility/QtHighlighter.cpp rename to src/lib_gui/qt/utility/QtHighlighter.cpp diff --git a/src/app/qt/utility/QtHighlighter.h b/src/lib_gui/qt/utility/QtHighlighter.h similarity index 100% rename from src/app/qt/utility/QtHighlighter.h rename to src/lib_gui/qt/utility/QtHighlighter.h diff --git a/src/app/qt/utility/QtThreadedFunctor.h b/src/lib_gui/qt/utility/QtThreadedFunctor.h similarity index 100% rename from src/app/qt/utility/QtThreadedFunctor.h rename to src/lib_gui/qt/utility/QtThreadedFunctor.h diff --git a/src/app/qt/utility/utilityQt.cpp b/src/lib_gui/qt/utility/utilityQt.cpp similarity index 100% rename from src/app/qt/utility/utilityQt.cpp rename to src/lib_gui/qt/utility/utilityQt.cpp diff --git a/src/app/qt/utility/utilityQt.h b/src/lib_gui/qt/utility/utilityQt.h similarity index 100% rename from src/app/qt/utility/utilityQt.h rename to src/lib_gui/qt/utility/utilityQt.h diff --git a/src/app/qt/view/QtCodeView.cpp b/src/lib_gui/qt/view/QtCodeView.cpp similarity index 100% rename from src/app/qt/view/QtCodeView.cpp rename to src/lib_gui/qt/view/QtCodeView.cpp diff --git a/src/app/qt/view/QtCodeView.h b/src/lib_gui/qt/view/QtCodeView.h similarity index 100% rename from src/app/qt/view/QtCodeView.h rename to src/lib_gui/qt/view/QtCodeView.h diff --git a/src/app/qt/view/QtCompositeView.cpp b/src/lib_gui/qt/view/QtCompositeView.cpp similarity index 100% rename from src/app/qt/view/QtCompositeView.cpp rename to src/lib_gui/qt/view/QtCompositeView.cpp diff --git a/src/app/qt/view/QtCompositeView.h b/src/lib_gui/qt/view/QtCompositeView.h similarity index 100% rename from src/app/qt/view/QtCompositeView.h rename to src/lib_gui/qt/view/QtCompositeView.h diff --git a/src/app/qt/view/QtGraphView.cpp b/src/lib_gui/qt/view/QtGraphView.cpp similarity index 100% rename from src/app/qt/view/QtGraphView.cpp rename to src/lib_gui/qt/view/QtGraphView.cpp diff --git a/src/app/qt/view/QtGraphView.h b/src/lib_gui/qt/view/QtGraphView.h similarity index 100% rename from src/app/qt/view/QtGraphView.h rename to src/lib_gui/qt/view/QtGraphView.h diff --git a/src/app/qt/view/QtGraphViewStyleImpl.cpp b/src/lib_gui/qt/view/QtGraphViewStyleImpl.cpp similarity index 100% rename from src/app/qt/view/QtGraphViewStyleImpl.cpp rename to src/lib_gui/qt/view/QtGraphViewStyleImpl.cpp diff --git a/src/app/qt/view/QtGraphViewStyleImpl.h b/src/lib_gui/qt/view/QtGraphViewStyleImpl.h similarity index 100% rename from src/app/qt/view/QtGraphViewStyleImpl.h rename to src/lib_gui/qt/view/QtGraphViewStyleImpl.h diff --git a/src/app/qt/view/QtMainView.cpp b/src/lib_gui/qt/view/QtMainView.cpp similarity index 100% rename from src/app/qt/view/QtMainView.cpp rename to src/lib_gui/qt/view/QtMainView.cpp diff --git a/src/app/qt/view/QtMainView.h b/src/lib_gui/qt/view/QtMainView.h similarity index 100% rename from src/app/qt/view/QtMainView.h rename to src/lib_gui/qt/view/QtMainView.h diff --git a/src/app/qt/view/QtRefreshView.cpp b/src/lib_gui/qt/view/QtRefreshView.cpp similarity index 100% rename from src/app/qt/view/QtRefreshView.cpp rename to src/lib_gui/qt/view/QtRefreshView.cpp diff --git a/src/app/qt/view/QtRefreshView.h b/src/lib_gui/qt/view/QtRefreshView.h similarity index 100% rename from src/app/qt/view/QtRefreshView.h rename to src/lib_gui/qt/view/QtRefreshView.h diff --git a/src/app/qt/view/QtSearchView.cpp b/src/lib_gui/qt/view/QtSearchView.cpp similarity index 100% rename from src/app/qt/view/QtSearchView.cpp rename to src/lib_gui/qt/view/QtSearchView.cpp diff --git a/src/app/qt/view/QtSearchView.h b/src/lib_gui/qt/view/QtSearchView.h similarity index 100% rename from src/app/qt/view/QtSearchView.h rename to src/lib_gui/qt/view/QtSearchView.h diff --git a/src/app/qt/view/QtStatusBarView.cpp b/src/lib_gui/qt/view/QtStatusBarView.cpp similarity index 100% rename from src/app/qt/view/QtStatusBarView.cpp rename to src/lib_gui/qt/view/QtStatusBarView.cpp diff --git a/src/app/qt/view/QtStatusBarView.h b/src/lib_gui/qt/view/QtStatusBarView.h similarity index 100% rename from src/app/qt/view/QtStatusBarView.h rename to src/lib_gui/qt/view/QtStatusBarView.h diff --git a/src/app/qt/view/QtUndoRedoView.cpp b/src/lib_gui/qt/view/QtUndoRedoView.cpp similarity index 100% rename from src/app/qt/view/QtUndoRedoView.cpp rename to src/lib_gui/qt/view/QtUndoRedoView.cpp diff --git a/src/app/qt/view/QtUndoRedoView.h b/src/lib_gui/qt/view/QtUndoRedoView.h similarity index 100% rename from src/app/qt/view/QtUndoRedoView.h rename to src/lib_gui/qt/view/QtUndoRedoView.h diff --git a/src/app/qt/view/QtViewFactory.cpp b/src/lib_gui/qt/view/QtViewFactory.cpp similarity index 100% rename from src/app/qt/view/QtViewFactory.cpp rename to src/lib_gui/qt/view/QtViewFactory.cpp diff --git a/src/app/qt/view/QtViewFactory.h b/src/lib_gui/qt/view/QtViewFactory.h similarity index 100% rename from src/app/qt/view/QtViewFactory.h rename to src/lib_gui/qt/view/QtViewFactory.h diff --git a/src/app/qt/view/QtViewWidgetWrapper.cpp b/src/lib_gui/qt/view/QtViewWidgetWrapper.cpp similarity index 100% rename from src/app/qt/view/QtViewWidgetWrapper.cpp rename to src/lib_gui/qt/view/QtViewWidgetWrapper.cpp diff --git a/src/app/qt/view/QtViewWidgetWrapper.h b/src/lib_gui/qt/view/QtViewWidgetWrapper.h similarity index 100% rename from src/app/qt/view/QtViewWidgetWrapper.h rename to src/lib_gui/qt/view/QtViewWidgetWrapper.h diff --git a/src/app/qt/view/graphElements/QtGraphEdge.cpp b/src/lib_gui/qt/view/graphElements/QtGraphEdge.cpp similarity index 100% rename from src/app/qt/view/graphElements/QtGraphEdge.cpp rename to src/lib_gui/qt/view/graphElements/QtGraphEdge.cpp diff --git a/src/app/qt/view/graphElements/QtGraphEdge.h b/src/lib_gui/qt/view/graphElements/QtGraphEdge.h similarity index 100% rename from src/app/qt/view/graphElements/QtGraphEdge.h rename to src/lib_gui/qt/view/graphElements/QtGraphEdge.h diff --git a/src/app/qt/view/graphElements/QtGraphNode.cpp b/src/lib_gui/qt/view/graphElements/QtGraphNode.cpp similarity index 100% rename from src/app/qt/view/graphElements/QtGraphNode.cpp rename to src/lib_gui/qt/view/graphElements/QtGraphNode.cpp diff --git a/src/app/qt/view/graphElements/QtGraphNode.h b/src/lib_gui/qt/view/graphElements/QtGraphNode.h similarity index 100% rename from src/app/qt/view/graphElements/QtGraphNode.h rename to src/lib_gui/qt/view/graphElements/QtGraphNode.h diff --git a/src/app/qt/view/graphElements/QtGraphNodeAccess.cpp b/src/lib_gui/qt/view/graphElements/QtGraphNodeAccess.cpp similarity index 100% rename from src/app/qt/view/graphElements/QtGraphNodeAccess.cpp rename to src/lib_gui/qt/view/graphElements/QtGraphNodeAccess.cpp diff --git a/src/app/qt/view/graphElements/QtGraphNodeAccess.h b/src/lib_gui/qt/view/graphElements/QtGraphNodeAccess.h similarity index 100% rename from src/app/qt/view/graphElements/QtGraphNodeAccess.h rename to src/lib_gui/qt/view/graphElements/QtGraphNodeAccess.h diff --git a/src/app/qt/view/graphElements/QtGraphNodeBundle.cpp b/src/lib_gui/qt/view/graphElements/QtGraphNodeBundle.cpp similarity index 100% rename from src/app/qt/view/graphElements/QtGraphNodeBundle.cpp rename to src/lib_gui/qt/view/graphElements/QtGraphNodeBundle.cpp diff --git a/src/app/qt/view/graphElements/QtGraphNodeBundle.h b/src/lib_gui/qt/view/graphElements/QtGraphNodeBundle.h similarity index 100% rename from src/app/qt/view/graphElements/QtGraphNodeBundle.h rename to src/lib_gui/qt/view/graphElements/QtGraphNodeBundle.h diff --git a/src/app/qt/view/graphElements/QtGraphNodeData.cpp b/src/lib_gui/qt/view/graphElements/QtGraphNodeData.cpp similarity index 100% rename from src/app/qt/view/graphElements/QtGraphNodeData.cpp rename to src/lib_gui/qt/view/graphElements/QtGraphNodeData.cpp diff --git a/src/app/qt/view/graphElements/QtGraphNodeData.h b/src/lib_gui/qt/view/graphElements/QtGraphNodeData.h similarity index 100% rename from src/app/qt/view/graphElements/QtGraphNodeData.h rename to src/lib_gui/qt/view/graphElements/QtGraphNodeData.h diff --git a/src/app/qt/view/graphElements/QtGraphNodeExpandToggle.cpp b/src/lib_gui/qt/view/graphElements/QtGraphNodeExpandToggle.cpp similarity index 100% rename from src/app/qt/view/graphElements/QtGraphNodeExpandToggle.cpp rename to src/lib_gui/qt/view/graphElements/QtGraphNodeExpandToggle.cpp diff --git a/src/app/qt/view/graphElements/QtGraphNodeExpandToggle.h b/src/lib_gui/qt/view/graphElements/QtGraphNodeExpandToggle.h similarity index 100% rename from src/app/qt/view/graphElements/QtGraphNodeExpandToggle.h rename to src/lib_gui/qt/view/graphElements/QtGraphNodeExpandToggle.h diff --git a/src/app/qt/view/graphElements/nodeComponents/QtGraphNodeComponent.cpp b/src/lib_gui/qt/view/graphElements/nodeComponents/QtGraphNodeComponent.cpp similarity index 100% rename from src/app/qt/view/graphElements/nodeComponents/QtGraphNodeComponent.cpp rename to src/lib_gui/qt/view/graphElements/nodeComponents/QtGraphNodeComponent.cpp diff --git a/src/app/qt/view/graphElements/nodeComponents/QtGraphNodeComponent.h b/src/lib_gui/qt/view/graphElements/nodeComponents/QtGraphNodeComponent.h similarity index 100% rename from src/app/qt/view/graphElements/nodeComponents/QtGraphNodeComponent.h rename to src/lib_gui/qt/view/graphElements/nodeComponents/QtGraphNodeComponent.h diff --git a/src/app/qt/view/graphElements/nodeComponents/QtGraphNodeComponentClickable.cpp b/src/lib_gui/qt/view/graphElements/nodeComponents/QtGraphNodeComponentClickable.cpp similarity index 100% rename from src/app/qt/view/graphElements/nodeComponents/QtGraphNodeComponentClickable.cpp rename to src/lib_gui/qt/view/graphElements/nodeComponents/QtGraphNodeComponentClickable.cpp diff --git a/src/app/qt/view/graphElements/nodeComponents/QtGraphNodeComponentClickable.h b/src/lib_gui/qt/view/graphElements/nodeComponents/QtGraphNodeComponentClickable.h similarity index 100% rename from src/app/qt/view/graphElements/nodeComponents/QtGraphNodeComponentClickable.h rename to src/lib_gui/qt/view/graphElements/nodeComponents/QtGraphNodeComponentClickable.h diff --git a/src/app/qt/view/graphElements/nodeComponents/QtGraphNodeComponentMoveable.cpp b/src/lib_gui/qt/view/graphElements/nodeComponents/QtGraphNodeComponentMoveable.cpp similarity index 100% rename from src/app/qt/view/graphElements/nodeComponents/QtGraphNodeComponentMoveable.cpp rename to src/lib_gui/qt/view/graphElements/nodeComponents/QtGraphNodeComponentMoveable.cpp diff --git a/src/app/qt/view/graphElements/nodeComponents/QtGraphNodeComponentMoveable.h b/src/lib_gui/qt/view/graphElements/nodeComponents/QtGraphNodeComponentMoveable.h similarity index 100% rename from src/app/qt/view/graphElements/nodeComponents/QtGraphNodeComponentMoveable.h rename to src/lib_gui/qt/view/graphElements/nodeComponents/QtGraphNodeComponentMoveable.h diff --git a/src/app/qt/window/QtAbout.cpp b/src/lib_gui/qt/window/QtAbout.cpp similarity index 100% rename from src/app/qt/window/QtAbout.cpp rename to src/lib_gui/qt/window/QtAbout.cpp diff --git a/src/app/qt/window/QtAbout.h b/src/lib_gui/qt/window/QtAbout.h similarity index 100% rename from src/app/qt/window/QtAbout.h rename to src/lib_gui/qt/window/QtAbout.h diff --git a/src/app/qt/window/QtAboutLicense.cpp b/src/lib_gui/qt/window/QtAboutLicense.cpp similarity index 100% rename from src/app/qt/window/QtAboutLicense.cpp rename to src/lib_gui/qt/window/QtAboutLicense.cpp diff --git a/src/app/qt/window/QtAboutLicense.h b/src/lib_gui/qt/window/QtAboutLicense.h similarity index 100% rename from src/app/qt/window/QtAboutLicense.h rename to src/lib_gui/qt/window/QtAboutLicense.h diff --git a/src/app/qt/window/QtApplicationSettingsScreen.cpp b/src/lib_gui/qt/window/QtApplicationSettingsScreen.cpp similarity index 100% rename from src/app/qt/window/QtApplicationSettingsScreen.cpp rename to src/lib_gui/qt/window/QtApplicationSettingsScreen.cpp diff --git a/src/app/qt/window/QtApplicationSettingsScreen.h b/src/lib_gui/qt/window/QtApplicationSettingsScreen.h similarity index 100% rename from src/app/qt/window/QtApplicationSettingsScreen.h rename to src/lib_gui/qt/window/QtApplicationSettingsScreen.h diff --git a/src/app/qt/window/QtMainWindow.cpp b/src/lib_gui/qt/window/QtMainWindow.cpp similarity index 100% rename from src/app/qt/window/QtMainWindow.cpp rename to src/lib_gui/qt/window/QtMainWindow.cpp diff --git a/src/app/qt/window/QtMainWindow.h b/src/lib_gui/qt/window/QtMainWindow.h similarity index 100% rename from src/app/qt/window/QtMainWindow.h rename to src/lib_gui/qt/window/QtMainWindow.h diff --git a/src/app/qt/window/QtProjectSetupScreen.cpp b/src/lib_gui/qt/window/QtProjectSetupScreen.cpp similarity index 100% rename from src/app/qt/window/QtProjectSetupScreen.cpp rename to src/lib_gui/qt/window/QtProjectSetupScreen.cpp diff --git a/src/app/qt/window/QtProjectSetupScreen.h b/src/lib_gui/qt/window/QtProjectSetupScreen.h similarity index 100% rename from src/app/qt/window/QtProjectSetupScreen.h rename to src/lib_gui/qt/window/QtProjectSetupScreen.h diff --git a/src/app/qt/window/QtSettingsWindow.cpp b/src/lib_gui/qt/window/QtSettingsWindow.cpp similarity index 100% rename from src/app/qt/window/QtSettingsWindow.cpp rename to src/lib_gui/qt/window/QtSettingsWindow.cpp diff --git a/src/app/qt/window/QtSettingsWindow.h b/src/lib_gui/qt/window/QtSettingsWindow.h similarity index 100% rename from src/app/qt/window/QtSettingsWindow.h rename to src/lib_gui/qt/window/QtSettingsWindow.h diff --git a/src/app/qt/window/QtSplashScreen.cpp b/src/lib_gui/qt/window/QtSplashScreen.cpp similarity index 100% rename from src/app/qt/window/QtSplashScreen.cpp rename to src/lib_gui/qt/window/QtSplashScreen.cpp diff --git a/src/app/qt/window/QtSplashScreen.h b/src/lib_gui/qt/window/QtSplashScreen.h similarity index 100% rename from src/app/qt/window/QtSplashScreen.h rename to src/lib_gui/qt/window/QtSplashScreen.h diff --git a/src/app/qt/window/QtStartScreen.cpp b/src/lib_gui/qt/window/QtStartScreen.cpp similarity index 100% rename from src/app/qt/window/QtStartScreen.cpp rename to src/lib_gui/qt/window/QtStartScreen.cpp diff --git a/src/app/qt/window/QtStartScreen.h b/src/lib_gui/qt/window/QtStartScreen.h similarity index 100% rename from src/app/qt/window/QtStartScreen.h rename to src/lib_gui/qt/window/QtStartScreen.h diff --git a/src/app/version.h.in b/src/lib_gui/version.h.in similarity index 100% rename from src/app/version.h.in rename to src/lib_gui/version.h.in diff --git a/src/trial/CMakeLists.txt b/src/trial/CMakeLists.txt new file mode 100644 index 00000000..863626c7 --- /dev/null +++ b/src/trial/CMakeLists.txt @@ -0,0 +1,8 @@ +add_files( + TRIAL_FILES + + data/parser/cxx/TaskParseCxx.cpp + + isTrial.cpp + main.cpp +) diff --git a/src/trial/data/parser/cxx/TaskParseCxx.cpp b/src/trial/data/parser/cxx/TaskParseCxx.cpp new file mode 100644 index 00000000..3ca17f9b --- /dev/null +++ b/src/trial/data/parser/cxx/TaskParseCxx.cpp @@ -0,0 +1,32 @@ +#include "data/parser/cxx/TaskParseCxx.h" + +TaskParseCxx::TaskParseCxx( + ParserClient* client, + const FileManager* fileManager, + const Parser::Arguments& arguments, + const std::vector& files +) + : m_arguments(arguments) +{ +} + +void TaskParseCxx::enter() +{ +} + +Task::TaskState TaskParseCxx::update() +{ + return Task::STATE_FINISHED; +} + +void TaskParseCxx::exit() +{ +} + +void TaskParseCxx::interrupt() +{ +} + +void TaskParseCxx::revert() +{ +} diff --git a/src/trial/isTrial.cpp b/src/trial/isTrial.cpp new file mode 100644 index 00000000..7ade7bf0 --- /dev/null +++ b/src/trial/isTrial.cpp @@ -0,0 +1,6 @@ +#include "isTrial.h" + +bool isTrail() +{ + return true; +} diff --git a/src/trial/main.cpp b/src/trial/main.cpp new file mode 100644 index 00000000..960e4309 --- /dev/null +++ b/src/trial/main.cpp @@ -0,0 +1,67 @@ +#include + +#include + +#include "utility/logging/ConsoleLogger.h" +#include "utility/logging/FileLogger.h" +#include "utility/logging/LogManager.h" +#include "utility/Version.h" + +#include "Application.h" +#include "includes.h" // defines 'void setup(int argc, char *argv[])' +#include "qt/window/QtMainWindow.h" +#include "qt/window/QtSplashScreen.h" +#include "qt/network/QtNetworkFactory.h" +#include "qt/utility/utilityQt.h" +#include "qt/view/QtViewFactory.h" +#include "version.h" + +#include "component/controller/helper/NetworkProtocolHelper.h" // remove when done + +void init() +{ + std::shared_ptr consoleLogger = std::make_shared(); + consoleLogger->setLogLevel(Logger::LOG_WARNINGS | Logger::LOG_ERRORS); + LogManager::getInstance()->addLogger(consoleLogger); + + std::shared_ptr fileLogger = std::make_shared(); + fileLogger->setLogLevel(Logger::LOG_ALL); + FileLogger::setFilePath(logPath); + LogManager::getInstance()->addLogger(fileLogger); + + utility::loadFontsFromDirectory("data/fonts", ".otf"); +} + +int main(int argc, char *argv[]) +{ + Version version = Version::fromString(GIT_VERSION_NUMBER); + + setup(argc, argv); + QApplication qtApp(argc, argv); + + qtApp.setAttribute(Qt::AA_UseHighDpiPixmaps); + + QPixmap whitePixmap(500, 500); + whitePixmap.fill(Qt::white); + + QtSplashScreen* splash = new QtSplashScreen(whitePixmap, Qt::WindowStaysOnTopHint); + splash->setMessage("Loading UI"); + splash->setVersion(version.toDisplayString().c_str()); + splash->exec(qtApp); + + init(); + + QtViewFactory viewFactory; + QtNetworkFactory networkFactory; + + QtMainWindow::setWindowSettingsPath(windowSettingsPath); + Application::setAppSettingsPath(appSettingsPath); + std::shared_ptr app = Application::create(version, &viewFactory, &networkFactory); + + if (splash) + { + delete splash; + } + + return qtApp.exec(); +}