diff --git a/.github/workflows/ci-workflow.yml b/.github/workflows/ci-workflow.yml index 9772e2e..d03c533 100644 --- a/.github/workflows/ci-workflow.yml +++ b/.github/workflows/ci-workflow.yml @@ -96,6 +96,7 @@ jobs: echo "$PWD/install-Debug/bin" >> $GITHUB_PATH echo "DYLD_LIBRARY_PATH=$PWD/install-Debug/lib:$DYLD_LIBRARY_PATH" >> $GITHUB_ENV cmake --version + system_profiler SPHardwareDataType - name: Build run: sh toucan/sbuild-macos.sh Debug @@ -124,6 +125,7 @@ jobs: echo "$PWD/install-Debug/bin" >> $GITHUB_PATH echo "DYLD_LIBRARY_PATH=$PWD/install-Debug/lib:$DYLD_LIBRARY_PATH" >> $GITHUB_ENV cmake --version + system_profiler SPHardwareDataType - name: Build run: bash toucan/sbuild-macos.sh diff --git a/CMakeLists.txt b/CMakeLists.txt index e980582..75f65c1 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -68,7 +68,7 @@ find_package(OpenColorIO) find_package(OpenImageIO) find_package(OpenFX) find_package(OpenTimelineIO) -find_package(feather-tk) +find_package(ftk) include_directories(lib) include_directories(tests) diff --git a/bin/toucan-filmstrip/App.cpp b/bin/toucan-filmstrip/App.cpp index 1b9b37e..fb19d48 100644 --- a/bin/toucan-filmstrip/App.cpp +++ b/bin/toucan-filmstrip/App.cpp @@ -5,7 +5,7 @@ #include -#include +#include #include diff --git a/bin/toucan-filmstrip/App.h b/bin/toucan-filmstrip/App.h index 5120d04..f3fac70 100644 --- a/bin/toucan-filmstrip/App.h +++ b/bin/toucan-filmstrip/App.h @@ -7,8 +7,8 @@ #include #include -#include -#include +#include +#include #include diff --git a/bin/toucan-filmstrip/main.cpp b/bin/toucan-filmstrip/main.cpp index ef38161..91c82c8 100644 --- a/bin/toucan-filmstrip/main.cpp +++ b/bin/toucan-filmstrip/main.cpp @@ -3,7 +3,7 @@ #include "App.h" -#include +#include #include diff --git a/bin/toucan-render/App.cpp b/bin/toucan-render/App.cpp index dc7ff2f..83f658e 100644 --- a/bin/toucan-render/App.cpp +++ b/bin/toucan-render/App.cpp @@ -7,7 +7,7 @@ #include #include -#include +#include #include diff --git a/bin/toucan-render/App.h b/bin/toucan-render/App.h index 8a1dc2d..c73a206 100644 --- a/bin/toucan-render/App.h +++ b/bin/toucan-render/App.h @@ -7,8 +7,8 @@ #include #include -#include -#include +#include +#include #include diff --git a/bin/toucan-render/main.cpp b/bin/toucan-render/main.cpp index 2e653a8..9d07b0c 100644 --- a/bin/toucan-render/main.cpp +++ b/bin/toucan-render/main.cpp @@ -3,7 +3,7 @@ #include "App.h" -#include +#include #include diff --git a/bin/toucan-view/main.cpp b/bin/toucan-view/main.cpp index d74c1e7..f891482 100644 --- a/bin/toucan-view/main.cpp +++ b/bin/toucan-view/main.cpp @@ -3,7 +3,7 @@ #include "toucanView/App.h" -#include +#include #include diff --git a/cmake/SuperBuild/Buildfeather-tk.cmake b/cmake/SuperBuild/Buildfeather-tk.cmake index 159358e..90da47a 100644 --- a/cmake/SuperBuild/Buildfeather-tk.cmake +++ b/cmake/SuperBuild/Buildfeather-tk.cmake @@ -1,7 +1,7 @@ include(ExternalProject) set(ftk_GIT_REPOSITORY "https://github.com/darbyjohnston/feather-tk.git") -set(ftk_GIT_TAG "038196681ad5825c431f7da22ff4d873c82b3acd") +set(ftk_GIT_TAG "d3d0eed9f1a77782f56d4ce3f74eb2260c0b49ca") set(ftk_DEPS ZLIB nlohmann_json PNG Freetype lunasvg) diff --git a/lib/toucanRender/CMakeLists.txt b/lib/toucanRender/CMakeLists.txt index b2199c0..02aa75c 100644 --- a/lib/toucanRender/CMakeLists.txt +++ b/lib/toucanRender/CMakeLists.txt @@ -46,7 +46,7 @@ endif() add_library(toucanRender ${HEADERS} ${HEADERS_PRIVATE} ${SOURCE}) set(LIBS_PUBLIC toucanResource - ftk::feather-tk-core + ftk::ftkCore OTIO::opentimelineio OTIO::opentime lunasvg::lunasvg diff --git a/lib/toucanRender/FFmpegRead.cpp b/lib/toucanRender/FFmpegRead.cpp index 32e1034..a945fa1 100644 --- a/lib/toucanRender/FFmpegRead.cpp +++ b/lib/toucanRender/FFmpegRead.cpp @@ -3,7 +3,7 @@ #include "FFmpegRead.h" -#include +#include #include #include diff --git a/lib/toucanRender/FFmpegWrite.cpp b/lib/toucanRender/FFmpegWrite.cpp index 7976c27..b1942b4 100644 --- a/lib/toucanRender/FFmpegWrite.cpp +++ b/lib/toucanRender/FFmpegWrite.cpp @@ -5,7 +5,7 @@ #include -#include +#include #include #include diff --git a/lib/toucanRender/ImageEffectHost.cpp b/lib/toucanRender/ImageEffectHost.cpp index bf322ef..62ae66c 100644 --- a/lib/toucanRender/ImageEffectHost.cpp +++ b/lib/toucanRender/ImageEffectHost.cpp @@ -5,7 +5,7 @@ #include "ImageEffect.h" -#include +#include #include #include diff --git a/lib/toucanRender/ImageEffectHost.h b/lib/toucanRender/ImageEffectHost.h index c459197..554a077 100644 --- a/lib/toucanRender/ImageEffectHost.h +++ b/lib/toucanRender/ImageEffectHost.h @@ -5,7 +5,7 @@ #include -#include +#include #include diff --git a/lib/toucanRender/ImageGraph.cpp b/lib/toucanRender/ImageGraph.cpp index d6c1545..ee074a0 100644 --- a/lib/toucanRender/ImageGraph.cpp +++ b/lib/toucanRender/ImageGraph.cpp @@ -10,7 +10,7 @@ #include "TimelineAlgo.h" #include "Util.h" -#include +#include #include #include diff --git a/lib/toucanRender/ImageGraph.h b/lib/toucanRender/ImageGraph.h index 246732d..7bd4672 100644 --- a/lib/toucanRender/ImageGraph.h +++ b/lib/toucanRender/ImageGraph.h @@ -6,8 +6,8 @@ #include #include -#include -#include +#include +#include #include #include diff --git a/lib/toucanRender/TimelineWrapper.cpp b/lib/toucanRender/TimelineWrapper.cpp index 5ed2c5d..18ba432 100644 --- a/lib/toucanRender/TimelineWrapper.cpp +++ b/lib/toucanRender/TimelineWrapper.cpp @@ -7,7 +7,7 @@ #include -#include +#include #include #include diff --git a/lib/toucanResource/CMakeLists.txt b/lib/toucanResource/CMakeLists.txt index 926e01a..c4fdcbe 100644 --- a/lib/toucanResource/CMakeLists.txt +++ b/lib/toucanResource/CMakeLists.txt @@ -6,7 +6,7 @@ foreach(RESOURCE ${RESOURCES}) get_filename_component(RESOURCE_BASE ${RESOURCE} NAME_WE) add_custom_command( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${RESOURCE_BASE}.cpp - COMMAND $ ${CMAKE_SOURCE_DIR}/${RESOURCE} ${RESOURCE_BASE} toucan_resource + COMMAND $ ${CMAKE_SOURCE_DIR}/${RESOURCE} ${RESOURCE_BASE} toucan_resource DEPENDS ${CMAKE_SOURCE_DIR}/${RESOURCE}) list(APPEND SOURCE ${CMAKE_CURRENT_BINARY_DIR}/${RESOURCE_BASE}.cpp) endforeach() diff --git a/lib/toucanView/App.cpp b/lib/toucanView/App.cpp index 9bbe3cb..8cc76c1 100644 --- a/lib/toucanView/App.cpp +++ b/lib/toucanView/App.cpp @@ -11,12 +11,12 @@ #include -#include -#include -#include -#include +#include +#include +#include +#include -#include +#include #include diff --git a/lib/toucanView/App.h b/lib/toucanView/App.h index 79f2812..55cdf74 100644 --- a/lib/toucanView/App.h +++ b/lib/toucanView/App.h @@ -3,8 +3,8 @@ #pragma once -#include -#include +#include +#include #include diff --git a/lib/toucanView/AudioClipItem.cpp b/lib/toucanView/AudioClipItem.cpp index 5138422..756df64 100644 --- a/lib/toucanView/AudioClipItem.cpp +++ b/lib/toucanView/AudioClipItem.cpp @@ -8,7 +8,7 @@ #include -#include +#include #include diff --git a/lib/toucanView/AudioClipItem.h b/lib/toucanView/AudioClipItem.h index 762b972..bd20959 100644 --- a/lib/toucanView/AudioClipItem.h +++ b/lib/toucanView/AudioClipItem.h @@ -7,7 +7,7 @@ #include #include -#include +#include #include diff --git a/lib/toucanView/BackgroundTool.cpp b/lib/toucanView/BackgroundTool.cpp index d31f3a0..9d4a91e 100644 --- a/lib/toucanView/BackgroundTool.cpp +++ b/lib/toucanView/BackgroundTool.cpp @@ -5,10 +5,10 @@ #include "App.h" -#include -#include -#include -#include +#include +#include +#include +#include namespace toucan { diff --git a/lib/toucanView/BackgroundTool.h b/lib/toucanView/BackgroundTool.h index 5a6db37..6c00196 100644 --- a/lib/toucanView/BackgroundTool.h +++ b/lib/toucanView/BackgroundTool.h @@ -7,11 +7,11 @@ #include #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include namespace toucan { diff --git a/lib/toucanView/CMakeLists.txt b/lib/toucanView/CMakeLists.txt index 189ea37..795cbf7 100644 --- a/lib/toucanView/CMakeLists.txt +++ b/lib/toucanView/CMakeLists.txt @@ -99,6 +99,6 @@ set(SOURCE WindowToolBar.cpp) add_library(toucanView ${HEADERS} ${SOURCE}) -target_link_libraries(toucanView PUBLIC toucanRender ftk::feather-tk-ui) +target_link_libraries(toucanView PUBLIC toucanRender ftk::ftkUi) set_target_properties(toucanView PROPERTIES FOLDER lib) add_dependencies(toucanView ${TOUCAN_PLUGINS}) diff --git a/lib/toucanView/CompareMenu.cpp b/lib/toucanView/CompareMenu.cpp index a6728a3..5968359 100644 --- a/lib/toucanView/CompareMenu.cpp +++ b/lib/toucanView/CompareMenu.cpp @@ -5,7 +5,7 @@ #include "App.h" -#include +#include namespace toucan { diff --git a/lib/toucanView/CompareMenu.h b/lib/toucanView/CompareMenu.h index c86b9db..ea51ab3 100644 --- a/lib/toucanView/CompareMenu.h +++ b/lib/toucanView/CompareMenu.h @@ -5,7 +5,7 @@ #include -#include +#include #include diff --git a/lib/toucanView/CompareTool.cpp b/lib/toucanView/CompareTool.cpp index 5c18745..7a5e7c3 100644 --- a/lib/toucanView/CompareTool.cpp +++ b/lib/toucanView/CompareTool.cpp @@ -6,10 +6,10 @@ #include "App.h" #include "SelectionModel.h" -#include -#include -#include -#include +#include +#include +#include +#include namespace toucan { diff --git a/lib/toucanView/CompareTool.h b/lib/toucanView/CompareTool.h index eee5528..5c01400 100644 --- a/lib/toucanView/CompareTool.h +++ b/lib/toucanView/CompareTool.h @@ -6,13 +6,13 @@ #include #include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include namespace toucan { diff --git a/lib/toucanView/DetailsTool.cpp b/lib/toucanView/DetailsTool.cpp index 4b08896..66a998c 100644 --- a/lib/toucanView/DetailsTool.cpp +++ b/lib/toucanView/DetailsTool.cpp @@ -7,10 +7,10 @@ #include "FilesModel.h" #include "PlaybackModel.h" -#include -#include -#include -#include +#include +#include +#include +#include #include diff --git a/lib/toucanView/DetailsTool.h b/lib/toucanView/DetailsTool.h index a5fc5c0..4052f07 100644 --- a/lib/toucanView/DetailsTool.h +++ b/lib/toucanView/DetailsTool.h @@ -9,16 +9,16 @@ #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include diff --git a/lib/toucanView/ExportTool.cpp b/lib/toucanView/ExportTool.cpp index 921a397..0e49be9 100644 --- a/lib/toucanView/ExportTool.cpp +++ b/lib/toucanView/ExportTool.cpp @@ -9,12 +9,12 @@ #include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #include diff --git a/lib/toucanView/ExportTool.h b/lib/toucanView/ExportTool.h index 61266d6..e27e8c7 100644 --- a/lib/toucanView/ExportTool.h +++ b/lib/toucanView/ExportTool.h @@ -8,20 +8,20 @@ #include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include namespace toucan { diff --git a/lib/toucanView/File.cpp b/lib/toucanView/File.cpp index c8d53e9..8410f96 100644 --- a/lib/toucanView/File.cpp +++ b/lib/toucanView/File.cpp @@ -9,7 +9,7 @@ #include -#include +#include namespace toucan { diff --git a/lib/toucanView/File.h b/lib/toucanView/File.h index 9dd210d..c8c1613 100644 --- a/lib/toucanView/File.h +++ b/lib/toucanView/File.h @@ -7,9 +7,9 @@ #include #include -#include -#include -#include +#include +#include +#include #include diff --git a/lib/toucanView/FileMenu.cpp b/lib/toucanView/FileMenu.cpp index 40c6e1a..46bf253 100644 --- a/lib/toucanView/FileMenu.cpp +++ b/lib/toucanView/FileMenu.cpp @@ -10,10 +10,10 @@ #include -#include -#include -#include -#include +#include +#include +#include +#include namespace toucan { diff --git a/lib/toucanView/FileMenu.h b/lib/toucanView/FileMenu.h index 0f59dff..a5226e7 100644 --- a/lib/toucanView/FileMenu.h +++ b/lib/toucanView/FileMenu.h @@ -3,9 +3,9 @@ #pragma once -#include -#include -#include +#include +#include +#include #include #include diff --git a/lib/toucanView/FileTab.h b/lib/toucanView/FileTab.h index d80f5c7..60777b4 100644 --- a/lib/toucanView/FileTab.h +++ b/lib/toucanView/FileTab.h @@ -5,7 +5,7 @@ #include -#include +#include namespace toucan { diff --git a/lib/toucanView/FileToolBar.h b/lib/toucanView/FileToolBar.h index 3779dd2..d972fb2 100644 --- a/lib/toucanView/FileToolBar.h +++ b/lib/toucanView/FileToolBar.h @@ -3,10 +3,10 @@ #pragma once -#include -#include -#include -#include +#include +#include +#include +#include namespace toucan { diff --git a/lib/toucanView/FilesModel.cpp b/lib/toucanView/FilesModel.cpp index 95923f1..4ba00f1 100644 --- a/lib/toucanView/FilesModel.cpp +++ b/lib/toucanView/FilesModel.cpp @@ -5,9 +5,9 @@ #include "PlaybackModel.h" -#include -#include -#include +#include +#include +#include #include diff --git a/lib/toucanView/FilesModel.h b/lib/toucanView/FilesModel.h index d913470..776ba1e 100644 --- a/lib/toucanView/FilesModel.h +++ b/lib/toucanView/FilesModel.h @@ -6,11 +6,11 @@ #include #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include namespace toucan { diff --git a/lib/toucanView/GapItem.cpp b/lib/toucanView/GapItem.cpp index 1090b31..1a9e819 100644 --- a/lib/toucanView/GapItem.cpp +++ b/lib/toucanView/GapItem.cpp @@ -5,7 +5,7 @@ #include "File.h" -#include +#include namespace toucan { diff --git a/lib/toucanView/GapItem.h b/lib/toucanView/GapItem.h index f52c749..58b36a8 100644 --- a/lib/toucanView/GapItem.h +++ b/lib/toucanView/GapItem.h @@ -5,7 +5,7 @@ #include -#include +#include #include diff --git a/lib/toucanView/GraphTool.cpp b/lib/toucanView/GraphTool.cpp index b7918b5..aa63ad8 100644 --- a/lib/toucanView/GraphTool.cpp +++ b/lib/toucanView/GraphTool.cpp @@ -6,7 +6,7 @@ #include "App.h" #include "FilesModel.h" -#include +#include namespace toucan { diff --git a/lib/toucanView/GraphTool.h b/lib/toucanView/GraphTool.h index 8c516b3..eb49b9f 100644 --- a/lib/toucanView/GraphTool.h +++ b/lib/toucanView/GraphTool.h @@ -7,10 +7,10 @@ #include -#include -#include -#include -#include +#include +#include +#include +#include namespace toucan { diff --git a/lib/toucanView/HUDWidget.cpp b/lib/toucanView/HUDWidget.cpp index 54e3216..49d4741 100644 --- a/lib/toucanView/HUDWidget.cpp +++ b/lib/toucanView/HUDWidget.cpp @@ -6,8 +6,8 @@ #include "App.h" #include "FilesModel.h" -#include -#include +#include +#include namespace toucan { diff --git a/lib/toucanView/HUDWidget.h b/lib/toucanView/HUDWidget.h index 9013f11..c30b1df 100644 --- a/lib/toucanView/HUDWidget.h +++ b/lib/toucanView/HUDWidget.h @@ -5,8 +5,8 @@ #include -#include -#include +#include +#include namespace toucan { diff --git a/lib/toucanView/IItem.h b/lib/toucanView/IItem.h index 6a80ef8..bf13186 100644 --- a/lib/toucanView/IItem.h +++ b/lib/toucanView/IItem.h @@ -7,9 +7,9 @@ #include #include -#include -#include -#include +#include +#include +#include #include diff --git a/lib/toucanView/IToolWidget.h b/lib/toucanView/IToolWidget.h index e986d56..7dae14a 100644 --- a/lib/toucanView/IToolWidget.h +++ b/lib/toucanView/IToolWidget.h @@ -3,7 +3,7 @@ #pragma once -#include +#include namespace toucan { diff --git a/lib/toucanView/InfoBar.cpp b/lib/toucanView/InfoBar.cpp index bfcb94b..3cf7eee 100644 --- a/lib/toucanView/InfoBar.cpp +++ b/lib/toucanView/InfoBar.cpp @@ -6,7 +6,7 @@ #include "App.h" #include "FilesModel.h" -#include +#include namespace toucan { diff --git a/lib/toucanView/InfoBar.h b/lib/toucanView/InfoBar.h index bb86c65..75232a9 100644 --- a/lib/toucanView/InfoBar.h +++ b/lib/toucanView/InfoBar.h @@ -3,11 +3,11 @@ #pragma once -#include -#include -#include +#include +#include +#include -#include +#include namespace toucan { diff --git a/lib/toucanView/ItemLabel.h b/lib/toucanView/ItemLabel.h index 3401971..1627535 100644 --- a/lib/toucanView/ItemLabel.h +++ b/lib/toucanView/ItemLabel.h @@ -3,7 +3,7 @@ #pragma once -#include +#include namespace toucan { diff --git a/lib/toucanView/JSONTool.cpp b/lib/toucanView/JSONTool.cpp index 5f9d927..ccd3523 100644 --- a/lib/toucanView/JSONTool.cpp +++ b/lib/toucanView/JSONTool.cpp @@ -6,11 +6,11 @@ #include "App.h" #include "FilesModel.h" -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include namespace toucan { diff --git a/lib/toucanView/JSONTool.h b/lib/toucanView/JSONTool.h index 1162efd..360056f 100644 --- a/lib/toucanView/JSONTool.h +++ b/lib/toucanView/JSONTool.h @@ -6,13 +6,13 @@ #include #include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include #include diff --git a/lib/toucanView/LogTool.cpp b/lib/toucanView/LogTool.cpp index 787bd1d..3148457 100644 --- a/lib/toucanView/LogTool.cpp +++ b/lib/toucanView/LogTool.cpp @@ -5,9 +5,9 @@ #include "App.h" -#include -#include -#include +#include +#include +#include namespace toucan { diff --git a/lib/toucanView/LogTool.h b/lib/toucanView/LogTool.h index e70c851..6c14397 100644 --- a/lib/toucanView/LogTool.h +++ b/lib/toucanView/LogTool.h @@ -5,12 +5,12 @@ #include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include namespace toucan { diff --git a/lib/toucanView/MainWindow.cpp b/lib/toucanView/MainWindow.cpp index 3586bc6..6cd3379 100644 --- a/lib/toucanView/MainWindow.cpp +++ b/lib/toucanView/MainWindow.cpp @@ -19,10 +19,10 @@ #include "TimelineWidget.h" #include "ToolBar.h" -#include -#include -#include -#include +#include +#include +#include +#include #include @@ -119,7 +119,7 @@ namespace toucan _infoBar = InfoBar::create(context, app, _layout); std::weak_ptr appWeak(app); - _tabWidget->setTabCallback( + _tabWidget->setCurrentTabCallback( [appWeak](int index) { if (auto app = appWeak.lock()) diff --git a/lib/toucanView/MainWindow.h b/lib/toucanView/MainWindow.h index 33efbab..bcc9a4a 100644 --- a/lib/toucanView/MainWindow.h +++ b/lib/toucanView/MainWindow.h @@ -5,12 +5,12 @@ #include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include namespace toucan { diff --git a/lib/toucanView/MarkerItem.cpp b/lib/toucanView/MarkerItem.cpp index 2653e81..a238322 100644 --- a/lib/toucanView/MarkerItem.cpp +++ b/lib/toucanView/MarkerItem.cpp @@ -3,7 +3,7 @@ #include "MarkerItem.h" -#include +#include namespace toucan { diff --git a/lib/toucanView/MarkerItem.h b/lib/toucanView/MarkerItem.h index fb3fe05..38d29e9 100644 --- a/lib/toucanView/MarkerItem.h +++ b/lib/toucanView/MarkerItem.h @@ -6,7 +6,7 @@ #include #include -#include +#include #include diff --git a/lib/toucanView/MenuBar.h b/lib/toucanView/MenuBar.h index 3c9c506..1898ce8 100644 --- a/lib/toucanView/MenuBar.h +++ b/lib/toucanView/MenuBar.h @@ -3,7 +3,7 @@ #pragma once -#include +#include namespace toucan { diff --git a/lib/toucanView/PlaybackBar.h b/lib/toucanView/PlaybackBar.h index a0d6220..075b320 100644 --- a/lib/toucanView/PlaybackBar.h +++ b/lib/toucanView/PlaybackBar.h @@ -6,9 +6,9 @@ #include #include -#include -#include -#include +#include +#include +#include namespace toucan { diff --git a/lib/toucanView/PlaybackMenu.cpp b/lib/toucanView/PlaybackMenu.cpp index b75bf1d..fa8a6ea 100644 --- a/lib/toucanView/PlaybackMenu.cpp +++ b/lib/toucanView/PlaybackMenu.cpp @@ -6,7 +6,7 @@ #include "App.h" #include "FilesModel.h" -#include +#include namespace toucan { diff --git a/lib/toucanView/PlaybackMenu.h b/lib/toucanView/PlaybackMenu.h index 48eb7da..69d382a 100644 --- a/lib/toucanView/PlaybackMenu.h +++ b/lib/toucanView/PlaybackMenu.h @@ -5,7 +5,7 @@ #include -#include +#include #include diff --git a/lib/toucanView/PlaybackModel.h b/lib/toucanView/PlaybackModel.h index 4991725..b059f5e 100644 --- a/lib/toucanView/PlaybackModel.h +++ b/lib/toucanView/PlaybackModel.h @@ -5,9 +5,9 @@ #include -#include -#include -#include +#include +#include +#include #include diff --git a/lib/toucanView/SelectMenu.cpp b/lib/toucanView/SelectMenu.cpp index 53e0dd4..e274246 100644 --- a/lib/toucanView/SelectMenu.cpp +++ b/lib/toucanView/SelectMenu.cpp @@ -7,7 +7,7 @@ #include "FilesModel.h" #include "SelectionModel.h" -#include +#include namespace toucan { diff --git a/lib/toucanView/SelectMenu.h b/lib/toucanView/SelectMenu.h index e2690ee..68ce66e 100644 --- a/lib/toucanView/SelectMenu.h +++ b/lib/toucanView/SelectMenu.h @@ -3,7 +3,7 @@ #pragma once -#include +#include #include diff --git a/lib/toucanView/SelectionModel.h b/lib/toucanView/SelectionModel.h index 09acd30..cdbb4b9 100644 --- a/lib/toucanView/SelectionModel.h +++ b/lib/toucanView/SelectionModel.h @@ -3,7 +3,7 @@ #pragma once -#include +#include #include diff --git a/lib/toucanView/StackItem.cpp b/lib/toucanView/StackItem.cpp index c7fb24a..2f35b6e 100644 --- a/lib/toucanView/StackItem.cpp +++ b/lib/toucanView/StackItem.cpp @@ -9,8 +9,8 @@ #include "TrackItem.h" #include "WindowModel.h" -#include -#include +#include +#include namespace toucan { diff --git a/lib/toucanView/StackItem.h b/lib/toucanView/StackItem.h index ce73dd7..7ce923b 100644 --- a/lib/toucanView/StackItem.h +++ b/lib/toucanView/StackItem.h @@ -5,7 +5,7 @@ #include -#include +#include #include diff --git a/lib/toucanView/ThumbnailGenerator.cpp b/lib/toucanView/ThumbnailGenerator.cpp index ae521a8..86d32b1 100644 --- a/lib/toucanView/ThumbnailGenerator.cpp +++ b/lib/toucanView/ThumbnailGenerator.cpp @@ -10,9 +10,9 @@ #include -#include -#include -#include +#include +#include +#include #include diff --git a/lib/toucanView/ThumbnailGenerator.h b/lib/toucanView/ThumbnailGenerator.h index 1d50040..338b56d 100644 --- a/lib/toucanView/ThumbnailGenerator.h +++ b/lib/toucanView/ThumbnailGenerator.h @@ -5,8 +5,8 @@ #include -#include -#include +#include +#include #include #include diff --git a/lib/toucanView/ThumbnailsWidget.cpp b/lib/toucanView/ThumbnailsWidget.cpp index 14a93b5..181b7e9 100644 --- a/lib/toucanView/ThumbnailsWidget.cpp +++ b/lib/toucanView/ThumbnailsWidget.cpp @@ -7,7 +7,7 @@ #include #include -#include +#include namespace toucan { diff --git a/lib/toucanView/ThumbnailsWidget.h b/lib/toucanView/ThumbnailsWidget.h index 42a3f73..02b3fcb 100644 --- a/lib/toucanView/ThumbnailsWidget.h +++ b/lib/toucanView/ThumbnailsWidget.h @@ -6,7 +6,7 @@ #include #include -#include +#include #include diff --git a/lib/toucanView/TimeLayout.h b/lib/toucanView/TimeLayout.h index 2e061e8..723067a 100644 --- a/lib/toucanView/TimeLayout.h +++ b/lib/toucanView/TimeLayout.h @@ -3,7 +3,7 @@ #pragma once -#include +#include #include diff --git a/lib/toucanView/TimeMenu.cpp b/lib/toucanView/TimeMenu.cpp index 2de9a28..12ee30f 100644 --- a/lib/toucanView/TimeMenu.cpp +++ b/lib/toucanView/TimeMenu.cpp @@ -7,7 +7,7 @@ #include "FilesModel.h" #include "PlaybackModel.h" -#include +#include namespace toucan { diff --git a/lib/toucanView/TimeMenu.h b/lib/toucanView/TimeMenu.h index 589c73e..a69d36b 100644 --- a/lib/toucanView/TimeMenu.h +++ b/lib/toucanView/TimeMenu.h @@ -5,7 +5,7 @@ #include -#include +#include #include diff --git a/lib/toucanView/TimeUnitsModel.cpp b/lib/toucanView/TimeUnitsModel.cpp index 536d040..7b38b22 100644 --- a/lib/toucanView/TimeUnitsModel.cpp +++ b/lib/toucanView/TimeUnitsModel.cpp @@ -3,10 +3,10 @@ #include "TimeUnitsModel.h" -#include -#include -#include -#include +#include +#include +#include +#include #include diff --git a/lib/toucanView/TimeUnitsModel.h b/lib/toucanView/TimeUnitsModel.h index cc4171e..7053825 100644 --- a/lib/toucanView/TimeUnitsModel.h +++ b/lib/toucanView/TimeUnitsModel.h @@ -3,9 +3,9 @@ #pragma once -#include -#include -#include +#include +#include +#include #include diff --git a/lib/toucanView/TimeWidgets.cpp b/lib/toucanView/TimeWidgets.cpp index 664b572..a691d55 100644 --- a/lib/toucanView/TimeWidgets.cpp +++ b/lib/toucanView/TimeWidgets.cpp @@ -3,7 +3,7 @@ #include "TimeWidgets.h" -#include +#include #include diff --git a/lib/toucanView/TimeWidgets.h b/lib/toucanView/TimeWidgets.h index 9e01d82..be69b4b 100644 --- a/lib/toucanView/TimeWidgets.h +++ b/lib/toucanView/TimeWidgets.h @@ -6,11 +6,11 @@ #include #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include diff --git a/lib/toucanView/TimelineItem.cpp b/lib/toucanView/TimelineItem.cpp index f8eb861..534a050 100644 --- a/lib/toucanView/TimelineItem.cpp +++ b/lib/toucanView/TimelineItem.cpp @@ -9,7 +9,7 @@ #include "ThumbnailsWidget.h" #include "WindowModel.h" -#include +#include namespace toucan { diff --git a/lib/toucanView/TimelineItem.h b/lib/toucanView/TimelineItem.h index aae655f..b1914a4 100644 --- a/lib/toucanView/TimelineItem.h +++ b/lib/toucanView/TimelineItem.h @@ -6,7 +6,7 @@ #include #include -#include +#include namespace toucan { diff --git a/lib/toucanView/TimelineWidget.h b/lib/toucanView/TimelineWidget.h index 9567716..2bc03c2 100644 --- a/lib/toucanView/TimelineWidget.h +++ b/lib/toucanView/TimelineWidget.h @@ -6,8 +6,8 @@ #include #include -#include -#include +#include +#include #include diff --git a/lib/toucanView/ToolBar.cpp b/lib/toucanView/ToolBar.cpp index 1bff46b..0db71fe 100644 --- a/lib/toucanView/ToolBar.cpp +++ b/lib/toucanView/ToolBar.cpp @@ -7,7 +7,7 @@ #include "ViewToolBar.h" #include "WindowToolBar.h" -#include +#include namespace toucan { diff --git a/lib/toucanView/ToolBar.h b/lib/toucanView/ToolBar.h index ddc4057..4f0b130 100644 --- a/lib/toucanView/ToolBar.h +++ b/lib/toucanView/ToolBar.h @@ -3,8 +3,8 @@ #pragma once -#include -#include +#include +#include namespace toucan { diff --git a/lib/toucanView/TrackItem.cpp b/lib/toucanView/TrackItem.cpp index 9f6b7c1..f16870f 100644 --- a/lib/toucanView/TrackItem.cpp +++ b/lib/toucanView/TrackItem.cpp @@ -8,8 +8,8 @@ #include "GapItem.h" #include "VideoClipItem.h" -#include -#include +#include +#include namespace toucan { diff --git a/lib/toucanView/TrackItem.h b/lib/toucanView/TrackItem.h index c40df2a..219e8bc 100644 --- a/lib/toucanView/TrackItem.h +++ b/lib/toucanView/TrackItem.h @@ -5,7 +5,7 @@ #include -#include +#include #include diff --git a/lib/toucanView/VideoClipItem.cpp b/lib/toucanView/VideoClipItem.cpp index c79ee5f..982c2b9 100644 --- a/lib/toucanView/VideoClipItem.cpp +++ b/lib/toucanView/VideoClipItem.cpp @@ -9,7 +9,7 @@ #include -#include +#include #include #include diff --git a/lib/toucanView/VideoClipItem.h b/lib/toucanView/VideoClipItem.h index 28830dc..6348113 100644 --- a/lib/toucanView/VideoClipItem.h +++ b/lib/toucanView/VideoClipItem.h @@ -8,7 +8,7 @@ #include #include -#include +#include #include diff --git a/lib/toucanView/ViewMenu.h b/lib/toucanView/ViewMenu.h index 0f07f09..41e0398 100644 --- a/lib/toucanView/ViewMenu.h +++ b/lib/toucanView/ViewMenu.h @@ -5,8 +5,8 @@ #include -#include -#include +#include +#include namespace toucan { diff --git a/lib/toucanView/ViewModel.cpp b/lib/toucanView/ViewModel.cpp index ba5fb5d..40f1d4d 100644 --- a/lib/toucanView/ViewModel.cpp +++ b/lib/toucanView/ViewModel.cpp @@ -3,8 +3,8 @@ #include "ViewModel.h" -#include -#include +#include +#include #include diff --git a/lib/toucanView/ViewModel.h b/lib/toucanView/ViewModel.h index a1c84fa..fdb46a1 100644 --- a/lib/toucanView/ViewModel.h +++ b/lib/toucanView/ViewModel.h @@ -3,10 +3,10 @@ #pragma once -#include -#include -#include -#include +#include +#include +#include +#include #include diff --git a/lib/toucanView/ViewToolBar.h b/lib/toucanView/ViewToolBar.h index 1e0fe43..90a4df8 100644 --- a/lib/toucanView/ViewToolBar.h +++ b/lib/toucanView/ViewToolBar.h @@ -3,10 +3,10 @@ #pragma once -#include -#include -#include -#include +#include +#include +#include +#include namespace toucan { diff --git a/lib/toucanView/Viewport.cpp b/lib/toucanView/Viewport.cpp index fede292..fb2e17b 100644 --- a/lib/toucanView/Viewport.cpp +++ b/lib/toucanView/Viewport.cpp @@ -8,7 +8,7 @@ #include "App.h" #include "ViewModel.h" -#include +#include namespace toucan { diff --git a/lib/toucanView/Viewport.h b/lib/toucanView/Viewport.h index 95173ce..3dacc3c 100644 --- a/lib/toucanView/Viewport.h +++ b/lib/toucanView/Viewport.h @@ -6,9 +6,9 @@ #include #include -#include +#include -#include +#include namespace toucan { diff --git a/lib/toucanView/WindowMenu.cpp b/lib/toucanView/WindowMenu.cpp index 5df1b82..531ef73 100644 --- a/lib/toucanView/WindowMenu.cpp +++ b/lib/toucanView/WindowMenu.cpp @@ -11,10 +11,10 @@ #include -#include -#include -#include -#include +#include +#include +#include +#include namespace toucan { diff --git a/lib/toucanView/WindowMenu.h b/lib/toucanView/WindowMenu.h index a66b0f2..736cda5 100644 --- a/lib/toucanView/WindowMenu.h +++ b/lib/toucanView/WindowMenu.h @@ -5,9 +5,9 @@ #include -#include -#include -#include +#include +#include +#include namespace toucan { diff --git a/lib/toucanView/WindowModel.cpp b/lib/toucanView/WindowModel.cpp index 9d615a9..6b2e8b2 100644 --- a/lib/toucanView/WindowModel.cpp +++ b/lib/toucanView/WindowModel.cpp @@ -3,9 +3,9 @@ #include "WindowModel.h" -#include -#include -#include +#include +#include +#include #include diff --git a/lib/toucanView/WindowModel.h b/lib/toucanView/WindowModel.h index 4d9fee9..04febbd 100644 --- a/lib/toucanView/WindowModel.h +++ b/lib/toucanView/WindowModel.h @@ -3,10 +3,10 @@ #pragma once -#include -#include -#include -#include +#include +#include +#include +#include namespace toucan { diff --git a/lib/toucanView/WindowToolBar.h b/lib/toucanView/WindowToolBar.h index 15fa3c8..0e4577a 100644 --- a/lib/toucanView/WindowToolBar.h +++ b/lib/toucanView/WindowToolBar.h @@ -5,10 +5,10 @@ #include -#include -#include -#include -#include +#include +#include +#include +#include namespace toucan { diff --git a/tests/toucan-test/main.cpp b/tests/toucan-test/main.cpp index 7e2d90c..c4a6883 100644 --- a/tests/toucan-test/main.cpp +++ b/tests/toucan-test/main.cpp @@ -17,9 +17,9 @@ #include #if defined(toucan_VIEW) -#include +#include #endif // toucan_VIEW -#include +#include #include diff --git a/tests/toucanViewTest/FilesModelTest.h b/tests/toucanViewTest/FilesModelTest.h index bc25df7..859ae14 100644 --- a/tests/toucanViewTest/FilesModelTest.h +++ b/tests/toucanViewTest/FilesModelTest.h @@ -5,7 +5,7 @@ #include -#include +#include namespace toucan { diff --git a/tests/toucanViewTest/PlaybackModelTest.h b/tests/toucanViewTest/PlaybackModelTest.h index dc821a6..cd88590 100644 --- a/tests/toucanViewTest/PlaybackModelTest.h +++ b/tests/toucanViewTest/PlaybackModelTest.h @@ -3,7 +3,7 @@ #pragma once -#include +#include namespace toucan { diff --git a/tests/toucanViewTest/SelectionModelTest.h b/tests/toucanViewTest/SelectionModelTest.h index fccec30..45a501b 100644 --- a/tests/toucanViewTest/SelectionModelTest.h +++ b/tests/toucanViewTest/SelectionModelTest.h @@ -3,7 +3,7 @@ #pragma once -#include +#include #include diff --git a/tests/toucanViewTest/ViewModelTest.h b/tests/toucanViewTest/ViewModelTest.h index 020ff77..b2ca35a 100644 --- a/tests/toucanViewTest/ViewModelTest.h +++ b/tests/toucanViewTest/ViewModelTest.h @@ -3,7 +3,7 @@ #pragma once -#include +#include namespace toucan { diff --git a/tests/toucanViewTest/WindowModelTest.h b/tests/toucanViewTest/WindowModelTest.h index 9d81daf..e5fcf38 100644 --- a/tests/toucanViewTest/WindowModelTest.h +++ b/tests/toucanViewTest/WindowModelTest.h @@ -3,7 +3,7 @@ #pragma once -#include +#include namespace toucan {