From 950681a8803398f0fdab4c3158a5de3026cc87c2 Mon Sep 17 00:00:00 2001 From: Andrea Zagli Date: Sun, 26 Jul 2009 15:26:41 +0200 Subject: [PATCH] Removed libform from all files names. --- src/Makefile.am | 32 +++++++++---------- src/field.c | 8 ++--- src/{libformfield.h => field.h} | 2 +- src/fieldboolean.c | 6 ++-- src/{libformfieldboolean.h => fieldboolean.h} | 2 +- src/fielddatetime.c | 14 ++++---- ...libformfielddatetime.h => fielddatetime.h} | 2 +- src/fieldfloat.c | 6 ++-- src/{libformfieldfloat.h => fieldfloat.h} | 2 +- src/fieldinteger.c | 6 ++-- src/{libformfieldinteger.h => fieldinteger.h} | 2 +- src/fieldtext.c | 6 ++-- src/{libformfieldtext.h => fieldtext.h} | 2 +- src/form.c | 4 +-- src/{libform.h => form.h} | 6 ++-- src/{formkey.c => key.c} | 4 +-- src/{libformkey.h => key.h} | 2 +- src/widget.c | 4 +-- src/{libformwidget.h => widget.h} | 2 +- src/widgetcheck.c | 4 +-- src/{libformwidgetcheck.h => widgetcheck.h} | 4 +-- src/widgetcombobox.c | 4 +-- ...bformwidgetcombobox.h => widgetcombobox.h} | 4 +-- src/widgetentry.c | 4 +-- src/{libformwidgetentry.h => widgetentry.h} | 4 +-- src/widgetlabel.c | 4 +-- src/{libformwidgetlabel.h => widgetlabel.h} | 4 +-- src/widgetspin.c | 4 +-- src/{libformwidgetspin.h => widgetspin.h} | 4 +-- src/widgettextview.c | 4 +-- ...bformwidgettextview.h => widgettextview.h} | 4 +-- test/main.c | 28 ++++++++-------- 32 files changed, 88 insertions(+), 100 deletions(-) rename src/{libformfield.h => field.h} (99%) rename src/{libformfieldboolean.h => fieldboolean.h} (98%) rename src/{libformfielddatetime.h => fielddatetime.h} (98%) rename src/{libformfieldfloat.h => fieldfloat.h} (98%) rename src/{libformfieldinteger.h => fieldinteger.h} (98%) rename src/{libformfieldtext.h => fieldtext.h} (98%) rename src/{libform.h => form.h} (96%) rename src/{formkey.c => key.c} (98%) rename src/{libformkey.h => key.h} (98%) rename src/{libformwidget.h => widget.h} (97%) rename src/{libformwidgetcheck.h => widgetcheck.h} (96%) rename src/{libformwidgetcombobox.h => widgetcombobox.h} (96%) rename src/{libformwidgetentry.h => widgetentry.h} (96%) rename src/{libformwidgetlabel.h => widgetlabel.h} (95%) rename src/{libformwidgetspin.h => widgetspin.h} (96%) rename src/{libformwidgettextview.h => widgettextview.h} (96%) diff --git a/src/Makefile.am b/src/Makefile.am index 2d70b3c..b9bc16d 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -5,7 +5,7 @@ AM_CPPFLAGS = $(GTKFORM_CFLAGS) lib_LTLIBRARIES = libgtkform.la libgtkform_la_SOURCES = form.c \ - formkey.c \ + key.c \ field.c \ fieldboolean.c \ fielddatetime.c \ @@ -22,20 +22,20 @@ libgtkform_la_SOURCES = form.c \ libgtkform_la_LDFLAGS = -no-undefined -libgtkform_include_HEADERS = libform.h \ - libformkey.h \ - libformfield.h \ - libformfieldboolean.h \ - libformfielddatetime.h \ - libformfieldfloat.h \ - libformfieldinteger.h \ - libformfieldtext.h \ - libformwidget.h \ - libformwidgetcheck.h \ - libformwidgetcombobox.h \ - libformwidgetentry.h \ - libformwidgetlabel.h \ - libformwidgetspin.h \ - libformwidgettextview.h +libgtkform_include_HEADERS = form.h \ + key.h \ + field.h \ + fieldboolean.h \ + fielddatetime.h \ + fieldfloat.h \ + fieldinteger.h \ + fieldtext.h \ + widget.h \ + widgetcheck.h \ + widgetcombobox.h \ + widgetentry.h \ + widgetlabel.h \ + widgetspin.h \ + widgettextview.h libgtkform_includedir = $(includedir)/libgtkform diff --git a/src/field.c b/src/field.c index b05be10..f99b56e 100644 --- a/src/field.c +++ b/src/field.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2006 Andrea Zagli + * Copyright (C) 2005-2009 Andrea Zagli * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -16,10 +16,8 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#include - -#include "libformwidget.h" -#include "libformfield.h" +#include "widget.h" +#include "field.h" enum { diff --git a/src/libformfield.h b/src/field.h similarity index 99% rename from src/libformfield.h rename to src/field.h index f9d2a76..2de6964 100644 --- a/src/libformfield.h +++ b/src/field.h @@ -23,7 +23,7 @@ #include -#include +#include "widget.h" G_BEGIN_DECLS diff --git a/src/fieldboolean.c b/src/fieldboolean.c index ffa68e9..4f36f71 100644 --- a/src/fieldboolean.c +++ b/src/fieldboolean.c @@ -18,10 +18,8 @@ #include -#include - -#include "libformwidget.h" -#include "libformfieldboolean.h" +#include "widget.h" +#include "fieldboolean.h" enum { diff --git a/src/libformfieldboolean.h b/src/fieldboolean.h similarity index 98% rename from src/libformfieldboolean.h rename to src/fieldboolean.h index 31fefdc..9d87359 100644 --- a/src/libformfieldboolean.h +++ b/src/fieldboolean.h @@ -21,7 +21,7 @@ #include -#include +#include "field.h" G_BEGIN_DECLS diff --git a/src/fielddatetime.c b/src/fielddatetime.c index 4a20580..28a006b 100644 --- a/src/fielddatetime.c +++ b/src/fielddatetime.c @@ -19,10 +19,8 @@ #include #include -#include - -#include "libformwidget.h" -#include "libformfielddatetime.h" +#include "widget.h" +#include "fielddatetime.h" enum { @@ -111,9 +109,9 @@ form_field_datetime_class_init (FormFieldDateTimeClass *klass) g_param_spec_int ("type", "Type", "Type", - G_MININT, - G_MAXINT, - FORM_FIELD_DATETIME_TYPE_DATETIME, + G_MININT, + G_MAXINT, + FORM_FIELD_DATETIME_TYPE_DATETIME, G_PARAM_READWRITE | G_PARAM_CONSTRUCT)); g_type_class_add_private (object_class, sizeof (FormFieldDateTimePrivate)); @@ -272,7 +270,7 @@ form_field_datetime_set_from_datamodel (FormField *field, GdaDataModel *dm, gint if (dm != NULL) { ret = form_field_datetime_set_value_stringify (field, - gdaex_data_model_get_field_value_stringify_at (dm, row, field_name)); + gdaex_data_model_get_field_value_stringify_at (dm, row, field_name)); } return ret; diff --git a/src/libformfielddatetime.h b/src/fielddatetime.h similarity index 98% rename from src/libformfielddatetime.h rename to src/fielddatetime.h index 84b2ecd..49c6f04 100644 --- a/src/libformfielddatetime.h +++ b/src/fielddatetime.h @@ -21,7 +21,7 @@ #include -#include +#include "field.h" G_BEGIN_DECLS diff --git a/src/fieldfloat.c b/src/fieldfloat.c index 5641edc..019f01b 100644 --- a/src/fieldfloat.c +++ b/src/fieldfloat.c @@ -18,10 +18,8 @@ #include -#include - -#include "libformwidget.h" -#include "libformfieldfloat.h" +#include "widget.h" +#include "fieldfloat.h" enum { diff --git a/src/libformfieldfloat.h b/src/fieldfloat.h similarity index 98% rename from src/libformfieldfloat.h rename to src/fieldfloat.h index 33e81ed..58801a7 100644 --- a/src/libformfieldfloat.h +++ b/src/fieldfloat.h @@ -21,7 +21,7 @@ #include -#include +#include "field.h" G_BEGIN_DECLS diff --git a/src/fieldinteger.c b/src/fieldinteger.c index 3e9d967..32403c6 100644 --- a/src/fieldinteger.c +++ b/src/fieldinteger.c @@ -16,10 +16,8 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#include - -#include "libformwidget.h" -#include "libformfieldinteger.h" +#include "widget.h" +#include "fieldinteger.h" enum { diff --git a/src/libformfieldinteger.h b/src/fieldinteger.h similarity index 98% rename from src/libformfieldinteger.h rename to src/fieldinteger.h index 92ec2bf..28c741e 100644 --- a/src/libformfieldinteger.h +++ b/src/fieldinteger.h @@ -21,7 +21,7 @@ #include -#include +#include "field.h" G_BEGIN_DECLS diff --git a/src/fieldtext.c b/src/fieldtext.c index ea4abcc..c25aaf9 100644 --- a/src/fieldtext.c +++ b/src/fieldtext.c @@ -16,10 +16,8 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#include - -#include "libformwidget.h" -#include "libformfieldtext.h" +#include "widget.h" +#include "fieldtext.h" enum { diff --git a/src/libformfieldtext.h b/src/fieldtext.h similarity index 98% rename from src/libformfieldtext.h rename to src/fieldtext.h index fcce038..15fd909 100644 --- a/src/libformfieldtext.h +++ b/src/fieldtext.h @@ -21,7 +21,7 @@ #include -#include +#include "field.h" G_BEGIN_DECLS diff --git a/src/form.c b/src/form.c index 935643c..60db4cc 100644 --- a/src/form.c +++ b/src/form.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2006 Andrea Zagli + * Copyright (C) 2005-2009 Andrea Zagli * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -22,7 +22,7 @@ #include -#include "libform.h" +#include "form.h" enum { diff --git a/src/libform.h b/src/form.h similarity index 96% rename from src/libform.h rename to src/form.h index 89d581e..9b16fb6 100644 --- a/src/libform.h +++ b/src/form.h @@ -22,9 +22,9 @@ #include #include -#include -#include -#include +#include "field.h" +#include "widget.h" +#include "key.h" G_BEGIN_DECLS diff --git a/src/formkey.c b/src/key.c similarity index 98% rename from src/formkey.c rename to src/key.c index 8789b44..0eda43d 100644 --- a/src/formkey.c +++ b/src/key.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2006 Andrea Zagli + * Copyright (C) 2005-2009 Andrea Zagli * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -19,7 +19,7 @@ #include #include -#include "libformkey.h" +#include "key.h" static void form_key_class_init (FormKeyClass *class); static void form_key_init (FormKey *form_key); diff --git a/src/libformkey.h b/src/key.h similarity index 98% rename from src/libformkey.h rename to src/key.h index 99e7c94..fbe4434 100644 --- a/src/libformkey.h +++ b/src/key.h @@ -21,7 +21,7 @@ #include -#include +#include "field.h" G_BEGIN_DECLS diff --git a/src/widget.c b/src/widget.c index 8c64011..b45b9c7 100644 --- a/src/widget.c +++ b/src/widget.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2006 Andrea Zagli + * Copyright (C) 2005-2009 Andrea Zagli * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -18,7 +18,7 @@ #include -#include "libformwidget.h" +#include "widget.h" enum { diff --git a/src/libformwidget.h b/src/widget.h similarity index 97% rename from src/libformwidget.h rename to src/widget.h index 97c5154..caf5608 100644 --- a/src/libformwidget.h +++ b/src/widget.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2006 Andrea Zagli + * Copyright (C) 2005-2009 Andrea Zagli * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/widgetcheck.c b/src/widgetcheck.c index 5b82aa8..46c39b2 100644 --- a/src/widgetcheck.c +++ b/src/widgetcheck.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2006 Andrea Zagli + * Copyright (C) 2005-2009 Andrea Zagli * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -20,7 +20,7 @@ #include -#include "libformwidgetcheck.h" +#include "widgetcheck.h" enum { diff --git a/src/libformwidgetcheck.h b/src/widgetcheck.h similarity index 96% rename from src/libformwidgetcheck.h rename to src/widgetcheck.h index 0cda388..1c7b88c 100644 --- a/src/libformwidgetcheck.h +++ b/src/widgetcheck.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2006 Andrea Zagli + * Copyright (C) 2005-2009 Andrea Zagli * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -19,7 +19,7 @@ #ifndef __LIBFORM_WIDGET_CHECK_H__ #define __LIBFORM_WIDGET_CHECK_H__ -#include +#include "widget.h" G_BEGIN_DECLS diff --git a/src/widgetcombobox.c b/src/widgetcombobox.c index 7e759a4..03077c9 100644 --- a/src/widgetcombobox.c +++ b/src/widgetcombobox.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2006 Andrea Zagli + * Copyright (C) 2005-2009 Andrea Zagli * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -18,7 +18,7 @@ #include -#include "libformwidgetcombobox.h" +#include "widgetcombobox.h" enum { diff --git a/src/libformwidgetcombobox.h b/src/widgetcombobox.h similarity index 96% rename from src/libformwidgetcombobox.h rename to src/widgetcombobox.h index db01d71..a0d48fa 100644 --- a/src/libformwidgetcombobox.h +++ b/src/widgetcombobox.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2006 Andrea Zagli + * Copyright (C) 2005-2009 Andrea Zagli * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -19,7 +19,7 @@ #ifndef __LIBFORM_WIDGET_COMBO_BOX_H__ #define __LIBFORM_WIDGET_COMBO_BOX_H__ -#include +#include "widget.h" G_BEGIN_DECLS diff --git a/src/widgetentry.c b/src/widgetentry.c index aceaa42..f1a4a88 100644 --- a/src/widgetentry.c +++ b/src/widgetentry.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2006 Andrea Zagli + * Copyright (C) 2005-2009 Andrea Zagli * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -18,7 +18,7 @@ #include -#include "libformwidgetentry.h" +#include "widgetentry.h" enum { diff --git a/src/libformwidgetentry.h b/src/widgetentry.h similarity index 96% rename from src/libformwidgetentry.h rename to src/widgetentry.h index 891b0cb..5579493 100644 --- a/src/libformwidgetentry.h +++ b/src/widgetentry.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2006 Andrea Zagli + * Copyright (C) 2005-2009 Andrea Zagli * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -19,7 +19,7 @@ #ifndef __LIBFORM_WIDGET_ENTRY_H__ #define __LIBFORM_WIDGET_ENTRY_H__ -#include +#include "widget.h" G_BEGIN_DECLS diff --git a/src/widgetlabel.c b/src/widgetlabel.c index 650a890..d53faed 100644 --- a/src/widgetlabel.c +++ b/src/widgetlabel.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2006 Andrea Zagli + * Copyright (C) 2005-2009 Andrea Zagli * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -18,7 +18,7 @@ #include -#include "libformwidgetlabel.h" +#include "widgetlabel.h" enum { diff --git a/src/libformwidgetlabel.h b/src/widgetlabel.h similarity index 95% rename from src/libformwidgetlabel.h rename to src/widgetlabel.h index 0ffab9a..7eb3218 100644 --- a/src/libformwidgetlabel.h +++ b/src/widgetlabel.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2006 Andrea Zagli + * Copyright (C) 2005-2009 Andrea Zagli * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -19,7 +19,7 @@ #ifndef __LIBFORM_WIDGET_LABEL_H__ #define __LIBFORM_WIDGET_LABEL_H__ -#include +#include "widget.h" G_BEGIN_DECLS diff --git a/src/widgetspin.c b/src/widgetspin.c index 850f25d..99b6230 100644 --- a/src/widgetspin.c +++ b/src/widgetspin.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2006 Andrea Zagli + * Copyright (C) 2005-2009 Andrea Zagli * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -20,7 +20,7 @@ #include -#include "libformwidgetspin.h" +#include "widgetspin.h" enum { diff --git a/src/libformwidgetspin.h b/src/widgetspin.h similarity index 96% rename from src/libformwidgetspin.h rename to src/widgetspin.h index ea0fcb1..55b7245 100644 --- a/src/libformwidgetspin.h +++ b/src/widgetspin.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2006 Andrea Zagli + * Copyright (C) 2005-2009 Andrea Zagli * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -19,7 +19,7 @@ #ifndef __LIBFORM_WIDGET_SPIN_H__ #define __LIBFORM_WIDGET_SPIN_H__ -#include +#include "widget.h" G_BEGIN_DECLS diff --git a/src/widgettextview.c b/src/widgettextview.c index cc80640..a8514d7 100644 --- a/src/widgettextview.c +++ b/src/widgettextview.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2006 Andrea Zagli + * Copyright (C) 2005-2009 Andrea Zagli * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -18,7 +18,7 @@ #include -#include "libformwidgettextview.h" +#include "widgettextview.h" enum { diff --git a/src/libformwidgettextview.h b/src/widgettextview.h similarity index 96% rename from src/libformwidgettextview.h rename to src/widgettextview.h index 1d9b2cd..c374fb4 100644 --- a/src/libformwidgettextview.h +++ b/src/widgettextview.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2006 Andrea Zagli + * Copyright (C) 2005-2009 Andrea Zagli * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -19,7 +19,7 @@ #ifndef __LIBFORM_WIDGET_TEXTVIEW_H__ #define __LIBFORM_WIDGET_TEXTVIEW_H__ -#include +#include "widget.h" G_BEGIN_DECLS diff --git a/test/main.c b/test/main.c index 97f09ce..fb4ebe7 100644 --- a/test/main.c +++ b/test/main.c @@ -22,20 +22,20 @@ #include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include "form.h" +#include "field.h" +#include "fieldboolean.h" +#include "fielddatetime.h" +#include "fieldinteger.h" +#include "fieldfloat.h" +#include "fieldtext.h" +#include "widget.h" +#include "widgetcheck.h" +#include "widgetcombobox.h" +#include "widgetentry.h" +#include "widgetlabel.h" +#include "widgetspin.h" +#include "widgettextview.h" Form *form; -- 2.49.0