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/widgets | |
| 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/widgets')
63 files changed, 245 insertions, 83 deletions
diff --git a/src/widgets/CMakeLists.txt b/src/widgets/CMakeLists.txt index f0beeed4a..184a25812 100644 --- a/src/widgets/CMakeLists.txt +++ b/src/widgets/CMakeLists.txt @@ -1,3 +1,4 @@ +# SPDX-License-Identifier: GPL-2.0-or-later add_subdirectory(gimp) set(widgets_SRC diff --git a/src/widgets/button.cpp b/src/widgets/button.cpp index a2848ac03..de7aa8880 100644 --- a/src/widgets/button.cpp +++ b/src/widgets/button.cpp @@ -1,14 +1,16 @@ -/** +// SPDX-License-Identifier: GPL-2.0-or-later +/** @file * Generic button widget - * + *//* * Authors: + * see git history * MenTaLguY <mental@rydia.net> * Lauris Kaplinski <lauris@kaplinski.com> * bulia byak <buliabyak@users.sf.net> * - * Copyright (C) 2002 Lauris Kaplinski * - * This code is in public domain + * Copyright (C) 2018 Authors + * Released under GNU GPL v2+, read the file 'COPYING' for more information. */ #include <glibmm.h> diff --git a/src/widgets/button.h b/src/widgets/button.h index 584818181..4aa29b40a 100644 --- a/src/widgets/button.h +++ b/src/widgets/button.h @@ -1,16 +1,17 @@ -#ifndef SEEN_SP_BUTTON_H -#define SEEN_SP_BUTTON_H - -/** +// SPDX-License-Identifier: GPL-2.0-or-later +/** @file * Generic button widget + *//* + * Authors: + * see git history + * Lauris Kaplinski <lauris@kaplinski.com> * - * Author: - * Lauris Kaplinski <lauris@kaplinski.com> - * - * Copyright (C) 2002 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_SP_BUTTON_H +#define SEEN_SP_BUTTON_H + #define SP_TYPE_BUTTON (sp_button_get_type ()) #define SP_BUTTON(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), SP_TYPE_BUTTON, SPButton)) diff --git a/src/widgets/dash-selector.cpp b/src/widgets/dash-selector.cpp index 3e65ae0f2..16520bbf4 100644 --- a/src/widgets/dash-selector.cpp +++ b/src/widgets/dash-selector.cpp @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /** * @file * Combobox for selecting dash patterns - implementation. @@ -9,7 +10,7 @@ * * Copyright (C) 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 "dash-selector.h" diff --git a/src/widgets/dash-selector.h b/src/widgets/dash-selector.h index eb48003a6..485f8abed 100644 --- a/src/widgets/dash-selector.h +++ b/src/widgets/dash-selector.h @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0-or-later #ifndef SEEN_SP_DASH_SELECTOR_NEW_H #define SEEN_SP_DASH_SELECTOR_NEW_H @@ -7,7 +8,7 @@ * * Copyright (C) 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 <gtkmm/box.h> diff --git a/src/widgets/desktop-widget.cpp b/src/widgets/desktop-widget.cpp index dade7c85d..32f1a126d 100644 --- a/src/widgets/desktop-widget.cpp +++ b/src/widgets/desktop-widget.cpp @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /** \file * Desktop widget implementation */ @@ -17,7 +18,7 @@ * Copyright (C) 1999-2002 Lauris Kaplinski * Copyright (C) 2000-2001 Ximian, Inc. * - * Released under GNU GPL, read the file 'COPYING' for more information + * Released under GNU GPL v2+, read the file 'COPYING' for more information. */ #ifdef HAVE_CONFIG_H diff --git a/src/widgets/desktop-widget.h b/src/widgets/desktop-widget.h index 40d194bb3..65733390c 100644 --- a/src/widgets/desktop-widget.h +++ b/src/widgets/desktop-widget.h @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0-or-later #ifndef SEEN_SP_DESKTOP_WIDGET_H #define SEEN_SP_DESKTOP_WIDGET_H @@ -7,9 +8,11 @@ * Authors: * Jon A. Cruz <jon@joncruz.org> (c) 2010 * John Bintz <jcoswell@coswellproductions.org> (c) 2006 - * Ralf Stephan <ralf@ark.in-berlin.de> (c) 2005, distrib. under GPL2 + * Ralf Stephan <ralf@ark.in-berlin.de> (c) 2005 * Abhishek Sharma * ? -2004 + * + * Released under GNU GPL v2+, read the file 'COPYING' for more information. */ #include <gtkmm/window.h> diff --git a/src/widgets/eek-preview.cpp b/src/widgets/eek-preview.cpp index 201afa97b..0da4279a5 100644 --- a/src/widgets/eek-preview.cpp +++ b/src/widgets/eek-preview.cpp @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0-or-later OR MPL-1.1 OR LGPL-2.1-or-later /* ***** BEGIN LICENSE BLOCK ***** * Version: MPL 1.1/GPL 2.0/LGPL 2.1 * diff --git a/src/widgets/eek-preview.h b/src/widgets/eek-preview.h index bc756260b..371d7a66a 100644 --- a/src/widgets/eek-preview.h +++ b/src/widgets/eek-preview.h @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0-or-later OR MPL-1.1 OR LGPL-2.1-or-later /* ***** BEGIN LICENSE BLOCK ***** * Version: MPL 1.1/GPL 2.0/LGPL 2.1 * diff --git a/src/widgets/ege-adjustment-action.cpp b/src/widgets/ege-adjustment-action.cpp index 927b6aec0..15647c245 100644 --- a/src/widgets/ege-adjustment-action.cpp +++ b/src/widgets/ege-adjustment-action.cpp @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0-or-later OR MPL-1.1 OR LGPL-2.1-or-later /* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- * */ diff --git a/src/widgets/ege-adjustment-action.h b/src/widgets/ege-adjustment-action.h index 5cb21a481..6dc754c66 100644 --- a/src/widgets/ege-adjustment-action.h +++ b/src/widgets/ege-adjustment-action.h @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0-or-later OR MPL-1.1 OR LGPL-2.1-or-later #ifndef SEEN_EGE_ADJUSTMENT_ACTION #define SEEN_EGE_ADJUSTMENT_ACTION /* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- diff --git a/src/widgets/ege-output-action.cpp b/src/widgets/ege-output-action.cpp index 929e8e5ea..ca4677e64 100644 --- a/src/widgets/ege-output-action.cpp +++ b/src/widgets/ege-output-action.cpp @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0-or-later OR MPL-1.1 OR LGPL-2.1-or-later /* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- * */ diff --git a/src/widgets/ege-output-action.h b/src/widgets/ege-output-action.h index f61493db7..92b007213 100644 --- a/src/widgets/ege-output-action.h +++ b/src/widgets/ege-output-action.h @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0-or-later OR MPL-1.1 OR LGPL-2.1-or-later #ifndef SEEN_EGE_OUTPUT_ACTION #define SEEN_EGE_OUTPUT_ACTION /* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- diff --git a/src/widgets/ege-paint-def.cpp b/src/widgets/ege-paint-def.cpp index 6ba5e3b6f..7cc951c4a 100644 --- a/src/widgets/ege-paint-def.cpp +++ b/src/widgets/ege-paint-def.cpp @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0-or-later OR MPL-1.1 OR LGPL-2.1-or-later /* ***** BEGIN LICENSE BLOCK ***** * Version: MPL 1.1/GPL 2.0/LGPL 2.1 * diff --git a/src/widgets/ege-paint-def.h b/src/widgets/ege-paint-def.h index c26fde1b2..63643c53a 100644 --- a/src/widgets/ege-paint-def.h +++ b/src/widgets/ege-paint-def.h @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0-or-later OR MPL-1.1 OR LGPL-2.1-or-later /* ***** BEGIN LICENSE BLOCK ***** * Version: MPL 1.1/GPL 2.0/LGPL 2.1 * diff --git a/src/widgets/fill-n-stroke-factory.h b/src/widgets/fill-n-stroke-factory.h index 89726dc0d..5ca9daa73 100644 --- a/src/widgets/fill-n-stroke-factory.h +++ b/src/widgets/fill-n-stroke-factory.h @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0-or-later #ifndef SEEN_FILL_N_STROKE_FACTORY_H #define SEEN_FILL_N_STROKE_FACTORY_H /* Authors: @@ -5,7 +6,7 @@ * * Copyright (C) 2010 Jon A. Cruz * - * Released under GNU GPL, read the file 'COPYING' for more information + * Released under GNU GPL v2+, read the file 'COPYING' for more information. */ #include "fill-or-stroke.h" diff --git a/src/widgets/fill-style.cpp b/src/widgets/fill-style.cpp index 33006e912..f4d439f29 100644 --- a/src/widgets/fill-style.cpp +++ b/src/widgets/fill-style.cpp @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /** * @file * Fill style widget. @@ -13,7 +14,7 @@ * Copyright (C) 2001-2002 Ximian, Inc. * Copyright (C) 2010 Jon A. Cruz * - * 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_FS_VERBOSE diff --git a/src/widgets/fill-style.h b/src/widgets/fill-style.h index 6e484077a..3a64f2c45 100644 --- a/src/widgets/fill-style.h +++ b/src/widgets/fill-style.h @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /** @file * @brief Fill style configuration */ @@ -8,7 +9,7 @@ * Copyright (C) 2010 Jon A. Cruz * Copyright (C) 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. */ #ifndef SEEN_DIALOGS_SP_FILL_STYLE_H diff --git a/src/widgets/gimp/CMakeLists.txt b/src/widgets/gimp/CMakeLists.txt index aa886cc67..0c8686cdd 100644 --- a/src/widgets/gimp/CMakeLists.txt +++ b/src/widgets/gimp/CMakeLists.txt @@ -1,3 +1,4 @@ +# SPDX-License-Identifier: GPL-2.0-or-later set(gimpwidgets_SRC gimpcolorwheel.c ruler.cpp diff --git a/src/widgets/gimp/gimpcolorwheel.c b/src/widgets/gimp/gimpcolorwheel.c index 51d2c7e1c..87f17eac6 100644 --- a/src/widgets/gimp/gimpcolorwheel.c +++ b/src/widgets/gimp/gimpcolorwheel.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: LGPL-3.0-or-later /* HSV color selector for GTK+ * * Copyright (C) 1999 The Free Software Foundation diff --git a/src/widgets/gimp/gimpcolorwheel.h b/src/widgets/gimp/gimpcolorwheel.h index 41a38c842..e79fc1575 100644 --- a/src/widgets/gimp/gimpcolorwheel.h +++ b/src/widgets/gimp/gimpcolorwheel.h @@ -1,3 +1,7 @@ +// SPDX-License-Identifier: LGPL-3.0-or-later +/** @file + * HSV color selector for GTK+ + */ /* HSV color selector for GTK+ * * Copyright (C) 1999 The Free Software Foundation @@ -5,7 +9,7 @@ * Authors: Simon Budig <Simon.Budig@unix-ag.org> (original code) * Federico Mena-Quintero <federico@gimp.org> (cleanup for GTK+) * Jonathan Blandford <jrb@redhat.com> (cleanup for GTK+) - * + * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as published by * the Free Software Foundation; either version 3 of the License, or diff --git a/src/widgets/gimp/ruler.cpp b/src/widgets/gimp/ruler.cpp index f4f1a2f29..a0dd19dc5 100644 --- a/src/widgets/gimp/ruler.cpp +++ b/src/widgets/gimp/ruler.cpp @@ -1,8 +1,9 @@ +// SPDX-License-Identifier: GPL-3.0-or-later /* * Customized ruler class for inkscape. Note that this is a fork of * the GimpRuler widget from GIMP: libgimpwidgets/gimpruler.c. - * The GIMP code is released under the GPL 3. The GIMP code itself - * is a fork of the now-obsolete GtkRuler widget from GTK+ 2. + * The GIMP code was released under the LGPL3+ (which is GPL3 plus extra permissions that may be ignored). + * The GIMP code itself is a fork of the now-obsolete GtkRuler widget from GTK+ 2. * * Major differences between implementations in Inkscape and GIMP are * as follows: @@ -26,7 +27,7 @@ * * Copyright (C) 1999-2011 authors * - * Released under GNU GPL, read the file 'COPYING' for more information + * Released under GNU GPL v3+. Read the file 'COPYING' for more information. */ #include <cstring> diff --git a/src/widgets/gimp/ruler.h b/src/widgets/gimp/ruler.h index ed529d082..5e9b1ee16 100644 --- a/src/widgets/gimp/ruler.h +++ b/src/widgets/gimp/ruler.h @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0-or-later #ifndef __SP_RULER_H__ #define __SP_RULER_H__ @@ -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 <gtk/gtk.h> diff --git a/src/widgets/gradient-image.cpp b/src/widgets/gradient-image.cpp index 67b1e3d38..1a0e253a9 100644 --- a/src/widgets/gradient-image.cpp +++ b/src/widgets/gradient-image.cpp @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /** * A simple gradient preview * @@ -7,7 +8,7 @@ * Copyright (C) 2001-2002 Lauris Kaplinski * Copyright (C) 2001 Ximian, Inc. * - * Released under GNU GPL, read the file 'COPYING' for more information + * Released under GNU GPL v2+, read the file 'COPYING' for more information. */ #include <sigc++/sigc++.h> diff --git a/src/widgets/gradient-image.h b/src/widgets/gradient-image.h index 637d7c39d..4fcc4ca71 100644 --- a/src/widgets/gradient-image.h +++ b/src/widgets/gradient-image.h @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0-or-later #ifndef SEEN_SP_GRADIENT_IMAGE_H #define SEEN_SP_GRADIENT_IMAGE_H @@ -10,7 +11,7 @@ * Copyright (C) 2001-2002 Lauris Kaplinski * Copyright (C) 2001 Ximian, Inc. * - * Released under GNU GPL, read the file 'COPYING' for more information + * Released under GNU GPL v2+, read the file 'COPYING' for more information. */ #include <gtk/gtk.h> diff --git a/src/widgets/gradient-selector.cpp b/src/widgets/gradient-selector.cpp index 11a2cc34b..8da832a26 100644 --- a/src/widgets/gradient-selector.cpp +++ b/src/widgets/gradient-selector.cpp @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Gradient vector widget * @@ -10,7 +11,7 @@ * Copyright (C) 2001 Ximian, Inc. * Copyright (C) 2010 Jon A. Cruz * - * Released under GNU GPL, read the file 'COPYING' for more information + * Released under GNU GPL v2+, read the file 'COPYING' for more information. */ #include <glibmm/i18n.h> diff --git a/src/widgets/gradient-selector.h b/src/widgets/gradient-selector.h index 4eb37b5e8..454d5c906 100644 --- a/src/widgets/gradient-selector.h +++ b/src/widgets/gradient-selector.h @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0-or-later #ifndef SEEN_GRADIENT_SELECTOR_H #define SEEN_GRADIENT_SELECTOR_H @@ -12,7 +13,7 @@ * Copyright (C) 2001 Ximian, Inc. * Copyright (C) 2010 Jon A. Cruz * - * Released under GNU GPL, read the file 'COPYING' for more information + * Released under GNU GPL v2+, read the file 'COPYING' for more information. */ #include <gtkmm/liststore.h> diff --git a/src/widgets/gradient-vector.cpp b/src/widgets/gradient-vector.cpp index 72b917c10..038835956 100644 --- a/src/widgets/gradient-vector.cpp +++ b/src/widgets/gradient-vector.cpp @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Gradient vector selection widget * @@ -15,7 +16,7 @@ * Copyright (C) 2006 MenTaLguY * Copyright (C) 2010 Jon A. Cruz * - * Released under GNU GPL, read the file 'COPYING' for more information + * Released under GNU GPL v2+, read the file 'COPYING' for more information. * */ diff --git a/src/widgets/gradient-vector.h b/src/widgets/gradient-vector.h index 27f818832..c30cb3230 100644 --- a/src/widgets/gradient-vector.h +++ b/src/widgets/gradient-vector.h @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0-or-later #ifndef SEEN_GRADIENT_VECTOR_H #define SEEN_GRADIENT_VECTOR_H @@ -12,7 +13,7 @@ * Copyright (C) 2001-2002 Lauris Kaplinski * Copyright (C) 2001 Ximian, Inc. * - * Released under GNU GPL, read the file 'COPYING' for more information + * Released under GNU GPL v2+, read the file 'COPYING' for more information. */ #include <gtkmm/liststore.h> diff --git a/src/widgets/ink-action.cpp b/src/widgets/ink-action.cpp index ee6478403..bbdcd1c66 100644 --- a/src/widgets/ink-action.cpp +++ b/src/widgets/ink-action.cpp @@ -1,3 +1,12 @@ +// SPDX-License-Identifier: GPL-2.0-or-later +/** @file + * TODO: insert short description here + *//* + * Authors: see git history + * + * Copyright (C) 2018 Authors + * Released under GNU GPL v2+, read the file 'COPYING' for more information. + */ #include "ink-action.h" #include "helper/icon-loader.h" #include <gtk/gtk.h> diff --git a/src/widgets/ink-action.h b/src/widgets/ink-action.h index 396e4838b..fa493d552 100644 --- a/src/widgets/ink-action.h +++ b/src/widgets/ink-action.h @@ -1,3 +1,12 @@ +// SPDX-License-Identifier: GPL-2.0-or-later +/** @file + * TODO: insert short description here + *//* + * Authors: see git history + * + * Copyright (C) 2017 Authors + * Released under GNU GPL v2+, read the file 'COPYING' for more information. + */ #ifndef SEEN_INK_ACTION #define SEEN_INK_ACTION diff --git a/src/widgets/ink-comboboxentry-action.cpp b/src/widgets/ink-comboboxentry-action.cpp index 65f7d5831..a49d5c2c3 100644 --- a/src/widgets/ink-comboboxentry-action.cpp +++ b/src/widgets/ink-comboboxentry-action.cpp @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* * A subclass of GtkAction that wraps a GtkComboBoxEntry. * Features: @@ -14,7 +15,7 @@ * * Copyright (C) 2010 Authors * - * Released under GNU GPL, read the file 'COPYING' for more information + * Released under GNU GPL v2+, read the file 'COPYING' for more information. */ /* diff --git a/src/widgets/ink-comboboxentry-action.h b/src/widgets/ink-comboboxentry-action.h index 042d42937..fa7dd5cdf 100644 --- a/src/widgets/ink-comboboxentry-action.h +++ b/src/widgets/ink-comboboxentry-action.h @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* * A subclass of GtkAction that wraps a GtkComboBoxEntry. * Features: @@ -13,7 +14,7 @@ * * Copyright (C) 2010 Authors * - * 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_INK_COMBOBOXENTRY_ACTION diff --git a/src/widgets/ink-radio-action.cpp b/src/widgets/ink-radio-action.cpp index d0bff1271..5f8e3448a 100644 --- a/src/widgets/ink-radio-action.cpp +++ b/src/widgets/ink-radio-action.cpp @@ -1,3 +1,12 @@ +// SPDX-License-Identifier: GPL-2.0-or-later +/** @file + * TODO: insert short description here + *//* + * Authors: see git history + * + * Copyright (C) 2018 Authors + * Released under GNU GPL v2+, read the file 'COPYING' for more information. + */ #include "ink-radio-action.h" #include "helper/icon-loader.h" diff --git a/src/widgets/ink-radio-action.h b/src/widgets/ink-radio-action.h index 52afa0cb8..c54346dd2 100644 --- a/src/widgets/ink-radio-action.h +++ b/src/widgets/ink-radio-action.h @@ -1,3 +1,12 @@ +// SPDX-License-Identifier: GPL-2.0-or-later +/** @file + * TODO: insert short description here + *//* + * Authors: see git history + * + * Copyright (C) 2017 Authors + * Released under GNU GPL v2+, read the file 'COPYING' for more information. + */ #ifndef INK_RADIO_ACTION_H #define INK_RADIO_ACTION_H diff --git a/src/widgets/ink-toggle-action.cpp b/src/widgets/ink-toggle-action.cpp index 7a29b95d5..fdd3e2498 100644 --- a/src/widgets/ink-toggle-action.cpp +++ b/src/widgets/ink-toggle-action.cpp @@ -1,3 +1,12 @@ +// SPDX-License-Identifier: GPL-2.0-or-later +/** @file + * TODO: insert short description here + *//* + * Authors: see git history + * + * Copyright (C) 2018 Authors + * Released under GNU GPL v2+, read the file 'COPYING' for more information. + */ #include "ink-toggle-action.h" #include "helper/icon-loader.h" diff --git a/src/widgets/ink-toggle-action.h b/src/widgets/ink-toggle-action.h index f329f57a6..833fc4ef6 100644 --- a/src/widgets/ink-toggle-action.h +++ b/src/widgets/ink-toggle-action.h @@ -1,3 +1,12 @@ +// SPDX-License-Identifier: GPL-2.0-or-later +/** @file + * TODO: insert short description here + *//* + * Authors: see git history + * + * Copyright (C) 2017 Authors + * Released under GNU GPL v2+, read the file 'COPYING' for more information. + */ #ifndef INK_TOGGLE_ACTION_H #define INK_TOGGLE_ACTION_H diff --git a/src/widgets/ink-tool-menu-action.cpp b/src/widgets/ink-tool-menu-action.cpp index d1d9501b4..667f074cc 100644 --- a/src/widgets/ink-tool-menu-action.cpp +++ b/src/widgets/ink-tool-menu-action.cpp @@ -1,3 +1,12 @@ +// SPDX-License-Identifier: GPL-2.0-or-later +/** @file + * TODO: insert short description here + *//* + * Authors: see git history + * + * Copyright (C) 2018 Authors + * Released under GNU GPL v2+, read the file 'COPYING' for more information. + */ #include "ink-tool-menu-action.h" // ToolMenu Action is happily derived from http://www.gtkforums.com/viewtopic.php?t=4215 diff --git a/src/widgets/ink-tool-menu-action.h b/src/widgets/ink-tool-menu-action.h index c34aa1322..58e1974d1 100644 --- a/src/widgets/ink-tool-menu-action.h +++ b/src/widgets/ink-tool-menu-action.h @@ -1,3 +1,12 @@ +// SPDX-License-Identifier: GPL-2.0-or-later +/** @file + * TODO: insert short description here + *//* + * Authors: see git history + * + * Copyright (C) 2017 Authors + * Released under GNU GPL v2+, read the file 'COPYING' for more information. + */ #ifndef INK_TOOL_MENU_ACTION_H #define INK_TOOL_MENU_ACTION_H diff --git a/src/widgets/paint-selector.cpp b/src/widgets/paint-selector.cpp index a2a84b115..51061a947 100644 --- a/src/widgets/paint-selector.cpp +++ b/src/widgets/paint-selector.cpp @@ -1,19 +1,18 @@ -/** - * @file +// SPDX-License-Identifier: GPL-2.0-or-later +/** @file * SPPaintSelector: Generic paint selector widget. - */ - -/* + *//* * Authors: + * see git history * Lauris Kaplinski * bulia byak <buliabyak@users.sf.net> * John Cliff <simarilius@yahoo.com> * Jon A. Cruz <jon@joncruz.org> * Abhishek Sharma * - * Copyright (C) Lauris Kaplinski 2002 - * Copyright (C) 2010 Authors -*/ + * Copyright (C) 2018 Authors + * Released under GNU GPL v2+, read the file 'COPYING' for more information. + */ #define noSP_PS_VERBOSE diff --git a/src/widgets/paint-selector.h b/src/widgets/paint-selector.h index d7c7e6326..4a6db3121 100644 --- a/src/widgets/paint-selector.h +++ b/src/widgets/paint-selector.h @@ -1,16 +1,16 @@ -#ifndef SEEN_SP_PAINT_SELECTOR_H -#define SEEN_SP_PAINT_SELECTOR_H -/* +// SPDX-License-Identifier: GPL-2.0-or-later +/** @file * Generic paint selector widget - * + *//* * Authors: * Lauris * Jon A. Cruz <jon@joncruz.org> * - * Copyright (C) Lauris 2002 - * Copyright (C) 2010 Authors - * + * Copyright (C) 2018 Authors + * Released under GNU GPL v2+, read the file 'COPYING' for more information. */ +#ifndef SEEN_SP_PAINT_SELECTOR_H +#define SEEN_SP_PAINT_SELECTOR_H #include <glib.h> #include <gtk/gtk.h> diff --git a/src/widgets/sp-attribute-widget.cpp b/src/widgets/sp-attribute-widget.cpp index e30f3bf0e..2b6aa9bbd 100644 --- a/src/widgets/sp-attribute-widget.cpp +++ b/src/widgets/sp-attribute-widget.cpp @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /** * @file * Base widget for user input of object properties. @@ -9,7 +10,7 @@ * * Copyright (C) 2001 Ximian, Inc. * Copyright (C) 2012, 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 <glibmm/i18n.h> diff --git a/src/widgets/sp-attribute-widget.h b/src/widgets/sp-attribute-widget.h index d8b350e58..f43fe84e7 100644 --- a/src/widgets/sp-attribute-widget.h +++ b/src/widgets/sp-attribute-widget.h @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /** * @file * Widget that listens and modifies repr attributes. @@ -9,7 +10,7 @@ * Copyright (C) 2001 Ximian, Inc. * Copyright (C) 2002,2011-2012 authors * - * Licensed under GNU GPL, read the file 'COPYING' for more information + * Released under GNU GPL v2+, read the file 'COPYING' for more information. */ #ifndef SEEN_DIALOGS_SP_ATTRIBUTE_WIDGET_H diff --git a/src/widgets/sp-color-selector.cpp b/src/widgets/sp-color-selector.cpp index 8d57ddee6..c1c69751e 100644 --- a/src/widgets/sp-color-selector.cpp +++ b/src/widgets/sp-color-selector.cpp @@ -1,6 +1,14 @@ -/* - * bulia byak <buliabyak@users.sf.net> - * Jon A. Cruz <jon@joncruz.org> +// SPDX-License-Identifier: GPL-2.0-or-later +/** @file + * TODO: insert short description here + *//* + * Authors: + * see git history + * bulia byak <buliabyak@users.sf.net> + * Jon A. Cruz <jon@joncruz.org> + * + * Copyright (C) 2018 Authors + * Released under GNU GPL v2+, read the file 'COPYING' for more information. */ #include <cmath> diff --git a/src/widgets/sp-color-selector.h b/src/widgets/sp-color-selector.h index e58a8adcd..eb772507c 100644 --- a/src/widgets/sp-color-selector.h +++ b/src/widgets/sp-color-selector.h @@ -1,3 +1,12 @@ +// SPDX-License-Identifier: GPL-2.0-or-later +/** @file + * TODO: insert short description here + *//* + * Authors: see git history + * + * Copyright (C) 2018 Authors + * Released under GNU GPL v2+, read the file 'COPYING' for more information. + */ #ifndef SEEN_SP_COLOR_SELECTOR_H #define SEEN_SP_COLOR_SELECTOR_H diff --git a/src/widgets/sp-widget.cpp b/src/widgets/sp-widget.cpp index 9bfec39d6..1e82d69ac 100644 --- a/src/widgets/sp-widget.cpp +++ b/src/widgets/sp-widget.cpp @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Abstract base class for dynamic control widgets * @@ -10,7 +11,7 @@ * Copyright (C) 2000-2001 Ximian, Inc. * Copyright (C) 2012 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 "document.h" diff --git a/src/widgets/sp-widget.h b/src/widgets/sp-widget.h index a53062cf4..3c08a3a50 100644 --- a/src/widgets/sp-widget.h +++ b/src/widgets/sp-widget.h @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0-or-later #ifndef SEEN_SP_WIDGET_H #define SEEN_SP_WIDGET_H @@ -12,7 +13,7 @@ * Copyright (C) 2000-2001 Ximian, Inc. * Copyright (C) 2012 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 <gtk/gtk.h> diff --git a/src/widgets/sp-xmlview-tree.cpp b/src/widgets/sp-xmlview-tree.cpp index 6b8db59ab..75e375ae5 100644 --- a/src/widgets/sp-xmlview-tree.cpp +++ b/src/widgets/sp-xmlview-tree.cpp @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /** * Specialization of GtkTreeView for the XML tree view * @@ -6,7 +7,7 @@ * * Copyright (C) 2002 MenTaLguY * - * Released under the GNU GPL; see COPYING for details + * Released under GNU GPL v2+, read the file 'COPYING' for more information. */ #include <cstring> diff --git a/src/widgets/sp-xmlview-tree.h b/src/widgets/sp-xmlview-tree.h index 82b7d5370..a6636d981 100644 --- a/src/widgets/sp-xmlview-tree.h +++ b/src/widgets/sp-xmlview-tree.h @@ -1,10 +1,11 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /** * Authors: * MenTaLguY <mental@rydia.net> * * Copyright (C) 2002 MenTaLguY * - * Released under the GNU GPL; see COPYING for details + * Released under GNU GPL v2+, read the file 'COPYING' for more information. */ #ifndef SEEN_SP_XMLVIEW_TREE_H diff --git a/src/widgets/spinbutton-events.cpp b/src/widgets/spinbutton-events.cpp index 47c59207a..1ed55f13f 100644 --- a/src/widgets/spinbutton-events.cpp +++ b/src/widgets/spinbutton-events.cpp @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Common callbacks for spinbuttons * @@ -8,7 +9,7 @@ * Copyright (C) 2013 authors * Copyright (C) 2003 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 <gtk/gtk.h> diff --git a/src/widgets/spinbutton-events.h b/src/widgets/spinbutton-events.h index 9bf50d87c..e32ef184e 100644 --- a/src/widgets/spinbutton-events.h +++ b/src/widgets/spinbutton-events.h @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Common callbacks for spinbuttons * @@ -6,7 +7,7 @@ * * Copyright (C) 2003 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 <glib.h> diff --git a/src/widgets/spw-utilities.cpp b/src/widgets/spw-utilities.cpp index 3794daaf2..5b2a5d778 100644 --- a/src/widgets/spw-utilities.cpp +++ b/src/widgets/spw-utilities.cpp @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Inkscape Widget Utilities * @@ -7,7 +8,7 @@ * * Copyright (C) 2003 Bryce W. Harrington * - * Released under GNU GPL, read the file 'COPYING' for more information + * Released under GNU GPL v2+, read the file 'COPYING' for more information. */ #include <cstring> diff --git a/src/widgets/spw-utilities.h b/src/widgets/spw-utilities.h index ea0d55279..8801ce46f 100644 --- a/src/widgets/spw-utilities.h +++ b/src/widgets/spw-utilities.h @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0-or-later #ifndef __SPW_UTILITIES_H__ #define __SPW_UTILITIES_H__ @@ -6,10 +7,10 @@ * * Author: * Bryce W. Harrington <brycehar@bryceharrington.org> - * + * * Copyright (C) 2003 Bryce Harrington * - * Released under GNU GPL, read the file 'COPYING' for more information + * Released under GNU GPL v2+, read the file 'COPYING' for more information. */ /* The following are helper routines for making Inkscape dialog widgets. diff --git a/src/widgets/stroke-marker-selector.cpp b/src/widgets/stroke-marker-selector.cpp index 434874cd8..f563e2352 100644 --- a/src/widgets/stroke-marker-selector.cpp +++ b/src/widgets/stroke-marker-selector.cpp @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /** * @file * Combobox for selecting dash patterns - implementation. @@ -9,7 +10,7 @@ * * Copyright (C) 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 "stroke-marker-selector.h" diff --git a/src/widgets/stroke-marker-selector.h b/src/widgets/stroke-marker-selector.h index 96f203b8b..d35584326 100644 --- a/src/widgets/stroke-marker-selector.h +++ b/src/widgets/stroke-marker-selector.h @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0-or-later #ifndef SEEN_SP_MARKER_SELECTOR_NEW_H #define SEEN_SP_MARKER_SELECTOR_NEW_H @@ -7,7 +8,7 @@ * * Copyright (C) 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 <vector> diff --git a/src/widgets/stroke-style.cpp b/src/widgets/stroke-style.cpp index bfa21a9ea..380a51c33 100644 --- a/src/widgets/stroke-style.cpp +++ b/src/widgets/stroke-style.cpp @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* Authors: * Lauris Kaplinski <lauris@kaplinski.com> * Bryce Harrington <brycehar@bryceharrington.org> @@ -12,7 +13,7 @@ * Copyright (C) 2004 John Cliff * Copyright (C) 2008 Maximilian Albert (gtkmm-ification) * - * 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/widgets/stroke-style.h b/src/widgets/stroke-style.h index 684479975..88331a5bf 100644 --- a/src/widgets/stroke-style.h +++ b/src/widgets/stroke-style.h @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /** * @file * Widgets used in the stroke style dialog. @@ -9,7 +10,7 @@ * Copyright (C) 2010 Jon A. Cruz * Copyright (C) 2001 Ximian, Inc. * - * Released under GNU GPL, read the file 'COPYING' for more information + * Released under GNU GPL v2+, read the file 'COPYING' for more information. */ // WHOA! talk about header bloat! diff --git a/src/widgets/style-utils.h b/src/widgets/style-utils.h index ba63cb898..1557218d7 100644 --- a/src/widgets/style-utils.h +++ b/src/widgets/style-utils.h @@ -1,19 +1,13 @@ -/** - * @file +// SPDX-License-Identifier: GPL-2.0-or-later +/** @file * Common utility functions for manipulating style. - */ -/* Author: - * Shlomi Fish <shlomif@cpan.org> - * - * Copyright (C) 2016 Shlomi Fish - * - * Dually-Licensed under: - * - * 1. The Expat license - https://www.gnu.org/licenses/license-list.html#Expat + *//* + * Authors: + * see git history + * Shlomi Fish <shlomif@cpan.org> * - * 2. The GNU General Public License, either version 2, or at your option, - * any later version of it. - * ( https://en.wikipedia.org/wiki/GNU_General_Public_License ) + * Copyright (C) 2016 Authors + * Released under GNU GPL v2+, read the file 'COPYING' for more information. */ #ifndef SEEN_DIALOGS_STYLE_UTILS_H diff --git a/src/widgets/swatch-selector.cpp b/src/widgets/swatch-selector.cpp index 286dcc610..ba1b8035d 100644 --- a/src/widgets/swatch-selector.cpp +++ b/src/widgets/swatch-selector.cpp @@ -1,3 +1,12 @@ +// SPDX-License-Identifier: GPL-2.0-or-later +/** @file + * TODO: insert short description here + *//* + * Authors: see git history + * + * Copyright (C) 2018 Authors + * Released under GNU GPL v2+, read the file 'COPYING' for more information. + */ #include "swatch-selector.h" diff --git a/src/widgets/swatch-selector.h b/src/widgets/swatch-selector.h index e0478f3ee..88e7ad68a 100644 --- a/src/widgets/swatch-selector.h +++ b/src/widgets/swatch-selector.h @@ -1,3 +1,12 @@ +// SPDX-License-Identifier: GPL-2.0-or-later +/** @file + * TODO: insert short description here + *//* + * Authors: see git history + * + * Copyright (C) 2018 Authors + * Released under GNU GPL v2+, read the file 'COPYING' for more information. + */ #ifndef SEEN_SP_SWATCH_SELECTOR_H #define SEEN_SP_SWATCH_SELECTOR_H diff --git a/src/widgets/toolbox.cpp b/src/widgets/toolbox.cpp index 0edb86053..670693bc4 100644 --- a/src/widgets/toolbox.cpp +++ b/src/widgets/toolbox.cpp @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /** * @file * Inkscape toolbar definitions and general utility functions. @@ -23,7 +24,7 @@ * Copyright (C) 1999-2015 authors * Copyright (C) 2001-2002 Ximian, Inc. * - * Released under GNU GPL, read the file 'COPYING' for more information + * Released under GNU GPL v2+, read the file 'COPYING' for more information. */ #include <gtkmm/box.h> diff --git a/src/widgets/toolbox.h b/src/widgets/toolbox.h index 47a5639de..ff19c802c 100644 --- a/src/widgets/toolbox.h +++ b/src/widgets/toolbox.h @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0-or-later #ifndef SEEN_TOOLBOX_H #define SEEN_TOOLBOX_H @@ -10,7 +11,7 @@ * Copyright (C) 1999-2002 Authors * Copyright (C) 2001-2002 Ximian, Inc. * - * Released under GNU GPL, read the file 'COPYING' for more information + * Released under GNU GPL v2+, read the file 'COPYING' for more information. */ #include <glibmm/ustring.h> diff --git a/src/widgets/widget-sizes.h b/src/widgets/widget-sizes.h index 186cf4730..8dd8c6c40 100644 --- a/src/widgets/widget-sizes.h +++ b/src/widgets/widget-sizes.h @@ -1,3 +1,12 @@ +// SPDX-License-Identifier: GPL-2.0-or-later +/** @file + * TODO: insert short description here + *//* + * Authors: see git history + * + * Copyright (C) 2016 Authors + * Released under GNU GPL v2+, read the file 'COPYING' for more information. + */ // #define TOOL_BUTTON_SIZE 28 // GTK uses 24 for icon sizes by default. Spacing adjust to keep the |