diff --git a/ChangeLog b/ChangeLog index 185c6ff932..eea7855943 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Sat Feb 26 04:37:44 CET 2000 Sven Neumann + + * libgimp/Makefile.am: excluded gserialize.[ch] from the build + + * libgimp/*: header cleanup + 2000-02-26 Michael Natterer * app/channels_dialog.c diff --git a/libgimp/Makefile.am b/libgimp/Makefile.am index 63ccd55bdd..c0bdc7011c 100644 --- a/libgimp/Makefile.am +++ b/libgimp/Makefile.am @@ -57,8 +57,6 @@ libgimpi_a_SOURCES = \ gimpwidgets.h \ gimpwire.c \ gimpwire.h \ - gserialize.c \ - gserialize.h \ parasite.c \ parasite.h \ parasiteF.h \ @@ -103,8 +101,6 @@ libgimp_la_SOURCES = \ gimpvector.h \ gimpwire.c \ gimpwire.h \ - gserialize.c \ - gserialize.h \ parasite.c \ parasite.h \ parasiteF.h \ @@ -162,7 +158,6 @@ gimpinclude_HEADERS = \ gimpvector.h \ gimpwidgets.h \ gimpintl.h \ - gserialize.h \ parasite.h \ parasiteF.h \ parasiteP.h \ diff --git a/libgimp/color_selector.h b/libgimp/color_selector.h index 9d187c3eef..8b7fc8b51c 100644 --- a/libgimp/color_selector.h +++ b/libgimp/color_selector.h @@ -1,5 +1,5 @@ -/* The GIMP -- an image manipulation program - * Copyright (C) 1995 Spencer Kimball and Peter Mattis +/* LIBGIMP - The GIMP Library + * Copyright (C) 1995-1997 Peter Mattis and Spencer Kimball * * Colour selector module (C) 1999 Austin Donnelly * diff --git a/libgimp/gimpchainbutton.c b/libgimp/gimpchainbutton.c index 0ec46318bc..308da8f64f 100644 --- a/libgimp/gimpchainbutton.c +++ b/libgimp/gimpchainbutton.c @@ -1,6 +1,9 @@ /* LIBGIMP - The GIMP Library * Copyright (C) 1995-1997 Peter Mattis and Spencer Kimball * + * gimpchainbutton.c + * Copyright (C) 1999-2000 Sven Neumann + * * This library 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 diff --git a/libgimp/gimpchainbutton.h b/libgimp/gimpchainbutton.h index b6f26559dc..004a265912 100644 --- a/libgimp/gimpchainbutton.h +++ b/libgimp/gimpchainbutton.h @@ -1,6 +1,9 @@ /* LIBGIMP - The GIMP Library * Copyright (C) 1995-1997 Peter Mattis and Spencer Kimball * + * gimpchainbutton.h + * Copyright (C) 1999-2000 Sven Neumann + * * This library 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 @@ -17,11 +20,12 @@ * Boston, MA 02111-1307, USA. */ -/* This implements a widget derived from gtk_button that visualizes - it's state with two different pixmaps showing a closed and a - broken chain. It's intented to be used with the gimpsizeentry - widget. The usage is quite similar to the one the gtk_toggle_button - provides. +/* + * This implements a widget derived from GtkTable that visualizes + * it's state with two different pixmaps showing a closed and a + * broken chain. It's intented to be used with the GimpSizeEntry + * widget. The usage is quite similar to the one the GtkToggleButton + * provides. */ #ifndef __GIMP_CHAIN_BUTTON_H__ @@ -56,7 +60,7 @@ typedef enum struct _GimpChainButton { - GtkTable table; + GtkTable table; GimpChainPosition position; GtkWidget *button; diff --git a/libgimp/gimpcolorbutton.c b/libgimp/gimpcolorbutton.c index 804a6b9421..2e56c6b8f2 100644 --- a/libgimp/gimpcolorbutton.c +++ b/libgimp/gimpcolorbutton.c @@ -1,7 +1,7 @@ /* LIBGIMP - The GIMP Library * Copyright (C) 1995-1997 Peter Mattis and Spencer Kimball * - * Gimp Color Button + * gimpcolorbutton.c * Copyright (C) 1999 Sven Neumann * * This library is free software; you can redistribute it and/or @@ -22,9 +22,10 @@ /* TODO: * - * handle bytes != 3|4 -- would we have to provide a special color select dialog - * for that case? Another possibility could be to hide or - * destroy all color-related widgets in the gtk colorselector. + * handle bytes != 3|4 -- would we have to provide a special color + * select dialog for that case? Another possibility + * could be to hide or destroy all color-related + * widgets in the gtk colorselector. */ #include "config.h" diff --git a/libgimp/gimpcolorbutton.h b/libgimp/gimpcolorbutton.h index bad41c364b..6c925b56d4 100644 --- a/libgimp/gimpcolorbutton.h +++ b/libgimp/gimpcolorbutton.h @@ -1,7 +1,7 @@ /* LIBGIMP - The GIMP Library * Copyright (C) 1995-1997 Peter Mattis and Spencer Kimball * - * Gimp Color Button + * gimpcolorbutton.h * Copyright (C) 1999 Sven Neumann * * This library is free software; you can redistribute it and/or diff --git a/libgimp/gimpcolorselector.h b/libgimp/gimpcolorselector.h index 9d187c3eef..8b7fc8b51c 100644 --- a/libgimp/gimpcolorselector.h +++ b/libgimp/gimpcolorselector.h @@ -1,5 +1,5 @@ -/* The GIMP -- an image manipulation program - * Copyright (C) 1995 Spencer Kimball and Peter Mattis +/* LIBGIMP - The GIMP Library + * Copyright (C) 1995-1997 Peter Mattis and Spencer Kimball * * Colour selector module (C) 1999 Austin Donnelly * diff --git a/libgimp/gimpcompat.h b/libgimp/gimpcompat.h index dbc09389b6..0cc83350c7 100644 --- a/libgimp/gimpcompat.h +++ b/libgimp/gimpcompat.h @@ -1,14 +1,14 @@ -/* - * Copyright (C) 1995-1997 Peter Mattis and Spencer Kimball +/* LIBGIMP - The GIMP Library + * Copyright (C) 1995-1997 Peter Mattis and Spencer Kimball * * This library 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 2 of the License, or (at your option) any later version. - * - * This library 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 + * version 2 of the License, or (at your option) any later version. + * + * This library 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 * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public @@ -47,16 +47,6 @@ extern "C" { #define gimp_image_freeze_undo gimp_image_undo_freeze #define gimp_image_thaw_undo gimp_image_undo_thaw -/* -#define gimp_get_data gimp_procedural_db_get_data -#define gimp_get_data_size gimp_procedural_db_get_data_size - -#define gimp_set_data(id, data, bytes) \ - (gimp_procedural_db_set_data (id, bytes, data)) - -#define gimp_query_images gimp_image_list -*/ - #endif /* GIMP_DISABLE_COMPAT_H */ #ifdef __cplusplus diff --git a/libgimp/gimpdialog.c b/libgimp/gimpdialog.c index 1db44f6283..e022558bd4 100644 --- a/libgimp/gimpdialog.c +++ b/libgimp/gimpdialog.c @@ -1,4 +1,4 @@ -/* LIBGIMP - The GIMP Library +/* LIBGIMP - The GIMP Library * Copyright (C) 1995 Spencer Kimball and Peter Mattis * * gimpdialog.c @@ -7,11 +7,11 @@ * This library 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 2 of the License, or (at your option) any later version. - * - * This library 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 + * version 2 of the License, or (at your option) any later version. + * + * This library 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 * Library General Public License for more details. * * You should have received a copy of the GNU Lesser General Public diff --git a/libgimp/gimpdialog.h b/libgimp/gimpdialog.h index fd68702f84..f8297caa5a 100644 --- a/libgimp/gimpdialog.h +++ b/libgimp/gimpdialog.h @@ -1,4 +1,4 @@ -/* LIBGIMP - The GIMP Library +/* LIBGIMP - The GIMP Library * Copyright (C) 1995 Spencer Kimball and Peter Mattis * * gimpdialog.h @@ -7,11 +7,11 @@ * This library 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 2 of the License, or (at your option) any later version. - * - * This library 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 + * version 2 of the License, or (at your option) any later version. + * + * This library 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 * Library General Public License for more details. * * You should have received a copy of the GNU Lesser General Public @@ -27,6 +27,10 @@ #include "gimphelpui.h" #include "gimpunit.h" +#ifdef __cplusplus +extern "C" { +#endif /* __cplusplus */ + GtkWidget * gimp_dialog_new (const gchar *title, const gchar *wmclass_name, GimpHelpFunc help_func, @@ -79,4 +83,24 @@ void gimp_dialog_create_action_area (GtkDialog *dialog, void gimp_dialog_create_action_areav (GtkDialog *dialog, va_list args); +#ifdef __cplusplus +} +#endif /* __cplusplus */ + #endif /* __GIMP_DIALOG_H__ */ + + + + + + + + + + + + + + + + diff --git a/libgimp/gimpenv.h b/libgimp/gimpenv.h index a59cee74e3..d40db14ab1 100644 --- a/libgimp/gimpenv.h +++ b/libgimp/gimpenv.h @@ -1,4 +1,7 @@ -/* gimpenv.h +/* LIBGIMP - The GIMP Library + * Copyright (C) 1995-1997 Peter Mattis and Spencer Kimball + * + * gimpenv.h * * Copyright (C) 1999 Tor Lillqvist * diff --git a/libgimp/gimpexport.c b/libgimp/gimpexport.c index 7afe7dafe3..5fae70cb75 100644 --- a/libgimp/gimpexport.c +++ b/libgimp/gimpexport.c @@ -1,6 +1,9 @@ /* LIBGIMP - The GIMP Library * Copyright (C) 1995-1997 Peter Mattis and Spencer Kimball * + * gimpexport.c + * Copyright (C) 1999-2000 Sven Neumann + * * This library 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 diff --git a/libgimp/gimpexport.h b/libgimp/gimpexport.h index 4cde44a396..4062bb95de 100644 --- a/libgimp/gimpexport.h +++ b/libgimp/gimpexport.h @@ -1,6 +1,9 @@ /* LIBGIMP - The GIMP Library * Copyright (C) 1995-1999 Peter Mattis and Spencer Kimball * + * gimpexport.h + * Copyright (C) 1999-2000 Sven Neumann + * * This library 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 diff --git a/libgimp/gimpfileselection.c b/libgimp/gimpfileselection.c index 8eb0eea18b..7d24f24055 100644 --- a/libgimp/gimpfileselection.c +++ b/libgimp/gimpfileselection.c @@ -1,5 +1,5 @@ /* LIBGIMP - The GIMP Library - * Copyright (C) 1995-1997 Peter Mattis and Spencer Kimball + * Copyright (C) 1995-1997 Peter Mattis and Spencer Kimball * * gimpfileselection.c * Copyright (C) 1999 Michael Natterer @@ -11,7 +11,7 @@ * * This library 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 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Library General Public License for more details. * * You should have received a copy of the GNU Lesser General Public @@ -21,7 +21,7 @@ */ #include "config.h" -#include /* Needed here by Win32 gcc compilation */ +#include /* Needed here by Win32 gcc compilation */ #include #include diff --git a/libgimp/gimpfileselection.h b/libgimp/gimpfileselection.h index a73c6e53a6..631c453c7e 100644 --- a/libgimp/gimpfileselection.h +++ b/libgimp/gimpfileselection.h @@ -1,4 +1,4 @@ -/* LIBGIMP - The GIMP Library +/* LIBGIMP - The GIMP Library * Copyright (C) 1995-1997 Peter Mattis and Spencer Kimball * * gimpfileselection.h @@ -7,11 +7,11 @@ * This library 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 2 of the License, or (at your option) any later version. - * - * This library 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 + * version 2 of the License, or (at your option) any later version. + * + * This library 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 * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public diff --git a/libgimp/gimphelpui.c b/libgimp/gimphelpui.c index 485088d5dc..40bc077a0b 100644 --- a/libgimp/gimphelpui.c +++ b/libgimp/gimphelpui.c @@ -1,4 +1,4 @@ -/* LIBGIMP - The GIMP Library +/* LIBGIMP - The GIMP Library * Copyright (C) 1995 Spencer Kimball and Peter Mattis * * gimphelpui.c @@ -7,11 +7,11 @@ * This library 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 2 of the License, or (at your option) any later version. - * - * This library 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 + * version 2 of the License, or (at your option) any later version. + * + * This library 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 * Library General Public License for more details. * * You should have received a copy of the GNU Lesser General Public diff --git a/libgimp/gimphelpui.h b/libgimp/gimphelpui.h index 490cd903fd..132501b8af 100644 --- a/libgimp/gimphelpui.h +++ b/libgimp/gimphelpui.h @@ -1,4 +1,4 @@ -/* LIBGIMP - The GIMP Library +/* LIBGIMP - The GIMP Library * Copyright (C) 1995 Spencer Kimball and Peter Mattis * * gimphelpui.h @@ -7,11 +7,11 @@ * This library 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 2 of the License, or (at your option) any later version. - * - * This library 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 + * version 2 of the License, or (at your option) any later version. + * + * This library 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 * Library General Public License for more details. * * You should have received a copy of the GNU Lesser General Public @@ -24,8 +24,11 @@ #include -typedef void (* GimpHelpFunc) (gchar *help_data); +#ifdef __cplusplus +extern "C" { +#endif /* __cplusplus */ +typedef void (* GimpHelpFunc) (gchar *help_data); void gimp_help_init (void); void gimp_help_free (void); @@ -49,4 +52,13 @@ void gimp_help_set_help_data (GtkWidget *widget, /* activate the context help inspector */ void gimp_context_help (void); +#ifdef __cplusplus +} +#endif /* __cplusplus */ + #endif /* __GIMP_HELP_UI_H__ */ + + + + + diff --git a/libgimp/gimpmath.h b/libgimp/gimpmath.h index d64f3b4ed6..5c980f3dcc 100644 --- a/libgimp/gimpmath.h +++ b/libgimp/gimpmath.h @@ -1,4 +1,7 @@ -/* gimpmath.h +/* LIBGIMP - The GIMP Library + * Copyright (C) 1995-1997 Peter Mattis and Spencer Kimball + * + * gimpmath.h * * Copyright (C) 1995-1997 Peter Mattis and Spencer Kimball * diff --git a/libgimp/gimpmatrix.c b/libgimp/gimpmatrix.c index b7389c9f1f..530b741a9d 100644 --- a/libgimp/gimpmatrix.c +++ b/libgimp/gimpmatrix.c @@ -1,4 +1,7 @@ -/* gimpmatrix.c +/* LIBGIMP - The GIMP Library + * Copyright (C) 1995-1997 Peter Mattis and Spencer Kimball + * + * gimpmatrix.c * Copyright (C) 1998 Jay Cox * * This library is free software; you can redistribute it and/or diff --git a/libgimp/gimpmatrix.h b/libgimp/gimpmatrix.h index dcf07e4c26..f1315156ed 100644 --- a/libgimp/gimpmatrix.h +++ b/libgimp/gimpmatrix.h @@ -1,4 +1,7 @@ -/* gimpmatrix.h +/* LIBGIMP - The GIMP Library + * Copyright (C) 1995-1997 Peter Mattis and Spencer Kimball + * + * gimpmatrix.h * Copyright (C) 1998 Jay Cox * * This library is free software; you can redistribute it and/or diff --git a/libgimp/gimpmenu.h b/libgimp/gimpmenu.h index 7b47a3fa2c..2f7583b7b9 100644 --- a/libgimp/gimpmenu.h +++ b/libgimp/gimpmenu.h @@ -1,21 +1,21 @@ -/* LIBGIMP - The GIMP Library - * Copyright (C) 1995-1997 Peter Mattis and Spencer Kimball +/* LIBGIMP - The GIMP Library + * Copyright (C) 1995-1997 Peter Mattis and Spencer Kimball * * This library 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 2 of the License, or (at your option) any later version. - * - * This library 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 + * version 2 of the License, or (at your option) any later version. + * + * This library 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 * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the * Free Software Foundation, Inc., 59 Temple Place - Suite 330, * Boston, MA 02111-1307, USA. - */ + */ #ifndef __GIMP_MENU_H__ #define __GIMP_MENU_H__ diff --git a/libgimp/gimpmodule.h b/libgimp/gimpmodule.h index 0992fc5194..65c1d01687 100644 --- a/libgimp/gimpmodule.h +++ b/libgimp/gimpmodule.h @@ -1,5 +1,5 @@ -/* The GIMP -- an image manipulation program - * Copyright (C) 1995 Spencer Kimball and Peter Mattis +/* LIBGIMP - The GIMP Library + * Copyright (C) 1995-1997 Peter Mattis and Spencer Kimball * * gimpmodule.h (C) 1999 Austin Donnelly * diff --git a/libgimp/gimpparasite.c b/libgimp/gimpparasite.c index 5789728720..f5c4314548 100644 --- a/libgimp/gimpparasite.c +++ b/libgimp/gimpparasite.c @@ -1,4 +1,7 @@ -/* parasite.c +/* LIBGIMP - The GIMP Library + * Copyright (C) 1995-1997 Peter Mattis and Spencer Kimball + * + * parasite.c * Copyright (C) 1998 Jay Cox * * This library is free software; you can redistribute it and/or diff --git a/libgimp/gimpparasite.h b/libgimp/gimpparasite.h index 68faf5428d..df8e7c8390 100644 --- a/libgimp/gimpparasite.h +++ b/libgimp/gimpparasite.h @@ -1,4 +1,7 @@ -/* parasite.h +/* LIBGIMP - The GIMP Library + * Copyright (C) 1995-1997 Peter Mattis and Spencer Kimball + * + * parasite.h * Copyright (C) 1998 Jay Cox * * This library is free software; you can redistribute it and/or @@ -17,8 +20,8 @@ * Boston, MA 02111-1307, USA. */ -#ifndef _PARASITE_H_ -#define _PARASITE_H_ +#ifndef __PARASITE_H__ +#define __PARASITE_H__ #include #include @@ -68,4 +71,4 @@ glong parasite_data_size (const Parasite *p); } #endif /* __cplusplus */ -#endif /* _PARASITE_H_ */ +#endif /* __PARASITE_H__ */ diff --git a/libgimp/gimpparasiteF.h b/libgimp/gimpparasiteF.h index 8caaa05b8f..fa4cc84aa7 100644 --- a/libgimp/gimpparasiteF.h +++ b/libgimp/gimpparasiteF.h @@ -1,4 +1,7 @@ -/* parasiteF.h +/* LIBGIMP - The GIMP Library + * Copyright (C) 1995-1997 Peter Mattis and Spencer Kimball + * + * parasiteF.h * Copyright (C) 1998 Jay Cox * * This library is free software; you can redistribute it and/or @@ -17,9 +20,9 @@ * Boston, MA 02111-1307, USA. */ -#ifndef _PARASITEF_H_ -#define _PARASITEF_H_ +#ifndef __PARASITEF_H__ +#define __PARASITEF_H__ typedef struct _Parasite Parasite; -#endif /* _PARASITEF_H_ */ +#endif /* __PARASITEF_H__ */ diff --git a/libgimp/gimpparasiteP.h b/libgimp/gimpparasiteP.h index d2f90519b0..c33a893d35 100644 --- a/libgimp/gimpparasiteP.h +++ b/libgimp/gimpparasiteP.h @@ -1,4 +1,7 @@ -/* parasiteP.h +/* LIBGIMP - The GIMP Library + * Copyright (C) 1995-1997 Peter Mattis and Spencer Kimball + * + * parasiteP.h * Copyright (C) 1998 Jay Cox * * This library is free software; you can redistribute it and/or @@ -17,11 +20,15 @@ * Boston, MA 02111-1307, USA. */ -#ifndef _PARASITEP_H_ -#define _PARASITEP_H_ +#ifndef __PARASITEP_H__ +#define __PARASITEP_H__ #include +#ifdef __cplusplus +extern "C" { +#endif /* __cplusplus */ + struct _Parasite { char *name; /* The name of the parasite. USE A UNIQUE PREFIX! */ @@ -31,4 +38,8 @@ struct _Parasite * responsible for tracking byte order */ }; -#endif /* _PARASITEP_H_ */ +#ifdef __cplusplus +} +#endif /* __cplusplus */ + +#endif /* __PARASITEP_H__ */ diff --git a/libgimp/gimpparasite_pdb.c b/libgimp/gimpparasite_pdb.c index 031d01dca8..3f8f9b1c9e 100644 --- a/libgimp/gimpparasite_pdb.c +++ b/libgimp/gimpparasite_pdb.c @@ -1,3 +1,24 @@ +/* LIBGIMP - The GIMP Library + * Copyright (C) 1995-1997 Peter Mattis and Spencer Kimball + * + * parasite.c + * Copyright (C) 1998 Jay Cox + * + * This library 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 2 of the License, or (at your option) any later version. + * + * This library 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 + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the + * Free Software Foundation, Inc., 59 Temple Place - Suite 330, + * Boston, MA 02111-1307, USA. + */ #include "gimp.h" Parasite * diff --git a/libgimp/gimpparasiteio.c b/libgimp/gimpparasiteio.c index c59426c537..ad2ad61548 100644 --- a/libgimp/gimpparasiteio.c +++ b/libgimp/gimpparasiteio.c @@ -1,5 +1,5 @@ -/* Functions for bulding and parsing string representations of - * various standard parasite types. +/* LIBGIMP - The GIMP Library + * Copyright (C) 1995-1997 Peter Mattis and Spencer Kimball * * Copyright (C) 1999 Tor Lillqvist * @@ -19,6 +19,11 @@ * Boston, MA 02111-1307, USA. */ +/* + * Functions for bulding and parsing string representations of + * various standard parasite types. + */ + #include "config.h" #include diff --git a/libgimp/gimpparasiteio.h b/libgimp/gimpparasiteio.h index a7ef1c8526..a4cab1a13c 100644 --- a/libgimp/gimpparasiteio.h +++ b/libgimp/gimpparasiteio.h @@ -1,4 +1,7 @@ -/* parasite.h +/* LIBGIMP - The GIMP Library + * Copyright (C) 1995-1997 Peter Mattis and Spencer Kimball + * + * parasiteio.h * Copyright (C) 1999 Tor Lillqvist * * This library is free software; you can redistribute it and/or @@ -17,8 +20,12 @@ * Boston, MA 02111-1307, USA. */ -#ifndef _PARASITEIO_H_ -#define _PARASITEIO_H_ +#ifndef __PARASITEIO_H__ +#define __PARASITEIO_H__ + +#ifdef __cplusplus +extern "C" { +#endif /* __cplusplus */ /* Data structures for various standard parasites used by plug-ins and * the GIMP core, and functions to build and parse their string @@ -61,4 +68,4 @@ gchar *pixpipeparams_build (PixPipeParams *params); } #endif /* __cplusplus */ -#endif /* _PARASITEIO_H_ */ +#endif /* __PARASITEIO_H__ */ diff --git a/libgimp/gimppatheditor.c b/libgimp/gimppatheditor.c index a065095a7d..ce4902760b 100644 --- a/libgimp/gimppatheditor.c +++ b/libgimp/gimppatheditor.c @@ -1,5 +1,5 @@ /* LIBGIMP - The GIMP Library - * Copyright (C) 1995-1997 Peter Mattis and Spencer Kimball + * Copyright (C) 1995-1997 Peter Mattis and Spencer Kimball * * gimppatheditor.c * Copyright (C) 1999 Michael Natterer diff --git a/libgimp/gimppatheditor.h b/libgimp/gimppatheditor.h index 592c30af38..304b5bd5d6 100644 --- a/libgimp/gimppatheditor.h +++ b/libgimp/gimppatheditor.h @@ -1,5 +1,5 @@ -/* LIBGIMP - The GIMP Library - * Copyright (C) 1995-1997 Peter Mattis and Spencer Kimball +/* LIBGIMP - The GIMP Library + * Copyright (C) 1995-1997 Peter Mattis and Spencer Kimball * * gimppatheditor.h * Copyright (C) 1999 Michael Natterer @@ -7,11 +7,11 @@ * This library 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 2 of the License, or (at your option) any later version. - * - * This library 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 + * version 2 of the License, or (at your option) any later version. + * + * This library 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 * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public diff --git a/libgimp/gimppixmap.c b/libgimp/gimppixmap.c index faa33db5df..8296a5e09f 100644 --- a/libgimp/gimppixmap.c +++ b/libgimp/gimppixmap.c @@ -1,5 +1,5 @@ -/* LIBGIMP - The GIMP Library - * Copyright (C) 1995-1997 Peter Mattis and Spencer Kimball +/* LIBGIMP - The GIMP Library + * Copyright (C) 1995-1997 Peter Mattis and Spencer Kimball * * gimppixmap.c * Copyright (C) 2000 Michael Natterer @@ -7,11 +7,11 @@ * This library 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 2 of the License, or (at your option) any later version. - * - * This library 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 + * version 2 of the License, or (at your option) any later version. + * + * This library 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 * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public diff --git a/libgimp/gimppixmap.h b/libgimp/gimppixmap.h index 3ffdfce9e5..eec51604bb 100644 --- a/libgimp/gimppixmap.h +++ b/libgimp/gimppixmap.h @@ -1,5 +1,5 @@ -/* LIBGIMP - The GIMP Library - * Copyright (C) 1995-1997 Peter Mattis and Spencer Kimball +/* LIBGIMP - The GIMP Library + * Copyright (C) 1995-1997 Peter Mattis and Spencer Kimball * * gimppixmap.h * Copyright (C) 2000 Michael Natterer @@ -7,11 +7,11 @@ * This library 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 2 of the License, or (at your option) any later version. - * - * This library 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 + * version 2 of the License, or (at your option) any later version. + * + * This library 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 * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public diff --git a/libgimp/gimpquerybox.c b/libgimp/gimpquerybox.c index 99544548af..5dc1656a2e 100644 --- a/libgimp/gimpquerybox.c +++ b/libgimp/gimpquerybox.c @@ -1,21 +1,24 @@ -/* LIBGIMP - The GIMP Library - * Copyright (C) 1995-1997 Peter Mattis and Spencer Kimball +/* LIBGIMP - The GIMP Library + * Copyright (C) 1995-1997 Peter Mattis and Spencer Kimball + * + * gimpquerybox.c + * Copyright (C) 1999-2000 Michael Natterer * * This library 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 2 of the License, or (at your option) any later version. - * - * This library 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 + * version 2 of the License, or (at your option) any later version. + * + * This library 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 * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the * Free Software Foundation, Inc., 59 Temple Place - Suite 330, * Boston, MA 02111-1307, USA. - */ + */ #include "gimpquerybox.h" diff --git a/libgimp/gimpquerybox.h b/libgimp/gimpquerybox.h index 0f80b3d664..cba746350f 100644 --- a/libgimp/gimpquerybox.h +++ b/libgimp/gimpquerybox.h @@ -1,21 +1,24 @@ -/* LIBGIMP - The GIMP Library - * Copyright (C) 1995-1997 Peter Mattis and Spencer Kimball +/* LIBGIMP - The GIMP Library + * Copyright (C) 1995-1997 Peter Mattis and Spencer Kimball * + * gimpquerybox.h + * Copyright (C) 1999-2000 Michael Natterer + * * This library 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 2 of the License, or (at your option) any later version. - * - * This library 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 + * version 2 of the License, or (at your option) any later version. + * + * This library 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 * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the * Free Software Foundation, Inc., 59 Temple Place - Suite 330, * Boston, MA 02111-1307, USA. - */ + */ #ifndef __GIMP_QUERY_BOX_H__ #define __GIMP_QUERY_BOX_H__ diff --git a/libgimp/gimpsizeentry.c b/libgimp/gimpsizeentry.c index 5bf8e553a5..3cdebc946f 100644 --- a/libgimp/gimpsizeentry.c +++ b/libgimp/gimpsizeentry.c @@ -1,6 +1,10 @@ /* LIBGIMP - The GIMP Library * Copyright (C) 1995-1997 Peter Mattis and Spencer Kimball * + * gimpsizeentry.c + * Copyright (C) 1999-2000 Sven Neumann + * Michael Natterer + * * This library 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 diff --git a/libgimp/gimpsizeentry.h b/libgimp/gimpsizeentry.h index 7313508e19..bbf86c4972 100644 --- a/libgimp/gimpsizeentry.h +++ b/libgimp/gimpsizeentry.h @@ -1,14 +1,18 @@ -/* LIBGIMP - The GIMP Library - * Copyright (C) 1995-1997 Peter Mattis and Spencer Kimball +/* LIBGIMP - The GIMP Library + * Copyright (C) 1995-1997 Peter Mattis and Spencer Kimball + * + * gimpsizeentry.h + * Copyright (C) 1999-2000 Sven Neumann + * Michael Natterer * * This library 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 2 of the License, or (at your option) any later version. - * - * This library 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 + * version 2 of the License, or (at your option) any later version. + * + * This library 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 * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public diff --git a/libgimp/gimpui.h b/libgimp/gimpui.h index dc46bd3232..2eefc6a6fa 100644 --- a/libgimp/gimpui.h +++ b/libgimp/gimpui.h @@ -1,21 +1,21 @@ -/* LIBGIMP - The GIMP Library - * Copyright (C) 1995-1997 Peter Mattis and Spencer Kimball +/* LIBGIMP - The GIMP Library + * Copyright (C) 1995-1997 Peter Mattis and Spencer Kimball * * This library 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 2 of the License, or (at your option) any later version. - * - * This library 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 + * version 2 of the License, or (at your option) any later version. + * + * This library 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 * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the * Free Software Foundation, Inc., 59 Temple Place - Suite 330, * Boston, MA 02111-1307, USA. - */ + */ #ifndef __GIMP_UI_H__ #define __GIMP_UI_H__ diff --git a/libgimp/gimpunit.c b/libgimp/gimpunit.c index bd942a659b..c0816cd1a6 100644 --- a/libgimp/gimpunit.c +++ b/libgimp/gimpunit.c @@ -1,8 +1,8 @@ -/* LIBGIMP - The GIMP Library - * Copyright (C) 1995-1997 Peter Mattis and Spencer Kimball +/* LIBGIMP - The GIMP Library + * Copyright (C) 1995-1997 Peter Mattis and Spencer Kimball * * gimpunit.c - * Copyright (C) 1999 Michael Natterer + * Copyright (C) 1999 Michael Natterer * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/libgimp/gimpunit.h b/libgimp/gimpunit.h index 73ce4ee59b..0cc0d97eef 100644 --- a/libgimp/gimpunit.h +++ b/libgimp/gimpunit.h @@ -1,5 +1,5 @@ -/* LIBGIMP - The GIMP Library - * Copyright (C) 1995-1997 Peter Mattis and Spencer Kimball +/* LIBGIMP - The GIMP Library + * Copyright (C) 1995-1997 Peter Mattis and Spencer Kimball * * gimpunit.h * Copyright (C) 1999 Michael Natterer diff --git a/libgimp/gimpunit_pdb.c b/libgimp/gimpunit_pdb.c index bd942a659b..c0816cd1a6 100644 --- a/libgimp/gimpunit_pdb.c +++ b/libgimp/gimpunit_pdb.c @@ -1,8 +1,8 @@ -/* LIBGIMP - The GIMP Library - * Copyright (C) 1995-1997 Peter Mattis and Spencer Kimball +/* LIBGIMP - The GIMP Library + * Copyright (C) 1995-1997 Peter Mattis and Spencer Kimball * * gimpunit.c - * Copyright (C) 1999 Michael Natterer + * Copyright (C) 1999 Michael Natterer * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/libgimp/gimpunitcache.c b/libgimp/gimpunitcache.c index bd942a659b..c0816cd1a6 100644 --- a/libgimp/gimpunitcache.c +++ b/libgimp/gimpunitcache.c @@ -1,8 +1,8 @@ -/* LIBGIMP - The GIMP Library - * Copyright (C) 1995-1997 Peter Mattis and Spencer Kimball +/* LIBGIMP - The GIMP Library + * Copyright (C) 1995-1997 Peter Mattis and Spencer Kimball * * gimpunit.c - * Copyright (C) 1999 Michael Natterer + * Copyright (C) 1999 Michael Natterer * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/libgimp/gimpunitmenu.c b/libgimp/gimpunitmenu.c index d18ca32af6..d4bf64cf33 100644 --- a/libgimp/gimpunitmenu.c +++ b/libgimp/gimpunitmenu.c @@ -1,5 +1,5 @@ -/* LIBGIMP - The GIMP Library - * Copyright (C) 1995-1999 Peter Mattis and Spencer Kimball +/* LIBGIMP - The GIMP Library + * Copyright (C) 1995-1999 Peter Mattis and Spencer Kimball * * gimpunitmenu.c * Copyright (C) 1999 Michael Natterer @@ -7,11 +7,11 @@ * This library 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 2 of the License, or (at your option) any later version. - * - * This library 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 + * version 2 of the License, or (at your option) any later version. + * + * This library 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 * Library General Public License for more details. * * You should have received a copy of the GNU Lesser General Public diff --git a/libgimp/gimpunitmenu.h b/libgimp/gimpunitmenu.h index 935c952408..3875c82e83 100644 --- a/libgimp/gimpunitmenu.h +++ b/libgimp/gimpunitmenu.h @@ -1,17 +1,17 @@ -/* LIBGIMP - The GIMP Library - * Copyright (C) 1995-1997 Peter Mattis and Spencer Kimball +/* LIBGIMP - The GIMP Library + * Copyright (C) 1995-1997 Peter Mattis and Spencer Kimball * * gimpunitmenu.h - * Copyright (C) 1999 Michael Natterer + * Copyright (C) 1999 Michael Natterer * * This library 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 2 of the License, or (at your option) any later version. - * - * This library 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 + * version 2 of the License, or (at your option) any later version + * + * This library 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 * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public diff --git a/libgimp/gimpwidgets.c b/libgimp/gimpwidgets.c index 90113bf453..529c4875df 100644 --- a/libgimp/gimpwidgets.c +++ b/libgimp/gimpwidgets.c @@ -1,5 +1,5 @@ -/* LIBGIMP - The GIMP Library - * Copyright (C) 1995-1999 Peter Mattis and Spencer Kimball +/* LIBGIMP - The GIMP Library + * Copyright (C) 1995-1999 Peter Mattis and Spencer Kimball * * gimpwidgets.c * Copyright (C) 2000 Michael Natterer @@ -7,11 +7,11 @@ * This library 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 2 of the License, or (at your option) any later version. - * - * This library 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 + * version 2 of the License, or (at your option) any later version. + * + * This library 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 * Library General Public License for more details. * * You should have received a copy of the GNU Lesser General Public diff --git a/libgimp/gimpwidgets.h b/libgimp/gimpwidgets.h index fbedec8980..1a81bdda82 100644 --- a/libgimp/gimpwidgets.h +++ b/libgimp/gimpwidgets.h @@ -1,5 +1,5 @@ -/* LIBGIMP - The GIMP Library - * Copyright (C) 1995-1997 Peter Mattis and Spencer Kimball +/* LIBGIMP - The GIMP Library + * Copyright (C) 1995-1997 Peter Mattis and Spencer Kimball * * gimpwidgets.h * Copyright (C) 2000 Michael Natterer @@ -7,11 +7,11 @@ * This library 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 2 of the License, or (at your option) any later version. - * - * This library 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 + * version 2 of the License, or (at your option) any later version. + * + * This library 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 * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public diff --git a/libgimp/parasite.c b/libgimp/parasite.c index 5789728720..f5c4314548 100644 --- a/libgimp/parasite.c +++ b/libgimp/parasite.c @@ -1,4 +1,7 @@ -/* parasite.c +/* LIBGIMP - The GIMP Library + * Copyright (C) 1995-1997 Peter Mattis and Spencer Kimball + * + * parasite.c * Copyright (C) 1998 Jay Cox * * This library is free software; you can redistribute it and/or diff --git a/libgimp/parasite.h b/libgimp/parasite.h index 68faf5428d..df8e7c8390 100644 --- a/libgimp/parasite.h +++ b/libgimp/parasite.h @@ -1,4 +1,7 @@ -/* parasite.h +/* LIBGIMP - The GIMP Library + * Copyright (C) 1995-1997 Peter Mattis and Spencer Kimball + * + * parasite.h * Copyright (C) 1998 Jay Cox * * This library is free software; you can redistribute it and/or @@ -17,8 +20,8 @@ * Boston, MA 02111-1307, USA. */ -#ifndef _PARASITE_H_ -#define _PARASITE_H_ +#ifndef __PARASITE_H__ +#define __PARASITE_H__ #include #include @@ -68,4 +71,4 @@ glong parasite_data_size (const Parasite *p); } #endif /* __cplusplus */ -#endif /* _PARASITE_H_ */ +#endif /* __PARASITE_H__ */ diff --git a/libgimp/parasiteF.h b/libgimp/parasiteF.h index 8caaa05b8f..fa4cc84aa7 100644 --- a/libgimp/parasiteF.h +++ b/libgimp/parasiteF.h @@ -1,4 +1,7 @@ -/* parasiteF.h +/* LIBGIMP - The GIMP Library + * Copyright (C) 1995-1997 Peter Mattis and Spencer Kimball + * + * parasiteF.h * Copyright (C) 1998 Jay Cox * * This library is free software; you can redistribute it and/or @@ -17,9 +20,9 @@ * Boston, MA 02111-1307, USA. */ -#ifndef _PARASITEF_H_ -#define _PARASITEF_H_ +#ifndef __PARASITEF_H__ +#define __PARASITEF_H__ typedef struct _Parasite Parasite; -#endif /* _PARASITEF_H_ */ +#endif /* __PARASITEF_H__ */ diff --git a/libgimp/parasiteP.h b/libgimp/parasiteP.h index d2f90519b0..c33a893d35 100644 --- a/libgimp/parasiteP.h +++ b/libgimp/parasiteP.h @@ -1,4 +1,7 @@ -/* parasiteP.h +/* LIBGIMP - The GIMP Library + * Copyright (C) 1995-1997 Peter Mattis and Spencer Kimball + * + * parasiteP.h * Copyright (C) 1998 Jay Cox * * This library is free software; you can redistribute it and/or @@ -17,11 +20,15 @@ * Boston, MA 02111-1307, USA. */ -#ifndef _PARASITEP_H_ -#define _PARASITEP_H_ +#ifndef __PARASITEP_H__ +#define __PARASITEP_H__ #include +#ifdef __cplusplus +extern "C" { +#endif /* __cplusplus */ + struct _Parasite { char *name; /* The name of the parasite. USE A UNIQUE PREFIX! */ @@ -31,4 +38,8 @@ struct _Parasite * responsible for tracking byte order */ }; -#endif /* _PARASITEP_H_ */ +#ifdef __cplusplus +} +#endif /* __cplusplus */ + +#endif /* __PARASITEP_H__ */ diff --git a/libgimp/parasiteio.c b/libgimp/parasiteio.c index c59426c537..ad2ad61548 100644 --- a/libgimp/parasiteio.c +++ b/libgimp/parasiteio.c @@ -1,5 +1,5 @@ -/* Functions for bulding and parsing string representations of - * various standard parasite types. +/* LIBGIMP - The GIMP Library + * Copyright (C) 1995-1997 Peter Mattis and Spencer Kimball * * Copyright (C) 1999 Tor Lillqvist * @@ -19,6 +19,11 @@ * Boston, MA 02111-1307, USA. */ +/* + * Functions for bulding and parsing string representations of + * various standard parasite types. + */ + #include "config.h" #include diff --git a/libgimp/parasiteio.h b/libgimp/parasiteio.h index a7ef1c8526..a4cab1a13c 100644 --- a/libgimp/parasiteio.h +++ b/libgimp/parasiteio.h @@ -1,4 +1,7 @@ -/* parasite.h +/* LIBGIMP - The GIMP Library + * Copyright (C) 1995-1997 Peter Mattis and Spencer Kimball + * + * parasiteio.h * Copyright (C) 1999 Tor Lillqvist * * This library is free software; you can redistribute it and/or @@ -17,8 +20,12 @@ * Boston, MA 02111-1307, USA. */ -#ifndef _PARASITEIO_H_ -#define _PARASITEIO_H_ +#ifndef __PARASITEIO_H__ +#define __PARASITEIO_H__ + +#ifdef __cplusplus +extern "C" { +#endif /* __cplusplus */ /* Data structures for various standard parasites used by plug-ins and * the GIMP core, and functions to build and parse their string @@ -61,4 +68,4 @@ gchar *pixpipeparams_build (PixPipeParams *params); } #endif /* __cplusplus */ -#endif /* _PARASITEIO_H_ */ +#endif /* __PARASITEIO_H__ */ diff --git a/libgimp/stdplugins-intl.h b/libgimp/stdplugins-intl.h index 167270162d..57fb9317b4 100644 --- a/libgimp/stdplugins-intl.h +++ b/libgimp/stdplugins-intl.h @@ -1,16 +1,16 @@ -/* LIBGIMP - The GIMP Library - * Copyright (C) 1995-1997 Peter Mattis and Spencer Kimball +/* LIBGIMP - The GIMP Library + * Copyright (C) 1995-1997 Peter Mattis and Spencer Kimball * - * libgimp-intl.h + * stdplugins-intl.h * * This library 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 2 of the License, or (at your option) any later version. - * - * This library 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 + * version 2 of the License, or (at your option) any later version. + * + * This library 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 * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public diff --git a/libgimpbase/gimpenv.h b/libgimpbase/gimpenv.h index a59cee74e3..d40db14ab1 100644 --- a/libgimpbase/gimpenv.h +++ b/libgimpbase/gimpenv.h @@ -1,4 +1,7 @@ -/* gimpenv.h +/* LIBGIMP - The GIMP Library + * Copyright (C) 1995-1997 Peter Mattis and Spencer Kimball + * + * gimpenv.h * * Copyright (C) 1999 Tor Lillqvist * diff --git a/libgimpbase/gimpparasite.c b/libgimpbase/gimpparasite.c index 5789728720..f5c4314548 100644 --- a/libgimpbase/gimpparasite.c +++ b/libgimpbase/gimpparasite.c @@ -1,4 +1,7 @@ -/* parasite.c +/* LIBGIMP - The GIMP Library + * Copyright (C) 1995-1997 Peter Mattis and Spencer Kimball + * + * parasite.c * Copyright (C) 1998 Jay Cox * * This library is free software; you can redistribute it and/or diff --git a/libgimpbase/gimpparasite.h b/libgimpbase/gimpparasite.h index 68faf5428d..df8e7c8390 100644 --- a/libgimpbase/gimpparasite.h +++ b/libgimpbase/gimpparasite.h @@ -1,4 +1,7 @@ -/* parasite.h +/* LIBGIMP - The GIMP Library + * Copyright (C) 1995-1997 Peter Mattis and Spencer Kimball + * + * parasite.h * Copyright (C) 1998 Jay Cox * * This library is free software; you can redistribute it and/or @@ -17,8 +20,8 @@ * Boston, MA 02111-1307, USA. */ -#ifndef _PARASITE_H_ -#define _PARASITE_H_ +#ifndef __PARASITE_H__ +#define __PARASITE_H__ #include #include @@ -68,4 +71,4 @@ glong parasite_data_size (const Parasite *p); } #endif /* __cplusplus */ -#endif /* _PARASITE_H_ */ +#endif /* __PARASITE_H__ */ diff --git a/libgimpbase/gimpparasiteio.c b/libgimpbase/gimpparasiteio.c index c59426c537..ad2ad61548 100644 --- a/libgimpbase/gimpparasiteio.c +++ b/libgimpbase/gimpparasiteio.c @@ -1,5 +1,5 @@ -/* Functions for bulding and parsing string representations of - * various standard parasite types. +/* LIBGIMP - The GIMP Library + * Copyright (C) 1995-1997 Peter Mattis and Spencer Kimball * * Copyright (C) 1999 Tor Lillqvist * @@ -19,6 +19,11 @@ * Boston, MA 02111-1307, USA. */ +/* + * Functions for bulding and parsing string representations of + * various standard parasite types. + */ + #include "config.h" #include diff --git a/libgimpbase/gimpparasiteio.h b/libgimpbase/gimpparasiteio.h index a7ef1c8526..a4cab1a13c 100644 --- a/libgimpbase/gimpparasiteio.h +++ b/libgimpbase/gimpparasiteio.h @@ -1,4 +1,7 @@ -/* parasite.h +/* LIBGIMP - The GIMP Library + * Copyright (C) 1995-1997 Peter Mattis and Spencer Kimball + * + * parasiteio.h * Copyright (C) 1999 Tor Lillqvist * * This library is free software; you can redistribute it and/or @@ -17,8 +20,12 @@ * Boston, MA 02111-1307, USA. */ -#ifndef _PARASITEIO_H_ -#define _PARASITEIO_H_ +#ifndef __PARASITEIO_H__ +#define __PARASITEIO_H__ + +#ifdef __cplusplus +extern "C" { +#endif /* __cplusplus */ /* Data structures for various standard parasites used by plug-ins and * the GIMP core, and functions to build and parse their string @@ -61,4 +68,4 @@ gchar *pixpipeparams_build (PixPipeParams *params); } #endif /* __cplusplus */ -#endif /* _PARASITEIO_H_ */ +#endif /* __PARASITEIO_H__ */ diff --git a/libgimpbase/gimpunit.h b/libgimpbase/gimpunit.h index 73ce4ee59b..0cc0d97eef 100644 --- a/libgimpbase/gimpunit.h +++ b/libgimpbase/gimpunit.h @@ -1,5 +1,5 @@ -/* LIBGIMP - The GIMP Library - * Copyright (C) 1995-1997 Peter Mattis and Spencer Kimball +/* LIBGIMP - The GIMP Library + * Copyright (C) 1995-1997 Peter Mattis and Spencer Kimball * * gimpunit.h * Copyright (C) 1999 Michael Natterer diff --git a/libgimpwidgets/gimpchainbutton.c b/libgimpwidgets/gimpchainbutton.c index 0ec46318bc..308da8f64f 100644 --- a/libgimpwidgets/gimpchainbutton.c +++ b/libgimpwidgets/gimpchainbutton.c @@ -1,6 +1,9 @@ /* LIBGIMP - The GIMP Library * Copyright (C) 1995-1997 Peter Mattis and Spencer Kimball * + * gimpchainbutton.c + * Copyright (C) 1999-2000 Sven Neumann + * * This library 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 diff --git a/libgimpwidgets/gimpchainbutton.h b/libgimpwidgets/gimpchainbutton.h index b6f26559dc..004a265912 100644 --- a/libgimpwidgets/gimpchainbutton.h +++ b/libgimpwidgets/gimpchainbutton.h @@ -1,6 +1,9 @@ /* LIBGIMP - The GIMP Library * Copyright (C) 1995-1997 Peter Mattis and Spencer Kimball * + * gimpchainbutton.h + * Copyright (C) 1999-2000 Sven Neumann + * * This library 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 @@ -17,11 +20,12 @@ * Boston, MA 02111-1307, USA. */ -/* This implements a widget derived from gtk_button that visualizes - it's state with two different pixmaps showing a closed and a - broken chain. It's intented to be used with the gimpsizeentry - widget. The usage is quite similar to the one the gtk_toggle_button - provides. +/* + * This implements a widget derived from GtkTable that visualizes + * it's state with two different pixmaps showing a closed and a + * broken chain. It's intented to be used with the GimpSizeEntry + * widget. The usage is quite similar to the one the GtkToggleButton + * provides. */ #ifndef __GIMP_CHAIN_BUTTON_H__ @@ -56,7 +60,7 @@ typedef enum struct _GimpChainButton { - GtkTable table; + GtkTable table; GimpChainPosition position; GtkWidget *button; diff --git a/libgimpwidgets/gimpcolorbutton.c b/libgimpwidgets/gimpcolorbutton.c index 804a6b9421..2e56c6b8f2 100644 --- a/libgimpwidgets/gimpcolorbutton.c +++ b/libgimpwidgets/gimpcolorbutton.c @@ -1,7 +1,7 @@ /* LIBGIMP - The GIMP Library * Copyright (C) 1995-1997 Peter Mattis and Spencer Kimball * - * Gimp Color Button + * gimpcolorbutton.c * Copyright (C) 1999 Sven Neumann * * This library is free software; you can redistribute it and/or @@ -22,9 +22,10 @@ /* TODO: * - * handle bytes != 3|4 -- would we have to provide a special color select dialog - * for that case? Another possibility could be to hide or - * destroy all color-related widgets in the gtk colorselector. + * handle bytes != 3|4 -- would we have to provide a special color + * select dialog for that case? Another possibility + * could be to hide or destroy all color-related + * widgets in the gtk colorselector. */ #include "config.h" diff --git a/libgimpwidgets/gimpcolorbutton.h b/libgimpwidgets/gimpcolorbutton.h index bad41c364b..6c925b56d4 100644 --- a/libgimpwidgets/gimpcolorbutton.h +++ b/libgimpwidgets/gimpcolorbutton.h @@ -1,7 +1,7 @@ /* LIBGIMP - The GIMP Library * Copyright (C) 1995-1997 Peter Mattis and Spencer Kimball * - * Gimp Color Button + * gimpcolorbutton.h * Copyright (C) 1999 Sven Neumann * * This library is free software; you can redistribute it and/or diff --git a/libgimpwidgets/gimpdialog.c b/libgimpwidgets/gimpdialog.c index 1db44f6283..e022558bd4 100644 --- a/libgimpwidgets/gimpdialog.c +++ b/libgimpwidgets/gimpdialog.c @@ -1,4 +1,4 @@ -/* LIBGIMP - The GIMP Library +/* LIBGIMP - The GIMP Library * Copyright (C) 1995 Spencer Kimball and Peter Mattis * * gimpdialog.c @@ -7,11 +7,11 @@ * This library 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 2 of the License, or (at your option) any later version. - * - * This library 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 + * version 2 of the License, or (at your option) any later version. + * + * This library 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 * Library General Public License for more details. * * You should have received a copy of the GNU Lesser General Public diff --git a/libgimpwidgets/gimpdialog.h b/libgimpwidgets/gimpdialog.h index fd68702f84..f8297caa5a 100644 --- a/libgimpwidgets/gimpdialog.h +++ b/libgimpwidgets/gimpdialog.h @@ -1,4 +1,4 @@ -/* LIBGIMP - The GIMP Library +/* LIBGIMP - The GIMP Library * Copyright (C) 1995 Spencer Kimball and Peter Mattis * * gimpdialog.h @@ -7,11 +7,11 @@ * This library 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 2 of the License, or (at your option) any later version. - * - * This library 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 + * version 2 of the License, or (at your option) any later version. + * + * This library 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 * Library General Public License for more details. * * You should have received a copy of the GNU Lesser General Public @@ -27,6 +27,10 @@ #include "gimphelpui.h" #include "gimpunit.h" +#ifdef __cplusplus +extern "C" { +#endif /* __cplusplus */ + GtkWidget * gimp_dialog_new (const gchar *title, const gchar *wmclass_name, GimpHelpFunc help_func, @@ -79,4 +83,24 @@ void gimp_dialog_create_action_area (GtkDialog *dialog, void gimp_dialog_create_action_areav (GtkDialog *dialog, va_list args); +#ifdef __cplusplus +} +#endif /* __cplusplus */ + #endif /* __GIMP_DIALOG_H__ */ + + + + + + + + + + + + + + + + diff --git a/libgimpwidgets/gimpfileentry.c b/libgimpwidgets/gimpfileentry.c index 8eb0eea18b..7d24f24055 100644 --- a/libgimpwidgets/gimpfileentry.c +++ b/libgimpwidgets/gimpfileentry.c @@ -1,5 +1,5 @@ /* LIBGIMP - The GIMP Library - * Copyright (C) 1995-1997 Peter Mattis and Spencer Kimball + * Copyright (C) 1995-1997 Peter Mattis and Spencer Kimball * * gimpfileselection.c * Copyright (C) 1999 Michael Natterer @@ -11,7 +11,7 @@ * * This library 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 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Library General Public License for more details. * * You should have received a copy of the GNU Lesser General Public @@ -21,7 +21,7 @@ */ #include "config.h" -#include /* Needed here by Win32 gcc compilation */ +#include /* Needed here by Win32 gcc compilation */ #include #include diff --git a/libgimpwidgets/gimpfileentry.h b/libgimpwidgets/gimpfileentry.h index a73c6e53a6..631c453c7e 100644 --- a/libgimpwidgets/gimpfileentry.h +++ b/libgimpwidgets/gimpfileentry.h @@ -1,4 +1,4 @@ -/* LIBGIMP - The GIMP Library +/* LIBGIMP - The GIMP Library * Copyright (C) 1995-1997 Peter Mattis and Spencer Kimball * * gimpfileselection.h @@ -7,11 +7,11 @@ * This library 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 2 of the License, or (at your option) any later version. - * - * This library 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 + * version 2 of the License, or (at your option) any later version. + * + * This library 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 * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public diff --git a/libgimpwidgets/gimpfileselection.c b/libgimpwidgets/gimpfileselection.c index 8eb0eea18b..7d24f24055 100644 --- a/libgimpwidgets/gimpfileselection.c +++ b/libgimpwidgets/gimpfileselection.c @@ -1,5 +1,5 @@ /* LIBGIMP - The GIMP Library - * Copyright (C) 1995-1997 Peter Mattis and Spencer Kimball + * Copyright (C) 1995-1997 Peter Mattis and Spencer Kimball * * gimpfileselection.c * Copyright (C) 1999 Michael Natterer @@ -11,7 +11,7 @@ * * This library 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 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Library General Public License for more details. * * You should have received a copy of the GNU Lesser General Public @@ -21,7 +21,7 @@ */ #include "config.h" -#include /* Needed here by Win32 gcc compilation */ +#include /* Needed here by Win32 gcc compilation */ #include #include diff --git a/libgimpwidgets/gimpfileselection.h b/libgimpwidgets/gimpfileselection.h index a73c6e53a6..631c453c7e 100644 --- a/libgimpwidgets/gimpfileselection.h +++ b/libgimpwidgets/gimpfileselection.h @@ -1,4 +1,4 @@ -/* LIBGIMP - The GIMP Library +/* LIBGIMP - The GIMP Library * Copyright (C) 1995-1997 Peter Mattis and Spencer Kimball * * gimpfileselection.h @@ -7,11 +7,11 @@ * This library 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 2 of the License, or (at your option) any later version. - * - * This library 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 + * version 2 of the License, or (at your option) any later version. + * + * This library 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 * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public diff --git a/libgimpwidgets/gimphelpui.c b/libgimpwidgets/gimphelpui.c index 485088d5dc..40bc077a0b 100644 --- a/libgimpwidgets/gimphelpui.c +++ b/libgimpwidgets/gimphelpui.c @@ -1,4 +1,4 @@ -/* LIBGIMP - The GIMP Library +/* LIBGIMP - The GIMP Library * Copyright (C) 1995 Spencer Kimball and Peter Mattis * * gimphelpui.c @@ -7,11 +7,11 @@ * This library 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 2 of the License, or (at your option) any later version. - * - * This library 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 + * version 2 of the License, or (at your option) any later version. + * + * This library 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 * Library General Public License for more details. * * You should have received a copy of the GNU Lesser General Public diff --git a/libgimpwidgets/gimphelpui.h b/libgimpwidgets/gimphelpui.h index 490cd903fd..132501b8af 100644 --- a/libgimpwidgets/gimphelpui.h +++ b/libgimpwidgets/gimphelpui.h @@ -1,4 +1,4 @@ -/* LIBGIMP - The GIMP Library +/* LIBGIMP - The GIMP Library * Copyright (C) 1995 Spencer Kimball and Peter Mattis * * gimphelpui.h @@ -7,11 +7,11 @@ * This library 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 2 of the License, or (at your option) any later version. - * - * This library 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 + * version 2 of the License, or (at your option) any later version. + * + * This library 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 * Library General Public License for more details. * * You should have received a copy of the GNU Lesser General Public @@ -24,8 +24,11 @@ #include -typedef void (* GimpHelpFunc) (gchar *help_data); +#ifdef __cplusplus +extern "C" { +#endif /* __cplusplus */ +typedef void (* GimpHelpFunc) (gchar *help_data); void gimp_help_init (void); void gimp_help_free (void); @@ -49,4 +52,13 @@ void gimp_help_set_help_data (GtkWidget *widget, /* activate the context help inspector */ void gimp_context_help (void); +#ifdef __cplusplus +} +#endif /* __cplusplus */ + #endif /* __GIMP_HELP_UI_H__ */ + + + + + diff --git a/libgimpwidgets/gimppatheditor.c b/libgimpwidgets/gimppatheditor.c index a065095a7d..ce4902760b 100644 --- a/libgimpwidgets/gimppatheditor.c +++ b/libgimpwidgets/gimppatheditor.c @@ -1,5 +1,5 @@ /* LIBGIMP - The GIMP Library - * Copyright (C) 1995-1997 Peter Mattis and Spencer Kimball + * Copyright (C) 1995-1997 Peter Mattis and Spencer Kimball * * gimppatheditor.c * Copyright (C) 1999 Michael Natterer diff --git a/libgimpwidgets/gimppatheditor.h b/libgimpwidgets/gimppatheditor.h index 592c30af38..304b5bd5d6 100644 --- a/libgimpwidgets/gimppatheditor.h +++ b/libgimpwidgets/gimppatheditor.h @@ -1,5 +1,5 @@ -/* LIBGIMP - The GIMP Library - * Copyright (C) 1995-1997 Peter Mattis and Spencer Kimball +/* LIBGIMP - The GIMP Library + * Copyright (C) 1995-1997 Peter Mattis and Spencer Kimball * * gimppatheditor.h * Copyright (C) 1999 Michael Natterer @@ -7,11 +7,11 @@ * This library 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 2 of the License, or (at your option) any later version. - * - * This library 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 + * version 2 of the License, or (at your option) any later version. + * + * This library 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 * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public diff --git a/libgimpwidgets/gimppixmap.c b/libgimpwidgets/gimppixmap.c index faa33db5df..8296a5e09f 100644 --- a/libgimpwidgets/gimppixmap.c +++ b/libgimpwidgets/gimppixmap.c @@ -1,5 +1,5 @@ -/* LIBGIMP - The GIMP Library - * Copyright (C) 1995-1997 Peter Mattis and Spencer Kimball +/* LIBGIMP - The GIMP Library + * Copyright (C) 1995-1997 Peter Mattis and Spencer Kimball * * gimppixmap.c * Copyright (C) 2000 Michael Natterer @@ -7,11 +7,11 @@ * This library 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 2 of the License, or (at your option) any later version. - * - * This library 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 + * version 2 of the License, or (at your option) any later version. + * + * This library 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 * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public diff --git a/libgimpwidgets/gimppixmap.h b/libgimpwidgets/gimppixmap.h index 3ffdfce9e5..eec51604bb 100644 --- a/libgimpwidgets/gimppixmap.h +++ b/libgimpwidgets/gimppixmap.h @@ -1,5 +1,5 @@ -/* LIBGIMP - The GIMP Library - * Copyright (C) 1995-1997 Peter Mattis and Spencer Kimball +/* LIBGIMP - The GIMP Library + * Copyright (C) 1995-1997 Peter Mattis and Spencer Kimball * * gimppixmap.h * Copyright (C) 2000 Michael Natterer @@ -7,11 +7,11 @@ * This library 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 2 of the License, or (at your option) any later version. - * - * This library 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 + * version 2 of the License, or (at your option) any later version. + * + * This library 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 * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public diff --git a/libgimpwidgets/gimpquerybox.c b/libgimpwidgets/gimpquerybox.c index 99544548af..5dc1656a2e 100644 --- a/libgimpwidgets/gimpquerybox.c +++ b/libgimpwidgets/gimpquerybox.c @@ -1,21 +1,24 @@ -/* LIBGIMP - The GIMP Library - * Copyright (C) 1995-1997 Peter Mattis and Spencer Kimball +/* LIBGIMP - The GIMP Library + * Copyright (C) 1995-1997 Peter Mattis and Spencer Kimball + * + * gimpquerybox.c + * Copyright (C) 1999-2000 Michael Natterer * * This library 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 2 of the License, or (at your option) any later version. - * - * This library 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 + * version 2 of the License, or (at your option) any later version. + * + * This library 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 * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the * Free Software Foundation, Inc., 59 Temple Place - Suite 330, * Boston, MA 02111-1307, USA. - */ + */ #include "gimpquerybox.h" diff --git a/libgimpwidgets/gimpquerybox.h b/libgimpwidgets/gimpquerybox.h index 0f80b3d664..cba746350f 100644 --- a/libgimpwidgets/gimpquerybox.h +++ b/libgimpwidgets/gimpquerybox.h @@ -1,21 +1,24 @@ -/* LIBGIMP - The GIMP Library - * Copyright (C) 1995-1997 Peter Mattis and Spencer Kimball +/* LIBGIMP - The GIMP Library + * Copyright (C) 1995-1997 Peter Mattis and Spencer Kimball * + * gimpquerybox.h + * Copyright (C) 1999-2000 Michael Natterer + * * This library 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 2 of the License, or (at your option) any later version. - * - * This library 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 + * version 2 of the License, or (at your option) any later version. + * + * This library 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 * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the * Free Software Foundation, Inc., 59 Temple Place - Suite 330, * Boston, MA 02111-1307, USA. - */ + */ #ifndef __GIMP_QUERY_BOX_H__ #define __GIMP_QUERY_BOX_H__ diff --git a/libgimpwidgets/gimpsizeentry.c b/libgimpwidgets/gimpsizeentry.c index 5bf8e553a5..3cdebc946f 100644 --- a/libgimpwidgets/gimpsizeentry.c +++ b/libgimpwidgets/gimpsizeentry.c @@ -1,6 +1,10 @@ /* LIBGIMP - The GIMP Library * Copyright (C) 1995-1997 Peter Mattis and Spencer Kimball * + * gimpsizeentry.c + * Copyright (C) 1999-2000 Sven Neumann + * Michael Natterer + * * This library 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 diff --git a/libgimpwidgets/gimpsizeentry.h b/libgimpwidgets/gimpsizeentry.h index 7313508e19..bbf86c4972 100644 --- a/libgimpwidgets/gimpsizeentry.h +++ b/libgimpwidgets/gimpsizeentry.h @@ -1,14 +1,18 @@ -/* LIBGIMP - The GIMP Library - * Copyright (C) 1995-1997 Peter Mattis and Spencer Kimball +/* LIBGIMP - The GIMP Library + * Copyright (C) 1995-1997 Peter Mattis and Spencer Kimball + * + * gimpsizeentry.h + * Copyright (C) 1999-2000 Sven Neumann + * Michael Natterer * * This library 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 2 of the License, or (at your option) any later version. - * - * This library 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 + * version 2 of the License, or (at your option) any later version. + * + * This library 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 * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public diff --git a/libgimpwidgets/gimpunitmenu.c b/libgimpwidgets/gimpunitmenu.c index d18ca32af6..d4bf64cf33 100644 --- a/libgimpwidgets/gimpunitmenu.c +++ b/libgimpwidgets/gimpunitmenu.c @@ -1,5 +1,5 @@ -/* LIBGIMP - The GIMP Library - * Copyright (C) 1995-1999 Peter Mattis and Spencer Kimball +/* LIBGIMP - The GIMP Library + * Copyright (C) 1995-1999 Peter Mattis and Spencer Kimball * * gimpunitmenu.c * Copyright (C) 1999 Michael Natterer @@ -7,11 +7,11 @@ * This library 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 2 of the License, or (at your option) any later version. - * - * This library 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 + * version 2 of the License, or (at your option) any later version. + * + * This library 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 * Library General Public License for more details. * * You should have received a copy of the GNU Lesser General Public diff --git a/libgimpwidgets/gimpunitmenu.h b/libgimpwidgets/gimpunitmenu.h index 935c952408..3875c82e83 100644 --- a/libgimpwidgets/gimpunitmenu.h +++ b/libgimpwidgets/gimpunitmenu.h @@ -1,17 +1,17 @@ -/* LIBGIMP - The GIMP Library - * Copyright (C) 1995-1997 Peter Mattis and Spencer Kimball +/* LIBGIMP - The GIMP Library + * Copyright (C) 1995-1997 Peter Mattis and Spencer Kimball * * gimpunitmenu.h - * Copyright (C) 1999 Michael Natterer + * Copyright (C) 1999 Michael Natterer * * This library 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 2 of the License, or (at your option) any later version. - * - * This library 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 + * version 2 of the License, or (at your option) any later version + * + * This library 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 * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public diff --git a/libgimpwidgets/gimpwidgets.c b/libgimpwidgets/gimpwidgets.c index 90113bf453..529c4875df 100644 --- a/libgimpwidgets/gimpwidgets.c +++ b/libgimpwidgets/gimpwidgets.c @@ -1,5 +1,5 @@ -/* LIBGIMP - The GIMP Library - * Copyright (C) 1995-1999 Peter Mattis and Spencer Kimball +/* LIBGIMP - The GIMP Library + * Copyright (C) 1995-1999 Peter Mattis and Spencer Kimball * * gimpwidgets.c * Copyright (C) 2000 Michael Natterer @@ -7,11 +7,11 @@ * This library 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 2 of the License, or (at your option) any later version. - * - * This library 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 + * version 2 of the License, or (at your option) any later version. + * + * This library 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 * Library General Public License for more details. * * You should have received a copy of the GNU Lesser General Public diff --git a/libgimpwidgets/gimpwidgets.h b/libgimpwidgets/gimpwidgets.h index fbedec8980..1a81bdda82 100644 --- a/libgimpwidgets/gimpwidgets.h +++ b/libgimpwidgets/gimpwidgets.h @@ -1,5 +1,5 @@ -/* LIBGIMP - The GIMP Library - * Copyright (C) 1995-1997 Peter Mattis and Spencer Kimball +/* LIBGIMP - The GIMP Library + * Copyright (C) 1995-1997 Peter Mattis and Spencer Kimball * * gimpwidgets.h * Copyright (C) 2000 Michael Natterer @@ -7,11 +7,11 @@ * This library 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 2 of the License, or (at your option) any later version. - * - * This library 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 + * version 2 of the License, or (at your option) any later version. + * + * This library 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 * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public