From d8b38145045425a12e9a2b4d124cfe75dba5a312 Mon Sep 17 00:00:00 2001 From: Elias Steurer Date: Sat, 16 May 2020 23:08:54 +0200 Subject: [PATCH] Fix missing license --- ScreenPlay/src/create.h | 26 +++++++++++------------ ScreenPlay/src/createimportvideo.h | 27 ++++++++++++------------ ScreenPlay/src/profile.h | 34 ++++++++++++++++++++++++++++++ ScreenPlaySDK/screenplaysdk.cpp | 2 +- 4 files changed, 60 insertions(+), 29 deletions(-) diff --git a/ScreenPlay/src/create.h b/ScreenPlay/src/create.h index 90bb091e..a2d965cc 100644 --- a/ScreenPlay/src/create.h +++ b/ScreenPlay/src/create.h @@ -3,21 +3,12 @@ ** Copyright (C) 2020 Elias Steurer (Kelteseth) ** Contact: https://screen-play.app ** -** This file is part of ScreenPlay. ScreenPlay is licensed under a dual license. -** When you contribute to ScreenPlay via a Gitlab Merge Request you accept that -** your work will be available under the two following licenses: +** This file is part of ScreenPlay. ScreenPlay is licensed under a dual license in +** order to ensure its sustainability. When you contribute to ScreenPlay +** you accept that your work will be available under the two following licenses: ** ** $SCREENPLAY_BEGIN_LICENSE$ ** -** #### Commercial License -** This code is owned by Elias Steurer. By changing/adding to the code you agree to the -** terms written in: -** * Legal/corporate_contributor_license_agreement.md - For corporate contributors -** * Legal/individual_contributor_license_agreement.md - For individual contributors -** -** Each Contributor hereby grants Elias Steurer (Kelteseth) a world-wide, -** royalty-free, non-exclusive license. -** ** #### Affero General Public License Usage (AGPLv3) ** Alternatively, this file may be used under the terms of the GNU Affero ** General Public License version 3 as published by the Free Software @@ -26,9 +17,16 @@ ** ensure the GNU Affero Lesser General Public License version 3 requirements ** will be met: https://www.gnu.org/licenses/agpl-3.0.en.html. ** -** Additional Limitations to the AGPLv3 and Commercial Lincese +** #### Commercial License +** This code is owned by Elias Steurer. By changing/adding to the code you agree to the +** terms written in: +** * Legal/corporate_contributor_license_agreement.md - For corporate contributors +** * Legal/individual_contributor_license_agreement.md - For individual contributors +** +** #### Additional Limitations to the AGPLv3 and Commercial Lincese ** This License does not grant any rights in the trademarks, -** service marks, or logos of any Contributor. +** service marks, or logos. +** ** ** $SCREENPLAY_END_LICENSE$ ** diff --git a/ScreenPlay/src/createimportvideo.h b/ScreenPlay/src/createimportvideo.h index 57e432d6..270727ea 100644 --- a/ScreenPlay/src/createimportvideo.h +++ b/ScreenPlay/src/createimportvideo.h @@ -3,21 +3,12 @@ ** Copyright (C) 2020 Elias Steurer (Kelteseth) ** Contact: https://screen-play.app ** -** This file is part of ScreenPlay. ScreenPlay is licensed under a dual license. -** When you contribute to ScreenPlay via a Gitlab Merge Request you accept that -** your work will be available under the two following licenses: +** This file is part of ScreenPlay. ScreenPlay is licensed under a dual license in +** order to ensure its sustainability. When you contribute to ScreenPlay +** you accept that your work will be available under the two following licenses: ** ** $SCREENPLAY_BEGIN_LICENSE$ ** -** #### Commercial License -** This code is owned by Elias Steurer. By changing/adding to the code you agree to the -** terms written in: -** * Legal/corporate_contributor_license_agreement.md - For corporate contributors -** * Legal/individual_contributor_license_agreement.md - For individual contributors -** -** Each Contributor hereby grants Elias Steurer (Kelteseth) a world-wide, -** royalty-free, non-exclusive license. -** ** #### Affero General Public License Usage (AGPLv3) ** Alternatively, this file may be used under the terms of the GNU Affero ** General Public License version 3 as published by the Free Software @@ -26,13 +17,21 @@ ** ensure the GNU Affero Lesser General Public License version 3 requirements ** will be met: https://www.gnu.org/licenses/agpl-3.0.en.html. ** -** Additional Limitations to the AGPLv3 and Commercial Lincese +** #### Commercial License +** This code is owned by Elias Steurer. By changing/adding to the code you agree to the +** terms written in: +** * Legal/corporate_contributor_license_agreement.md - For corporate contributors +** * Legal/individual_contributor_license_agreement.md - For individual contributors +** +** #### Additional Limitations to the AGPLv3 and Commercial Lincese ** This License does not grant any rights in the trademarks, -** service marks, or logos of any Contributor. +** service marks, or logos. +** ** ** $SCREENPLAY_END_LICENSE$ ** ****************************************************************************/ + #pragma once #include diff --git a/ScreenPlay/src/profile.h b/ScreenPlay/src/profile.h index 82c3194d..e662eda0 100644 --- a/ScreenPlay/src/profile.h +++ b/ScreenPlay/src/profile.h @@ -1,3 +1,37 @@ +/**************************************************************************** +** +** Copyright (C) 2020 Elias Steurer (Kelteseth) +** Contact: https://screen-play.app +** +** This file is part of ScreenPlay. ScreenPlay is licensed under a dual license in +** order to ensure its sustainability. When you contribute to ScreenPlay +** you accept that your work will be available under the two following licenses: +** +** $SCREENPLAY_BEGIN_LICENSE$ +** +** #### Affero General Public License Usage (AGPLv3) +** Alternatively, this file may be used under the terms of the GNU Affero +** General Public License version 3 as published by the Free Software +** Foundation and appearing in the file "ScreenPlay License.md" included in the +** packaging of this App. Please review the following information to +** ensure the GNU Affero Lesser General Public License version 3 requirements +** will be met: https://www.gnu.org/licenses/agpl-3.0.en.html. +** +** #### Commercial License +** This code is owned by Elias Steurer. By changing/adding to the code you agree to the +** terms written in: +** * Legal/corporate_contributor_license_agreement.md - For corporate contributors +** * Legal/individual_contributor_license_agreement.md - For individual contributors +** +** #### Additional Limitations to the AGPLv3 and Commercial Lincese +** This License does not grant any rights in the trademarks, +** service marks, or logos. +** +** +** $SCREENPLAY_END_LICENSE$ +** +****************************************************************************/ + #pragma once #include #include diff --git a/ScreenPlaySDK/screenplaysdk.cpp b/ScreenPlaySDK/screenplaysdk.cpp index c034d4cb..d007b0de 100644 --- a/ScreenPlaySDK/screenplaysdk.cpp +++ b/ScreenPlaySDK/screenplaysdk.cpp @@ -36,7 +36,7 @@ void ScreenPlaySDK::init() // If the wallpaper never connects it will never get the // disconnect event. We can savely assume no connection will // be made after 1 second timeout. - QTimer::singleShot(10000,[this](){ + QTimer::singleShot(1000,[this](){ if(m_socket.state() != QLocalSocket::ConnectedState){ m_socket.disconnectFromServer(); emit sdkDisconnected();