diff options
| author | Max Gaukler <development@maxgaukler.de> | 2018-09-11 14:05:17 +0000 |
|---|---|---|
| committer | Max Gaukler <development@maxgaukler.de> | 2018-11-08 17:18:20 +0000 |
| commit | 79d82382b3ea1b7d77e3a47a96a786557588787a (patch) | |
| tree | e2729fa6bb00d24ac6140cafabb9cf9b94ffa01b /src/helper | |
| parent | Implement the remaining vector effects properties. (diff) | |
| download | inkscape-79d82382b3ea1b7d77e3a47a96a786557588787a.tar.gz inkscape-79d82382b3ea1b7d77e3a47a96a786557588787a.zip | |
Clarify licenses
- add license headers to everything
- convert a few files from public domain or LGPL2.1+ to GPL2+
- some archaeology to clarify which files are from which library
Diffstat (limited to 'src/helper')
30 files changed, 159 insertions, 149 deletions
diff --git a/src/helper/CMakeLists.txt b/src/helper/CMakeLists.txt index 7b6b548b9..f1a2e7105 100644 --- a/src/helper/CMakeLists.txt +++ b/src/helper/CMakeLists.txt @@ -1,3 +1,4 @@ +# SPDX-License-Identifier: GPL-2.0-or-later include(${CMAKE_SOURCE_DIR}/CMakeScripts/UseGlibMarshal.cmake) diff --git a/src/helper/action-context.cpp b/src/helper/action-context.cpp index e9299f7eb..648101540 100644 --- a/src/helper/action-context.cpp +++ b/src/helper/action-context.cpp @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* * ActionContext implementation. * @@ -6,7 +7,7 @@ * * Copyright (C) 2013 Eric Greveson * - * Released under GNU GPL, read the file 'COPYING' for more information + * Released under GNU GPL v2+, read the file 'COPYING' for more information. */ #include "desktop.h" diff --git a/src/helper/action-context.h b/src/helper/action-context.h index bb538f413..2660bc59c 100644 --- a/src/helper/action-context.h +++ b/src/helper/action-context.h @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /** \file * Inkscape UI action context implementation *//* @@ -6,7 +7,7 @@ * * Copyright (C) 2013 Eric Greveson * - * Released under GNU GPL, read the file 'COPYING' for more information + * Released under GNU GPL v2+, read the file 'COPYING' for more information. */ #ifndef SEEN_INKSCAPE_ACTION_CONTEXT_H diff --git a/src/helper/action.cpp b/src/helper/action.cpp index 6d14037f0..7df15c9c1 100644 --- a/src/helper/action.cpp +++ b/src/helper/action.cpp @@ -1,12 +1,13 @@ -/* - * SPAction implementation. - * - * Author: - * Lauris Kaplinski <lauris@kaplinski.com> - * - * Copyright (C) 2003 Lauris Kaplinski +// SPDX-License-Identifier: GPL-2.0-or-later +/** @file + * Inkscape UI action implementation + *//* + * Authors: + * see git history + * Lauris Kaplinski <lauris@kaplinski.com> * - * This code is in public domain + * Copyright (C) 2018 Authors + * Released under GNU GPL v2+, read the file 'COPYING' for more information. */ #include "helper/action.h" diff --git a/src/helper/action.h b/src/helper/action.h index d731f2884..1f871dbaa 100644 --- a/src/helper/action.h +++ b/src/helper/action.h @@ -1,12 +1,13 @@ -/** \file +// SPDX-License-Identifier: GPL-2.0-or-later +/** @file * Inkscape UI action implementation *//* - * Author: - * Lauris Kaplinski <lauris@kaplinski.com> + * Authors: + * see git history + * Lauris Kaplinski <lauris@kaplinski.com> * - * Copyright (C) 2003 Lauris Kaplinski - * - * This code is in public domain + * Copyright (C) 2018 Authors + * Released under GNU GPL v2+, read the file 'COPYING' for more information. */ #ifndef SEEN_INKSCAPE_SP_ACTION_H diff --git a/src/helper/geom-curves.h b/src/helper/geom-curves.h index 7357403f7..08403e2ae 100644 --- a/src/helper/geom-curves.h +++ b/src/helper/geom-curves.h @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0-or-later #ifndef INKSCAPE_HELPER_GEOM_CURVES_H #define INKSCAPE_HELPER_GEOM_CURVES_H @@ -11,7 +12,7 @@ * * Copyright (C) 2008-2009 Johan Engelen * - * Released under GNU GPL + * Released under GNU GPL v2+, read the file 'COPYING' for more information. */ #include <2geom/line.h> diff --git a/src/helper/geom-nodetype.cpp b/src/helper/geom-nodetype.cpp index da620b3fd..e04b08dbd 100644 --- a/src/helper/geom-nodetype.cpp +++ b/src/helper/geom-nodetype.cpp @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Specific nodetype geometry functions for Inkscape, not provided my lib2geom. * @@ -6,7 +7,7 @@ * * Copyright (C) 2008 Johan Engelen * - * Released under GNU GPL + * Released under GNU GPL v2+, read the file 'COPYING' for more information. */ #include "helper/geom-nodetype.h" diff --git a/src/helper/geom-nodetype.h b/src/helper/geom-nodetype.h index e3953a65d..d7d4d4c02 100644 --- a/src/helper/geom-nodetype.h +++ b/src/helper/geom-nodetype.h @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0-or-later #ifndef INKSCAPE_HELPER_GEOM_NODETYPE_H #define INKSCAPE_HELPER_GEOM_NODETYPE_H @@ -11,7 +12,7 @@ * * Copyright (C) 2008 Johan Engelen * - * Released under GNU GPL + * Released under GNU GPL v2+, read the file 'COPYING' for more information. */ #include <2geom/forward.h> diff --git a/src/helper/geom-pathstroke.cpp b/src/helper/geom-pathstroke.cpp index 1736f9b16..d1ed7898d 100644 --- a/src/helper/geom-pathstroke.cpp +++ b/src/helper/geom-pathstroke.cpp @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* Authors: * Liam P. White * Tavmjong Bah @@ -5,7 +6,7 @@ * * Copyright (C) 2014-2015 Authors * - * Released under GNU GPL, read the file 'COPYING' for more information + * Released under GNU GPL v2+, read the file 'COPYING' for more information. */ #include <iomanip> diff --git a/src/helper/geom-pathstroke.h b/src/helper/geom-pathstroke.h index 4e4b8b91e..73d35b402 100644 --- a/src/helper/geom-pathstroke.h +++ b/src/helper/geom-pathstroke.h @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0-or-later #ifndef INKSCAPE_HELPER_PATH_STROKE_H #define INKSCAPE_HELPER_PATH_STROKE_H @@ -7,7 +8,7 @@ * * Copyright (C) 2014-2015 Authors * - * Released under GNU GPL, read the file 'COPYING' for more information + * Released under GNU GPL v2+, read the file 'COPYING' for more information. */ #include <2geom/path.h> diff --git a/src/helper/geom-pathvectorsatellites.cpp b/src/helper/geom-pathvectorsatellites.cpp index 861af0e04..2516181cb 100644 --- a/src/helper/geom-pathvectorsatellites.cpp +++ b/src/helper/geom-pathvectorsatellites.cpp @@ -1,18 +1,21 @@ -/** - * \file - * \brief PathVectorSatellites a class to manage satellites -per node extra data- in a pathvector - */ /* - * Authors: - * Jabiertxof - * Nathan Hurst - * Johan Engelen - * Josh Andler - * suv - * Mc- - * Liam P. White - * Krzysztof Kosiński - * This code is in public domain - */ +// SPDX-License-Identifier: GPL-2.0-or-later +/** @file + * PathVectorSatellites a class to manage satellites -per node extra data- in a pathvector + *//* + * Authors: see git history + * Jabiertxof + * Nathan Hurst + * Johan Engelen + * Josh Andler + * suv + * Mc- + * Liam P. White + * Krzysztof Kosiński + * This code is in public domain + * + * Copyright (C) 2018 Authors + * Released under GNU GPL v2+, read the file 'COPYING' for more information. + */ #include <helper/geom-pathvectorsatellites.h> #include "util/units.h" diff --git a/src/helper/geom-pathvectorsatellites.h b/src/helper/geom-pathvectorsatellites.h index e95458a91..3009081bb 100644 --- a/src/helper/geom-pathvectorsatellites.h +++ b/src/helper/geom-pathvectorsatellites.h @@ -1,18 +1,21 @@ -/** - * \file +// SPDX-License-Identifier: GPL-2.0-or-later +/** @file * \brief PathVectorSatellites a class to manage satellites -per node extra data- in a pathvector - */ /* - * Authors: - * Jabiertxof - * Nathan Hurst - * Johan Engelen - * Josh Andler - * suv - * Mc- - * Liam P. White - * Krzysztof Kosiński - * This code is in public domain - */ + *//* + * Authors: see git history + * Jabiertxof + * Nathan Hurst + * Johan Engelen + * Josh Andler + * suv + * Mc- + * Liam P. White + * Krzysztof Kosiński + * + * Copyright (C) 2017 Authors + * Released under GNU GPL v2+, read the file 'COPYING' for more information. + */ + #ifndef SEEN_PATHVECTORSATELLITES_H #define SEEN_PATHVECTORSATELLITES_H diff --git a/src/helper/geom-satellite.cpp b/src/helper/geom-satellite.cpp index 9cd6a3889..8049c861d 100644 --- a/src/helper/geom-satellite.cpp +++ b/src/helper/geom-satellite.cpp @@ -1,12 +1,14 @@ -/** - * \file +// SPDX-License-Identifier: GPL-2.0-or-later +/** @file * \brief Satellite a per node holder of data. - */ /* - * Authors: - * 2015 Jabier Arraiza Cenoz<jabier.arraiza@marker.es> - * - * This code is in public domain - */ + *//* + * Authors: + * see git history + * 2015 Jabier Arraiza Cenoz<jabier.arraiza@marker.es> + * + * Copyright (C) 2018 Authors + * Released under GNU GPL v2+, read the file 'COPYING' for more information. + */ #include <helper/geom-satellite.h> #include <2geom/curve.h> @@ -15,7 +17,7 @@ #include <2geom/sbasis-to-bezier.h> #include <2geom/ray.h> #include <boost/optional.hpp> -//log cache +// log cache #ifdef _WIN32 #include <Windows.h> #else diff --git a/src/helper/geom-satellite.h b/src/helper/geom-satellite.h index c9cf84308..5fbcae159 100644 --- a/src/helper/geom-satellite.h +++ b/src/helper/geom-satellite.h @@ -1,12 +1,14 @@ -/** - * \file - * \brief Satellite a per node holder of data. - */ /* - * Authors: - * 2015 Jabier Arraiza Cenoz<jabier.arraiza@marker.es> - * - * This code is in public domain - */ +// SPDX-License-Identifier: GPL-2.0-or-later +/** @file + * Satellite -- a per node holder of data. + *//* + * Authors: + * see git history + * Jabier Arraiza Cenoz<jabier.arraiza@marker.es> + * + * Copyright (C) 2017 Authors + * Released under GNU GPL v2+, read the file 'COPYING' for more information. + */ #ifndef SEEN_SATELLITE_H #define SEEN_SATELLITE_H diff --git a/src/helper/geom.cpp b/src/helper/geom.cpp index 253188f1d..e1d48580c 100644 --- a/src/helper/geom.cpp +++ b/src/helper/geom.cpp @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Specific geometry functions for Inkscape, not provided my lib2geom. * @@ -6,7 +7,7 @@ * * Copyright (C) 2008 Johan Engelen * - * Released under GNU GPL + * Released under GNU GPL v2+, read the file 'COPYING' for more information. */ #include <algorithm> diff --git a/src/helper/geom.h b/src/helper/geom.h index b3d907e51..b0e3f2b7d 100644 --- a/src/helper/geom.h +++ b/src/helper/geom.h @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0-or-later #ifndef INKSCAPE_HELPER_GEOM_H #define INKSCAPE_HELPER_GEOM_H @@ -11,7 +12,7 @@ * * Copyright (C) 2008 Johan Engelen * - * Released under GNU GPL + * Released under GNU GPL v2+, read the file 'COPYING' for more information. */ #include <2geom/forward.h> diff --git a/src/helper/gettext.cpp b/src/helper/gettext.cpp index 0bd3da06a..dd27f9f78 100644 --- a/src/helper/gettext.cpp +++ b/src/helper/gettext.cpp @@ -1,26 +1,13 @@ -/** - * \file - * \brief helper functions for gettext +// SPDX-License-Identifier: GPL-2.0-or-later +/** @file + * helper functions for gettext *//* * Authors: + * see git history * Eduard Braun <eduard.braun2@gmx.de> * - * Copyright 2017 Authors - * - * This file is part of Inkscape. - * - * Inkscape 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. - * - * Inkscape 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 Inkscape. If not, see <http://www.gnu.org/licenses/>. + * Copyright (C) 2018 Authors + * Released under GNU GPL v2+, read the file 'COPYING' for more information. */ #ifdef HAVE_CONFIG_H diff --git a/src/helper/gettext.h b/src/helper/gettext.h index ecffcdc07..5a3716386 100644 --- a/src/helper/gettext.h +++ b/src/helper/gettext.h @@ -1,26 +1,13 @@ -/** - * \file +// SPDX-License-Identifier: GPL-2.0-or-later +/** @file * \brief helper functions for gettext *//* * Authors: + * see git history * Eduard Braun <eduard.braun2@gmx.de> * - * Copyright 2017 Authors - * - * This file is part of Inkscape. - * - * Inkscape 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. - * - * Inkscape 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 Inkscape. If not, see <http://www.gnu.org/licenses/>. + * Copyright (C) 2017 Authors + * Released under GNU GPL v2+, read the file 'COPYING' for more information. */ #ifndef SEEN_GETTEXT_HELPER_H @@ -43,4 +30,4 @@ namespace Inkscape { fill-column:99 End: */ -// vim:filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:fileencoding=utf-8:textwidth=99:
\ No newline at end of file +// vim:filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:fileencoding=utf-8:textwidth=99: diff --git a/src/helper/icon-loader.cpp b/src/helper/icon-loader.cpp index 25c6eb32b..7116c2eaf 100644 --- a/src/helper/icon-loader.cpp +++ b/src/helper/icon-loader.cpp @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Icon Loader * @@ -6,7 +7,7 @@ * Authors: * Jabiertxo Arraiza <jabier.arraiza@marker.es> * - * Released under GNU GPL, read the file 'COPYING' for more information + * Released under GNU GPL v2+, read the file 'COPYING' for more information. */ #include "icon-loader.h" diff --git a/src/helper/icon-loader.h b/src/helper/icon-loader.h index 38a41fcfb..1555871c3 100644 --- a/src/helper/icon-loader.h +++ b/src/helper/icon-loader.h @@ -1,15 +1,17 @@ -#ifndef SEEN_INK_ICON_LOADER_H -#define SEEN_INK_ICON_LOADER_H - -/* +// SPDX-License-Identifier: GPL-2.0-or-later +/** @file * Icon Loader - * - * + *//* * Authors: - * Jabiertxo Arraiza <jabier.arraiza@marker.es> - * + * see git history + * Jabiertxo Arraiza <jabier.arraiza@marker.es> * + * Copyright (C) 2018 Authors + * Released under GNU GPL v2+, read the file 'COPYING' for more information. */ +#ifndef SEEN_INK_ICON_LOADER_H +#define SEEN_INK_ICON_LOADER_H + #include <gdkmm/pixbuf.h> #include <gtkmm/box.h> #include <gtkmm/image.h> diff --git a/src/helper/mathfns.h b/src/helper/mathfns.h index 8fb88dc26..3fa51a09b 100644 --- a/src/helper/mathfns.h +++ b/src/helper/mathfns.h @@ -1,12 +1,13 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* - * ... some mathmatical functions + * ... some mathmatical functions * * Authors: * Johan Engelen <goejendaagh@zonnet.nl> * * Copyright (C) 2007 Johan Engelen * - * Released under GNU GPL, read the file 'COPYING' for more information + * Released under GNU GPL v2+, read the file 'COPYING' for more information. */ #ifndef SEEN_INKSCAPE_UTIL_MATHFNS_H diff --git a/src/helper/pixbuf-ops.cpp b/src/helper/pixbuf-ops.cpp index 3a853ed23..cfb6f8836 100644 --- a/src/helper/pixbuf-ops.cpp +++ b/src/helper/pixbuf-ops.cpp @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Helpers for SPItem -> gdk_pixbuf related stuff * @@ -8,7 +9,7 @@ * * Copyright (C) 2008 John Cliff * - * Released under GNU GPL, read the file 'COPYING' for more information + * Released under GNU GPL v2+, read the file 'COPYING' for more information. */ #include <2geom/transforms.h> diff --git a/src/helper/pixbuf-ops.h b/src/helper/pixbuf-ops.h index 6f326a286..d56579ef9 100644 --- a/src/helper/pixbuf-ops.h +++ b/src/helper/pixbuf-ops.h @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0-or-later #ifndef __SP_PIXBUF_OPS_H__ #define __SP_PIXBUF_OPS_H__ @@ -9,7 +10,7 @@ * * Copyright (C) 2008 John Cliff * - * Released under GNU GPL, read the file 'COPYING' for more information + * Released under GNU GPL v2+, read the file 'COPYING' for more information. */ #include <glib.h> diff --git a/src/helper/png-write.cpp b/src/helper/png-write.cpp index 0358bc5d7..6af505278 100644 --- a/src/helper/png-write.cpp +++ b/src/helper/png-write.cpp @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* * PNG file format utilities * @@ -10,7 +11,7 @@ * * Copyright (C) 1999-2002 authors * - * Released under GNU GPL, read the file 'COPYING' for more information + * Released under GNU GPL v2+, read the file 'COPYING' for more information. */ #include <png.h> diff --git a/src/helper/png-write.h b/src/helper/png-write.h index b886158c9..8d1aa97e9 100644 --- a/src/helper/png-write.h +++ b/src/helper/png-write.h @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0-or-later #ifndef SEEN_SP_PNG_WRITE_H #define SEEN_SP_PNG_WRITE_H @@ -11,7 +12,7 @@ * * Copyright (C) 1999-2002 Lauris Kaplinski * - * Released under GNU GPL, read the file 'COPYING' for more information + * Released under GNU GPL v2+, read the file 'COPYING' for more information. */ #include <2geom/forward.h> diff --git a/src/helper/sp-marshal.list b/src/helper/sp-marshal.list index ba5c3a889..340d2c5c4 100644 --- a/src/helper/sp-marshal.list +++ b/src/helper/sp-marshal.list @@ -1,3 +1,4 @@ +# SPDX-License-Identifier: GPL-2.0-or-later # marshallers for inkscape VOID:POINTER,UINT BOOLEAN:POINTER diff --git a/src/helper/stock-items.cpp b/src/helper/stock-items.cpp index dbd9e6826..16b90c23f 100644 --- a/src/helper/stock-items.cpp +++ b/src/helper/stock-items.cpp @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Stock-items * @@ -11,7 +12,7 @@ * Copyright 2004 John Cliff * * - * Released under GNU GPL, read the file 'COPYING' for more information + * Released under GNU GPL v2+, read the file 'COPYING' for more information. */ #define noSP_SS_VERBOSE diff --git a/src/helper/stock-items.h b/src/helper/stock-items.h index a0e5cc2a3..0d1bb20fc 100644 --- a/src/helper/stock-items.h +++ b/src/helper/stock-items.h @@ -1,17 +1,16 @@ -#ifndef SEEN_INK_STOCK_ITEMS_H -#define SEEN_INK_STOCK_ITEMS_H - -/* - * Stock-items - * - * Stock Item management code - * +// SPDX-License-Identifier: GPL-2.0-or-later +/** @file + * TODO: insert short description here + *//* * Authors: - * John Cliff <simarilius@yahoo.com> - * - * Copyright 2004 John Cliff + * see git history + * John Cliff <simarilius@yahoo.com> * + * Copyright (C) 2012 Authors + * Released under GNU GPL v2+, read the file 'COPYING' for more information. */ +#ifndef SEEN_INK_STOCK_ITEMS_H +#define SEEN_INK_STOCK_ITEMS_H #include <glib.h> diff --git a/src/helper/window.cpp b/src/helper/window.cpp index 28fc25606..d51e92358 100644 --- a/src/helper/window.cpp +++ b/src/helper/window.cpp @@ -1,10 +1,13 @@ -/** +// SPDX-License-Identifier: GPL-2.0-or-later +/** @file * Generic window implementation + *//* + * Authors: + * see git history + * Lauris Kaplinski <lauris@kaplinski.com> * - * Author: - * Lauris Kaplinski <lauris@kaplinski.com> - * - * This code is in public domain + * Copyright (C) 2017 Authors + * Released under GNU GPL v2+, read the file 'COPYING' for more information. */ #include <glibmm.h> diff --git a/src/helper/window.h b/src/helper/window.h index a0efcd292..cd303d0b9 100644 --- a/src/helper/window.h +++ b/src/helper/window.h @@ -1,14 +1,16 @@ -#ifndef SEEN_SP_WINDOW_H -#define SEEN_SP_WINDOW_H - -/** - * Generic window implementation +// SPDX-License-Identifier: GPL-2.0-or-later +/** @file + * TODO: insert short description here + *//* + * Authors: + * see git history + * Lauris Kaplinski <lauris@kaplinski.com> * - * Author: - * Lauris Kaplinski <lauris@kaplinski.com> - * - * This code is in public domain + * Copyright (C) 2014 Authors + * Released under GNU GPL v2+, read the file 'COPYING' for more information. */ +#ifndef SEEN_SP_WINDOW_H +#define SEEN_SP_WINDOW_H struct _GtkWidget; typedef _GtkWidget GtkWidget; |
