[libgdamm] Use NO_GTYPE with many _WRAP_GERROR() and _WRAP_ENUMS() lines.



commit ae0b54dae77336d0ce5ce2a801fb3d929f67693e
Author: Murray Cumming <murrayc murrayc com>
Date:   Fri Apr 25 21:40:07 2014 +0200

    Use NO_GTYPE with many _WRAP_GERROR() and _WRAP_ENUMS() lines.
    
    libgda-6.0 does not rnu glib-mkenums over all of the header
    files anymore, so not all enums have *_get_type() functions.
    This is apparently intentional though it was an unrelated
    change in this commit:
    https://git.gnome.org/browse/libgda/commit/libgda/Makefile.am?id=0111e1411cdaa9bca1169b367ef2ec26338c432b
    
    It only prevents us from using these enums in a Glib::Value<>
    so it is not a big problem.

 libgda/src/config.hg          |    2 +-
 libgda/src/connectionevent.hg |    4 ++--
 libgda/src/datamodel.hg       |    8 ++++----
 libgda/src/datamodeliter.hg   |    2 +-
 libgda/src/holder.hg          |    2 +-
 libgda/src/metastore.hg       |    2 +-
 libgda/src/metastruct.hg      |   10 +++++-----
 libgda/src/serveroperation.hg |    7 ++++---
 libgda/src/serverprovider.hg  |    2 +-
 libgda/src/sqlbuilder.hg      |    2 +-
 libgda/src/statement.hg       |    6 +++---
 11 files changed, 24 insertions(+), 23 deletions(-)
