From 74e4ec7dca6f39a4cc61fd299bcc3d699bd08f63 Mon Sep 17 00:00:00 2001 From: Andrew Chadwick Date: Sun, 22 May 2016 21:22:55 +0100 Subject: [PATCH] =?UTF-8?q?Update=20headers=20etc.=20"brushlib"=20?= =?UTF-8?q?=E2=86=92=20"libmypaint"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Closes mypaint/libmypaint#34. --- COPYING | 2 +- README.md | 4 ++-- brushmodes.c | 2 +- gegl/mypaint-gegl-surface.c | 2 +- gegl/mypaint-gegl-surface.h | 2 +- helpers.c | 2 +- mypaint-brush-settings.c | 2 +- mypaint-brush-settings.h | 2 +- mypaint-brush.c | 2 +- mypaint-brush.h | 2 +- mypaint-mapping.c | 2 +- mypaint-rectangle.c | 2 +- mypaint-rectangle.h | 2 +- mypaint-surface.c | 2 +- mypaint-surface.h | 2 +- mypaint-tiled-surface.c | 2 +- operationqueue.c | 2 +- tests/mypaint-benchmark.c | 2 +- tests/mypaint-benchmark.h | 2 +- tests/mypaint-test-surface.c | 2 +- tests/mypaint-utils-stroke-player.c | 2 +- tests/mypaint-utils-stroke-player.h | 2 +- tests/test_ctests.py | 10 +++++++--- tilemap.c | 2 +- tilemap.h | 2 +- 25 files changed, 32 insertions(+), 28 deletions(-) diff --git a/COPYING b/COPYING index bc3eb42b..542c9a62 100644 --- a/COPYING +++ b/COPYING @@ -1,4 +1,4 @@ -brushlib - The MyPaint Brush Library +libmypaint - The MyPaint Brush Library Copyright (C) 2008-2011 Martin Renold and contributors Permission to use, copy, modify, and/or distribute this software for any diff --git a/README.md b/README.md index 120d4262..0e13a229 100644 --- a/README.md +++ b/README.md @@ -93,5 +93,5 @@ in `po/POTFILES.in`. ### Documentation -Further documentation can be found in the MyPaint wiki: -. +Further documentation can be found in the libmypaint wiki: +. diff --git a/brushmodes.c b/brushmodes.c index 5b439d7c..aa794da2 100644 --- a/brushmodes.c +++ b/brushmodes.c @@ -1,4 +1,4 @@ -/* brushlib - The MyPaint Brush Library +/* libmypaint - The MyPaint Brush Library * Copyright (C) 2007-2014 Martin Renold et. al * * Permission to use, copy, modify, and/or distribute this software for any diff --git a/gegl/mypaint-gegl-surface.c b/gegl/mypaint-gegl-surface.c index 232b7122..0c7ad91b 100644 --- a/gegl/mypaint-gegl-surface.c +++ b/gegl/mypaint-gegl-surface.c @@ -1,4 +1,4 @@ -/* brushlib - The MyPaint Brush Library +/* libmypaint - The MyPaint Brush Library * Copyright (C) 2012 Jon Nordby * * Permission to use, copy, modify, and/or distribute this software for any diff --git a/gegl/mypaint-gegl-surface.h b/gegl/mypaint-gegl-surface.h index 712e0cab..2d1630e6 100644 --- a/gegl/mypaint-gegl-surface.h +++ b/gegl/mypaint-gegl-surface.h @@ -1,7 +1,7 @@ #ifndef MYPAINTGEGLSURFACE_H #define MYPAINTGEGLSURFACE_H -/* brushlib - The MyPaint Brush Library +/* libmypaint - The MyPaint Brush Library * Copyright (C) 2012 Jon Nordby * * Permission to use, copy, modify, and/or distribute this software for any diff --git a/helpers.c b/helpers.c index de616a48..b64a7499 100644 --- a/helpers.c +++ b/helpers.c @@ -1,4 +1,4 @@ -/* brushlib - The MyPaint Brush Library +/* libmypaint - The MyPaint Brush Library * Copyright (C) 2007-2008 Martin Renold * * Permission to use, copy, modify, and/or distribute this software for any diff --git a/mypaint-brush-settings.c b/mypaint-brush-settings.c index 4e43ce62..337c163f 100644 --- a/mypaint-brush-settings.c +++ b/mypaint-brush-settings.c @@ -1,4 +1,4 @@ -/* brushlib - The MyPaint Brush Library +/* libmypaint - The MyPaint Brush Library * Copyright (C) 2012 Jon Nordby * * Permission to use, copy, modify, and/or distribute this software for any diff --git a/mypaint-brush-settings.h b/mypaint-brush-settings.h index d67bc64f..01d9798c 100644 --- a/mypaint-brush-settings.h +++ b/mypaint-brush-settings.h @@ -1,7 +1,7 @@ #ifndef MYPAINTBRUSHSETTINGS_H #define MYPAINTBRUSHSETTINGS_H -/* brushlib - The MyPaint Brush Library +/* libmypaint - The MyPaint Brush Library * Copyright (C) 2012 Jon Nordby * * Permission to use, copy, modify, and/or distribute this software for any diff --git a/mypaint-brush.c b/mypaint-brush.c index 8e6898be..78c37f11 100644 --- a/mypaint-brush.c +++ b/mypaint-brush.c @@ -1,4 +1,4 @@ -/* brushlib - The MyPaint Brush Library +/* libmypaint - The MyPaint Brush Library * Copyright (C) 2007-2011 Martin Renold * * Permission to use, copy, modify, and/or distribute this software for any diff --git a/mypaint-brush.h b/mypaint-brush.h index 2ab2d717..953966a6 100644 --- a/mypaint-brush.h +++ b/mypaint-brush.h @@ -1,7 +1,7 @@ #ifndef MYPAINTBRUSH_H #define MYPAINTBRUSH_H -/* brushlib - The MyPaint Brush Library +/* libmypaint - The MyPaint Brush Library * Copyright (C) 2008 Martin Renold * Copyright (C) 2012 Jon Nordby * diff --git a/mypaint-mapping.c b/mypaint-mapping.c index d4140cbb..5f16c501 100644 --- a/mypaint-mapping.c +++ b/mypaint-mapping.c @@ -1,4 +1,4 @@ -/* brushlib - The MyPaint Brush Library +/* libmypaint - The MyPaint Brush Library * Copyright (C) 2007-2008 Martin Renold * * Permission to use, copy, modify, and/or distribute this software for any diff --git a/mypaint-rectangle.c b/mypaint-rectangle.c index b61b4a2e..6c63acf9 100644 --- a/mypaint-rectangle.c +++ b/mypaint-rectangle.c @@ -1,4 +1,4 @@ -/* brushlib - The MyPaint Brush Library +/* libmypaint - The MyPaint Brush Library * Copyright (C) 2008 Martin Renold * Copyright (C) 2012 Jon Nordby * diff --git a/mypaint-rectangle.h b/mypaint-rectangle.h index 3002c9f3..f88df6e6 100644 --- a/mypaint-rectangle.h +++ b/mypaint-rectangle.h @@ -1,7 +1,7 @@ #ifndef MYPAINTRECTANGLE_H #define MYPAINTRECTANGLE_H -/* brushlib - The MyPaint Brush Library +/* libmypaint - The MyPaint Brush Library * Copyright (C) 2008 Martin Renold * Copyright (C) 2012 Jon Nordby * diff --git a/mypaint-surface.c b/mypaint-surface.c index 8e9ef14d..7c9dc884 100644 --- a/mypaint-surface.c +++ b/mypaint-surface.c @@ -1,4 +1,4 @@ -/* brushlib - The MyPaint Brush Library +/* libmypaint - The MyPaint Brush Library * Copyright (C) 2008 Martin Renold * Copyright (C) 2012 Jon Nordby * diff --git a/mypaint-surface.h b/mypaint-surface.h index ca0db698..6ddc7956 100644 --- a/mypaint-surface.h +++ b/mypaint-surface.h @@ -1,7 +1,7 @@ #ifndef MYPAINTSURFACE_H #define MYPAINTSURFACE_H -/* brushlib - The MyPaint Brush Library +/* libmypaint - The MyPaint Brush Library * Copyright (C) 2008 Martin Renold * Copyright (C) 2012 Jon Nordby * diff --git a/mypaint-tiled-surface.c b/mypaint-tiled-surface.c index 1497c653..e4ae505a 100644 --- a/mypaint-tiled-surface.c +++ b/mypaint-tiled-surface.c @@ -1,4 +1,4 @@ -/* brushlib - The MyPaint Brush Library +/* libmypaint - The MyPaint Brush Library * Copyright (C) 2007-2014 Martin Renold et. al. * * Permission to use, copy, modify, and/or distribute this software for any diff --git a/operationqueue.c b/operationqueue.c index e43c3cb7..9f57fb71 100644 --- a/operationqueue.c +++ b/operationqueue.c @@ -1,4 +1,4 @@ -/* brushlib - The MyPaint Brush Library +/* libmypaint - The MyPaint Brush Library * Copyright (C) 2012 Jon Nordby * * Permission to use, copy, modify, and/or distribute this software for any diff --git a/tests/mypaint-benchmark.c b/tests/mypaint-benchmark.c index 44878f7f..73dbd389 100644 --- a/tests/mypaint-benchmark.c +++ b/tests/mypaint-benchmark.c @@ -1,4 +1,4 @@ -/* brushlib - The MyPaint Brush Library +/* libmypaint - The MyPaint Brush Library * Copyright (C) 2012 Jon Nordby * * Permission to use, copy, modify, and/or distribute this software for any diff --git a/tests/mypaint-benchmark.h b/tests/mypaint-benchmark.h index 17d66d15..ad6e7eba 100644 --- a/tests/mypaint-benchmark.h +++ b/tests/mypaint-benchmark.h @@ -1,7 +1,7 @@ #ifndef MYPAINTBENCHMARK_H #define MYPAINTBENCHMARK_H -/* brushlib - The MyPaint Brush Library +/* libmypaint - The MyPaint Brush Library * Copyright (C) 2012 Jon Nordby * * Permission to use, copy, modify, and/or distribute this software for any diff --git a/tests/mypaint-test-surface.c b/tests/mypaint-test-surface.c index 49d0874c..d91ca670 100644 --- a/tests/mypaint-test-surface.c +++ b/tests/mypaint-test-surface.c @@ -1,4 +1,4 @@ -/* brushlib - The MyPaint Brush Library +/* libmypaint - The MyPaint Brush Library * Copyright (C) 2012 Jon Nordby * * Permission to use, copy, modify, and/or distribute this software for any diff --git a/tests/mypaint-utils-stroke-player.c b/tests/mypaint-utils-stroke-player.c index 68b1149a..cb7b4400 100644 --- a/tests/mypaint-utils-stroke-player.c +++ b/tests/mypaint-utils-stroke-player.c @@ -1,4 +1,4 @@ -/* brushlib - The MyPaint Brush Library +/* libmypaint - The MyPaint Brush Library * Copyright (C) 2012 Jon Nordby * * Permission to use, copy, modify, and/or distribute this software for any diff --git a/tests/mypaint-utils-stroke-player.h b/tests/mypaint-utils-stroke-player.h index 98069dc1..3c964335 100644 --- a/tests/mypaint-utils-stroke-player.h +++ b/tests/mypaint-utils-stroke-player.h @@ -1,7 +1,7 @@ #ifndef MYPAINTUTILSSTROKEPLAYER_H #define MYPAINTUTILSSTROKEPLAYER_H -/* brushlib - The MyPaint Brush Library +/* libmypaint - The MyPaint Brush Library * Copyright (C) 2012 Jon Nordby * * Permission to use, copy, modify, and/or distribute this software for any diff --git a/tests/test_ctests.py b/tests/test_ctests.py index e2f15e97..6a43d77a 100644 --- a/tests/test_ctests.py +++ b/tests/test_ctests.py @@ -4,7 +4,7 @@ import os import ctests -"""Simple nosetest compatible test wrapper that runs the plain-C tests found in brushlib.""" +"""Nosetest compatible wrapper, runs the libmypaint plain-C tests.""" tests_dir = ctests.tests_dir @@ -13,8 +13,12 @@ def is_ctest(fn): return fn.startswith('test-') and not os.path.splitext(fn)[1] -def test_brushlib(): - c_tests = [os.path.abspath(os.path.join(tests_dir, fn)) for fn in os.listdir(tests_dir) if is_ctest(fn)] +def test_libmypaint(): + c_tests = [ + os.path.abspath(os.path.join(tests_dir, fn)) + for fn in os.listdir(tests_dir) + if is_ctest(fn) + ] for executable in c_tests: yield ctests.run_ctest, executable diff --git a/tilemap.c b/tilemap.c index 0d000754..42e22d90 100644 --- a/tilemap.c +++ b/tilemap.c @@ -1,4 +1,4 @@ -/* brushlib - The MyPaint Brush Library +/* libmypaint - The MyPaint Brush Library * Copyright (C) 2012 Jon Nordby * * Permission to use, copy, modify, and/or distribute this software for any diff --git a/tilemap.h b/tilemap.h index 244b3248..a5627674 100644 --- a/tilemap.h +++ b/tilemap.h @@ -1,4 +1,4 @@ -/* brushlib - The MyPaint Brush Library +/* libmypaint - The MyPaint Brush Library * Copyright (C) 2012 Jon Nordby * * Permission to use, copy, modify, and/or distribute this software for any