GNOME.org
 

[nautilus-actions/file-manager-actions] NAXMLProvider class is renamed to FMAXMLProvider

commit 9a5ff1b3e6f6d7d12697d062095ad32924f2838a
Author: Pierre Wieser <pwieser trychlos org>
Date:   Tue Sep 8 17:29:42 2015 +0200

    NAXMLProvider class is renamed to FMAXMLProvider

 src/io-xml/Makefile.am                             |    4 +-
 src/io-xml/fma-xml-module.c                        |    6 +-
 .../{naxml-provider.c => fma-xml-provider.c}       |   58 ++++++++++----------
 .../{naxml-provider.h => fma-xml-provider.h}       |   44 ++++++++--------
 4 files changed, 56 insertions(+), 56 deletions(-)
---
diff --git a/src/io-xml/Makefile.am b/src/io-xml/Makefile.am
index 6c4ed27..02e3dfb 100644
--- a/src/io-xml/Makefile.am
+++ b/src/io-xml/Makefile.am
@@ -46,8 +46,8 @@ libna_io_xml_la_SOURCES = \
        fma-xml-keys.c                                                                          \
        fma-xml-keys.h                                                                          \
        fma-xml-module.c                                                                        \
-       naxml-provider.c                                                                        \
-       naxml-provider.h                                                                        \
+       fma-xml-provider.c                                                                      \
+       fma-xml-provider.h                                                                      \
        naxml-reader.c                                                                          \
        naxml-reader.h                                                                          \
        naxml-writer.c                                                                          \
diff --git a/src/io-xml/fma-xml-module.c b/src/io-xml/fma-xml-module.c
index 27932aa..e71753e 100644
--- a/src/io-xml/fma-xml-module.c
+++ b/src/io-xml/fma-xml-module.c
@@ -33,7 +33,7 @@
 
 #include <api/fma-extension.h>
 
-#include "naxml-provider.h"
+#include "fma-xml-provider.h"
 
 /* the count of GType types provided by this extension
  * each new GType type must
@@ -54,7 +54,7 @@ fma_extension_startup( GTypeModule *module )
 
        g_debug( "%s: module=%p", thisfn, ( void * ) module );
 
-       naxml_provider_register_type( module );
+       fma_xml_provider_register_type( module );
 
        return( TRUE );
 }
@@ -90,7 +90,7 @@ fma_extension_list_types( const GType **types )
 
        g_debug( "%s: types=%p", thisfn, ( void * ) types );
 
-       types_list[0] = NAXML_TYPE_PROVIDER;
+       types_list[0] = FMA_TYPE_XML_PROVIDER;
 
        types_list[FMA_TYPES_COUNT] = 0;
        *types = types_list;
diff --git a/src/io-xml/naxml-provider.c b/src/io-xml/fma-xml-provider.c
similarity index 82%
rename from src/io-xml/naxml-provider.c
rename to src/io-xml/fma-xml-provider.c
index ab7125f..2cb4779 100644
--- a/src/io-xml/naxml-provider.c
+++ b/src/io-xml/fma-xml-provider.c
@@ -35,27 +35,27 @@
 #include <api/fma-iexporter.h>
 #include <api/fma-iimporter.h>
 
-#include "naxml-provider.h"
+#include "fma-xml-provider.h"
 #include "fma-xml-formats.h"
 #include "naxml-reader.h"
 #include "naxml-writer.h"
 
 /* private class data
  */
