From 7fae2b2d40c52182195bb7fefe46567f41d65a54 Mon Sep 17 00:00:00 2001 From: Michael Natterer Date: Tue, 8 Mar 2011 13:58:56 +0100 Subject: [PATCH] libgimp: rename the "misc" pdb group to "gimp" So we finally have a proper place for PDB procedures that don't act on an object like image, item, ... --- app/pdb/Makefile.am | 2 +- app/pdb/{misc-cmds.c => gimp-cmds.c} | 2 +- app/pdb/internal-procs.c | 2 +- app/pdb/internal-procs.h | 2 +- libgimp/Makefile.am | 4 ++-- libgimp/{gimpmisc_pdb.c => gimp_pdb.c} | 6 +++--- libgimp/{gimpmisc_pdb.h => gimp_pdb.h} | 8 ++++---- libgimp/gimp_pdb_headers.h | 2 +- tools/pdbgen/Makefile.am | 2 +- tools/pdbgen/groups.pl | 2 +- tools/pdbgen/lib.pl | 13 ++++++++++--- tools/pdbgen/pdb/{misc.pdb => gimp.pdb} | 2 +- 12 files changed, 27 insertions(+), 20 deletions(-) rename app/pdb/{misc-cmds.c => gimp-cmds.c} (99%) rename libgimp/{gimpmisc_pdb.c => gimp_pdb.c} (97%) rename libgimp/{gimpmisc_pdb.h => gimp_pdb.h} (90%) rename tools/pdbgen/pdb/{misc.pdb => gimp.pdb} (98%) diff --git a/app/pdb/Makefile.am b/app/pdb/Makefile.am index e06479ca42..eb86f143a5 100644 --- a/app/pdb/Makefile.am +++ b/app/pdb/Makefile.am @@ -51,6 +51,7 @@ libappinternal_procs_a_SOURCES = \ floating-sel-cmds.c \ font-select-cmds.c \ fonts-cmds.c \ + gimp-cmds.c \ gimprc-cmds.c \ gradient-cmds.c \ gradient-select-cmds.c \ @@ -64,7 +65,6 @@ libappinternal_procs_a_SOURCES = \ item-transform-cmds.c \ layer-cmds.c \ message-cmds.c \ - misc-cmds.c \ paint-tools-cmds.c \ palette-cmds.c \ palette-select-cmds.c \ diff --git a/app/pdb/misc-cmds.c b/app/pdb/gimp-cmds.c similarity index 99% rename from app/pdb/misc-cmds.c rename to app/pdb/gimp-cmds.c index b913c7c9b3..ce91ab17cc 100644 --- a/app/pdb/misc-cmds.c +++ b/app/pdb/gimp-cmds.c @@ -95,7 +95,7 @@ quit_invoker (GimpProcedure *procedure, } void -register_misc_procs (GimpPDB *pdb) +register_gimp_procs (GimpPDB *pdb) { GimpProcedure *procedure; diff --git a/app/pdb/internal-procs.c b/app/pdb/internal-procs.c index 2409ded19a..4f2713cb9b 100644 --- a/app/pdb/internal-procs.c +++ b/app/pdb/internal-procs.c @@ -51,6 +51,7 @@ internal_procs_init (GimpPDB *pdb) register_floating_sel_procs (pdb); register_font_select_procs (pdb); register_fonts_procs (pdb); + register_gimp_procs (pdb); register_gimprc_procs (pdb); register_gradient_procs (pdb); register_gradient_select_procs (pdb); @@ -64,7 +65,6 @@ internal_procs_init (GimpPDB *pdb) register_item_transform_procs (pdb); register_layer_procs (pdb); register_message_procs (pdb); - register_misc_procs (pdb); register_paint_tools_procs (pdb); register_palette_procs (pdb); register_palette_select_procs (pdb); diff --git a/app/pdb/internal-procs.h b/app/pdb/internal-procs.h index 1bdfba26bc..a8b3a27e66 100644 --- a/app/pdb/internal-procs.h +++ b/app/pdb/internal-procs.h @@ -40,6 +40,7 @@ void register_fileops_procs (GimpPDB *pdb); void register_floating_sel_procs (GimpPDB *pdb); void register_font_select_procs (GimpPDB *pdb); void register_fonts_procs (GimpPDB *pdb); +void register_gimp_procs (GimpPDB *pdb); void register_gimprc_procs (GimpPDB *pdb); void register_gradient_procs (GimpPDB *pdb); void register_gradient_select_procs (GimpPDB *pdb); @@ -53,7 +54,6 @@ void register_item_procs (GimpPDB *pdb); void register_item_transform_procs (GimpPDB *pdb); void register_layer_procs (GimpPDB *pdb); void register_message_procs (GimpPDB *pdb); -void register_misc_procs (GimpPDB *pdb); void register_paint_tools_procs (GimpPDB *pdb); void register_palette_procs (GimpPDB *pdb); void register_palette_select_procs (GimpPDB *pdb); diff --git a/libgimp/Makefile.am b/libgimp/Makefile.am index df33ece2d8..a2abe6c3e1 100644 --- a/libgimp/Makefile.am +++ b/libgimp/Makefile.am @@ -68,6 +68,7 @@ INCLUDES = \ lib_LTLIBRARIES = libgimp-2.0.la libgimpui-2.0.la PDB_WRAPPERS_C = \ + gimp_pdb.c \ gimpbrush_pdb.c \ gimpbrushes_pdb.c \ gimpbrushselect_pdb.c \ @@ -97,7 +98,6 @@ PDB_WRAPPERS_C = \ gimpitemtransform_pdb.c \ gimplayer_pdb.c \ gimpmessage_pdb.c \ - gimpmisc_pdb.c \ gimppainttools_pdb.c \ gimppalette_pdb.c \ gimppalettes_pdb.c \ @@ -121,6 +121,7 @@ PDB_WRAPPERS_C = \ PDB_WRAPPERS_H = \ gimp_pdb_headers.h \ + gimp_pdb.h \ gimpbrush_pdb.h \ gimpbrushes_pdb.h \ gimpbrushselect_pdb.h \ @@ -150,7 +151,6 @@ PDB_WRAPPERS_H = \ gimpitemtransform_pdb.h \ gimplayer_pdb.h \ gimpmessage_pdb.h \ - gimpmisc_pdb.h \ gimppainttools_pdb.h \ gimppalette_pdb.h \ gimppalettes_pdb.h \ diff --git a/libgimp/gimpmisc_pdb.c b/libgimp/gimp_pdb.c similarity index 97% rename from libgimp/gimpmisc_pdb.c rename to libgimp/gimp_pdb.c index c97c4749f4..9ade3676f2 100644 --- a/libgimp/gimpmisc_pdb.c +++ b/libgimp/gimp_pdb.c @@ -1,7 +1,7 @@ /* LIBGIMP - The GIMP Library * Copyright (C) 1995-2003 Peter Mattis and Spencer Kimball * - * gimpmisc_pdb.c + * gimp_pdb.c * * This library is free software: you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -26,8 +26,8 @@ /** - * SECTION: gimpmisc - * @title: gimpmisc + * SECTION: gimp + * @title: gimp * @short_description: Miscellaneous procedures * * Miscellaneous procedures not fitting in any category. diff --git a/libgimp/gimpmisc_pdb.h b/libgimp/gimp_pdb.h similarity index 90% rename from libgimp/gimpmisc_pdb.h rename to libgimp/gimp_pdb.h index 517641f65a..6b71a87151 100644 --- a/libgimp/gimpmisc_pdb.h +++ b/libgimp/gimp_pdb.h @@ -1,7 +1,7 @@ /* LIBGIMP - The GIMP Library * Copyright (C) 1995-2003 Peter Mattis and Spencer Kimball * - * gimpmisc_pdb.h + * gimp_pdb.h * * This library is free software: you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -20,8 +20,8 @@ /* NOTE: This file is auto-generated by pdbgen.pl */ -#ifndef __GIMP_MISC_PDB_H__ -#define __GIMP_MISC_PDB_H__ +#ifndef __GIMP_GIMP_PDB_H__ +#define __GIMP_GIMP_PDB_H__ G_BEGIN_DECLS @@ -34,4 +34,4 @@ gint gimp_getpid (void); G_END_DECLS -#endif /* __GIMP_MISC_PDB_H__ */ +#endif /* __GIMP_GIMP_PDB_H__ */ diff --git a/libgimp/gimp_pdb_headers.h b/libgimp/gimp_pdb_headers.h index 0bc7fc7bc3..a747d21989 100644 --- a/libgimp/gimp_pdb_headers.h +++ b/libgimp/gimp_pdb_headers.h @@ -23,6 +23,7 @@ #ifndef __GIMP_PDB_HEADERS_H__ #define __GIMP_PDB_HEADERS_H__ +#include #include #include #include @@ -52,7 +53,6 @@ #include #include #include -#include #include #include #include diff --git a/tools/pdbgen/Makefile.am b/tools/pdbgen/Makefile.am index ea4695b0e3..a921fc65c6 100644 --- a/tools/pdbgen/Makefile.am +++ b/tools/pdbgen/Makefile.am @@ -18,6 +18,7 @@ pdb_sources = \ pdb/floating_sel.pdb \ pdb/font_select.pdb \ pdb/fonts.pdb \ + pdb/gimp.pdb \ pdb/gimprc.pdb \ pdb/gradient.pdb \ pdb/gradient_select.pdb \ @@ -31,7 +32,6 @@ pdb_sources = \ pdb/item_transform.pdb \ pdb/layer.pdb \ pdb/message.pdb \ - pdb/misc.pdb \ pdb/paint_tools.pdb \ pdb/palette.pdb \ pdb/palette_select.pdb \ diff --git a/tools/pdbgen/groups.pl b/tools/pdbgen/groups.pl index aab9717074..692dae72bb 100644 --- a/tools/pdbgen/groups.pl +++ b/tools/pdbgen/groups.pl @@ -16,6 +16,7 @@ floating_sel font_select fonts + gimp gimprc gradient gradient_select @@ -29,7 +30,6 @@ item_transform layer message - misc paint_tools palette palette_select diff --git a/tools/pdbgen/lib.pl b/tools/pdbgen/lib.pl index c5f1aff859..548130454a 100644 --- a/tools/pdbgen/lib.pl +++ b/tools/pdbgen/lib.pl @@ -508,8 +508,12 @@ LGPL # We generate two files, a _pdb.h file with prototypes for all # the functions we make, and a _pdb.c file for the actual implementation while (my($group, $out) = each %out) { - my $hname = "gimp${group}pdb.h"; - my $cname = "gimp${group}pdb.c"; + my $hname = "${group}pdb.h"; + my $cname = "${group}pdb.c"; + if ($group ne 'gimp') { + $hname = "gimp${hname}"; + $cname = "gimp${cname}"; + } $hname =~ s/_//g; $hname =~ s/pdb\./_pdb./; $cname =~ s/_//g; $cname =~ s/pdb\./_pdb./; my $hfile = "$destdir/$hname$FILE_EXT"; @@ -689,7 +693,10 @@ SECTION_DOCS HEADER my @groups; foreach $group (keys %out) { - my $hname = "gimp${group}pdb.h"; + my $hname = "${group}pdb.h"; + if ($group ne 'gimp') { + $hname = "gimp${hname}"; + } $hname =~ s/_//g; $hname =~ s/pdb\./_pdb./; push @groups, $hname; } diff --git a/tools/pdbgen/pdb/misc.pdb b/tools/pdbgen/pdb/gimp.pdb similarity index 98% rename from tools/pdbgen/pdb/misc.pdb rename to tools/pdbgen/pdb/gimp.pdb index f73788e541..3ab8f53904 100644 --- a/tools/pdbgen/pdb/misc.pdb +++ b/tools/pdbgen/pdb/gimp.pdb @@ -99,7 +99,7 @@ CODE %exports = (app => [@procs], lib => [@procs[0..1]]); $desc = 'Miscellaneous'; -$doc_title = 'gimpmisc'; +$doc_title = 'gimp'; $doc_short_desc = 'Miscellaneous procedures'; $doc_long_desc = 'Miscellaneous procedures not fitting in any category.';