From 6a11bcd27e5ae53bda1860c839719dd4438b9cea Mon Sep 17 00:00:00 2001 From: Elias Steurer Date: Sun, 24 Apr 2022 10:37:56 +0200 Subject: [PATCH] Formatting --- ScreenPlay/CMakeLists.txt | 13 +++---------- ScreenPlay/inc/public/ScreenPlay/create.h | 2 +- .../inc/public/ScreenPlay/installedlistmodel.h | 2 +- ScreenPlay/inc/public/ScreenPlay/screenplaywidget.h | 2 +- ScreenPlay/inc/public/ScreenPlay/sdkconnection.h | 2 +- ScreenPlay/inc/public/ScreenPlay/util.h | 2 +- 6 files changed, 8 insertions(+), 15 deletions(-) diff --git a/ScreenPlay/CMakeLists.txt b/ScreenPlay/CMakeLists.txt index 79e6b0ca..f52b8e86 100644 --- a/ScreenPlay/CMakeLists.txt +++ b/ScreenPlay/CMakeLists.txt @@ -165,13 +165,10 @@ target_link_libraries( if(${SCREENPLAY_STEAM}) target_compile_definitions(ScreenPlayLib PRIVATE SCREENPLAY_STEAM=1) - target_link_libraries( - ScreenPlayLib - PUBLIC ScreenPlayWorkshopplugin - ScreenPlayWorkshop) + target_link_libraries(ScreenPlayLib PUBLIC ScreenPlayWorkshopplugin ScreenPlayWorkshop) endif() -target_include_directories(ScreenPlayLib PUBLIC ) +target_include_directories(ScreenPlayLib PUBLIC) qt_add_executable(${PROJECT_NAME} main.cpp) target_link_libraries(${PROJECT_NAME} PRIVATE ScreenPlayLib) @@ -181,14 +178,10 @@ if(${SCREENPLAY_TESTS}) target_link_libraries(tst_ScreenPlay PRIVATE ScreenPlayLib Qt6::Test) if(${SCREENPLAY_STEAM}) target_compile_definitions(tst_ScreenPlay PRIVATE SCREENPLAY_STEAM=1) - target_link_libraries( - tst_ScreenPlay - PUBLIC ScreenPlayWorkshopplugin - ScreenPlayWorkshop) + target_link_libraries(tst_ScreenPlay PUBLIC ScreenPlayWorkshopplugin ScreenPlayWorkshop) endif() endif() - set_source_files_properties(${TS_FILES} PROPERTIES OUTPUT_LOCATION "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/translations") # qt_add_lupdate does not work for some reason. Lets do it manually: diff --git a/ScreenPlay/inc/public/ScreenPlay/create.h b/ScreenPlay/inc/public/ScreenPlay/create.h index e09bbcdc..dbef3e93 100644 --- a/ScreenPlay/inc/public/ScreenPlay/create.h +++ b/ScreenPlay/inc/public/ScreenPlay/create.h @@ -56,10 +56,10 @@ #include -#include "ScreenPlayUtil/util.h" #include "ScreenPlay/createimportvideo.h" #include "ScreenPlay/globalvariables.h" #include "ScreenPlay/util.h" +#include "ScreenPlayUtil/util.h" namespace ScreenPlay { diff --git a/ScreenPlay/inc/public/ScreenPlay/installedlistmodel.h b/ScreenPlay/inc/public/ScreenPlay/installedlistmodel.h index f1efbb2c..4fb2ea96 100644 --- a/ScreenPlay/inc/public/ScreenPlay/installedlistmodel.h +++ b/ScreenPlay/inc/public/ScreenPlay/installedlistmodel.h @@ -54,10 +54,10 @@ #include #include -#include "ScreenPlayUtil/projectfile.h" #include "ScreenPlay/globalvariables.h" #include "ScreenPlay/profilelistmodel.h" #include "ScreenPlay/util.h" +#include "ScreenPlayUtil/projectfile.h" #include diff --git a/ScreenPlay/inc/public/ScreenPlay/screenplaywidget.h b/ScreenPlay/inc/public/ScreenPlay/screenplaywidget.h index fe68488c..a2a04571 100644 --- a/ScreenPlay/inc/public/ScreenPlay/screenplaywidget.h +++ b/ScreenPlay/inc/public/ScreenPlay/screenplaywidget.h @@ -42,10 +42,10 @@ #include #include -#include "ScreenPlayUtil/util.h" #include "ScreenPlay/globalvariables.h" #include "ScreenPlay/projectsettingslistmodel.h" #include "ScreenPlay/sdkconnection.h" +#include "ScreenPlayUtil/util.h" #include #include diff --git a/ScreenPlay/inc/public/ScreenPlay/sdkconnection.h b/ScreenPlay/inc/public/ScreenPlay/sdkconnection.h index ff4957fa..f663cf7f 100644 --- a/ScreenPlay/inc/public/ScreenPlay/sdkconnection.h +++ b/ScreenPlay/inc/public/ScreenPlay/sdkconnection.h @@ -46,9 +46,9 @@ #include #include -#include "ScreenPlayUtil/util.h" #include "ScreenPlay/globalvariables.h" #include "ScreenPlay/util.h" +#include "ScreenPlayUtil/util.h" #include diff --git a/ScreenPlay/inc/public/ScreenPlay/util.h b/ScreenPlay/inc/public/ScreenPlay/util.h index ec7ed286..0ac0041d 100644 --- a/ScreenPlay/inc/public/ScreenPlay/util.h +++ b/ScreenPlay/inc/public/ScreenPlay/util.h @@ -53,8 +53,8 @@ #include #include -#include "ScreenPlayUtil/util.h" #include "ScreenPlay/globalvariables.h" +#include "ScreenPlayUtil/util.h" #include #include