ui: Fixed scope annotations were highlighted with selection when only one was active

ui: scroll to code snippet containing clicked edge
This change scrolls animated to the snippet representing the clicked edge instead of showing only this code snippet.
2015-06-01 22:41:27 +02:00 · 2015-05-31 22:52:16 +02:00 · 2015-05-30 21:18:18 +02:00 · 2015-05-29 16:49:10 +02:00 · 2015-05-27 12:24:18 +02:00 · 2015-05-27 10:56:25 +02:00
568 changed files with 54100 additions and 1 deletions
@@ -0,0 +1,10 @@
+<module>: <title>
+
+<description>
+
+# bug id = <id>
+# review id = <id>
+
+# fortune cookie message = <message>
+
+# modules: build, src, logic, ui, data, utility, test, script
@@ -0,0 +1,21 @@
+#!/bin/bash
+
+ABORT="\033[31mAbort:\033[00m"
+SUCCESS="\033[32mSuccess:\033[00m"
+INFO="\033[33mInfo:\033[00m"
+
+BRANCH_NAME=$(git symbolic-ref -q --short HEAD)
+
+if [ -z $BRANCH_NAME ]
+then
+	echo -e $ABORT "You are not on any branch."
+	exit 1
+fi
+
+if [ $BRANCH_NAME == "master" ]
+then
+	echo -e $ABORT "Commiting to master is prohibited."
+	exit 1
+fi
+
+exit 0
@@ -0,0 +1,18 @@
+/build/
+
+/bin/app/Debug/
+/bin/app/data/log/
+/bin/app/data/projects/
+/bin/app/data/ApplicationSettings.xml
+/bin/app/data/window_settings.ini
+/bin/app/Release/
+
+/bin/lib/
+
+/bin/test/Debug/
+/bin/test/Release/
+/bin/test/data/log/
+/bin/test/data/temp.xml
+/bin/test/data/TestSettings.xml
+
+.DS_Store
@@ -0,0 +1,336 @@
+cmake_minimum_required(VERSION 2.8.9)
+
+include(cmake/add_files.cmake)
+include(cmake/create_source_groups.cmake)
+
+
+# Variables --------------------------------------------------------------------
+
+set(PROJECT_NAME Coati)
+
+set(APP_PROJECT_NAME "${PROJECT_NAME}")
+set(LIB_PROJECT_NAME "${PROJECT_NAME}_lib")
+set(TEST_PROJECT_NAME "${PROJECT_NAME}_test")
+
+if (WIN32)
+	set(PLATFORM_INCLUDE "includesWindows.h")
+	LINK_DIRECTORIES($ENV{VLD_DIR}/lib/Win32) # this adds the library path for VLD, must be done before the project target is created
+elseif (APPLE)
+	set(PLATFORM_INCLUDE "includesMac.h")
+else ()
+	set(PLATFORM_INCLUDE "includesDefault.h")
+endif ()
+
+# Settings ---------------------------------------------------------------------
+
+if (UNIX)
+	add_definitions(-std=c++11 -Wno-unknown-warning-option -fcolor-diagnostics -DQT_COMPILING_QSTRING_COMPAT_CPP )
+	#set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -m32" CACHE STRING "c++ flags")
+	#set(CMAKE_C_FLAGS   "${CMAKE_C_FLAGS} -m32" CACHE STRING "c flags")
+endif ()
+
+# Project ----------------------------------------------------------------------
+
+project(${PROJECT_NAME})
+
+# Clang ------------------------------------------------------------------------
+
+find_package(LLVM REQUIRED PATHS "$ENV{CLANG_DIR}/build/share/llvm/cmake")
+find_package(CLANG REQUIRED PATHS "${CMAKE_SOURCE_DIR}/cmake")
+
+add_definitions(${CLANG_DEFINITIONS})
+
+# Boost ------------------------------------------------------------------------
+
+set(BOOST_ROOT $ENV{BOOST_155_DIR})
+set(Boost_USE_MULTITHREAD ON)
+set(Boost_USE_STATIC_LIBS OFF)
+set(Boost_USE_STATIC_RUNTIME OFF)
+set(BOOST_LIBRARYDIR $ENV{BOOST_155_DIR})
+find_package(Boost 1.55 COMPONENTS system filesystem date_time REQUIRED)
+
+# Eigen -------------------------------------------------------------------------
+
+set(EIGEN_ROOT $ENV{EIGEN_DIR})
+
+# Lib --------------------------------------------------------------------------
+
+set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_SOURCE_DIR}/bin/lib)
+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")
+
+add_library(${LIB_PROJECT_NAME} ${LIB_FILES} ${CLANG_FILES} ${EXTERNAL_FILES})
+
+create_source_groups(${LIB_FILES})
+create_source_groups(${CLANG_FILES})
+create_source_groups(${EXTERNAL_FILES})
+
+set_target_properties(
+	${LIB_PROJECT_NAME}
+	PROPERTIES
+		DEBUG_OUTPUT_NAME ${PROJECT_NAME}_d
+		RELEASE_OUTPUT_NAME ${PROJECT_NAME}
+)
+
+set_property(
+	TARGET ${LIB_PROJECT_NAME}
+	PROPERTY INCLUDE_DIRECTORIES
+		"${CMAKE_SOURCE_DIR}/src/lib"
+		"${CMAKE_SOURCE_DIR}/src/external"
+		${LLVM_INCLUDE_DIRS}
+		${CLANG_INCLUDE_DIRS}
+		${Boost_INCLUDE_DIRS}
+		${EIGEN_ROOT}
+)
+
+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 --------------------------------------------------------------------------
+
+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)
+
+# Find includes in corresponding build directories
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+# Instruct CMake to run moc automatically when needed.
+set(CMAKE_AUTOMOC ON)
+
+# Find the QtWidgets library
+set(CMAKE_PREFIX_PATH "$ENV{QT_DIR}/")
+
+find_package(Qt5Widgets)
+find_package(Qt5PrintSupport)
+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)
+else ()
+	add_executable(${APP_PROJECT_NAME} ${APP_FILES})
+endif ()
+
+create_source_groups(${APP_FILES})
+
+target_link_libraries(${APP_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/external"
+		${Boost_INCLUDE_DIRS}
+)
+
+# Use the Widgets module from Qt 5.
+qt5_use_modules(${APP_PROJECT_NAME} Widgets)
+
+# 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"
+)
+
+# add platform specific libraries
+if (APPLE)
+	find_library(CORE_FOUNDATION CoreFoundation)
+	target_link_libraries(${APP_PROJECT_NAME} ${CORE_FOUNDATION})
+endif ()
+
+set(CMAKE_AUTOMOC OFF)
+
+# MacOSX Bundle ----------------------------------------------------------------
+
+if (APPLE)
+
+	set(MACOSX_BUNDLE_NAME ${PROJECT_NAME})
+	set(MACOSX_BINARY_NAME ${APP_PROJECT_NAME})
+
+	set(MACOSX_DYNAMIC_LIBRARIES ${Boost_LIBRARIES} "${LLVM_LIBRARY_DIRS}/libLTO.dylib")
+	string(REPLACE ";" " " MACOSX_DYNAMIC_LIBRARIES "${MACOSX_DYNAMIC_LIBRARIES}")
+
+	get_property(QT_CORE_PATH TARGET ${Qt5Core_LIBRARIES} PROPERTY LOCATION)
+	get_filename_component(QT_CORE_PATH ${QT_CORE_PATH} REALPATH)
+
+	get_property(QT_GUI_PATH TARGET ${Qt5Gui_LIBRARIES} PROPERTY LOCATION)
+	get_filename_component(QT_GUI_PATH ${QT_GUI_PATH} REALPATH)
+
+	get_property(QT_WIDGETS_PATH TARGET ${Qt5Widgets_LIBRARIES} PROPERTY LOCATION)
+	get_filename_component(QT_WIDGETS_PATH ${QT_WIDGETS_PATH} REALPATH)
+
+	get_property(QT_PRINT_PATH TARGET ${Qt5PrintSupport_LIBRARIES} PROPERTY LOCATION)
+	get_filename_component(QT_PRINT_PATH ${QT_PRINT_PATH} REALPATH)
+
+	list(APPEND MACOSX_QT_FRAMEWORKS ${QT_CORE_PATH} ${QT_GUI_PATH} ${QT_WIDGETS_PATH} ${QT_PRINT_PATH})
+	string(REPLACE ";" " " MACOSX_QT_FRAMEWORKS "${MACOSX_QT_FRAMEWORKS}")
+
+	set(MACOSX_QT_DIR "$ENV{QT_DIR}")
+
+	configure_file(
+		${PROJECT_SOURCE_DIR}/setup/MacOSX/bundle_install.sh.in
+		${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/bundle_install.sh
+		@ONLY
+	)
+
+	configure_file(
+		${PROJECT_SOURCE_DIR}/setup/MacOSX/Info.plist.in
+		${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/bundle_info.plist
+		@ONLY
+	)
+
+endif ()
+
+# CxxTest ----------------------------------------------------------------------
+
+if (UNIX)
+	set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_SOURCE_DIR}/bin/test/${CMAKE_BUILD_TYPE})
+else ()
+	set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_SOURCE_DIR}/bin/test/)
+endif ()
+
+add_subdirectory(src/test)
+
+set(CXXTEST_INCLUDE_DIR $ENV{CXX_TEST_DIR})
+set(CXXTEST_PYTHON_TESTGEN_EXECUTABLE ${CXXTEST_INCLUDE_DIR}/bin/cxxtestgen)
+set(TESTGEN_FILE ${CMAKE_CURRENT_BINARY_DIR}/test_main.cpp)
+
+find_package(PythonInterp REQUIRED)
+
+add_executable (${TEST_PROJECT_NAME} ${TESTGEN_FILE} ${TEST_FILES})
+
+create_source_groups(${TEST_FILES})
+
+target_link_libraries(${TEST_PROJECT_NAME} ${LIB_PROJECT_NAME})
+
+find_package(CxxTest)
+if (CXXTEST_FOUND)
+	set_property(
+		TARGET ${TEST_PROJECT_NAME}
+		PROPERTY INCLUDE_DIRECTORIES
+			"${CMAKE_SOURCE_DIR}/src/lib"
+			"${CXXTEST_INCLUDE_DIR}"
+			"${CMAKE_SOURCE_DIR}/src/external"
+			${Boost_INCLUDE_DIRS}
+	)
+endif (CXXTEST_FOUND)
+
+if (WIN32)
+
+	add_custom_command(
+		TARGET ${TEST_PROJECT_NAME}
+		PRE_BUILD
+		COMMAND ${PYTHON_EXECUTABLE} ${CXXTEST_PYTHON_TESTGEN_EXECUTABLE} --runner=ParenPrinter -o ${TESTGEN_FILE} ${PROJECT_SOURCE_DIR}/src/test/*.h
+		COMMENT "Generating unittest code with cxxtestgen"
+	)
+
+	add_custom_command(
+		TARGET ${TEST_PROJECT_NAME}
+		POST_BUILD
+		COMMAND cd $(ProjectDir)../bin/test/\n$(OutDir)$(TargetName)$(TargetExt)
+		COMMENT "Running unittest code"
+	)
+
+elseif (UNIX)
+
+	add_custom_command(
+		OUTPUT ${TESTGEN_FILE}
+		PRE_BUILD
+		COMMAND cd ${PROJECT_SOURCE_DIR} && ${PYTHON_EXECUTABLE} ${CXXTEST_PYTHON_TESTGEN_EXECUTABLE} --runner=ParenPrinter -o ${TESTGEN_FILE} ${TEST_FILES}
+		COMMENT "Generating unittest code with cxxtestgen"
+	)
+
+	add_custom_target(gen DEPENDS ${TESTGEN_FILE})
+
+	add_dependencies(${TEST_PROJECT_NAME} gen)
+
+endif ()
+
+
+# Visual Leak Detector ---------------------------------------------------------
+
+if (WIN32)
+
+	include_directories($ENV{VLD_DIR}/include)
+
+endif ()
+
+# Linux package
+
+if(UNIX AND NOT APPLE)
+
+	INSTALL(DIRECTORY ${CMAKE_SOURCE_DIR}/bin/app/data
+		DESTINATION share/coati
+		)
+	INSTALL(FILES ${CMAKE_SOURCE_DIR}/setup/Linux/coati.desktop
+		DESTINATION share/applications
+		)
+	INSTALL(FILES ${CMAKE_SOURCE_DIR}/bin/app/data/gui/icon/logo_1024_1024.png
+		DESTINATION share/icons
+		RENAME coati.png)
+	INSTALL(FILES
+		${CMAKE_SOURCE_DIR}/setup/Linux/libedit.so.0.0.52
+		${CMAKE_SOURCE_DIR}/setup/Linux/libboost_filesystem.so.1.55.0
+		${CMAKE_SOURCE_DIR}/setup/Linux/libboost_system.so.1.55.0
+		${CMAKE_SOURCE_DIR}/setup/Linux/libboost_date_time.so.1.55.0
+		${CMAKE_SOURCE_DIR}/setup/Linux/libstdc++.so.6
+		${CMAKE_SOURCE_DIR}/setup/Linux/libpng16.so.16
+		${CMAKE_SOURCE_DIR}/setup/Linux/libQt5Core.so.5
+		${CMAKE_SOURCE_DIR}/setup/Linux/libQt5DBus.so.5
+		${CMAKE_SOURCE_DIR}/setup/Linux/libQt5Gui.so.5
+		${CMAKE_SOURCE_DIR}/setup/Linux/libQt5Widgets.so.5
+		${CMAKE_SOURCE_DIR}/setup/Linux/libicui18n.so.54
+		${CMAKE_SOURCE_DIR}/setup/Linux/libicuuc.so.54
+		${CMAKE_SOURCE_DIR}/setup/Linux/libpcre16.so.0
+		${CMAKE_SOURCE_DIR}/setup/Linux/libsystemd.so.0
+		${CMAKE_SOURCE_DIR}/setup/Linux/libicudata.so.54
+		${CMAKE_SOURCE_DIR}/setup/Linux/liblz4.so.1
+		${CMAKE_SOURCE_DIR}/setup/Linux/libgcrypt.so.20
+		${CMAKE_SOURCE_DIR}/setup/Linux/libgpg-error.so.0
+
+		DESTINATION share/coati/lib
+		)
+	INSTALL(FILES
+		${CMAKE_SOURCE_DIR}/setup/Linux/libqxcb.so
+		DESTINATION share/coati/platforms
+		)
+	INSTALL(PROGRAMS
+		${CMAKE_SOURCE_DIR}/setup/Linux/Coati.sh
+		DESTINATION share/coati
+		)
+
+	# add the automatically determined parts of the RPATH
+	# which point to directories outside the build tree to the install RPATH
+	SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
+
+	INSTALL(TARGETS ${APP_PROJECT_NAME}
+		DESTINATION share/coati
+		)
+
+	SET(CPACK_GENERATOR "DEB;TGZ")
+
+	# DEBIAN PACKAGE
+	SET(CPACK_DEBIAN_PACKAGE_MAINTAINER "Andreas Stallinger <astallinger.mmt-m2013@fh-salzburg.ac.at>")
+	SET(CPACK_DEBIAN_PACKAGE_ARCHITECTURE  "amd64")
+	SET(CPACK_PACKAGE_NAME "Coati")
+	SET(CPACK_PACKAGE_VERSION_MAJOR 0)
+	SET(CPACK_PACKAGE_VERSION_MINOR 1)
+	SET(CPACK_PACKAGE_VERSION_PATCH 2)
+	SET(CPACK_PACKAGE_EXECUTABLES "Coati")
+
+	INCLUDE(CPack)
+
+endif  ()
@@ -1,2 +1,28 @@
-### Masterproject ###
+### Masterproject

+#### Setup
+
+##### External Software
+
+* QT 5.2.1
+* CxxTest 4.3
+* Valgrind 3.9.0(linux, macOS)
+* Clang & LLVM (installation guide http://clang.llvm.org/docs/LibASTMatchersTutorial.html)
+* Boost 1.55 ()
+* Eigen 3.2.3
+
+##### Environment Variables
+
+* QT_DIR - ...\Qt\Qt5.2.1\5.2.1\<IDE>\
+* CXX_TEST_DIR - .../cxxtest-4.3/
+* CLANG_DIR - .../clang-llvm/
+* BOOST_155_DIR - .../boost_1_55_0
+* EIGEN_DIR - .../eigen
+
+For Win32:
+* VLD_DIR - .../Visual Leak Detector
+
+##### Settings
+
+Run setup script:
+$ ./script/setup.sh
@@ -0,0 +1,117 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!-- BOOL: 0, 1 -->
+<!-- INTEGER: int e.g 123 -->
+<!-- DECIMAL: float e.g 123.456 -->
+<!-- STRING: string e.g hello -->
+<!-- COLOR: int int int int - rgba e.g. 125 125 125 255 -->
+
+<config>
+	<StartupProject><!-- STRING: path to project settings xml file --></StartupProject>
+
+	<FilterUndefinedNodesFromGraph><!-- BOOL: filter out undefined nodes in graph --></FilterUndefinedNodesFromGraph>
+
+	<source>
+		<CompilerFlags>
+			<CompilerFlag><!-- STRING: compiler flag, including the dash e.g. -v --></CompilerFlag>
+		</CompilerFlags>
+
+		<HeaderSearchPaths>
+			<HeaderSearchPath><!-- STRING: header search path for each path a HeaderSearchPath element --></HeaderSearchPath>
+		</HeaderSearchPaths>
+
+		<!-- MAC ONLY -->
+		<FrameworkSearchPaths>
+			<FrameworkSearchPath><!-- STRING: framework search path --></FrameworkSearchPath>
+		</FrameworkSearchPaths>
+	</source>
+
+	<code>
+		<TabWidth><!-- INTEGER: number of spaces to represent a tab in code files --></TabWidth>
+
+		<FontName><!-- STRING: name of the font used for source view --></FontName> <!-- DEPRECATED -->
+		<FontSize><!-- INTEGER: size of the font in the source view --></FontSize> <!-- DEPRECATED -->
+
+		<snippet>
+			<snap_range><!-- INTEGER: max amount of lines that the current snippet will be extended to snap to scope start/end --></snap_range>
+			<expand_range><!-- INTEGER: amount of lines that the snippet range (not snapped) will be extended --></expand_range>
+		</snippet>
+	</code>
+
+	<colors>
+		<!-- QueryNodeType -->
+		<command>
+			<normal>#8FBC92</normal>
+			<hover>#5EA071</hover>
+		</command>
+		<operator>
+			<normal>#FCA47E</normal>
+			<hover>#F97A4E</hover>
+		</operator>
+		<!-- NodeType -->
+		<class>
+			<normal>#ededed</normal>
+			<hover>#ededed</hover>
+		</class>
+		<struct>
+			<normal>#ededed</normal>
+			<hover>#ededed</hover>
+		</struct>
+		<enum>
+			<normal>#ededed</normal>
+			<hover>#ededed</hover>
+		</enum>
+		<function>
+			<normal>#F4D07D</normal>
+			<hover>#F4BC3D</hover>
+		</function>
+		<method>
+			<normal>#F4D07D</normal>
+			<hover>#F4BC3D</hover>
+		</method>
+		<field>
+			<normal>#7BB5D4</normal>
+			<hover>#42A1D4</hover>
+		</field>
+		<global>
+			<normal>#7BB5D4</normal>
+			<hover>#42A1D4</hover>
+		</global>
+		<undefined>
+			<normal>#00000000</normal>
+			<hover>#00000000</hover>
+		</undefined>
+		<undefined_variable>
+			<normal>#7BB5D4</normal>
+			<hover>#42A1D4</hover>
+		</undefined_variable>
+		<undefined_function>
+			<normal>#F4D07D</normal>
+			<hover>#F4BC3D</hover>
+		</undefined_function>
+		<undefined_type>
+			<normal>#ededed</normal>
+			<hover>#ededed</hover>
+		</undefined_type>
+		<namespace>
+			<normal>#00000000</normal>
+			<hover>#00000000</hover>
+		</namespace>
+		<typedef>
+			<normal>#ededed</normal>
+			<hover>#ededed</hover>
+		</typedef>
+		<enum_constant>
+			<normal>#7BB5D4</normal>
+			<hover>#42A1D4</hover>
+		</enum_constant>
+		<template_parameter_type>
+			<normal>#ededed</normal>
+			<hover>#ededed</hover>
+		</template_parameter_type>
+		<file>
+			<normal>#88BAB3</normal>
+			<hover>#6AA39B</hover>
+		</file>
+	</colors>
+</config>
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!-- BOOL: 0, 1 -->
+<!-- INTEGER: int e.g 123 -->
+<!-- DECIMAL: float e.g 123.456 -->
+<!-- STRING: string e.g hello -->
+<!-- COLOR: int int int int - rgba e.g. 125 125 125 255 -->
+
+<config>
+	<source>
+		<SourcePaths>
+			<SourcePath><!-- STRING: path to source file or directory, also used as header search path --></SourcePath>
+		</SourcePaths>
+
+		<CompilerFlags>
+			<CompilerFlag><!-- STRING: compiler flag, including the dash e.g. -v --></CompilerFlag>
+		</CompilerFlags>
+
+		<HeaderSearchPaths>
+			<HeaderSearchPath><!-- STRING: header search path for each path a HeaderSearchPath element --></HeaderSearchPath>
+		</HeaderSearchPaths>
+
+		<!-- MAC ONLY -->
+		<FrameworkSearchPaths>
+			<FrameworkSearchPath><!-- STRING: framework search path --></FrameworkSearchPath>
+		</FrameworkSearchPaths>
+
+		<Extensions>
+			<HeaderExtensions><!-- STRING: extension for header/include e.g. .h --></HeaderExtensions>
+			<SourceExtensions><!-- STRING: extension for source e.g. .cpp --></SourceExtensions>
+		</Extensions>
+
+	</source>
+</config>
@@ -0,0 +1,109 @@
+#code_file_list {
+	background-color: white;
+}
+
+#code_file {
+	background-color: white;
+	border: 2px solid #E0E0E0;
+	border-radius: 14px;
+}
+
+#code_file #title_widget {
+	background-color: #E0E0E0;
+	border-top-left-radius: 10px;
+	border-top-right-radius: 10px;
+	margin-bottom: 5px;
+	min-height: 28px;
+	padding-right: 5px;
+}
+
+#code_file #title_label {
+	background: none;
+	border: none;
+	border-radius: 3px;
+	font-size: 14px;
+	padding: 2px 4px;
+	margin: 2px 8px;
+}
+
+#code_file #title_label:hover {
+	background-color: #D0D0D0;
+}
+
+#code_file #title_label:disabled {
+	color: black;
+}
+
+#code_file #code_snippet{
+	border-top: 2px solid #E0E0E0;
+	padding-top: 2px;
+}
+
+#code_file #code_snippet[isFirst=true] {
+	border: none;
+	padding-top: 0px;
+}
+
+#code_file #code_snippet #scope_name, #code_file #code_snippet #dots {
+	background: none;
+	color: gray;
+	border: none;
+	font-family: "Source Code Pro";
+	font-size: 14px;
+}
+
+#code_file #code_snippet #dots {
+	padding-right: 13px;
+	text-align: right;
+}
+
+#code_file #code_snippet #scope_name {
+	padding-left: 4px;
+}
+
+#code_area {
+	background-color: transparent;
+	font-family: "Source Code Pro";
+	font-size: 14px;
+}
+
+#code_area #line_number_area {
+	font-family: "Source Code Pro";
+	font-size: 14px;
+}
+
+#code_file #maximize_button, #code_file #snippet_button, #code_file #minimize_button {
+	margin: 3px;
+	max-height: 16px;
+	max-width: 16px;
+}
+
+#code_file #maximize_button {
+	border-image: url(data/gui/code_view/images/maximize_inactive.png);
+}
+
+#code_file #maximize_button:enabled {
+	border-image: url(data/gui/code_view/images/maximize_active.png);
+}
+
+#code_file #snippet_button {
+	border-image: url(data/gui/code_view/images/snippet_inactive.png);
+}
+
+#code_file #snippet_button:enabled {
+	border-image: url(data/gui/code_view/images/snippet_active.png);
+}
+
+#code_file #minimize_button {
+	border-image: url(data/gui/code_view/images/minimize_inactive.png);
+}
+
+#code_file #minimize_button:enabled {
+	border-image: url(data/gui/code_view/images/minimize_active.png);
+}
+
+QToolTip {
+	background-color: rgb(204, 204, 204);
+	border: 1px solid rgb(0, 0, 0);
+	color: rgb(0, 0, 0);
+}
@@ -0,0 +1,35 @@
+#refresh_bar {
+	background: white;
+}
+
+QPushButton {
+	background: #E0E0E0;
+	border: none;
+	height: 30px;
+	width: 30px;
+}
+
+QPushButton:hover, QPushButton:checked {
+	background: #B2B2B2;
+}
+
+QPushButton:pressed {
+	background: #626262;
+}
+
+#refresh_button {
+	border-bottom-left-radius: 12px;
+	border-top-left-radius: 12px;
+	margin-right: 2px;
+}
+
+#auto_refresh_button {
+	border-bottom-right-radius: 12px;
+	border-top-right-radius: 12px;
+}
+
+QToolTip {
+	background-color: rgb(204, 204, 204);
+	border: 1px solid rgb(0, 0, 0);
+	color: rgb(0, 0, 0);
+}
@@ -0,0 +1,8 @@
+QPushButton {
+	border: none;
+	font-family: "Source Code Pro";
+	font-size: 16px;
+	height: 20px;
+	padding-left: 4px;
+	padding-right: 4px;
+}
@@ -0,0 +1,72 @@
+#search_bar {
+	background: white;
+}
+
+QWidget#search_box_container {
+	background: #E0E0E0;
+	border: none;
+	border-bottom-left-radius: 12px;
+	border-top-left-radius: 12px;
+	margin-right: 2px;
+}
+
+QLineEdit#search_box {
+	background: #E0E0E0;
+	border: none;
+	font-family: "Source Code Pro";
+	font-size: 16px;
+	height: 24px;
+	selection-background-color: #B2B2B2;
+}
+
+QWidget#search_box_highlight {
+	background: #B2B2B2;
+	border: none;
+	height: 24px;
+}
+
+QAbstractItemView#search_box_popup {
+	background-color: white;
+	border: none;
+	font-family: "Source Code Pro";
+	font-size: 14pt;
+	margin: 8px 0 0;
+	min-height: 26px;
+	selection-background-color: #B2B2B2;
+}
+
+QPushButton#search_button {
+	background: #E0E0E0;
+	border: none;
+	border-bottom-right-radius: 12px;
+	border-top-right-radius: 12px;
+	background-position: 15px 5px;
+	height: 30px;
+	width: 30px;
+}
+
+#search_button:hover {
+	background: #B2B2B2;
+}
+
+#search_button:pressed {
+	background: #626262;
+}
+
+/*QPushButton#case_sensitive_button {
+	border: none;
+	border-image: url(data/gui/search_view/images/button_case_sensitive_inactive.png);
+	height: 26px;
+	width: 26px;
+	margin-left: 4px;
+}
+
+QPushButton#case_sensitive_button:checked {
+	border-image: url(data/gui/search_view/images/button_case_sensitive_active.png);
+}*/
+
+QToolTip {
+	background-color: rgb(204, 204, 204);
+	border: 1px solid rgb(0, 0, 0);
+	color: rgb(0, 0, 0);
+}
@@ -0,0 +1,40 @@
+#undo_redo_bar {
+	background: white;
+}
+
+QPushButton {
+	background: #E0E0E0;
+	border: none;
+	background-position: 15px 5px;
+	height: 30px;
+	width: 30px;
+}
+
+#undo_button {
+	border-bottom-left-radius: 12px;
+	border-top-left-radius: 12px;
+	margin-right: 2px;
+}
+
+#redo_button {
+	border-bottom-right-radius: 12px;
+	border-top-right-radius: 12px;
+}
+
+QPushButton:disabled {
+	background: #F4F4F4;
+}
+
+QPushButton:hover {
+	background: #B2B2B2;
+}
+
+QPushButton:pressed {
+	background: #626262;
+}
+
+QToolTip {
+	background-color: rgb(204, 204, 204);
+	border: 1px solid rgb(0, 0, 0);
+	color: rgb(0, 0, 0);
+}
@@ -0,0 +1,34 @@
+class Player {
+public:
+  void Do() {}
+};
+
+class Base {
+protected:
+  void Init() {}
+};
+
+class Game : public Base {
+public:
+  Game() {
+    Init();
+  }
+
+  void Run() {
+    player.Do();
+  }
+
+private:
+  Player player;
+};
+
+Game* game;
+
+int main() {
+  game = new Game();
+
+  game->Run();
+
+  delete game;
+  return 0;
+}
@@ -0,0 +1,272 @@
+const bool *abd(int abc, int bca);
+
+bool const *abc(int a, int b);
+
+bool *const abcd(int a, int b);
+
+int main();
+void foo();
+int sum(int a, int b);
+int diff(int a, int b);
+
+void funk();
+
+class A
+{
+public:
+	A(char c)
+		: m_importantValue(42)
+		, m_importanterValue(c)
+		, m_importantestValue(3.14159265359f)
+	{
+	}
+
+	~A()
+	{
+	}
+
+	void doImportantStuff()
+	{
+		int a = 1;
+		m_importantValue *= a;
+	}
+
+	void doModeratelyImportantStuff()
+	{
+		m_importanterValue = 'R';
+		int answer = sum(21, 21);
+	}
+
+private:
+	int m_importantValue;
+	char m_importanterValue;
+	const float m_importantestValue;
+};
+
+A globalA(' ');
+
+class B : public A
+{
+public:
+	B()
+		: A('b')
+	{
+	}
+
+	virtual ~B()
+	{
+	}
+
+protected:
+	virtual float getNumber() = 0;
+};
+
+class C
+{
+public:
+	C()
+		: m_valuable(0)
+	{
+		globalA.doImportantStuff();
+		s_count++;
+	}
+
+	~C()
+	{
+		s_count--;
+	}
+
+	static int getCount()
+	{
+		return s_count;
+	}
+
+	void solveAllProblems() const
+	{
+		A aInstance('a');
+		aInstance.doImportantStuff();
+		aInstance.doModeratelyImportantStuff();
+	}
+
+private:
+	static int s_count;
+	int m_valuable;
+};
+
+namespace
+{
+	namespace noname
+	{
+		struct V
+		{
+			int x;
+			int y;
+		};
+	}
+
+	enum E
+	{
+		X,
+		Y
+	};
+}
+
+noname::V voo;
+
+typedef A* D;
+
+D globalD;
+
+class E
+{
+public:
+	E(){}
+	~E(){}
+
+	class SubE
+	{
+	public:
+		SubE(){}
+		~SubE(){}
+	};
+
+private:
+	int m_importantInt;
+};
+
+class AnotherClass
+	: public A
+{
+public:
+	AnotherClass()
+		: A('x')
+	{
+	}
+
+	int publicInt;
+protected:
+	int protectedInt;
+private:
+	int privateInt;
+};
+
+
+class circleA
+{
+public:
+	circleA()
+	{
+		
+	}
+
+private:
+	//circleB m_b;
+};
+
+class circleB
+{
+public:
+	circleB()
+	{
+		m_a = circleA();
+	}
+	
+	circleA foo(){return circleA();}
+
+private:
+	circleA m_a;
+};
+
+struct circleC
+{
+public:
+	circleC()
+	{
+		m_b = circleB();
+	}
+	
+	circleA foo0(){return circleA();}
+	circleB foo1(){return circleB();}
+
+private:
+	circleB m_b;
+};
+
+class circleD
+{
+public:
+	circleD()
+	{
+		m_c = circleC();
+	}
+	
+	circleC foo(){return circleC();}
+	
+	circleA foo2(){return circleA();}
+	circleB foo3(){return circleB();}
+
+private:
+	circleC m_c;
+};
+
+class circleE
+{
+public:
+	circleE()
+	{
+		m_d = circleD();
+	}
+	
+	circleC foo(){return circleC();}
+	circleB foo1(){return circleB();}
+	circleD foo2(){return circleD();}
+	circleA foo3(){return circleA();}
+
+private:
+	circleD m_d;
+};
+
+class circleF
+{
+public:
+	circleF()
+	{
+		m_e = circleE();
+	}
+	
+	circleC foo(){return circleC();}
+	circleB foo1(){return circleB();}
+	circleD foo2(){return circleD();}
+	circleA foo3(){return circleA();}
+	circleE foo4(){return circleE();}
+
+private:
+	circleE m_e;
+};
+
+class circleCenter
+{
+public:
+	circleCenter()
+	{
+		m_a = circleA();
+		m_b = circleB();
+		m_c = circleC();
+		m_d = circleD();
+	}
+	
+	circleA foo0(){return circleA();}
+	circleB foo1(){return circleB();}
+	circleC foo2(){return circleC();}
+	circleD foo3(){return circleD();}
+	circleE foo4(){return circleE();}
+	circleF foo5(){return circleF();}
+	
+private:
+	circleA m_a;
+	circleB m_b;
+	circleC m_c;
+	circleD m_d;
+	
+	//AnotherClass m_anotherClass;
+};
@@ -0,0 +1,48 @@
+#include "header.h"
+
+int main();
+void foo();
+int sum(int a, int b);
+int sum(int* a, int* b);
+int diff(int a, int b);
+
+int main()
+{
+	A aInstance('m');
+	aInstance.doImportantStuff();
+
+	int a = sum(1, 2);
+	int b = diff(a, 3);
+	int c = a * b;
+
+	int x = 0;
+
+	return 0;
+}
+
+int sum(int a, int b);
+
+int diff(int a, int b);
+
+void foo()
+{
+	const char* foo = "bar";
+}
+
+int diff(int a, int b);
+
+int sum(int a, int b)
+{
+	return a + b;
+}
+
+int diff(int a, int b)
+{
+	return a - b;
+}
+
+void funk()
+{
+	A aInstance('x');
+	aInstance.doModeratelyImportantStuff();
+}
@@ -0,0 +1,13 @@
+#include "header.h"
+
+void test(int i, int b)
+{
+
+	int x;
+
+	A instanceOfA('v');
+
+	return;
+}
+
+
@@ -0,0 +1,23 @@
+#include <memory>
+
+class A
+{
+};
+
+template <typename T>
+class B
+{
+};
+
+int main()
+{
+	A a;
+
+	A* aPtr = nullptr;
+
+	std::shared_ptr<A> aSharedPtr = std::make_shared<A>();
+
+	B<A> b;
+
+	return 0;
+}
@@ -0,0 +1,8 @@
+template <bool B, typename, class F>
+class Foo
+{
+public:
+	void bar()
+	{
+	}
+};
@@ -0,0 +1,8 @@
+#include "header.h"
+
+int main()
+{
+	Foo<true, int, float> ft;
+	ft.bar();
+	return 0;
+}
@@ -0,0 +1,82 @@
+#ifndef _ARTIFICIAL_
+#define _ARTIFICIAL_
+
+#include <stdlib.h>
+#include <time.h>
+#include "player.h"
+
+class ArtificialPlayer : public Player {
+public:
+	ArtificialPlayer( Field::Token token, const std::string& name  )
+		: Player( token, name ) {
+	}
+	virtual ~ArtificialPlayer() {}
+
+	virtual Field::Move Turn( const Field& field ) const {
+//		srand( static_cast<unsigned int>( time( NULL ) ) );
+		Field fakeField = field.Clone();
+		Node node = MinMax( fakeField, token_ );
+		return node.move;
+	}
+
+private:
+	struct Node {
+		Field::Move move;
+		int value;
+	};
+
+	Node MinMax( Field& field, Field::Token token ) const {
+		Node node;
+		node.value = -10000;
+
+		Field::Move move;
+		int sameMove;
+
+		for ( int i = 0; i < 3; i++ ) {
+			move.row = i;
+
+			for ( int j = 0; j < 3; j++ ) {
+				move.col = j;
+
+				if ( !field.IsEmpty( move ) ) {
+					continue;
+				}
+
+				field.MakeMove( move, token );
+
+				int turnValue = Evaluate( field, token );
+				if ( !turnValue && !field.IsFull() ) {
+					turnValue = -MinMax( field, Field::Opponent( token ) ).value;
+				}
+
+				field.ClearMove( move );
+
+				if ( turnValue > node.value ) {
+					node.move = move;
+					node.value = turnValue;
+					sameMove = 1;
+				} else if ( turnValue == node.value ) {
+					sameMove++;
+					if ( 1 % sameMove == 0 ) {
+						node.move = move;
+					}
+				}
+			}
+		}
+
+		return node;
+	}
+
+	int Evaluate( const Field& field, Field::Token token ) const {
+		if ( field.SameInRow( token, 3 ) ) {
+			return 2;
+		} else if ( field.SameInRow( Field::Opponent( token ), 2 ) ) {
+			return -1;
+		} else if ( field.SameInRow( token, 2 ) > 1 ) {
+			return 1;
+		}
+		return 0;
+	}
+};
+
+#endif // _ARTIFICIAL_
@@ -0,0 +1,147 @@
+#ifndef _FIELD_
+#define _FIELD_
+
+#include <cassert>
+#include <iostream>
+
+class Field {
+public:
+	enum Token {
+		None = 0,
+		PlayerA = 1,
+		PlayerB = 4
+	};
+
+	static Token Opponent( Token token ) {
+		assert( token != None );
+		if ( token == PlayerA ) {
+			return PlayerB;
+		} else {
+			return PlayerA;
+		}
+	}
+
+	struct Move {
+		int row;
+		int col;
+	};
+
+	Field()
+		: left_( 9 ) {
+		grid_ = new Token* [3];
+		for ( int i = 0; i < 3 ; i++ ) {
+			grid_[i] = new Token[3];
+		}
+	}
+
+	~Field() {
+		for ( int i = 0; i < 3; i++ ) {
+			delete grid_[i];
+		}
+		delete [] grid_;
+	}
+
+	Field Clone() const {
+		Field field;
+		for ( int i = 0; i < 3; i++ ) {
+			for ( int j = 0; j < 3; j++ ) {
+				field.grid_[i][j] = grid_[i][j];
+			}
+		}
+		field.left_ = left_;
+		return field;
+	}
+
+	void Clear() {
+		for ( int i = 0; i < 3; i++ ) {
+			for ( int j = 0; j < 3; j++ ) {
+				grid_[i][j] = None;
+			}
+		}
+		left_ = 9;
+	}
+
+	void Show() const {
+		std::cout << "   1   2   3\n";
+		for ( int row = 0; row < 3; row++ ) {
+			std::cout << row + 1 << " ";
+
+			for ( int col = 0; col < 3; col++ ) {
+				if ( grid_[row][col] == PlayerA ) {
+					std::cout << " X ";
+				} else if ( grid_[row][col] == PlayerB ) {
+					std::cout << " O ";
+				} else {
+					std::cout << "   ";
+				}
+
+				if ( col < 2 ) {
+					std::cout << "|";
+				}
+			}
+
+			if ( row < 2 ) {
+				std::cout << "\n  -----------\n";
+			}
+		}
+		std::cout << "\n\n";
+	}
+
+	int SameInRow( Token token, int amount ) const {
+		int sum = amount * token;
+		int count = 0;
+
+		for ( int i = 0; i < 3; i++ ) {
+			if ( grid_[i][0] + grid_[i][1] + grid_[i][2] == sum ) {
+				count++;
+			} else if ( grid_[0][i] + grid_[1][i] + grid_[2][i] == sum ) {
+				count++;
+			}
+		}
+
+		if ( grid_[0][0] + grid_[1][1] + grid_[2][2] == sum ) {
+			count++;
+		} else if ( grid_[2][0] + grid_[1][1] + grid_[0][2] == sum ) {
+			count++;
+		}
+
+		return count;
+	}
+
+	bool InRange( const Move& move ) const {
+		return move.row >= 0 && move.row < 3 && move.col >= 0 && move.col < 3;
+	}
+
+	bool IsEmpty( const Move& move ) const {
+		return grid_[move.row][move.col] == None;
+	}
+
+	bool IsFull() const {
+		return left_ == 0;
+	}
+
+	void MakeMove( const Move& move, Token token ) {
+		assert( InRange( move ) );
+		assert( IsEmpty( move ) );
+		assert( token != None );
+		assert( left_ );
+
+		grid_[move.row][move.col] = token;
+		left_--;
+	}
+
+	void ClearMove( const Move& move ) {
+		assert( InRange(move) );
+		assert( !IsEmpty(move) );
+		assert( left_ < 9 );
+
+		grid_[move.row][move.col] = None;
+		left_++;
+	}
+
+private:
+	Token** grid_;
+	int left_;
+};
+
+#endif // _FIELD_
@@ -0,0 +1,51 @@
+#ifndef _HUMAN_
+#define _HUMAN_
+
+#include "input.h"
+#include "player.h"
+
+class HumanPlayer : public Player {
+public:
+	HumanPlayer( Field::Token token, const std::string& name  )
+		: Player( token, name ) {
+	}
+	virtual ~HumanPlayer() {}
+
+	virtual Field::Move Turn( const Field& field ) const {
+		Field::Move move;
+		std::cout << name_ << '\n';
+		do {
+			move = Input();
+			move.row -= 1;
+			move.col -= 1;
+		} while ( !Check( field, move ) );
+		return move;
+	}
+
+private:
+	Field::Move Input() const {
+		Field::Move move;
+
+		std::cout << "Insert row: ";
+		input::number( &move.row );
+
+		std::cout << "Insert column: ";
+		input::number( &move.col );
+
+		std::cout << '\n';
+		return move;
+	}
+
+	bool Check( const Field& field, const Field::Move& move ) const {
+		if ( !field.InRange( move ) ) {
+			std::cout << "Wrong input!\n";
+			return false;
+		} else if ( !field.IsEmpty( move ) ) {
+			std::cout << "Is occupied!\n";
+			return false;
+		}
+		return true;
+	}
+};
+
+#endif // _HUMAN_
@@ -0,0 +1,20 @@
+#ifndef _INPUT_
+#define _INPUT_
+
+#include <string>
+#include <iostream>
+#include <sstream>
+
+namespace input {
+
+template<typename T>
+void number( T* number ) {
+	std::string input;
+	getline( std::cin, input );
+	std::stringstream stream( input );
+	stream >> *number;
+}
+
+}
+
+#endif // _INPUT_
@@ -0,0 +1,11 @@
+#include "tictactoe.h"
+
+int main() {
+	TicTacToe tictactoe;
+
+	while ( tictactoe.Start() ) {
+		tictactoe.Run();
+	}
+
+	return 0;
+}
@@ -0,0 +1,33 @@
+#ifndef _PLAYER_
+#define _PLAYER_
+
+#include <string>
+
+#include "field.h"
+
+class Player {
+public:
+	Player( Field::Token token, const std::string& name )
+		: token_( token )
+		, name_( name ) {
+	}
+	virtual ~Player() {}
+
+	virtual Field::Move Turn( const Field& field ) const = 0;
+
+	const Field::Token& getToken() const
+	{
+		return token_;
+	}
+
+	const std::string getName() const
+	{
+		return name_;
+	}
+
+protected:
+	const Field::Token token_;
+	const std::string name_;
+};
+
+#endif // _PLAYER_
@@ -0,0 +1,93 @@
+#ifndef _TIC_TAC_TOE_
+#define _TIC_TAC_TOE_
+
+#include "computer.h"
+#include "field.h"
+#include "human.h"
+#include "input.h"
+#include "player.h"
+
+class TicTacToe {
+public:
+	TicTacToe() {
+		players_[0] = NULL;
+		players_[1] = NULL;
+	}
+
+	~TicTacToe() {
+		Reset();
+	}
+
+	bool Start() {
+		Reset();
+		std::cout << "Tic Tac Toe\n\n[1] Human\n[2] Computer\n[3] Quit\n\n";
+
+		players_[0] = SelectPlayer( Field::PlayerA, "PlayerA" );
+		if ( !players_[0] ) {
+			return false;
+		}
+
+		players_[1] = SelectPlayer( Field::PlayerB, "PlayerB" );
+		if ( !players_[1] ) {
+			return false;
+		}
+
+		std::cout << '\n';
+		return true;
+	}
+
+	void Run() {
+		field_.Show();
+
+		int playerIndex = 0;
+
+		for ( int i = 0; i < 9; i++ ) {
+			Player& player = *players_[playerIndex];
+
+			field_.MakeMove( player.Turn( field_ ), player.getToken() );
+			field_.Show();
+
+			if ( field_.SameInRow( player.getToken(), 3 ) ) {
+				std::cout << player.getName() << " won!\n\n";
+				return;
+			}
+
+			playerIndex = ( playerIndex + 1 ) % 2;
+		}
+
+		std::cout << "Game ends in draw!\n\n";
+	}
+
+private:
+	void Reset() {
+		field_.Clear();
+
+		for ( int i = 0; i < 2; i++ ) {
+			if ( players_[i] ) {
+				delete players_[i];
+				players_[i] = NULL;
+			}
+		}
+	}
+
+	Player* SelectPlayer( Field::Token token, const std::string& name ) const {
+		int selection;
+
+		while ( true ) {
+			std::cout << "Choose " << name << ": ";
+			input::number( &selection );
+
+			switch ( selection ) {
+				case 1 : return new HumanPlayer( token, name );
+				case 2 : return new ArtificialPlayer( token, name );
+				case 3 : return NULL;
+				default : std::cout << "Wrong input!\n";
+			}
+		}
+	}
+
+	Player* players_[2];
+	Field field_;
+};
+
+#endif // _TIC_TAC_TOE_
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<config>
+    <source>
+        <SourcePath>data/src</SourcePath>
+    </source>
+</config>
@@ -0,0 +1,61 @@
+#include "header.h"
+
+char* name;
+H g;
+
+int ceil(float a)
+{
+	return static_cast<int>(a) + 1;
+}
+
+namespace X
+{
+	struct A;
+
+	enum E
+	{
+		P,
+		Q
+	};
+}
+
+class B
+{
+public:
+	class C
+	{
+		static const int amount;
+	};
+
+	B();
+
+	virtual ~B()
+	{
+	}
+
+protected:
+	virtual void process() = 0;
+
+private:
+	int getCount() const
+	{
+		return count;
+	}
+
+	const int count;
+	H h;
+};
+
+B::B()
+	: count(0)
+{
+}
+
+namespace
+{
+	int sum(int a, int b)
+	{
+		int c = a + b;
+		return c;
+	}
+}
@@ -0,0 +1,11 @@
+typedef unsigned int uint;
+
+class G
+{};
+
+class H
+	: public G
+{
+private:
+	int width;
+};
@@ -0,0 +1 @@
+update
@@ -0,0 +1,21 @@
+#ifndef _PLAYER_
+#define _PLAYER_
+
+#include <string>
+
+#include "field.h"
+
+class Player {
+public:
+	Player( Field::Token token, const std::string& name )
+		: token_( token )
+		, name_( name ) {
+	}
+
+	virtual Field::Move Turn( const Field& field ) const = 0;
+
+	const Field::Token token_;
+	const std::string name_;
+};
+
+#endif // _PLAYER_
@@ -0,0 +1,33 @@
+class Player {
+public:
+  void Do() {}
+};
+
+class Base {};
+
+class Game : public Base {
+public:
+  Game() {
+    Init();
+  }
+
+  void Init() {}
+
+  void Run() {
+    player.Do();
+  }
+
+private:
+  Player player;
+};
+
+Game* game;
+
+int main() {
+  game = new Game();
+
+  game->Run();
+
+  delete game;
+  return 0;
+}
@@ -0,0 +1,11 @@
+#include "tictactoe.h"
+
+int main() {
+	TicTacToe tictactoe;
+
+	while ( tictactoe.Start() ) {
+		tictactoe.Run();
+	}
+
+	return 0;
+}
@@ -0,0 +1,93 @@
+#ifndef _TIC_TAC_TOE_
+#define _TIC_TAC_TOE_
+
+#include "computer.h"
+#include "field.h"
+#include "human.h"
+#include "input.h"
+#include "player.h"
+
+class TicTacToe {
+public:
+	TicTacToe() {
+		players_[0] = NULL;
+		players_[1] = NULL;
+	}
+
+	~TicTacToe() {
+		Reset();
+	}
+
+	bool Start() {
+		Reset();
+		std::cout << "Tic Tac Toe\n\n[1] Human\n[2] Computer\n[3] Quit\n\n";
+
+		players_[0] = SelectPlayer( Field::PlayerA, "PlayerA" );
+		if ( !players_[0] ) {
+			return false;
+		}
+
+		players_[1] = SelectPlayer( Field::PlayerB, "PlayerB" );
+		if ( !players_[1] ) {
+			return false;
+		}
+
+		std::cout << '\n';
+		return true;
+	}
+
+	void Run() {
+		field_.Show();
+
+		int playerIndex = 0;
+
+		for ( int i = 0; i < 9; i++ ) {
+			Player& player = *players_[playerIndex];
+
+			field_.MakeMove( player.Turn( field_ ), player.token_ );
+			field_.Show();
+
+			if ( field_.SameInRow( player.token_, 3 ) ) {
+				std::cout << player.name_ << " won!\n\n";
+				return;
+			}
+
+			playerIndex = ( playerIndex + 1 ) % 2;
+		}
+
+		std::cout << "Game ends in draw!\n\n";
+	}
+
+private:
+	void Reset() {
+		field_.Clear();
+
+		for ( int i = 0; i < 2; i++ ) {
+			if ( players_[i] ) {
+				delete players_[i];
+				players_[i] = NULL;
+			}
+		}
+	}
+
+	Player* SelectPlayer( Field::Token token, const std::string& name ) const {
+		int selection;
+
+		while ( true ) {
+			std::cout << "Choose " << name << ": ";
+			input::number( &selection );
+
+			switch ( selection ) {
+				case 1 : return new HumanPlayer( token, name );
+				case 2 : return new ArtificialPlayer( token, name );
+				case 3 : return NULL;
+				default : std::cout << "Wrong input!\n";
+			}
+		}
+	}
+
+	Player* players_[2];
+	Field field_;
+};
+
+#endif // _TIC_TAC_TOE_
@@ -0,0 +1 @@
+update
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<config>
+	<Bool>1</Bool>
+	<Int>42</Int>
+	<Float>3.1416</Float>
+	<String>Hello World!</String>
+
+	<source>
+		<SourcePaths>
+			<SourcePath>data</SourcePath>
+		</SourcePaths>
+		<HeaderSearchPaths>
+			<HeaderSearchPath>data/</HeaderSearchPath>
+			<HeaderSearchPath>src/</HeaderSearchPath>
+		</HeaderSearchPaths>
+
+	</source>
+</config>
+
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!-- INTEGER: int e.g 123 -->
+<!-- DECIMAL: float e.g 123.456 -->
+<!-- STRING: string e.g hello -->
+<!-- COLOR: int int int int - rgba e.g. 125 125 125 255 -->
+
+<config>
+	<source>
+		<HeaderSearchPaths>
+			<HeaderSearchPath><!-- STRING: header search path for each path a HeaderSearchPaht element--></HeaderSearchPath>
+		</HeaderSearchPaths>
+	</source>
+</config>
@@ -0,0 +1,7 @@
+"If you're a researcher on this book thing and you were on Earth, you must have been gathering material on it."
+"Well, I was able to extend the original entry a bit, yes."
+"Let me see what it says in this edition, then. I've got to see it."
+... "What? Harmless! Is that all it's got to say? Harmless! One word! ... Well, for God's sake I hope you managed to recitify that a bit."
+"Oh yes, well I managed to transmit a new entry off to the editor. He had to trim it a bit, but it's still an improvement."
+"And what does it say now?" asked Arthur.
+"Mostly harmless," admitted Ford with a slightly embarrassed cough.
@@ -0,0 +1,145 @@
+ConfigManager.cpp WARNING: value path/to/nowhere is not present in config.
+Storage.cpp INFO: file: input.cc < 0:0 0:0>
+Storage.cpp INFO: class: A <input.cc 1:7 1:7>
+Storage.cpp INFO: method: A::A <input.cc 4:2 4:2>
+Storage.cpp INFO: global usage: A::A -> A::count <input.cc 5:3 5:7>
+Storage.cpp INFO: method: A::A <input.cc 8:2 8:2>
+Storage.cpp INFO: global usage: A::A -> A::count <input.cc 9:3 9:7>
+Storage.cpp INFO: method: A::getCount <input.cc 12:13 12:20>
+Storage.cpp INFO: global usage: A::getCount -> A::count <input.cc 14:10 14:14>
+Storage.cpp INFO: method: A::process <input.cc 18:15 18:21>
+Storage.cpp INFO: field: A::count <input.cc 21:13 21:17>
+Storage.cpp INFO: class: B <input.cc 24:7 24:7>
+Storage.cpp INFO: inheritance: B : A <input.cc 25:4 25:11>
+Storage.cpp INFO: method: B::process <input.cc 28:15 28:21>
+Storage.cpp INFO: override: A::process -> B::process < 0:0 0:0>
+Storage.cpp INFO: type usage: B::process -> int <input.cc 30:3 30:5>
+Storage.cpp INFO: function: _main_ <input.cc 34:5 34:10>
+Storage.cpp INFO: type usage: _main_ -> B <input.cc 36:2 36:2>
+Storage.cpp INFO: call: _main_ -> B::B <input.cc 36:4 36:4>
+Storage.cpp INFO: call: _main_ -> A::getCount <input.cc 38:9 38:21>
+SearchMatch.cpp INFO: 
+1 matches for "_main_":
+931	_main_
+	^^^^^^
+
+SearchMatch.cpp INFO: 
+1 matches for "_main_":
+931	_main_
+	^^^^^^
+
+SearchMatch.cpp INFO: 
+1 matches for "A::A":
+190	A::A
+	^^^^
+
+Storage.cpp INFO: file: input.cc < 0:0 0:0>
+Storage.cpp INFO: class: A <input.cc 1:7 1:7>
+Storage.cpp INFO: method: A::A <input.cc 4:2 4:2>
+Storage.cpp INFO: global usage: A::A -> A::count <input.cc 5:3 5:7>
+Storage.cpp INFO: method: A::getCount <input.cc 8:13 8:20>
+Storage.cpp INFO: global usage: A::getCount -> A::count <input.cc 10:10 10:14>
+Storage.cpp INFO: method: A::process <input.cc 14:15 14:21>
+Storage.cpp INFO: field: A::count <input.cc 17:13 17:17>
+Storage.cpp INFO: class: B <input.cc 20:7 20:7>
+Storage.cpp INFO: inheritance: B : A <input.cc 21:4 21:11>
+Storage.cpp INFO: method: B::process <input.cc 24:15 24:21>
+Storage.cpp INFO: override: A::process -> B::process < 0:0 0:0>
+Storage.cpp INFO: type usage: B::process -> int <input.cc 26:3 26:5>
+Storage.cpp INFO: function: main <input.cc 30:5 30:8>
+Storage.cpp INFO: type usage: main -> B <input.cc 32:2 32:2>
+Storage.cpp INFO: call: main -> B::B <input.cc 32:4 32:4>
+Storage.cpp INFO: call: main -> A::getCount <input.cc 34:9 34:21>
+Token.cpp ERROR: Location Id was not referenced by this Token.
+Node.cpp WARNING: Cannot change NodeType after it was already set from namespace to class
+Edge.cpp ERROR: Nodes are not plain copies.
+Edge.cpp ERROR: Edge usage can't go from Node undefined to Node undefined
+Edge.cpp ERROR: Edge usage can't go from Node undefined to Node undefined
+Edge.cpp ERROR: Edge usage can't go from Node undefined to Node undefined
+Settings.cpp WARNING: File for Settings not found.
+ConfigManager.cpp WARNING: value Bool is not present in config.
+ConfigManager.cpp WARNING: value Int is not present in config.
+ConfigManager.cpp WARNING: value Float is not present in config.
+ConfigManager.cpp WARNING: value String is not present in config.
+Settings.cpp WARNING: File for Settings not found.
+ConfigManager.cpp WARNING: value Bool is not present in config.
+ConfigManager.cpp WARNING: value Int is not present in config.
+ConfigManager.cpp WARNING: value Float is not present in config.
+ConfigManager.cpp WARNING: value String is not present in config.
+ConfigManager.cpp WARNING: value Bool is not present in config.
+ConfigManager.cpp WARNING: value Int is not present in config.
+ConfigManager.cpp WARNING: value Float is not present in config.
+ConfigManager.cpp WARNING: value String is not present in config.
+ConfigManager.cpp WARNING: value NewBool is not present in config.
+Graph.cpp ERROR: Can't remove member edge, without removing the child node.
+Storage.cpp INFO: typedef: type -> int <file.cpp 1:1 1:1>
+Storage.cpp INFO: class: Class <file.cpp 1:1 1:1>
+Storage.cpp INFO: struct: Struct <file.cpp 1:1 1:1>
+Storage.cpp INFO: global: Global <file.cpp 1:42 1:42>
+Storage.cpp INFO: global: Global <file.cpp 1:7 1:7>
+Storage.cpp INFO: field: m_field <file.cpp 1:3 1:3>
+Storage.cpp ERROR: Field is not a member of anything.
+Storage.cpp ERROR: Field needs to have access type [public, protected, private] but has none.
+Storage.cpp INFO: field: Struct::m_field <file.cpp 1:11 1:11>
+Storage.cpp INFO: function: isTrue <file.cpp 1:14 1:14>
+Storage.cpp INFO: method: isMethod <file.cpp 1:9 1:9>
+Storage.cpp ERROR: Method is not a member of anything.
+Storage.cpp ERROR: Method needs to have access type [public, protected, private] but has none.
+Storage.cpp INFO: method: isMethod <file.cpp 1:1 1:1>
+Storage.cpp ERROR: Method is not a member of anything.
+Storage.cpp ERROR: Method needs to have access type [public, protected, private] but has none.
+Storage.cpp INFO: method: Class::isMethod <file.cpp 1:1 1:1>
+Storage.cpp INFO: namespace: utility <file.cpp 1:1 1:1>
+Storage.cpp INFO: enum: Category <file.cpp 1:17 1:17>
+Storage.cpp INFO: enum: Class::Category <file.cpp 1:1 1:1>
+Storage.cpp INFO: enum constant: VALUE <file.cpp 1:1 1:1>
+Storage.cpp INFO: class: ClassA <file.cpp 1:0 1:0>
+Storage.cpp INFO: class: ClassB <file.cpp 1:0 1:0>
+Storage.cpp INFO: inheritance: ClassB : ClassA <file.cpp 1:5 1:5>
+Storage.cpp INFO: struct: StructA <file.cpp 1:0 1:0>
+Storage.cpp INFO: struct: StructB <file.cpp 1:0 1:0>
+Storage.cpp INFO: inheritance: StructB : StructA <file.cpp 1:5 1:5>
+Storage.cpp INFO: method: A::isMethod <file.cpp 1:9 1:9>
+Storage.cpp INFO: method: B::isMethod <file.cpp 1:7 1:7>
+Storage.cpp INFO: override: A::isMethod -> B::isMethod < 0:0 0:0>
+Storage.cpp INFO: function: isTrue <file.cpp 1:0 1:0>
+Storage.cpp INFO: function: func <file.cpp 1:0 1:0>
+Storage.cpp INFO: call: isTrue -> func <file.cpp 1:9 1:9>
+Storage.cpp INFO: global: global <file.cpp 1:0 1:0>
+Storage.cpp INFO: function: isTrue <file.cpp 1:0 1:0>
+Storage.cpp INFO: call: global -> isTrue <file.cpp 1:7 1:7>
+Storage.cpp INFO: function: isTrue <file.cpp 1:0 1:0>
+Storage.cpp INFO: field: Foo::m_field <file.cpp 1:0 1:0>
+Storage.cpp INFO: field usage: isTrue -> Foo::m_field <file.cpp 1:7 1:7>
+Storage.cpp INFO: function: isTrue <file.cpp 1:0 1:0>
+Storage.cpp INFO: global: global <file.cpp 1:0 1:0>
+Storage.cpp INFO: global usage: isTrue -> global <file.cpp 1:7 1:7>
+Storage.cpp INFO: function: isTrue <file.cpp 1:0 1:0>
+Storage.cpp INFO: struct: Struct <file.cpp 1:0 1:0>
+Storage.cpp INFO: type usage: isTrue -> Struct <file.cpp 1:0 1:0>
+Storage.cpp INFO: function: isTrue <file.cpp 1:0 1:0>
+Storage.cpp INFO: function: isTrue <file.h 1:0 1:0>
+Storage.cpp INFO: function: main <file.cpp 1:0 1:0>
+Storage.cpp INFO: call: main -> isTrue <file.cpp 1:0 1:0>
+Storage.cpp INFO: function: isTrue <file.h 1:0 1:0>
+Storage.cpp INFO: function: main <file.cpp 1:0 1:0>
+Storage.cpp INFO: call: main -> isTrue <file.cpp 1:0 1:0>
+Storage.cpp INFO: function: isTrue <file.h 1:0 1:0>
+Storage.cpp INFO: function: main <file.cpp 1:0 1:0>
+Storage.cpp INFO: call: main -> isTrue <file.cpp 1:0 1:0>
+Storage.cpp INFO: file: file.h < 0:0 0:0>
+Storage.cpp INFO: file: file.h < 0:0 0:0>
+Storage.cpp INFO: file: file.cpp < 0:0 0:0>
+Storage.cpp INFO: include: file.h <file.cpp 1:7 1:7>
+Storage.cpp INFO: file: f.h < 0:0 0:0>
+Storage.cpp INFO: file: file.h < 0:0 0:0>
+Storage.cpp INFO: file: file.cpp < 0:0 0:0>
+Storage.cpp INFO: include: f.h <file.cpp 1:0 1:0>
+Storage.cpp INFO: include: file.h <file.cpp 1:0 1:0>
+TextAccess.cpp WARNING: Index 'firstLine' has to be lower or equal index 'lastLine', is 3 > 2
+TextAccess.cpp WARNING: Tried to access index 10. Maximum index is 8
+TextAccess.cpp WARNING: Tried to access index 10. Maximum index is 8
+TextAccess.cpp WARNING: Line numbers start with one, is 0
+TextAccess.cpp WARNING: Line numbers start with one, is 0
+TokenLocationCollection.cpp ERROR: Can't create TokenLocation with wrong boundaries.
+TokenLocationCollection.cpp ERROR: Can't create TokenLocation with wrong boundaries.
@@ -0,0 +1,54 @@
+execute_process(
+	COMMAND $ENV{CLANG_DIR}/build/bin/llvm-config --cxxflags
+	OUTPUT_VARIABLE CLANG_DEFINITIONS
+)
+
+set(CLANG_INCLUDE_DIRS
+	"$ENV{CLANG_DIR}/llvm/tools/clang/include"
+	"$ENV{CLANG_DIR}/build/tools/clang/include"
+)
+
+
+set(CLANG_LIBRARY_DIRS "$ENV{CLANG_DIR}/build/lib")
+if (UNIX)
+	if ("${CMAKE_BUILD_TYPE}" STREQUAL "Release")
+		set(CLANG_LIBRARY_DIRS "$ENV{CLANG_DIR}/build/Release+Asserts/lib")
+	endif()
+endif ()
+
+
+set(CLANG_LIBRARIES
+	#clangApplyReplacements
+	#clangARCMigrate
+	#clangCodeGen
+	#clangDynamicASTMatchers
+	#clangFormat
+	#clangFrontendTool
+	#clangIndex
+	#clangQuer
+	#clangTidy
+	#clangTidyGoogleModule
+	#clangTidyLLVMModule
+	#clangTidyMiscModule
+	clangASTMatchers
+	clangFrontend
+	clangSerialization
+	clangDriver
+	clangTooling
+	clangParse
+	clangSema
+	clangStaticAnalyzerFrontend
+	clangStaticAnalyzerCheckers
+	clangStaticAnalyzerCore
+	clangAnalysis
+	clangRewriteFrontend
+	clangEdit
+	clangAST
+	clangLex
+	clangBasic
+)
+
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(CLANG DEFAULT_MSG CLANG_LIBRARIES CLANG_INCLUDE_DIRS)
+
+mark_as_advanced(CLANG_INCLUDE_DIRS CLANG_LIBRARIES)
@@ -0,0 +1,29 @@
+#
+# Defines a list of files with a given name, prepends the relative path to the
+# source dir to each file if available and passes the list to PARENT_SCOPE.
+#
+# Usage:
+#	add_files(
+#		NAME_OF_FILES
+#		file1.cpp
+#		file2.cpp
+#		...
+#		)
+#
+macro(add_files var_name)
+    file (RELATIVE_PATH _relPath "${CMAKE_SOURCE_DIR}" "${CMAKE_CURRENT_SOURCE_DIR}")
+
+    foreach (_src ${ARGN})
+        if (_relPath)
+            list (APPEND ${var_name} "${_relPath}/${_src}")
+        else()
+            list (APPEND ${var_name} "${_src}")
+        endif()
+    endforeach()
+
+    if (_relPath)
+        set(${var_name} ${${var_name}} PARENT_SCOPE)
+    else()
+        set(${var_name} ${${var_name}})
+    endif()
+endmacro()
@@ -0,0 +1,13 @@
+macro(create_source_groups)
+    foreach(FILE ${ARGN}) 
+		get_filename_component(PARENT_DIR "${FILE}" PATH)
+		# skip src or include and changes /'s to \\'s
+		string(REGEX REPLACE "(\\./)?(src|include)/?" "" GROUP "${PARENT_DIR}")
+		string(REPLACE "/" "\\" GROUP "${GROUP}")
+		
+		string(LENGTH "${GROUP}" GROUP_NAME_LENGTH)
+		if (${GROUP_NAME_LENGTH} GREATER 0)
+			source_group("${GROUP}" FILES "${FILE}")
+		endif()
+	endforeach()
+endmacro()
@@ -0,0 +1,32 @@
+#!/bin/bash
+
+# Determine path to script
+MY_PATH=`dirname "$0"`
+
+cd $MY_PATH/..
+
+# Build and run target
+
+if [ "$1" = "release" ] || [ "$1" = "r" ]
+then
+	if [ "$2" = "test" ]
+	then
+		#echo "release test"
+		ninja -C build/Release Coati_test && cd bin/test && Release/Coati_test
+	else
+		#echo "release app"
+		ninja -C build/Release Coati && cd bin/app && Release/Coati
+	fi
+elif [ "$1" = "debug" ] || [ "$1" = "d" ]
+then
+	if [ "$2" = "test" ]
+	then
+		#echo "debug test"
+		ninja -C build/Debug Coati_test && cd bin/test && Debug/Coati_test
+	else
+		#echo "debug app"
+		ninja -C build/Debug Coati && cd bin/app && Debug/Coati
+	fi
+else
+	echo "no arguments: first argument 'release' or 'debug', second argument 'test' for tests"
+fi
@@ -0,0 +1,21 @@
+#!/bin/bash
+
+SUCCESS="\033[32mSuccess:\033[00m"
+
+# Enter masterproject directory
+MY_PATH=`dirname "$0"`
+cd $MY_PATH/..
+
+# Remove folders and contents
+rm -rf build
+rm -rf bin/app/Debug
+rm -rf bin/app/Release
+rm -rf bin/lib/Debug
+rm -rf bin/lib/Release
+rm -rf bin/test/Debug
+rm -rf bin/test/Release
+
+# Remove log files
+find bin/test/data/log -type f -name 'log*' -delete
+
+echo -e $SUCCESS "clean complete"
@@ -0,0 +1,20 @@
+MY_PATH=`dirname "$0"`
+
+ICON_INPUT_PATH=$MY_PATH/../bin/app/data/gui/icon
+ICON_OUTPUT_PATH=$MY_PATH/../build
+ICON_SIZES_PATH=$ICON_INPUT_PATH/sizes
+
+mkdir -p $ICON_SIZES_PATH
+
+convert $ICON_INPUT_PATH/logo_1024_1024.png -resize 16x16 $ICON_SIZES_PATH/icon_16.png
+convert $ICON_INPUT_PATH/logo_1024_1024.png -resize 24x24 $ICON_SIZES_PATH/icon_24.png
+convert $ICON_INPUT_PATH/logo_1024_1024.png -resize 32x32 $ICON_SIZES_PATH/icon_32.png
+convert $ICON_INPUT_PATH/logo_1024_1024.png -resize 40x40 $ICON_SIZES_PATH/icon_40.png
+convert $ICON_INPUT_PATH/logo_1024_1024.png -resize 48x48 $ICON_SIZES_PATH/icon_48.png
+convert $ICON_INPUT_PATH/logo_1024_1024.png -resize 64x64 $ICON_SIZES_PATH/icon_64.png
+convert $ICON_INPUT_PATH/logo_1024_1024.png -resize 128x128 $ICON_SIZES_PATH/icon_128.png
+convert $ICON_INPUT_PATH/logo_1024_1024.png -resize 256x256 $ICON_SIZES_PATH/icon_256.png
+
+convert $ICON_SIZES_PATH/icon_16.png $ICON_SIZES_PATH/icon_24.png $ICON_SIZES_PATH/icon_32.png $ICON_SIZES_PATH/icon_40.png $ICON_SIZES_PATH/icon_48.png $ICON_SIZES_PATH/icon_64.png $ICON_SIZES_PATH/icon_128.png $ICON_SIZES_PATH/icon_256.png -colors 256 $ICON_OUTPUT_PATH/coati.ico
+
+rm -rf $ICON_SIZES_PATH
@@ -0,0 +1,107 @@
+#!/bin/bash
+
+ABORT="\033[31mAbort:\033[00m"
+SUCCESS="\033[32mSuccess:\033[00m"
+INFO="\033[33mInfo:\033[00m"
+
+echo -e $INFO "Checking index"
+
+# check clean index
+if [[ -n $(git diff HEAD) ]]
+then
+	echo -e $ABORT "You have uncommited changes."
+	exit 1
+fi
+
+BRANCH_NAME=$(git symbolic-ref -q --short HEAD)
+PUBLISH_BRANCH_NAME=_publish_"$BRANCH_NAME"_
+
+echo -e $INFO "Checking branch $BRANCH_NAME"
+
+# check if on branch
+if [ -z $BRANCH_NAME ]
+then
+	echo -e $ABORT "You are not on any branch."
+	exit 1
+fi
+
+# check if on master
+if [ $BRANCH_NAME == "master" ]
+then
+	echo -e $ABORT "You are on master. Use this script only from a feature branch."
+	exit 1
+fi
+
+git checkout -q master
+git remote update &>/dev/null
+
+echo -e $INFO "Checking master"
+
+# check if master is up to date
+if [[ -n $(git diff origin/master) ]]
+then
+	echo -e $ABORT "Your master is not up-to-date. Run 'git-sync-master.sh' to update master and rebase $BRANCH_NAME."
+	git checkout -q $BRANCH_NAME
+	exit 1
+fi
+
+MASTER_HEAD_COMMIT=$(git rev-parse HEAD)
+BASE_COMMIT=$(git merge-base $BRANCH_NAME master)
+
+git checkout -q $BRANCH_NAME
+
+BRANCH_HEAD_COMMIT=$(git rev-parse HEAD)
+
+# check if feature has commits
+if [ $BRANCH_HEAD_COMMIT == $MASTER_HEAD_COMMIT ]
+then
+	echo -e $ABORT "Your feature branch has no commits."
+	exit 1
+fi
+
+# check if feature is not behind master
+if [ $BASE_COMMIT != $MASTER_HEAD_COMMIT ]
+then
+	echo -e $ABORT "Your feature branch is behind master. Use 'git rebase master' to update your feature branch."
+	exit 1
+fi
+
+# Prepare publish message with commit messages
+GIT_DIR=$(git rev-parse --show-toplevel)/.git
+cat $GIT_DIR/../.git_commit_template.txt > $GIT_DIR/PUBLISH_MSG
+printf "\n# commits:\n" >> $GIT_DIR/PUBLISH_MSG
+git log --graph --format=%B $BASE_COMMIT..HEAD | sed 's/^/#   &/' >> $GIT_DIR/PUBLISH_MSG
+
+# switch to temporary branch for squashing
+git checkout -q -b $PUBLISH_BRANCH_NAME
+
+echo -e $INFO "Squashing commits"
+git reset --soft $BASE_COMMIT
+git commit --template=$GIT_DIR/PUBLISH_MSG
+
+if [ $? != 0 ]
+then
+	echo -e $ABORT "Commit was aborted."
+	git checkout -q $BRANCH_NAME
+	git branch -q -D $PUBLISH_BRANCH_NAME
+	exit 1
+fi
+
+echo -e $INFO "Rebasing on master"
+git checkout -q master
+git rebase -q $PUBLISH_BRANCH_NAME
+git branch -q -d $PUBLISH_BRANCH_NAME
+
+echo -e $INFO "Uploading to origin master"
+git push origin master
+
+if [ $? != 0 ]
+then
+	git reset --hard -q HEAD^
+	git checkout -q $BRANCH_NAME
+	echo -e $ABORT "Pushing to origin master has failed, there are new remote changes. Run 'git-sync-master.sh' to update master and rebase $BRANCH_NAME."
+	exit 1
+fi
+
+echo -e $SUCCESS "Published $BRANCH_NAME successfully"
+exit 0
@@ -0,0 +1,96 @@
+#!/bin/bash
+
+ABORT="\033[31mAbort:\033[00m"
+ALERT="\033[31mAlert:\033[00m"
+SUCCESS="\033[32mSuccess:\033[00m"
+INFO="\033[33mInfo:\033[00m"
+
+BRANCH_NAME=$(git symbolic-ref -q --short HEAD)
+
+# check if on branch
+echo -e $INFO "Checking on branch"
+
+if [ -z $BRANCH_NAME ]
+then
+	echo -e $ABORT "You are not on any branch."
+	exit 1
+fi
+
+# check clean index
+echo -e $INFO "Checking index"
+
+if [[ -n $(git diff HEAD) ]]
+then
+	echo -e $ABORT "You have uncommited changes."
+	exit 1
+fi
+
+# switch to master
+if [ $BRANCH_NAME != 'master' ]
+then
+	echo -e $INFO "Switching to master"
+	git checkout -q master
+
+	if [ $? != 0 ]
+	then
+		echo -e $ABORT "Switching to master failed."
+		exit 1
+	fi
+fi
+
+# fetch remote changes
+echo -e $INFO "Fetching changes"
+git fetch origin master
+
+if [ $? != 0 ]
+then
+	echo -e $ABORT "Fetching from origin master failed"
+	git checkout -q "$BRANCH_NAME"
+	exit 1
+fi
+
+# rebase master to origin/master
+if [[ -z $(git diff origin/master) ]]
+then
+	echo -e $SUCCESS "Your master is up-to-date"
+else
+	echo -e $INFO "Rebasing to origin/master"
+	git rebase origin/master
+
+	if [ $? != 0 ]
+	then
+		echo -e $ALERT "Rebasing on master caused conflicts. This should never happen. Follow the instructions above to resolve them then use 'git push origin master' to update the remote."
+		exit 1
+	fi
+
+	echo -e $SUCCESS "Updated master"
+fi
+
+if [ $BRANCH_NAME == 'master' ]
+then
+	exit 0
+fi
+
+# switch to branch
+echo -e $INFO "Switching back to $BRANCH_NAME"
+git checkout -q "$BRANCH_NAME"
+
+if [ $? != 0 ]
+then
+	echo -e $ABORT "Switching back to $BRANCH_NAME failed."
+	exit 1
+fi
+
+# rebase branch to master
+echo -e $INFO "Rebasing $BRANCH_NAME to master"
+git rebase master
+
+if [ $? != 0 ]
+then
+	echo -e $ALERT "Rebasing $BRANCH_NAME to master caused conflicts. Follow the instructions above to resolve them."
+	exit 1
+else
+	echo -e $SUCCESS "$BRANCH_NAME is now up-to-date."
+fi
+
+exit 0
@@ -0,0 +1,68 @@
+#!/bin/bash
+
+ABORT="\033[31mAbort:\033[00m"
+SUCCESS="\033[32mSuccess:\033[00m"
+INFO="\033[33mInfo:\033[00m"
+
+# Determine current platform
+PLATFORM='unknown'
+if [ "$(uname)" == "Darwin" ]; then
+	PLATFORM='MacOS'
+elif [ "$(expr substr $(uname -s) 1 5)" == "Linux" ]; then
+	PLATFORM='Linux'
+elif [ "$(expr substr $(uname -s) 1 10)" == "MINGW32_NT" ]; then
+	PLATFORM='Windows'
+fi
+
+# Enter masterproject directory
+MY_PATH=`dirname "$0"`
+cd $MY_PATH/..
+
+# git settings
+echo -e $INFO "install git settings"
+
+git config commit.template .git_commit_template.txt
+git config color.ui true
+cp .git_pre_commit_hook.sh .git/hooks/pre-commit
+
+
+# Create Debug and Release folders
+echo -e $INFO "create build folders"
+
+mkdir -p build
+mkdir -p bin/app/Debug
+mkdir -p bin/app/Release
+mkdir -p bin/lib/Debug
+mkdir -p bin/lib/Release
+mkdir -p bin/test/Debug
+mkdir -p bin/test/Release
+
+# Copy necessary dynamic libraries to bin folder
+if [ $PLATFORM == "Windows" ]; then
+	echo -e $INFO "copy dynamic libraries"
+	cp -u -r setup/dynamic_libraries/windows/app/Debug/* bin/app/Debug
+	cp -u -r setup/dynamic_libraries/windows/app/Release/* bin/app/Release
+
+	cp -u -r setup/dynamic_libraries/windows/test/Debug/* bin/test/Debug
+	cp -u -r setup/dynamic_libraries/windows/test/Release/* bin/test/Release
+
+	echo -e $INFO "copy test_main file"
+	cp -u setup/cxx_test/windows/test_main.cpp build
+	
+	echo -e $INFO "creating program icon"
+	sh script/create_windows_icon.sh
+fi
+
+# Setup both Debug and Release configuration
+if [ $PLATFORM == "Linux" ] || [ $PLATFORM == "MacOS" ]; then
+	mkdir -p build/Debug
+	mkdir -p build/Release
+
+	echo -e $INFO "run cmake with Debug configuration"
+	cd build/Debug && cmake -G Ninja -DCMAKE_BUILD_TYPE="Debug" ../..
+
+	echo -e $INFO "run cmake with Release configuration"
+	cd ../Release && cmake -G Ninja -DCMAKE_BUILD_TYPE="Release" ../..
+fi
+
+echo -e $SUCCESS "setup complete"
@@ -0,0 +1,9 @@
+#!/bin/bash
+
+# Determine path to script
+MY_PATH=`dirname "$0"`
+
+cd $MY_PATH/..
+
+# Build and run target
+ninja -C build/Debug "$1" && cd bin && valgrind --tool=memcheck --leak-check=yes --log-file=../build/Debug/"$1".leaklog Debug/"$1"
@@ -0,0 +1,9 @@
+#!/bin/bash
+
+# Determine path to script
+MY_PATH=`dirname "$0"`
+
+cd $MY_PATH/..
+
+# Build and run target
+ninja -C build/Release "$1" && cd bin && valgrind --tool=memcheck --leak-check=yes --log-file=../build/Release/"$1".leaklog Release/"$1"
@@ -0,0 +1,17 @@
+#!/bin/sh
+appname=`basename $0 | sed s,\.sh$,,`
+
+dirname=`dirname $0`
+echo $dirname
+tmp="${dirname#?}"
+echo $tmp
+
+if [ "${dirname%$tmp}" != "/" ]; then
+dirname=$PWD/$dirname
+echo $dirname
+fi
+LD_LIBRARY_PATH=$dirname/lib
+export LD_LIBRARY_PATH
+echo $LD_LIBRARY_PATH
+
+$dirname/$appname
@@ -0,0 +1,2 @@
+export LD_LIBRARY_PATH=$PWD/lib
+exec ./Coati
@@ -0,0 +1,11 @@
+[Desktop Entry]
+Name=Coati
+GenericName=Coati
+X-GNOME-FullName=Coati
+Comment=Code Explorer
+Exec=/usr/share/coati/Coati.sh %u
+Icon=coati
+Path=/usr/share/coati/
+Terminal=true
+Type=Application
+StartupNotify=true
@@ -0,0 +1 @@
+sudo ln -s ./Coati /bin/Coati
--- a/Show More
+++ b/Show More