-struct _NAXMLProviderClassPrivate {
+struct _FMAXMLProviderClassPrivate {
        void *empty;                                            /* so that gcc -pedantic is happy */
 };
 
 /* private instance data
  */
-struct _NAXMLProviderPrivate {
+struct _FMAXMLProviderPrivate {
        gboolean dispose_has_run;
 };
 
 static GType         st_module_type = 0;
 static GObjectClass *st_parent_class = NULL;
 
-static void   class_init( NAXMLProviderClass *klass );
+static void   class_init( FMAXMLProviderClass *klass );
 static void   instance_init( GTypeInstance *instance, gpointer klass );
 static void   instance_dispose( GObject *object );
 static void   instance_finalize( GObject *object );
@@ -73,24 +73,24 @@ static void   ifactory_provider_iface_init( FMAIFactoryProviderInterface *iface
 static guint  ifactory_provider_get_version( const FMAIFactoryProvider *factory );
 
 GType
-naxml_provider_get_type( void )
+fma_xml_provider_get_type( void )
 {
        return( st_module_type );
 }
 
 void
-naxml_provider_register_type( GTypeModule *module )
+fma_xml_provider_register_type( GTypeModule *module )
 {
-       static const gchar *thisfn = "naxml_provider_register_type";
+       static const gchar *thisfn = "fma_xml_provider_register_type";
 
        static GTypeInfo info = {
-               sizeof( NAXMLProviderClass ),
+               sizeof( FMAXMLProviderClass ),
                NULL,
                NULL,
                ( GClassInitFunc ) class_init,
                NULL,
                NULL,
-               sizeof( NAXMLProvider ),
+               sizeof( FMAXMLProvider ),
                0,
                ( GInstanceInitFunc ) instance_init
        };
@@ -115,7 +115,7 @@ naxml_provider_register_type( GTypeModule *module )
 
        g_debug( "%s", thisfn );
 
-       st_module_type = g_type_module_register_type( module, G_TYPE_OBJECT, "NAXMLProvider", &info, 0 );
+       st_module_type = g_type_module_register_type( module, G_TYPE_OBJECT, "FMAXMLProvider", &info, 0 );
 
        g_type_module_add_interface( module, st_module_type, FMA_TYPE_IIMPORTER, &iimporter_iface_info );
 
@@ -125,9 +125,9 @@ naxml_provider_register_type( GTypeModule *module )
 }
 
 static void
-class_init( NAXMLProviderClass *klass )
+class_init( FMAXMLProviderClass *klass )
 {
-       static const gchar *thisfn = "naxml_provider_class_init";
+       static const gchar *thisfn = "fma_xml_provider_class_init";
        GObjectClass *object_class;
 
        g_debug( "%s: klass=%p", thisfn, ( void * ) klass );
@@ -138,23 +138,23 @@ class_init( NAXMLProviderClass *klass )
        object_class->dispose = instance_dispose;
        object_class->finalize = instance_finalize;
 
-       klass->private = g_new0( NAXMLProviderClassPrivate, 1 );
+       klass->private = g_new0( FMAXMLProviderClassPrivate, 1 );
 }
 
 static void
 instance_init( GTypeInstance *instance, gpointer klass )
 {
-       static const gchar *thisfn = "naxml_provider_instance_init";
-       NAXMLProvider *self;
+       static const gchar *thisfn = "fma_xml_provider_instance_init";
+       FMAXMLProvider *self;
 
-       g_return_if_fail( NA_IS_XML_PROVIDER( instance ));
+       g_return_if_fail( FMA_IS_XML_PROVIDER( instance ));
 
        g_debug( "%s: instance=%p (%s), klass=%p",
                        thisfn, ( void * ) instance, G_OBJECT_TYPE_NAME( instance ), ( void * ) klass );
 
-       self = NAXML_PROVIDER( instance );
+       self = FMA_XML_PROVIDER( instance );
 
-       self->private = g_new0( NAXMLProviderPrivate, 1 );
+       self->private = g_new0( FMAXMLProviderPrivate, 1 );
 
        self->private->dispose_has_run = FALSE;
 }
@@ -162,12 +162,12 @@ instance_init( GTypeInstance *instance, gpointer klass )
 static void
 instance_dispose( GObject *object )
 {
-       static const gchar *thisfn = "naxml_provider_instance_dispose";
-       NAXMLProvider *self;
+       static const gchar *thisfn = "fma_xml_provider_instance_dispose";
+       FMAXMLProvider *self;
 
-       g_return_if_fail( NA_IS_XML_PROVIDER( object ));
+       g_return_if_fail( FMA_IS_XML_PROVIDER( object ));
 
-       self = NAXML_PROVIDER( object );
+       self = FMA_XML_PROVIDER( object );
 
        if( !self->private->dispose_has_run ){
 
@@ -185,14 +185,14 @@ instance_dispose( GObject *object )
 static void
 instance_finalize( GObject *object )
 {
-       static const gchar *thisfn = "naxml_provider_instance_finalize";
-       NAXMLProvider *self;
+       static const gchar *thisfn = "fma_xml_provider_instance_finalize";
+       FMAXMLProvider *self;
 
-       g_return_if_fail( NA_IS_XML_PROVIDER( object ));
+       g_return_if_fail( FMA_IS_XML_PROVIDER( object ));
 
        g_debug( "%s: object=%p (%s)", thisfn, ( void * ) object, G_OBJECT_TYPE_NAME( object ));
 
-       self = NAXML_PROVIDER( object );
+       self = FMA_XML_PROVIDER( object );
 
        g_free( self->private );
 
@@ -205,7 +205,7 @@ instance_finalize( GObject *object )
 static void
 iimporter_iface_init( FMAIImporterInterface *iface )
 {
-       static const gchar *thisfn = "naxml_provider_iimporter_iface_init";
+       static const gchar *thisfn = "fma_xml_provider_iimporter_iface_init";
 
        g_debug( "%s: iface=%p", thisfn, ( void * ) iface );
 
@@ -222,7 +222,7 @@ iimporter_get_version( const FMAIImporter *importer )
 static void
 iexporter_iface_init( FMAIExporterInterface *iface )
 {
-       static const gchar *thisfn = "naxml_provider_iexporter_iface_init";
+       static const gchar *thisfn = "fma_xml_provider_iexporter_iface_init";
 
        g_debug( "%s: iface=%p", thisfn, ( void * ) iface );
 
@@ -261,7 +261,7 @@ iexporter_free_formats( const FMAIExporter *exporter, GList *format_list )
 static void
 ifactory_provider_iface_init( FMAIFactoryProviderInterface *iface )
 {
-       static const gchar *thisfn = "naxml_provider_ifactory_provider_iface_init";
+       static const gchar *thisfn = "fma_xml_provider_ifactory_provider_iface_init";
 
        g_debug( "%s: iface=%p", thisfn, ( void * ) iface );
 
diff --git a/src/io-xml/naxml-provider.h b/src/io-xml/fma-xml-provider.h
similarity index 50%
rename from src/io-xml/naxml-provider.h
rename to src/io-xml/fma-xml-provider.h
index 82024b4..b332b21 100644
--- a/src/io-xml/naxml-provider.h
+++ b/src/io-xml/fma-xml-provider.h
@@ -27,13 +27,13 @@
  *   ... and many others (see AUTHORS)
  */
 
-#ifndef __NAXML_PROVIDER_H__
-#define __NAXML_PROVIDER_H__
+#ifndef __IO_XML_FMA_XML_PROVIDER_H__
+#define __IO_XML_FMA_XML_PROVIDER_H__
 
 /**
- * SECTION: naxml_provider
- * @short_description: #NAXMLProvider class definition.
- * @include: naxml-provider.h
+ * SECTION: fma_xml_provider
+ * @short_description: #FMAXMLProvider class definition.
+ * @include: fma-xml-provider.h
  *
  * This class manages I/O in XML formats.
  */
@@ -42,34 +42,34 @@
 
 G_BEGIN_DECLS
 
-#define NAXML_TYPE_PROVIDER                ( naxml_provider_get_type())
-#define NAXML_PROVIDER( object )           ( G_TYPE_CHECK_INSTANCE_CAST( object, NAXML_TYPE_PROVIDER, 
NAXMLProvider ))
-#define NAXML_PROVIDER_CLASS( klass )      ( G_TYPE_CHECK_CLASS_CAST( klass, NAXML_TYPE_PROVIDER, 
NAXMLProviderClass ))
-#define NA_IS_XML_PROVIDER( object )       ( G_TYPE_CHECK_INSTANCE_TYPE( object, NAXML_TYPE_PROVIDER ))
-#define NA_IS_XML_PROVIDER_CLASS( klass )  ( G_TYPE_CHECK_CLASS_TYPE(( klass ), NAXML_TYPE_PROVIDER ))
-#define NAXML_PROVIDER_GET_CLASS( object ) ( G_TYPE_INSTANCE_GET_CLASS(( object ), NAXML_TYPE_PROVIDER, 
NAXMLProviderClass ))
+#define FMA_TYPE_XML_PROVIDER                ( fma_xml_provider_get_type())
+#define FMA_XML_PROVIDER( object )           ( G_TYPE_CHECK_INSTANCE_CAST( object, FMA_TYPE_XML_PROVIDER, 
FMAXMLProvider ))
+#define FMA_XML_PROVIDER_CLASS( klass )      ( G_TYPE_CHECK_CLASS_CAST( klass, FMA_TYPE_XML_PROVIDER, 
FMAXMLProviderClass ))
+#define FMA_IS_XML_PROVIDER( object )        ( G_TYPE_CHECK_INSTANCE_TYPE( object, FMA_TYPE_XML_PROVIDER ))
+#define FMA_IS_XML_PROVIDER_CLASS( klass )   ( G_TYPE_CHECK_CLASS_TYPE(( klass ), FMA_TYPE_XML_PROVIDER ))
+#define FMA_XML_PROVIDER_GET_CLASS( object ) ( G_TYPE_INSTANCE_GET_CLASS(( object ), FMA_TYPE_XML_PROVIDER, 
FMAXMLProviderClass ))
 
