build: trial version target

builds now app and trail target, lib_gui added, istrail function

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
+)

src/app/data/parser/cxx/TaskParseCxx.cpp

@@ -2,6 +2,7 @@
 
 #include <sstream>
 
+#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<FilePath>& files
 )
 	: m_client(client)
-	, m_parser(client, fileManager)
+	, m_parser(std::make_shared<CxxParser>(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<std::string>(1, sourcePath.str()));
+	m_parser->runTool(std::vector<std::string>(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();
 }
 

src/app/isTrial.cpp

@@ -0,0 +1,6 @@
+#include "isTrial.h"
+
+bool isTrail()
+{
+	return false;
+}

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
 )

src/lib/data/parser/cxx/TaskParseCxx.h

@@ -1,12 +1,16 @@
 #ifndef TASK_PARSE_CXX_H
 #define TASK_PARSE_CXX_H
 
+#include <memory>
 #include <queue>
 
+#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<CxxParser> m_parser;
 	const Parser::Arguments m_arguments;
 	const std::vector<FilePath> m_files;
 

src/lib/isTrial.h

@@ -0,0 +1,6 @@
+#ifndef IS_TRIAL_H
+#define IS_TRIAL_H
+
+bool isTrial();
+
+#endif // IS_TRIAL_H

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
+)

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");