From 5059c91621007eb2ba51293854a77d54d99b4ab3 Mon Sep 17 00:00:00 2001 From: Andrea Zagli Date: Thu, 6 Dec 2012 16:05:03 +0100 Subject: [PATCH] Added namespace to Commons (refs #538). --- .cproject | 24 +++++-- .project | 155 +++++++++++++++++++++++++++++++++++++++++++ src/authorization.c | 4 +- src/authorization.h | 2 +- src/authorizations.c | 4 +- src/authorizations.h | 2 +- src/commons.h | 10 +-- src/main.c | 4 +- src/openauditds.c | 4 +- src/openauditds.h | 2 +- src/resource.c | 4 +- src/resource.h | 2 +- src/resources.c | 4 +- src/resources.h | 2 +- src/role.c | 4 +- src/role.h | 2 +- src/roles.c | 4 +- src/roles.h | 2 +- 18 files changed, 202 insertions(+), 33 deletions(-) diff --git a/.cproject b/.cproject index 93af0a2..f17aff3 100644 --- a/.cproject +++ b/.cproject @@ -16,14 +16,25 @@ - + - - + + + - + + + + @@ -35,8 +46,11 @@ + + + + - diff --git a/.project b/.project index e6d3d6c..214f4d9 100644 --- a/.project +++ b/.project @@ -23,4 +23,159 @@ org.eclipse.cdt.managedbuilder.core.managedBuildNature org.eclipse.cdt.managedbuilder.core.ScannerConfigNature + + + 1354805835476 + + 30 + + org.eclipse.ui.ide.multiFilter + 1.0-name-matches-false-false-*.o + + + + 1354805835479 + + 30 + + org.eclipse.ui.ide.multiFilter + 1.0-name-matches-false-false-autom4te.cache + + + + 1354805835481 + + 30 + + org.eclipse.ui.ide.multiFilter + 1.0-name-matches-false-false-*.exe + + + + 1354805835485 + + 22 + + org.eclipse.ui.ide.multiFilter + 1.0-name-matches-false-false-config.h + + + + 1354805835489 + + 22 + + org.eclipse.ui.ide.multiFilter + 1.0-name-matches-false-false-aclocal.m4 + + + + 1354805835492 + + 22 + + org.eclipse.ui.ide.multiFilter + 1.0-name-matches-false-false-config.h.in + + + + 1354805835495 + + 22 + + org.eclipse.ui.ide.multiFilter + 1.0-name-matches-false-false-config.guess + + + + 1354805835498 + + 22 + + org.eclipse.ui.ide.multiFilter + 1.0-name-matches-false-false-config.log + + + + 1354805835500 + + 22 + + org.eclipse.ui.ide.multiFilter + 1.0-name-matches-false-false-Makefile + + + + 1354805835504 + + 22 + + org.eclipse.ui.ide.multiFilter + 1.0-name-matches-false-false-Makefile.in + + + + 1354805835507 + + 22 + + org.eclipse.ui.ide.multiFilter + 1.0-name-matches-false-false-config.sub + + + + 1354805835510 + + 22 + + org.eclipse.ui.ide.multiFilter + 1.0-name-matches-false-false-config.status + + + + 1354805835513 + + 22 + + org.eclipse.ui.ide.multiFilter + 1.0-name-matches-false-false-configure + + + + 1354805835516 + + 22 + + org.eclipse.ui.ide.multiFilter + 1.0-name-matches-false-false-missing + + + + 1354805835519 + + 22 + + org.eclipse.ui.ide.multiFilter + 1.0-name-matches-false-false-stamp-h1 + + + + 1354805835523 + + 22 + + org.eclipse.ui.ide.multiFilter + 1.0-name-matches-false-false-depcomp + + + + 1354805835527 + + 22 + + org.eclipse.ui.ide.multiFilter + 1.0-name-matches-false-false-install-sh + + + diff --git a/src/authorization.c b/src/authorization.c index 220ef7a..c258e03 100644 --- a/src/authorization.c +++ b/src/authorization.c @@ -60,7 +60,7 @@ static void authorization_on_btn_save_clicked (GtkButton *button, typedef struct _AuthorizationPrivate AuthorizationPrivate; struct _AuthorizationPrivate { - Commons *commons; + AutozGuiCommons *commons; GtkWidget *w; @@ -109,7 +109,7 @@ authorization_init (Authorization *authorization) * Returns: the newly created #Authorization object. */ Authorization -*authorization_new (Commons *commons, gint id) +*authorization_new (AutozGuiCommons *commons, gint id) { GError *error; diff --git a/src/authorization.h b/src/authorization.h index 019b129..164505d 100644 --- a/src/authorization.h +++ b/src/authorization.h @@ -55,7 +55,7 @@ struct _AuthorizationClass GType authorization_get_type (void) G_GNUC_CONST; -Authorization *authorization_new (Commons *commons, gint id); +Authorization *authorization_new (AutozGuiCommons *commons, gint id); GtkWidget *authorization_get_widget (Authorization *authorization); diff --git a/src/authorizations.c b/src/authorizations.c index aadec65..bc3b957 100644 --- a/src/authorizations.c +++ b/src/authorizations.c @@ -65,7 +65,7 @@ enum typedef struct _AuthorizationsPrivate AuthorizationsPrivate; struct _AuthorizationsPrivate { - Commons *commons; + AutozGuiCommons *commons; GtkWidget *widget; @@ -100,7 +100,7 @@ authorizations_init (Authorizations *authorizations) * Returns: the newly created #Authorizations object. */ Authorizations -*authorizations_new (Commons *commons, gboolean selection) +*authorizations_new (AutozGuiCommons *commons, gboolean selection) { GError *error; diff --git a/src/authorizations.h b/src/authorizations.h index 339320e..2a962e6 100644 --- a/src/authorizations.h +++ b/src/authorizations.h @@ -53,7 +53,7 @@ struct _AuthorizationsClass GType authorizations_get_type (void) G_GNUC_CONST; -Authorizations *authorizations_new (Commons *commons, gboolean selection); +Authorizations *authorizations_new (AutozGuiCommons *commons, gboolean selection); GtkWidget *authorizations_get_widget (Authorizations *authorizations); diff --git a/src/commons.h b/src/commons.h index 60b1b71..0c84484 100644 --- a/src/commons.h +++ b/src/commons.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2011 Andrea Zagli + * Copyright (C) 2011-2012 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,8 +20,8 @@ #include #endif -#ifndef __COMMONS_H__ -#define __COMMONS_H__ +#ifndef __AUTOZ_GUI_COMMONS_H__ +#define __AUTOZ_GUI_COMMONS_H__ #include @@ -38,6 +38,6 @@ typedef struct GdaSqlParser *gdaparser; gchar *prefix; - } Commons; + } AutozGuiCommons; -#endif /* __COMMONS_H__ */ +#endif /* __AUTOZ_GUI_COMMONS_H__ */ diff --git a/src/main.c b/src/main.c index 8d3c9f2..10870ad 100644 --- a/src/main.c +++ b/src/main.c @@ -36,7 +36,7 @@ G_MODULE_EXPORT void on_mnu_file_close_activate (GtkMenuItem *menuitem, gpointer user_data); -static Commons *commons; +static AutozGuiCommons *commons; static GtkWidget *w; static GtkWidget *vbx_body; @@ -222,7 +222,7 @@ main (int argc, char *argv[]) gda_init (); /* inizializzazione commons */ - commons = g_malloc0 (sizeof (Commons)); + commons = g_malloc0 (sizeof (AutozGuiCommons)); #ifdef G_OS_WIN32 diff --git a/src/openauditds.c b/src/openauditds.c index c9f33b3..750ba37 100644 --- a/src/openauditds.c +++ b/src/openauditds.c @@ -47,7 +47,7 @@ static void open_audit_ds_on_btn_open_clicked (GtkButton *button, typedef struct _OpenAuditDSPrivate OpenAuditDSPrivate; struct _OpenAuditDSPrivate { - Commons *commons; + AutozGuiCommons *commons; GtkWidget *w; GtkWidget *wlogin; @@ -95,7 +95,7 @@ open_audit_ds_init (OpenAuditDS *open_audit_ds) * Returns: the newly created #OpenAuditDS object. */ OpenAuditDS -*open_audit_ds_new (Commons *commons) +*open_audit_ds_new (AutozGuiCommons *commons) { GError *error; diff --git a/src/openauditds.h b/src/openauditds.h index dced370..763e719 100644 --- a/src/openauditds.h +++ b/src/openauditds.h @@ -55,7 +55,7 @@ struct _OpenAuditDSClass GType open_audit_ds_get_type (void) G_GNUC_CONST; -OpenAuditDS *open_audit_ds_new (Commons *commons); +OpenAuditDS *open_audit_ds_new (AutozGuiCommons *commons); GtkWidget *open_audit_ds_get_widget (OpenAuditDS *open_audit_ds); diff --git a/src/resource.c b/src/resource.c index c2d5820..a3c4768 100644 --- a/src/resource.c +++ b/src/resource.c @@ -47,7 +47,7 @@ static void resource_on_btn_save_clicked (GtkButton *button, typedef struct _ResourcePrivate ResourcePrivate; struct _ResourcePrivate { - Commons *commons; + AutozGuiCommons *commons; GtkWidget *w; @@ -96,7 +96,7 @@ resource_init (Resource *resource) * Returns: the newly created #Resource object. */ Resource -*resource_new (Commons *commons, gint id) +*resource_new (AutozGuiCommons *commons, gint id) { GError *error; diff --git a/src/resource.h b/src/resource.h index 93270ac..9146314 100644 --- a/src/resource.h +++ b/src/resource.h @@ -55,7 +55,7 @@ struct _ResourceClass GType resource_get_type (void) G_GNUC_CONST; -Resource *resource_new (Commons *commons, gint id); +Resource *resource_new (AutozGuiCommons *commons, gint id); GtkWidget *resource_get_widget (Resource *resource); diff --git a/src/resources.c b/src/resources.c index 91acabb..440241a 100644 --- a/src/resources.c +++ b/src/resources.c @@ -63,7 +63,7 @@ enum typedef struct _ResourcesPrivate ResourcesPrivate; struct _ResourcesPrivate { - Commons *commons; + AutozGuiCommons *commons; GtkWidget *widget; @@ -98,7 +98,7 @@ resources_init (Resources *resources) * Returns: the newly created #Resources object. */ Resources -*resources_new (Commons *commons, gboolean selection) +*resources_new (AutozGuiCommons *commons, gboolean selection) { GError *error; diff --git a/src/resources.h b/src/resources.h index 21ab8e8..1ce1abd 100644 --- a/src/resources.h +++ b/src/resources.h @@ -53,7 +53,7 @@ struct _ResourcesClass GType resources_get_type (void) G_GNUC_CONST; -Resources *resources_new (Commons *commons, gboolean selection); +Resources *resources_new (AutozGuiCommons *commons, gboolean selection); GtkWidget *resources_get_widget (Resources *resources); diff --git a/src/role.c b/src/role.c index d2716a7..35ddc7e 100644 --- a/src/role.c +++ b/src/role.c @@ -47,7 +47,7 @@ static void role_on_btn_save_clicked (GtkButton *button, typedef struct _RolePrivate RolePrivate; struct _RolePrivate { - Commons *commons; + AutozGuiCommons *commons; GtkWidget *w; @@ -96,7 +96,7 @@ role_init (Role *role) * Returns: the newly created #Role object. */ Role -*role_new (Commons *commons, gint id) +*role_new (AutozGuiCommons *commons, gint id) { GError *error; diff --git a/src/role.h b/src/role.h index 43888ed..10d3e1c 100644 --- a/src/role.h +++ b/src/role.h @@ -55,7 +55,7 @@ struct _RoleClass GType role_get_type (void) G_GNUC_CONST; -Role *role_new (Commons *commons, gint id); +Role *role_new (AutozGuiCommons *commons, gint id); GtkWidget *role_get_widget (Role *role); diff --git a/src/roles.c b/src/roles.c index d2e9136..bf8c46c 100644 --- a/src/roles.c +++ b/src/roles.c @@ -63,7 +63,7 @@ enum typedef struct _RolesPrivate RolesPrivate; struct _RolesPrivate { - Commons *commons; + AutozGuiCommons *commons; GtkWidget *widget; @@ -98,7 +98,7 @@ roles_init (Roles *roles) * Returns: the newly created #Roles object. */ Roles -*roles_new (Commons *commons, gboolean selection) +*roles_new (AutozGuiCommons *commons, gboolean selection) { GError *error; diff --git a/src/roles.h b/src/roles.h index 8db3586..ddae38b 100644 --- a/src/roles.h +++ b/src/roles.h @@ -53,7 +53,7 @@ struct _RolesClass GType roles_get_type (void) G_GNUC_CONST; -Roles *roles_new (Commons *commons, gboolean selection); +Roles *roles_new (AutozGuiCommons *commons, gboolean selection); GtkWidget *roles_get_widget (Roles *roles); -- 2.49.0