-typedef struct _NAXMLProviderPrivate       NAXMLProviderPrivate;
+typedef struct _FMAXMLProviderPrivate        FMAXMLProviderPrivate;
 
 typedef struct {
        /*< private >*/
-       GObject               parent;
-       NAXMLProviderPrivate *private;
+       GObject                parent;
+       FMAXMLProviderPrivate *private;
 }
-       NAXMLProvider;
+       FMAXMLProvider;
 
-typedef struct _NAXMLProviderClassPrivate  NAXMLProviderClassPrivate;
+typedef struct _FMAXMLProviderClassPrivate   FMAXMLProviderClassPrivate;
 
 typedef struct {
        /*< private >*/
-       GObjectClass               parent;
-       NAXMLProviderClassPrivate *private;
+       GObjectClass                parent;
+       FMAXMLProviderClassPrivate *private;
 }
-       NAXMLProviderClass;
+       FMAXMLProviderClass;
 
-GType naxml_provider_get_type     ( void );
-void  naxml_provider_register_type( GTypeModule *module );
+GType fma_xml_provider_get_type     ( void );
+void  fma_xml_provider_register_type( GTypeModule *module );
 
 G_END_DECLS
 
-#endif /* __NAXML_PROVIDER_H__ */
+#endif /* __IO_XML_FMA_XML_PROVIDER_H__ */
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]