From 5c6f4d559896d7290d8877651d60010eefc1c6bb Mon Sep 17 00:00:00 2001 From: Jim Evins Date: Sat, 18 Dec 2010 23:11:04 -0500 Subject: [PATCH] Renamed libglabels source files to have "lgl-" prefix. Improve odds that source files (headers in particular) remain unique. --- docs/libglabels/libglabels-3.0-sections.txt | 24 +++---- libglabels/Makefile.am | 72 +++++++++---------- libglabels/{category.c => lgl-category.c} | 6 +- libglabels/{category.h => lgl-category.h} | 4 +- libglabels/{db.c => lgl-db.c} | 14 ++-- libglabels/{db.h => lgl-db.h} | 12 ++-- libglabels/{paper.c => lgl-paper.c} | 6 +- libglabels/{paper.h => lgl-paper.h} | 4 +- libglabels/{str.c => lgl-str.c} | 6 +- libglabels/{str.h => lgl-str.h} | 4 +- libglabels/{template.c => lgl-template.c} | 10 +-- libglabels/{template.h => lgl-template.h} | 6 +- libglabels/{units.c => lgl-units.c} | 6 +- libglabels/{units.h => lgl-units.h} | 4 +- libglabels/{vendor.c => lgl-vendor.c} | 6 +- libglabels/{vendor.h => lgl-vendor.h} | 4 +- .../{xml-category.c => lgl-xml-category.c} | 8 +-- .../{xml-category.h => lgl-xml-category.h} | 6 +- libglabels/{xml-paper.c => lgl-xml-paper.c} | 8 +-- libglabels/{xml-paper.h => lgl-xml-paper.h} | 6 +- .../{xml-template.c => lgl-xml-template.c} | 10 +-- .../{xml-template.h => lgl-xml-template.h} | 6 +- libglabels/{xml-vendor.c => lgl-xml-vendor.c} | 8 +-- libglabels/{xml-vendor.h => lgl-xml-vendor.h} | 6 +- libglabels/{xml.c => lgl-xml.c} | 6 +- libglabels/{xml.h => lgl-xml.h} | 6 +- libglabels/libglabels-private.h | 4 +- libglabels/libglabels.h | 20 +++--- po/POTFILES.in | 40 +++++------ 29 files changed, 161 insertions(+), 161 deletions(-) rename libglabels/{category.c => lgl-category.c} (96%) rename libglabels/{category.h => lgl-category.h} (95%) rename libglabels/{db.c => lgl-db.c} (99%) rename libglabels/{db.h => lgl-db.h} (97%) rename libglabels/{paper.c => lgl-paper.c} (97%) rename libglabels/{paper.h => lgl-paper.h} (96%) rename libglabels/{str.c => lgl-str.c} (98%) rename libglabels/{str.h => lgl-str.h} (94%) rename libglabels/{template.c => lgl-template.c} (99%) rename libglabels/{template.h => lgl-template.h} (99%) rename libglabels/{units.c => lgl-units.c} (98%) rename libglabels/{units.h => lgl-units.h} (96%) rename libglabels/{vendor.c => lgl-vendor.c} (96%) rename libglabels/{vendor.h => lgl-vendor.h} (95%) rename libglabels/{xml-category.c => lgl-xml-category.c} (97%) rename libglabels/{xml-category.h => lgl-xml-category.h} (92%) rename libglabels/{xml-paper.c => lgl-xml-paper.c} (97%) rename libglabels/{xml-paper.h => lgl-xml-paper.h} (92%) rename libglabels/{xml-template.c => lgl-xml-template.c} (99%) rename libglabels/{xml-template.h => lgl-xml-template.h} (94%) rename libglabels/{xml-vendor.c => lgl-xml-vendor.c} (96%) rename libglabels/{xml-vendor.h => lgl-xml-vendor.h} (92%) rename libglabels/{xml.c => lgl-xml.c} (99%) rename libglabels/{xml.h => lgl-xml.h} (96%) diff --git a/docs/libglabels/libglabels-3.0-sections.txt b/docs/libglabels/libglabels-3.0-sections.txt index 5323ab0f..7efab0c5 100644 --- a/docs/libglabels/libglabels-3.0-sections.txt +++ b/docs/libglabels/libglabels-3.0-sections.txt @@ -1,6 +1,6 @@
db -libglabels/db.h +libglabels/lgl-db.h lglDbRegStatus lglDbDeleteStatus @@ -58,7 +58,7 @@ lgl_db_print_known_vendors
template -libglabels/template.h +libglabels/lgl-template.h lglTemplate lglTemplateFrameShape @@ -127,7 +127,7 @@ lgl_template_print
paper -libglabels/paper.h +libglabels/lgl-paper.h lglPaper lgl_paper_new lgl_paper_dup @@ -136,7 +136,7 @@ lgl_paper_free
category -libglabels/category.h +libglabels/lgl-category.h lglCategory lgl_category_new lgl_category_dup @@ -145,7 +145,7 @@ lgl_category_free
vendor -libglabels/vendor.h +libglabels/lgl-vendor.h lglVendor lgl_vendor_new lgl_vendor_dup @@ -154,7 +154,7 @@ lgl_vendor_free
xml-paper -libglabels/xml-paper.h +libglabels/lgl-xml-paper.h lgl_xml_paper_read_papers_from_file lgl_xml_paper_parse_papers_doc lgl_xml_paper_parse_paper_node @@ -162,7 +162,7 @@ lgl_xml_paper_parse_paper_node
xml-category -libglabels/xml-category.h +libglabels/lgl-xml-category.h lgl_xml_category_read_categories_from_file lgl_xml_category_parse_categories_doc lgl_xml_category_parse_category_node @@ -170,7 +170,7 @@ lgl_xml_category_parse_category_node
xml-template -libglabels/xml-templates.h +libglabels/lgl-xml-templates.h lgl_xml_template_read_templates_from_file lgl_xml_template_parse_templates_doc lgl_xml_template_parse_template_node @@ -181,7 +181,7 @@ lgl_xml_template_create_template_node
xml-vendor -libglabels/xml-vendor.h +libglabels/lgl-xml-vendor.h lgl_xml_vendor_read_vendors_from_file lgl_xml_vendor_parse_vendors_doc lgl_xml_vendor_parse_vendor_node @@ -189,7 +189,7 @@ lgl_xml_vendor_parse_vendor_node
xml -libglabels/xml.h +libglabels/lgl-xml.h LGL_XML_NAME_SPACE lgl_xml_get_prop_string @@ -215,7 +215,7 @@ lgl_xml_set_default_units
units -libglabels/units.h +libglabels/lgl-units.h lglUnits lgl_units_get_id lgl_units_from_id @@ -227,7 +227,7 @@ lgl_units_get_units_per_point
str -libglabels/str.h +libglabels/lgl-str.h lgl_str_utf8_casecmp lgl_str_part_name_cmp lgl_str_format_fraction diff --git a/libglabels/Makefile.am b/libglabels/Makefile.am index 4d43f5c0..f9013460 100644 --- a/libglabels/Makefile.am +++ b/libglabels/Makefile.am @@ -12,32 +12,32 @@ libglabels_3_0_la_LDFLAGS=\ lib_LTLIBRARIES = libglabels-3.0.la -libglabels_3_0_la_SOURCES = \ +libglabels_3_0_la_SOURCES = \ libglabels-private.h \ - db.h \ - db.c \ - units.h \ - units.c \ - paper.h \ - paper.c \ - category.h \ - category.c \ - vendor.h \ - vendor.c \ - template.h \ - template.c \ - xml-paper.h \ - xml-paper.c \ - xml-category.h \ - xml-category.c \ - xml-vendor.h \ - xml-vendor.c \ - xml-template.h \ - xml-template.c \ - xml.h \ - xml.c \ - str.h \ - str.c + lgl-db.h \ + lgl-db.c \ + lgl-units.h \ + lgl-units.c \ + lgl-paper.h \ + lgl-paper.c \ + lgl-category.h \ + lgl-category.c \ + lgl-vendor.h \ + lgl-vendor.c \ + lgl-template.h \ + lgl-template.c \ + lgl-xml-paper.h \ + lgl-xml-paper.c \ + lgl-xml-category.h \ + lgl-xml-category.c \ + lgl-xml-vendor.h \ + lgl-xml-vendor.c \ + lgl-xml-template.h \ + lgl-xml-template.c \ + lgl-xml.h \ + lgl-xml.c \ + lgl-str.h \ + lgl-str.c libglabels_3_0includedir=$(includedir)/$(LIBGLABELS_BRANCH) @@ -46,17 +46,17 @@ libglabels_3_0include_HEADERS = \ libglabels_3_0subincludedir=$(includedir)/$(LIBGLABELS_BRANCH)/libglabels -libglabels_3_0subinclude_HEADERS = \ - db.h \ - units.h \ - paper.h \ - category.h \ - template.h \ - xml-paper.h \ - xml-category.h \ - xml-template.h \ - xml.h \ - str.h +libglabels_3_0subinclude_HEADERS = \ + lgl-db.h \ + lgl-units.h \ + lgl-paper.h \ + lgl-category.h \ + lgl-template.h \ + lgl-xml-paper.h \ + lgl-xml-category.h \ + lgl-xml-template.h \ + lgl-xml.h \ + lgl-str.h EXTRA_DIST = \ $(LIBGLABELS_BRANCH).pc.in diff --git a/libglabels/category.c b/libglabels/lgl-category.c similarity index 96% rename from libglabels/category.c rename to libglabels/lgl-category.c index f7f4052c..a7335354 100644 --- a/libglabels/category.c +++ b/libglabels/lgl-category.c @@ -1,6 +1,6 @@ /* - * category.c - * Copyright (C) 2006-2009 Jim Evins . + * lgl-category.c + * Copyright (C) 2006-2010 Jim Evins . * * This file is part of libglabels. * @@ -20,7 +20,7 @@ #include -#include "category.h" +#include "lgl-category.h" #include #include diff --git a/libglabels/category.h b/libglabels/lgl-category.h similarity index 95% rename from libglabels/category.h rename to libglabels/lgl-category.h index b62b9065..8ac35362 100644 --- a/libglabels/category.h +++ b/libglabels/lgl-category.h @@ -1,6 +1,6 @@ /* - * category.h - * Copyright (C) 2006-2009 Jim Evins . + * lgl-category.h + * Copyright (C) 2006-2010 Jim Evins . * * This file is part of libglabels. * diff --git a/libglabels/db.c b/libglabels/lgl-db.c similarity index 99% rename from libglabels/db.c rename to libglabels/lgl-db.c index daf914c4..fed3aeec 100644 --- a/libglabels/db.c +++ b/libglabels/lgl-db.c @@ -1,6 +1,6 @@ /* - * db.c - * Copyright (C) 2003-2009 Jim Evins . + * lgl-db.c + * Copyright (C) 2003-2010 Jim Evins . * * This file is part of libglabels. * @@ -20,7 +20,7 @@ #include -#include "db.h" +#include "lgl-db.h" #include #include @@ -32,10 +32,10 @@ #include "libglabels-private.h" -#include "xml-paper.h" -#include "xml-category.h" -#include "xml-vendor.h" -#include "xml-template.h" +#include "lgl-xml-paper.h" +#include "lgl-xml-category.h" +#include "lgl-xml-vendor.h" +#include "lgl-xml-template.h" /*===========================================*/ /* Private macros and constants. */ diff --git a/libglabels/db.h b/libglabels/lgl-db.h similarity index 97% rename from libglabels/db.h rename to libglabels/lgl-db.h index bcba326b..a505e62a 100644 --- a/libglabels/db.h +++ b/libglabels/lgl-db.h @@ -1,6 +1,6 @@ /* - * db.h - * Copyright (C) 2006-2009 Jim Evins . + * lgl-db.h + * Copyright (C) 2006-2010 Jim Evins . * * This file is part of libglabels. * @@ -23,10 +23,10 @@ #include -#include "paper.h" -#include "category.h" -#include "vendor.h" -#include "template.h" +#include "lgl-paper.h" +#include "lgl-category.h" +#include "lgl-vendor.h" +#include "lgl-template.h" G_BEGIN_DECLS diff --git a/libglabels/paper.c b/libglabels/lgl-paper.c similarity index 97% rename from libglabels/paper.c rename to libglabels/lgl-paper.c index d0b80fbb..43cca91c 100644 --- a/libglabels/paper.c +++ b/libglabels/lgl-paper.c @@ -1,6 +1,6 @@ /* - * paper.c - * Copyright (C) 2003-2009 Jim Evins . + * lgl-paper.c + * Copyright (C) 2003-2010 Jim Evins . * * This file is part of libglabels. * @@ -20,7 +20,7 @@ #include -#include "paper.h" +#include "lgl-paper.h" #include #include diff --git a/libglabels/paper.h b/libglabels/lgl-paper.h similarity index 96% rename from libglabels/paper.h rename to libglabels/lgl-paper.h index 46a7a64d..ecb5b8ee 100644 --- a/libglabels/paper.h +++ b/libglabels/lgl-paper.h @@ -1,6 +1,6 @@ /* - * paper.h - * Copyright (C) 2003-2009 Jim Evins . + * lgl-paper.h + * Copyright (C) 2003-2010 Jim Evins . * * This file is part of libglabels. * diff --git a/libglabels/str.c b/libglabels/lgl-str.c similarity index 98% rename from libglabels/str.c rename to libglabels/lgl-str.c index a9364c7d..4618fadf 100644 --- a/libglabels/str.c +++ b/libglabels/lgl-str.c @@ -1,6 +1,6 @@ /* - * str.c - * Copyright (C) 2007-2009 Jim Evins . + * lgl-str.c + * Copyright (C) 2007-2010 Jim Evins . * * This file is part of libglabels. * @@ -20,7 +20,7 @@ #include -#include "str.h" +#include "lgl-str.h" #include #include diff --git a/libglabels/str.h b/libglabels/lgl-str.h similarity index 94% rename from libglabels/str.h rename to libglabels/lgl-str.h index b22f13b5..3c096b01 100644 --- a/libglabels/str.h +++ b/libglabels/lgl-str.h @@ -1,6 +1,6 @@ /* - * str.h - * Copyright (C) 2007-2009 Jim Evins . + * lgl-str.h + * Copyright (C) 2007-2010 Jim Evins . * * This file is part of libglabels. * diff --git a/libglabels/template.c b/libglabels/lgl-template.c similarity index 99% rename from libglabels/template.c rename to libglabels/lgl-template.c index b28a6c24..11763dcf 100644 --- a/libglabels/template.c +++ b/libglabels/lgl-template.c @@ -1,6 +1,6 @@ /* - * template.c - * Copyright (C) 2001-2009 Jim Evins . + * lgl-template.c + * Copyright (C) 2001-2010 Jim Evins . * * This file is part of libglabels. * @@ -20,7 +20,7 @@ #include -#include "template.h" +#include "lgl-template.h" #include #include @@ -31,8 +31,8 @@ #include "libglabels-private.h" -#include "db.h" -#include "paper.h" +#include "lgl-db.h" +#include "lgl-paper.h" /*===========================================*/ /* Private macros and constants. */ diff --git a/libglabels/template.h b/libglabels/lgl-template.h similarity index 99% rename from libglabels/template.h rename to libglabels/lgl-template.h index 74e50cf8..c1439ab2 100644 --- a/libglabels/template.h +++ b/libglabels/lgl-template.h @@ -1,6 +1,6 @@ /* - * template.h - * Copyright (C) 2001-2009 Jim Evins . + * lgl-template.h + * Copyright (C) 2001-2010 Jim Evins . * * This file is part of libglabels. * @@ -22,7 +22,7 @@ #define __LGL_TEMPLATE_H__ #include -#include "units.h" +#include "lgl-units.h" G_BEGIN_DECLS diff --git a/libglabels/units.c b/libglabels/lgl-units.c similarity index 98% rename from libglabels/units.c rename to libglabels/lgl-units.c index e585962b..73d243d0 100644 --- a/libglabels/units.c +++ b/libglabels/lgl-units.c @@ -1,6 +1,6 @@ /* - * units.c - * Copyright (C) 2003-2009 Jim Evins . + * lgl-units.c + * Copyright (C) 2003-2010 Jim Evins . * * This file is part of libglabels. * @@ -20,7 +20,7 @@ #include -#include "units.h" +#include "lgl-units.h" #include #include diff --git a/libglabels/units.h b/libglabels/lgl-units.h similarity index 96% rename from libglabels/units.h rename to libglabels/lgl-units.h index ac3bb0c7..b22be074 100644 --- a/libglabels/units.h +++ b/libglabels/lgl-units.h @@ -1,6 +1,6 @@ /* - * units.h - * Copyright (C) 2003-2009 Jim Evins . + * lgl-units.h + * Copyright (C) 2003-2010 Jim Evins . * * This file is part of libglabels. * diff --git a/libglabels/vendor.c b/libglabels/lgl-vendor.c similarity index 96% rename from libglabels/vendor.c rename to libglabels/lgl-vendor.c index e7f950bd..425c1b53 100644 --- a/libglabels/vendor.c +++ b/libglabels/lgl-vendor.c @@ -1,6 +1,6 @@ /* - * vendor.c - * Copyright (C) 2003-2009 Jim Evins . + * lgl-vendor.c + * Copyright (C) 2003-2010 Jim Evins . * * This file is part of libglabels. * @@ -20,7 +20,7 @@ #include -#include "vendor.h" +#include "lgl-vendor.h" #include #include diff --git a/libglabels/vendor.h b/libglabels/lgl-vendor.h similarity index 95% rename from libglabels/vendor.h rename to libglabels/lgl-vendor.h index 68b9ff58..fc0be293 100644 --- a/libglabels/vendor.h +++ b/libglabels/lgl-vendor.h @@ -1,6 +1,6 @@ /* - * vendor.h - * Copyright (C) 2003-2009 Jim Evins . + * lgl-vendor.h + * Copyright (C) 2003-2010 Jim Evins . * * This file is part of libglabels. * diff --git a/libglabels/xml-category.c b/libglabels/lgl-xml-category.c similarity index 97% rename from libglabels/xml-category.c rename to libglabels/lgl-xml-category.c index 4925eba3..91822eec 100644 --- a/libglabels/xml-category.c +++ b/libglabels/lgl-xml-category.c @@ -1,6 +1,6 @@ /* - * xml-category.c - * Copyright (C) 2006-2009 Jim Evins . + * lgl-xml-category.c + * Copyright (C) 2006-2010 Jim Evins . * * This file is part of libglabels. * @@ -20,7 +20,7 @@ #include -#include "xml-category.h" +#include "lgl-xml-category.h" #include #include @@ -29,7 +29,7 @@ #include "libglabels-private.h" -#include "xml.h" +#include "lgl-xml.h" /*===========================================*/ /* Private types */ diff --git a/libglabels/xml-category.h b/libglabels/lgl-xml-category.h similarity index 92% rename from libglabels/xml-category.h rename to libglabels/lgl-xml-category.h index acfc5a53..1f535e9b 100644 --- a/libglabels/xml-category.h +++ b/libglabels/lgl-xml-category.h @@ -1,6 +1,6 @@ /* - * xml-category.h - * Copyright (C) 2006-2009 Jim Evins . + * lgl-xml-category.h + * Copyright (C) 2006-2010 Jim Evins . * * This file is part of libglabels. * @@ -24,7 +24,7 @@ #include #include -#include "category.h" +#include "lgl-category.h" G_BEGIN_DECLS diff --git a/libglabels/xml-paper.c b/libglabels/lgl-xml-paper.c similarity index 97% rename from libglabels/xml-paper.c rename to libglabels/lgl-xml-paper.c index 00263e71..549f9e8a 100644 --- a/libglabels/xml-paper.c +++ b/libglabels/lgl-xml-paper.c @@ -1,6 +1,6 @@ /* - * xml-paper.c - * Copyright (C) 2003-2009 Jim Evins . + * lgl-xml-paper.c + * Copyright (C) 2003-2010 Jim Evins . * * This file is part of libglabels. * @@ -20,7 +20,7 @@ #include -#include "xml-paper.h" +#include "lgl-xml-paper.h" #include #include @@ -29,7 +29,7 @@ #include "libglabels-private.h" -#include "xml.h" +#include "lgl-xml.h" /*===========================================*/ /* Private types */ diff --git a/libglabels/xml-paper.h b/libglabels/lgl-xml-paper.h similarity index 92% rename from libglabels/xml-paper.h rename to libglabels/lgl-xml-paper.h index 71c30878..e4704c62 100644 --- a/libglabels/xml-paper.h +++ b/libglabels/lgl-xml-paper.h @@ -1,6 +1,6 @@ /* - * xml-paper.h - * Copyright (C) 2003-2009 Jim Evins . + * lgl-xml-paper.h + * Copyright (C) 2003-2010 Jim Evins . * * This file is part of libglabels. * @@ -24,7 +24,7 @@ #include #include -#include "paper.h" +#include "lgl-paper.h" G_BEGIN_DECLS diff --git a/libglabels/xml-template.c b/libglabels/lgl-xml-template.c similarity index 99% rename from libglabels/xml-template.c rename to libglabels/lgl-xml-template.c index 8e9f5b3d..95a2a659 100644 --- a/libglabels/xml-template.c +++ b/libglabels/lgl-xml-template.c @@ -1,6 +1,6 @@ /* - * xml-template.c - * Copyright (C) 2001-2009 Jim Evins . + * lgl-xml-template.c + * Copyright (C) 2001-2010 Jim Evins . * * This file is part of libglabels. * @@ -20,7 +20,7 @@ #include -#include "xml-template.h" +#include "lgl-xml-template.h" #include #include @@ -29,8 +29,8 @@ #include "libglabels-private.h" -#include "db.h" -#include "xml.h" +#include "lgl-db.h" +#include "lgl-xml.h" /*===========================================*/ /* Private types */ diff --git a/libglabels/xml-template.h b/libglabels/lgl-xml-template.h similarity index 94% rename from libglabels/xml-template.h rename to libglabels/lgl-xml-template.h index 3c323491..99b52d39 100644 --- a/libglabels/xml-template.h +++ b/libglabels/lgl-xml-template.h @@ -1,6 +1,6 @@ /* - * xml-template.h - * Copyright (C) 2001-2009 Jim Evins . + * lgl-xml-template.h + * Copyright (C) 2001-2010 Jim Evins . * * This file is part of libglabels. * @@ -24,7 +24,7 @@ #include #include -#include "template.h" +#include "lgl-template.h" G_BEGIN_DECLS diff --git a/libglabels/xml-vendor.c b/libglabels/lgl-xml-vendor.c similarity index 96% rename from libglabels/xml-vendor.c rename to libglabels/lgl-xml-vendor.c index c6ba9911..cc44bc87 100644 --- a/libglabels/xml-vendor.c +++ b/libglabels/lgl-xml-vendor.c @@ -1,6 +1,6 @@ /* - * xml-vendor.c - * Copyright (C) 2003-2009 Jim Evins . + * lgl-xml-vendor.c + * Copyright (C) 2003-2010 Jim Evins . * * This file is part of libglabels. * @@ -20,7 +20,7 @@ #include -#include "xml-vendor.h" +#include "lgl-xml-vendor.h" #include #include @@ -29,7 +29,7 @@ #include "libglabels-private.h" -#include "xml.h" +#include "lgl-xml.h" /*===========================================*/ /* Private types */ diff --git a/libglabels/xml-vendor.h b/libglabels/lgl-xml-vendor.h similarity index 92% rename from libglabels/xml-vendor.h rename to libglabels/lgl-xml-vendor.h index a565eb09..0aac3b71 100644 --- a/libglabels/xml-vendor.h +++ b/libglabels/lgl-xml-vendor.h @@ -1,6 +1,6 @@ /* - * xml-vendor.h - * Copyright (C) 2003-2009 Jim Evins . + * lgl-xml-vendor.h + * Copyright (C) 2003-2010 Jim Evins . * * This file is part of libglabels. * @@ -24,7 +24,7 @@ #include #include -#include "vendor.h" +#include "lgl-vendor.h" G_BEGIN_DECLS diff --git a/libglabels/xml.c b/libglabels/lgl-xml.c similarity index 99% rename from libglabels/xml.c rename to libglabels/lgl-xml.c index 4bce17e2..8a090198 100644 --- a/libglabels/xml.c +++ b/libglabels/lgl-xml.c @@ -1,6 +1,6 @@ /* - * xml.c - * Copyright (C) 2003-2009 Jim Evins . + * lgl-xml.c + * Copyright (C) 2003-2010 Jim Evins . * * This file is part of libglabels. * @@ -20,7 +20,7 @@ #include -#include "xml.h" +#include "lgl-xml.h" #include #include diff --git a/libglabels/xml.h b/libglabels/lgl-xml.h similarity index 96% rename from libglabels/xml.h rename to libglabels/lgl-xml.h index 8b5ba9dd..8bae2431 100644 --- a/libglabels/xml.h +++ b/libglabels/lgl-xml.h @@ -1,6 +1,6 @@ /* - * xml.h - * Copyright (C) 2003-2009 Jim Evins . + * lgl-xml.h + * Copyright (C) 2003-2010 Jim Evins . * * This file is part of libglabels. * @@ -24,7 +24,7 @@ #include #include -#include "units.h" +#include "lgl-units.h" #define LGL_XML_NAME_SPACE "http://glabels.org/xmlns/2.3/" diff --git a/libglabels/libglabels-private.h b/libglabels/libglabels-private.h index 726c8039..43ea4cd4 100644 --- a/libglabels/libglabels-private.h +++ b/libglabels/libglabels-private.h @@ -23,8 +23,8 @@ #include -#include "str.h" -#include "template.h" +#include "lgl-str.h" +#include "lgl-template.h" #undef G_LOG_DOMAIN #define G_LOG_DOMAIN "LibGlabels" diff --git a/libglabels/libglabels.h b/libglabels/libglabels.h index 6d456700..222670ca 100644 --- a/libglabels/libglabels.h +++ b/libglabels/libglabels.h @@ -21,16 +21,16 @@ #ifndef __LIBGLABELS_H__ #define __LIBGLABELS_H__ -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #endif /* __LIBGLABELS_H__ */ diff --git a/po/POTFILES.in b/po/POTFILES.in index 5f1297bb..f71c35b4 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -185,27 +185,27 @@ src/xml-label-04.h src/xml-label.c src/xml-label.h -libglabels/category.c -libglabels/category.h -libglabels/db.c -libglabels/db.h +libglabels/lgl-category.c +libglabels/lgl-category.h +libglabels/lgl-db.c +libglabels/lgl-db.h +libglabels/lgl-paper.c +libglabels/lgl-paper.h +libglabels/lgl-str.c +libglabels/lgl-str.h +libglabels/lgl-template.c +libglabels/lgl-template.h +libglabels/lgl-units.c +libglabels/lgl-units.h +libglabels/lgl-xml.c +libglabels/lgl-xml.h +libglabels/lgl-xml-category.c +libglabels/lgl-xml-category.h +libglabels/lgl-xml-paper.c +libglabels/lgl-xml-paper.h +libglabels/lgl-xml-template.c +libglabels/lgl-xml-template.h libglabels/libglabels-private.h -libglabels/paper.c -libglabels/paper.h -libglabels/str.c -libglabels/str.h -libglabels/template.c -libglabels/template.h -libglabels/units.c -libglabels/units.h -libglabels/xml.c -libglabels/xml.h -libglabels/xml-category.c -libglabels/xml-category.h -libglabels/xml-paper.c -libglabels/xml-paper.h -libglabels/xml-template.c -libglabels/xml-template.h [type: gettext/glade]data/ui/merge-properties-dialog.ui [type: gettext/glade]data/ui/media-select.ui -- 2.39.5