try to fix outstanding licence text issues (#341)

This commit is contained in:
Volker Fischer 2020-06-10 20:04:09 +02:00
parent 63649ec8f1
commit a3d242e177
10 changed files with 128 additions and 45 deletions

View file

@ -1,3 +1,27 @@
/******************************************************************************\
* Copyright (c) 2020
*
* Author(s):
* Simon Tomlinson
*
******************************************************************************
*
* This program is free software; you can redistribute it and/or modify it under
* the terms of the GNU General Public License as published by the Free Software
* Foundation; either version 2 of the License, or (at your option) any later
* version.
*
* This program is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
* FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
* details.
*
* You should have received a copy of the GNU General Public License along with
* this program; if not, write to the Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
*
\******************************************************************************/
const char*const applicationName = "Jamulus"; const char*const applicationName = "Jamulus";
#ifdef ANDROIDDEBUG // Set in my myapp.pro file for android builds #ifdef ANDROIDDEBUG // Set in my myapp.pro file for android builds
@ -12,34 +36,46 @@ const char*const applicationName="Jamulus";
void myMessageHandler ( QtMsgType type, const QMessageLogContext& context, const QString& msg ) void myMessageHandler ( QtMsgType type, const QMessageLogContext& context, const QString& msg )
{ {
QString report = msg; QString report = msg;
if (context.file && !QString(context.file).isEmpty()) {
if ( context.file && !QString ( context.file ).isEmpty() )
{
report += " in file "; report += " in file ";
report += QString ( context.file ); report += QString ( context.file );
report += " line "; report += " line ";
report += QString::number ( context.line ); report += QString::number ( context.line );
} }
if (context.function && !QString(context.function).isEmpty()) {
if ( context.function && !QString ( context.function ).isEmpty() )
{
report +=+" function "; report +=+" function ";
report += QString(context.function); report += QString(context.function);
} }
const char*const local = report.toLocal8Bit().constData(); const char*const local = report.toLocal8Bit().constData();
switch (type) {
switch ( type )
{
case QtDebugMsg: case QtDebugMsg:
__android_log_write ( ANDROID_LOG_DEBUG, applicationName, local) ; __android_log_write ( ANDROID_LOG_DEBUG, applicationName, local) ;
break; break;
case QtInfoMsg: case QtInfoMsg:
__android_log_write ( ANDROID_LOG_INFO, applicationName, local ); __android_log_write ( ANDROID_LOG_INFO, applicationName, local );
break; break;
case QtWarningMsg: case QtWarningMsg:
__android_log_write ( ANDROID_LOG_WARN, applicationName, local ); __android_log_write ( ANDROID_LOG_WARN, applicationName, local );
break; break;
case QtCriticalMsg: case QtCriticalMsg:
__android_log_write ( ANDROID_LOG_ERROR, applicationName, local ); __android_log_write ( ANDROID_LOG_ERROR, applicationName, local );
break; break;
case QtFatalMsg: case QtFatalMsg:
default: default:
__android_log_write ( ANDROID_LOG_FATAL, applicationName, local ); __android_log_write ( ANDROID_LOG_FATAL, applicationName, local );
abort(); abort();
break;
} }
} }
#endif #endif

View file

@ -2,7 +2,7 @@
* Copyright (c) 2004-2020 * Copyright (c) 2004-2020
* *
* Author(s): * Author(s):
* Simon Tomlinson * Simon Tomlinson, Volker Fischer
* *
****************************************************************************** ******************************************************************************
* *

View file

@ -2,7 +2,7 @@
* Copyright (c) 2004-2020 * Copyright (c) 2004-2020
* *
* Author(s): * Author(s):
* Simon Tomlinson * Simon Tomlinson, Volker Fischer
* *
****************************************************************************** ******************************************************************************
* *

View file

@ -18,7 +18,7 @@
* *
* You should have received a copy of the GNU General Public License along with * You should have received a copy of the GNU General Public License along with
* this program; if not, write to the Free Software Foundation, Inc., * this program; if not, write to the Free Software Foundation, Inc.,
* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
* *
\******************************************************************************/ \******************************************************************************/

View file

@ -4,7 +4,25 @@
* Author(s): * Author(s):
* Volker Fischer * Volker Fischer
* *
******************************************************************************
*
* This program is free software; you can redistribute it and/or modify it under
* the terms of the GNU General Public License as published by the Free Software
* Foundation; either version 2 of the License, or (at your option) any later
* version.
*
* This program is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
* FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
* details.
*
* You should have received a copy of the GNU General Public License along with
* this program; if not, write to the Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
*
\******************************************************************************/
/*
Protocol message definition Protocol message definition
--------------------------- ---------------------------
@ -359,25 +377,7 @@ CONNECTION LESS MESSAGES
five times for one registration request at 500ms intervals. five times for one registration request at 500ms intervals.
Beyond this, it should "ping" every 15 minutes Beyond this, it should "ping" every 15 minutes
(standard re-registration timeout). (standard re-registration timeout).
*/
******************************************************************************
*
* This program is free software; you can redistribute it and/or modify it under
* the terms of the GNU General Public License as published by the Free Software
* Foundation; either version 2 of the License, or (at your option) any later
* version.
*
* This program is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
* FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
* details.
*
* You should have received a copy of the GNU General Public License along with
* this program; if not, write to the Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
*
\******************************************************************************/
#include "protocol.h" #include "protocol.h"

View file

@ -18,7 +18,7 @@
* *
* You should have received a copy of the GNU General Public License along with * You should have received a copy of the GNU General Public License along with
* this program; if not, write to the Free Software Foundation, Inc., * this program; if not, write to the Free Software Foundation, Inc.,
* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
* *
\******************************************************************************/ \******************************************************************************/

View file

@ -18,7 +18,7 @@
* *
* You should have received a copy of the GNU General Public License along with * You should have received a copy of the GNU General Public License along with
* this program; if not, write to the Free Software Foundation, Inc., * this program; if not, write to the Free Software Foundation, Inc.,
* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
* *
\******************************************************************************/ \******************************************************************************/

View file

@ -18,7 +18,7 @@
* *
* You should have received a copy of the GNU General Public License along with * You should have received a copy of the GNU General Public License along with
* this program; if not, write to the Free Software Foundation, Inc., * this program; if not, write to the Free Software Foundation, Inc.,
* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
* *
\******************************************************************************/ \******************************************************************************/

View file

@ -1,4 +1,27 @@
@echo off @echo off
rem /******************************************************************************\
rem * Copyright (c) 2004-2020
rem *
rem * Author(s):
rem * Volker Fischer
rem *
rem ******************************************************************************
rem *
rem * This program is free software; you can redistribute it and/or modify it under
rem * the terms of the GNU General Public License as published by the Free Software
rem * Foundation; either version 2 of the License, or (at your option) any later
rem * version.
rem *
rem * This program is distributed in the hope that it will be useful, but WITHOUT
rem * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
rem * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
rem * details.
rem *
rem * You should have received a copy of the GNU General Public License along with
rem * this program; if not, write to the Free Software Foundation, Inc.,
rem * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
rem *
rem \******************************************************************************/
rem To set up a new Qt and Visual Studio version rem To set up a new Qt and Visual Studio version
rem - set environment path variable to the correct Qt bin directories: rem - set environment path variable to the correct Qt bin directories:

View file

@ -1,3 +1,27 @@
;/******************************************************************************\
; * Copyright (c) 2004-2020
; *
; * Author(s):
; * Volker Fischer
; *
; ******************************************************************************
; *
; * This program is free software; you can redistribute it and/or modify it under
; * the terms of the GNU General Public License as published by the Free Software
; * Foundation; either version 2 of the License, or (at your option) any later
; * version.
; *
; * This program is distributed in the hope that it will be useful, but WITHOUT
; * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
; * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
; * details.
; *
; * You should have received a copy of the GNU General Public License along with
; * this program; if not, write to the Free Software Foundation, Inc.,
; * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
; *
;\******************************************************************************/
; Jamulus NSIS installer script ; Jamulus NSIS installer script
!include LogicLib.nsh !include LogicLib.nsh
!include x64.nsh !include x64.nsh