---
diff --git a/libgda/src/config.hg b/libgda/src/config.hg
index 6e9fafc..72496df 100644
--- a/libgda/src/config.hg
+++ b/libgda/src/config.hg
@@ -33,7 +33,7 @@ namespace Gnome
 namespace Gda
 {
 
-_WRAP_GERROR(ConfigError, GdaConfigError, GDA_CONFIG_ERROR)
+_WRAP_GERROR(ConfigError, GdaConfigError, GDA_CONFIG_ERROR, NO_GTYPE)
 
 
 /** Configuration — Access/Management of libgda configuration.
diff --git a/libgda/src/connectionevent.hg b/libgda/src/connectionevent.hg
index 51885c5..f45b806 100644
--- a/libgda/src/connectionevent.hg
+++ b/libgda/src/connectionevent.hg
@@ -32,8 +32,8 @@ namespace Gnome
 namespace Gda
 {
 
-_WRAP_ENUM(ConnectionEventCode, GdaConnectionEventCode)
-_WRAP_ENUM(ConnectionEventType, GdaConnectionEventType)
+_WRAP_ENUM(ConnectionEventCode, GdaConnectionEventCode, NO_GTYPE)
+_WRAP_ENUM(ConnectionEventType, GdaConnectionEventType, NO_GTYPE)
 
 /** Any event which has occurred on a Gda::Connection.
  * Events occuring on a connection are each represented as a ConnectionEvent object. 
diff --git a/libgda/src/datamodel.hg b/libgda/src/datamodel.hg
index e245c2b..099188d 100644
--- a/libgda/src/datamodel.hg
+++ b/libgda/src/datamodel.hg
@@ -40,11 +40,11 @@ class ServerProvider;
 
 /** Exception class for Gda connection errors.
  */
-_WRAP_GERROR(DataModelError, GdaDataModelError, GDA_DATA_MODEL_ERROR)
+_WRAP_GERROR(DataModelError, GdaDataModelError, GDA_DATA_MODEL_ERROR, NO_GTYPE)
 
-_WRAP_ENUM(DataModelAccessFlags, GdaDataModelAccessFlags)
-_WRAP_ENUM(DataModelHint, GdaDataModelHint)
-_WRAP_ENUM(DataModelIOFormat, GdaDataModelIOFormat)
+_WRAP_ENUM(DataModelAccessFlags, GdaDataModelAccessFlags, NO_GTYPE)
+_WRAP_ENUM(DataModelHint, GdaDataModelHint, NO_GTYPE)
+_WRAP_ENUM(DataModelIOFormat, GdaDataModelIOFormat, NO_GTYPE)
 
 typedef GdaValueAttribute ValueAttribute;
 
diff --git a/libgda/src/datamodeliter.hg b/libgda/src/datamodeliter.hg
index 035d233..f429a94 100644
--- a/libgda/src/datamodeliter.hg
+++ b/libgda/src/datamodeliter.hg
@@ -32,7 +32,7 @@ namespace Gnome
 namespace Gda
 {
 
-_WRAP_GERROR(DataModelIterError, GdaDataModelIterError, GDA_DATA_MODEL_ITER_ERROR)
+_WRAP_GERROR(DataModelIterError, GdaDataModelIterError, GDA_DATA_MODEL_ITER_ERROR, NO_GTYPE)
 
 /** Data model iterator.
  *
diff --git a/libgda/src/holder.hg b/libgda/src/holder.hg
index 58d1048..4d1859f 100644
--- a/libgda/src/holder.hg
+++ b/libgda/src/holder.hg
@@ -35,7 +35,7 @@ namespace Gda
 
 class DataModel;
 
-_WRAP_GERROR(HolderError, GdaHolderError, GDA_HOLDER_ERROR) 
+_WRAP_GERROR(HolderError, GdaHolderError, GDA_HOLDER_ERROR, NO_GTYPE) 
 
 /** Container for a single Gda::Value.
  *
diff --git a/libgda/src/metastore.hg b/libgda/src/metastore.hg
index 2e123c6..3b026dd 100644
--- a/libgda/src/metastore.hg
+++ b/libgda/src/metastore.hg
@@ -31,7 +31,7 @@ namespace Gnome
 namespace Gda
 {
 
-_WRAP_GERROR(MetaStoreError, GdaMetaStoreError, GDA_META_STORE_ERROR)
+_WRAP_GERROR(MetaStoreError, GdaMetaStoreError, GDA_META_STORE_ERROR, NO_GTYPE)
 _WRAP_ENUM(SqlIdentifierStyle, GdaSqlIdentifierStyle)
 
 /** Dictionary object.
diff --git a/libgda/src/metastruct.hg b/libgda/src/metastruct.hg
index 1d4e098..cbc82d8 100644
--- a/libgda/src/metastruct.hg
+++ b/libgda/src/metastruct.hg
@@ -35,12 +35,12 @@ namespace Gda
 
 /** Exception class for Gda MetaStruct errors.
  */
-_WRAP_GERROR(MetaStructError, GdaMetaStructError, GDA_META_STRUCT_ERROR)
+_WRAP_GERROR(MetaStructError, GdaMetaStructError, GDA_META_STRUCT_ERROR, NO_GTYPE)
 
-_WRAP_ENUM(MetaStructFeature, GdaMetaStructFeature)
-_WRAP_ENUM(MetaDbObjectType, GdaMetaDbObjectType)
-_WRAP_ENUM(MetaSortType, GdaMetaSortType)
-_WRAP_ENUM(MetaGraphInfo, GdaMetaGraphInfo) 
+_WRAP_ENUM(MetaStructFeature, GdaMetaStructFeature, NO_GTYPE)
+_WRAP_ENUM(MetaDbObjectType, GdaMetaDbObjectType, NO_GTYPE)
+_WRAP_ENUM(MetaSortType, GdaMetaSortType, NO_GTYPE)
+_WRAP_ENUM(MetaGraphInfo, GdaMetaGraphInfo, NO_GTYPE) 
 
 class MetaStore;
 
diff --git a/libgda/src/serveroperation.hg b/libgda/src/serveroperation.hg
index ef12fd0..ea80011 100644
--- a/libgda/src/serveroperation.hg
+++ b/libgda/src/serveroperation.hg
@@ -39,9 +39,10 @@ class Connection;
 class ServerProvider;
 
 //_WRAP_ENUM(ClientSpecsType, GdaClientSpecsType)
-_WRAP_ENUM(ServerOperationNodeType, GdaServerOperationNodeType)
-_WRAP_ENUM(ServerOperationNodeStatus, GdaServerOperationNodeStatus)
-_WRAP_ENUM(ServerOperationType, GdaServerOperationType)
+_WRAP_ENUM(ServerOperationNodeType, GdaServerOperationNodeType, NO_GTYPE)
+_WRAP_ENUM(ServerOperationNodeStatus, GdaServerOperationNodeStatus, NO_GTYPE)
+_WRAP_ENUM(ServerOperationType, GdaServerOperationType, NO_GTYPE)
+
 typedef GdaServerOperationNode ServerOperationNode;
 
 /** @defgroup DDL Data definition (DDL) queries
diff --git a/libgda/src/serverprovider.hg b/libgda/src/serverprovider.hg
index 92b187d..dbeeb3b 100644
--- a/libgda/src/serverprovider.hg
+++ b/libgda/src/serverprovider.hg
@@ -34,7 +34,7 @@ namespace Gnome
 namespace Gda
 {
 
-_WRAP_GERROR(ServerProviderError, GdaServerProviderError, GDA_SERVER_PROVIDER_ERROR)
+_WRAP_GERROR(ServerProviderError, GdaServerProviderError, GDA_SERVER_PROVIDER_ERROR, NO_GTYPE)
 
 _WRAP_ENUM(ConnectionFeature, GdaConnectionFeature)
 
diff --git a/libgda/src/sqlbuilder.hg b/libgda/src/sqlbuilder.hg
index 4ab051d..4a89137 100644
--- a/libgda/src/sqlbuilder.hg
+++ b/libgda/src/sqlbuilder.hg
@@ -34,7 +34,7 @@ namespace Gda
 
 _WRAP_ENUM(SqlOperatorType, GdaSqlOperatorType)
 _WRAP_ENUM(SqlSelectJoinType, GdaSqlSelectJoinType)
-_WRAP_GERROR(SqlBuilderError, GdaSqlBuilderError, GDA_SQL_BUILDER_ERROR)
+_WRAP_GERROR(SqlBuilderError, GdaSqlBuilderError, GDA_SQL_BUILDER_ERROR, NO_GTYPE)
 _WRAP_GERROR(SqlError, GdaSqlError, GDA_SQL_ERROR)
 
 /** SqlBuilder can be used to build a Statement from its structural description, 
diff --git a/libgda/src/statement.hg b/libgda/src/statement.hg
index 74dd817..3ff26aa 100644
--- a/libgda/src/statement.hg
+++ b/libgda/src/statement.hg
@@ -35,10 +35,10 @@ namespace Gda
 
 class Connection;
 
-_WRAP_ENUM(StatementModelUsage, GdaStatementModelUsage)
-_WRAP_ENUM(StatementSqlFlag, GdaStatementSqlFlag)
+_WRAP_ENUM(StatementModelUsage, GdaStatementModelUsage, NO_GTYPE)
+_WRAP_ENUM(StatementSqlFlag, GdaStatementSqlFlag, NO_GTYPE)
 
-_WRAP_GERROR(StatementError, GdaStatementError, GDA_STATEMENT_ERROR)
+_WRAP_GERROR(StatementError, GdaStatementError, GDA_STATEMENT_ERROR, NO_GTYPE)
 
 /** Single SQL statement.
  *


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]