GNOME.org
 

[libgda: 3/15] Fixing include files paths

commit 88493c249c54115df2c408df3ad93588bef5fdb1
Author: Pavlo Solntsev <p sun fun gmail com>
Date:   Wed Jan 2 22:03:57 2019 -0600

    Fixing include files paths
    
    Header files will be correctly located by a static code analyzer

 libgda/gda-attributes-manager.c                    |  4 ++--
 libgda/gda-connection-private.h                    |  2 +-
 libgda/gda-data-proxy.c                            | 16 +++++++---------
 libgda/gda-data-select.c                           |  1 -
 libgda/gda-data-select.h                           |  4 ++--
 libgda/gda-sql-builder.h                           |  2 +-
 libgda/gda-statement-extra.h                       |  2 +-
 libgda/gda-statement.h                             |  2 +-
 libgda/gda-util.h                                  |  2 +-
 libgda/providers-support/gda-data-select-priv.h    |  2 +-
 libgda/sql-parser/gda-sql-parser.h                 |  4 ++--
 libgda/sql-parser/gda-sql-statement.h              | 16 ++++++++--------
 libgda/sql-parser/gda-statement-struct-compound.h  |  4 ++--
 libgda/sql-parser/gda-statement-struct-delete.h    |  6 +++---
 libgda/sql-parser/gda-statement-struct-insert.h    |  6 +++---
 libgda/sql-parser/gda-statement-struct-parts.h     |  6 +++---
 libgda/sql-parser/gda-statement-struct-select.h    |  4 ++--
 libgda/sql-parser/gda-statement-struct-trans.h     |  4 ++--
 libgda/sql-parser/gda-statement-struct-unknown.h   |  4 ++--
 libgda/sql-parser/gda-statement-struct-update.h    |  6 +++---
 libgda/sql-parser/gda-statement-struct.h           |  4 ++--
 libgda/sqlite/gda-sqlite.h                         |  1 +
 libgda/sqlite/virtual/gda-vconnection-data-model.h |  4 ++--
 libgda/sqlite/virtual/gda-vconnection-hub.h        |  2 +-
 libgda/sqlite/virtual/gda-virtual-connection.h     |  2 +-
 libgda/sqlite/virtual/gda-vprovider-data-model.h   |  2 +-
 providers/ldap/gda-ldap-util.c                     |  2 +-
 providers/postgres/gda-postgres-provider.c         |  1 -
 28 files changed, 56 insertions(+), 59 deletions(-)
---
diff --git a/libgda/gda-attributes-manager.c b/libgda/gda-attributes-manager.c
index 217d18e07..7de7780c2 100644
--- a/libgda/gda-attributes-manager.c
+++ b/libgda/gda-attributes-manager.c
@@ -21,8 +21,8 @@
  */
 
 #include <string.h>
-#include <gda-attributes-manager.h>
-#include <gda-value.h>
+#include <libgda/gda-attributes-manager.h>
+#include <libgda/gda-value.h>
 
 /*
  * Structure for the attribute names
diff --git a/libgda/gda-connection-private.h b/libgda/gda-connection-private.h
index de5a6572e..57ee25157 100644
--- a/libgda/gda-connection-private.h
+++ b/libgda/gda-connection-private.h
@@ -21,7 +21,7 @@
 #define __GDA_CONNECTION_PRIVATE_H_
 
 #include <libgda/gda-meta-store.h>
-#include <providers-support/gda-pstmt.h>
+#include <libgda/providers-support/gda-pstmt.h>
 #include <libgda/thread-wrapper/gda-worker.h>
 #include <libgda/gda-transaction-status.h>
 #include <libgda/gda-connection-event.h>
diff --git a/libgda/gda-data-proxy.c b/libgda/gda-data-proxy.c
index d9e923dd7..7b12ff8e6 100644
--- a/libgda/gda-data-proxy.c
+++ b/libgda/gda-data-proxy.c
@@ -42,10 +42,13 @@
 #include "gda-marshal.h"
 #include "gda-data-access-wrapper.h"
 #include "gda-enum-types.h"
-#include <virtual/libgda-virtual.h>
-#include <sql-parser/gda-sql-parser.h>
-#include <sql-parser/gda-sql-statement.h>
-#include <sql-parser/gda-statement-struct-util.h>
+#include <libgda/sqlite/virtual/libgda-virtual.h>
+#include <libgda/sqlite/virtual/gda-virtual-provider.h>
+#include <libgda/sqlite/virtual/gda-vconnection-data-model.h>
+#include <libgda/sqlite/virtual/gda-vprovider-data-model.h>
+#include <libgda/sql-parser/gda-sql-parser.h>
+#include <libgda/sql-parser/gda-sql-statement.h>
+#include <libgda/sql-parser/gda-statement-struct-util.h>
 #include <libgda/gda-custom-marshal.h>
 
 /*
@@ -905,7 +908,6 @@ gda_data_proxy_dispose (GObject *object)
        g_return_if_fail (GDA_IS_DATA_PROXY (object));
 
        proxy = GDA_DATA_PROXY (object);
-       GdaDataProxyPrivate *priv = gda_data_proxy_get_instance_private (proxy);
        clean_proxy (proxy);
 
        clean_cached_changes (proxy);
@@ -917,13 +919,9 @@ gda_data_proxy_dispose (GObject *object)
 static void
 gda_data_proxy_finalize (GObject *object)
 {
-       GdaDataProxy *proxy;
-
        g_return_if_fail (object != NULL);
        g_return_if_fail (GDA_IS_DATA_PROXY (object));
 
-       proxy = GDA_DATA_PROXY (object);
-       GdaDataProxyPrivate *priv = gda_data_proxy_get_instance_private (proxy);
        /* parent class */
        G_OBJECT_CLASS (gda_data_proxy_parent_class)->finalize (object);
 }
diff --git a/libgda/gda-data-select.c b/libgda/gda-data-select.c
index 53f3dff4b..507fc8bfa 100644
--- a/libgda/gda-data-select.c
+++ b/libgda/gda-data-select.c
@@ -492,7 +492,6 @@ free_private_shared_data (GdaDataSelect *model)
 
        model->priv->sh->ref_count --;
        if (model->priv->sh->ref_count == 0) {
-               guint i;
 
                if (model->priv->sh->sel_stmt) {
                        g_object_unref (model->priv->sh->sel_stmt);
diff --git a/libgda/gda-data-select.h b/libgda/gda-data-select.h
index 6d87eff85..88d7104ad 100644
--- a/libgda/gda-data-select.h
+++ b/libgda/gda-data-select.h
@@ -22,8 +22,8 @@
 
 #include <glib-object.h>
 #include <libgda/gda-row.h>
-#include <providers-support/gda-pstmt.h>
-#include <sql-parser/gda-sql-statement.h>
+#include <libgda/providers-support/gda-pstmt.h>
+#include <libgda/sql-parser/gda-sql-statement.h>
 
 G_BEGIN_DECLS
 
diff --git a/libgda/gda-sql-builder.h b/libgda/gda-sql-builder.h
index 536c21fb5..0742864b8 100644
--- a/libgda/gda-sql-builder.h
+++ b/libgda/gda-sql-builder.h
@@ -24,7 +24,7 @@
 #define __GDA_SQL_BUILDER_H_
 
 #include <glib-object.h>
-#include <sql-parser/gda-sql-statement.h>
+#include <libgda/sql-parser/gda-sql-statement.h>
 #include <libgda/gda-data-handler.h>
 
 G_BEGIN_DECLS
diff --git a/libgda/gda-statement-extra.h b/libgda/gda-statement-extra.h
index 1acfbd143..55ae0cbea 100644
--- a/libgda/gda-statement-extra.h
+++ b/libgda/gda-statement-extra.h
@@ -21,7 +21,7 @@
 #ifndef __GDA_STATEMENT_EXTRA__
 #define __GDA_STATEMENT_EXTRA__
 
-#include <sql-parser/gda-sql-statement.h>
+#include <libgda/sql-parser/gda-sql-statement.h>
 
 G_BEGIN_DECLS
 
diff --git a/libgda/gda-statement.h b/libgda/gda-statement.h
index 06c5f43e6..2e6a9b882 100644
--- a/libgda/gda-statement.h
+++ b/libgda/gda-statement.h
@@ -23,7 +23,7 @@
 #define _GDA_STATEMENT_H_
 
 #include <glib-object.h>
-#include <sql-parser/gda-statement-struct.h>
+#include <libgda/sql-parser/gda-statement-struct.h>
 
 G_BEGIN_DECLS
 
diff --git a/libgda/gda-util.h b/libgda/gda-util.h
index bfd32831b..41560c800 100644
--- a/libgda/gda-util.h
+++ b/libgda/gda-util.h
@@ -31,7 +31,7 @@
 #include "gda-holder.h"
 #include "gda-row.h"
 #include "gda-connection.h"
-#include <sql-parser/gda-sql-statement.h>
+#include <libgda/sql-parser/gda-sql-statement.h>
 #include <libgda/gda-data-select.h>
 
 G_BEGIN_DECLS
diff --git a/libgda/providers-support/gda-data-select-priv.h b/libgda/providers-support/gda-data-select-priv.h
index 258547d63..c0eaff0ee 100644
--- a/libgda/providers-support/gda-data-select-priv.h
+++ b/libgda/providers-support/gda-data-select-priv.h
@@ -27,7 +27,7 @@
 #include <glib-object.h>
 #include <libgda/gda-row.h>
 #include <libgda/providers-support/gda-pstmt.h>
-#include <sql-parser/gda-sql-statement.h>
+#include <libgda/sql-parser/gda-sql-statement.h>
 #include <libgda/gda-data-select.h>
 
 G_BEGIN_DECLS
diff --git a/libgda/sql-parser/gda-sql-parser.h b/libgda/sql-parser/gda-sql-parser.h
index cd5817bb9..7e8c3927e 100644
--- a/libgda/sql-parser/gda-sql-parser.h
+++ b/libgda/sql-parser/gda-sql-parser.h
@@ -25,8 +25,8 @@
 #include <glib-object.h>
 #include <libgda/gda-statement.h>
 #include <libgda/gda-batch.h>
-#include <sql-parser/gda-statement-struct.h>
-#include <sql-parser/gda-statement-struct-util.h>
+#include <libgda/sql-parser/gda-statement-struct.h>
+#include <libgda/sql-parser/gda-statement-struct-util.h>
 
 G_BEGIN_DECLS
 
diff --git a/libgda/sql-parser/gda-sql-statement.h b/libgda/sql-parser/gda-sql-statement.h
index 8783ca8a1..46e60c4f2 100644
--- a/libgda/sql-parser/gda-sql-statement.h
+++ b/libgda/sql-parser/gda-sql-statement.h
@@ -55,14 +55,14 @@ G_BEGIN_DECLS
  * provide the examples in this section of the documentation.
  */
 
-#include <sql-parser/gda-statement-struct-select.h>
-#include <sql-parser/gda-statement-struct-insert.h>
-#include <sql-parser/gda-statement-struct-update.h>
-#include <sql-parser/gda-statement-struct-delete.h>
-#include <sql-parser/gda-statement-struct-compound.h>
-#include <sql-parser/gda-statement-struct-trans.h>
-#include <sql-parser/gda-statement-struct-unknown.h>
-#include <sql-parser/gda-statement-struct-parts.h>
+#include <libgda/sql-parser/gda-statement-struct-select.h>
+#include <libgda/sql-parser/gda-statement-struct-insert.h>
+#include <libgda/sql-parser/gda-statement-struct-update.h>
+#include <libgda/sql-parser/gda-statement-struct-delete.h>
+#include <libgda/sql-parser/gda-statement-struct-compound.h>
+#include <libgda/sql-parser/gda-statement-struct-trans.h>
+#include <libgda/sql-parser/gda-statement-struct-unknown.h>
+#include <libgda/sql-parser/gda-statement-struct-parts.h>
 
 G_END_DECLS
 
diff --git a/libgda/sql-parser/gda-statement-struct-compound.h 
b/libgda/sql-parser/gda-statement-struct-compound.h
index e2f61cc55..1b89fdd03 100644
--- a/libgda/sql-parser/gda-statement-struct-compound.h
+++ b/libgda/sql-parser/gda-statement-struct-compound.h
@@ -24,8 +24,8 @@
 
 #include <glib.h>
 #include <glib-object.h>
-#include <sql-parser/gda-statement-struct-decl.h>
-#include <sql-parser/gda-statement-struct-select.h>
+#include <libgda/sql-parser/gda-statement-struct-decl.h>
+#include <libgda/sql-parser/gda-statement-struct-select.h>
 
 G_BEGIN_DECLS
 
diff --git a/libgda/sql-parser/gda-statement-struct-delete.h b/libgda/sql-parser/gda-statement-struct-delete.h
index 2e51c5eae..325889ce3 100644
--- a/libgda/sql-parser/gda-statement-struct-delete.h
+++ b/libgda/sql-parser/gda-statement-struct-delete.h
@@ -26,9 +26,9 @@
 
 #include <glib.h>
 #include <glib-object.h>
-#include <sql-parser/gda-statement-struct-decl.h>
-#include <sql-parser/gda-statement-struct-select.h>
-#include <sql-parser/gda-statement-struct-parts.h>
+#include <libgda/sql-parser/gda-statement-struct-decl.h>
+#include <libgda/sql-parser/gda-statement-struct-select.h>
+#include <libgda/sql-parser/gda-statement-struct-parts.h>
 
 G_BEGIN_DECLS
 
diff --git a/libgda/sql-parser/gda-statement-struct-insert.h b/libgda/sql-parser/gda-statement-struct-insert.h
index ec757b7c8..0acec190c 100644
--- a/libgda/sql-parser/gda-statement-struct-insert.h
+++ b/libgda/sql-parser/gda-statement-struct-insert.h
@@ -23,9 +23,9 @@
 
 #include <glib.h>
 #include <glib-object.h>
-#include <sql-parser/gda-statement-struct-decl.h>
-#include <sql-parser/gda-statement-struct-select.h>
-#include <sql-parser/gda-statement-struct-parts.h>
+#include <libgda/sql-parser/gda-statement-struct-decl.h>
+#include <libgda/sql-parser/gda-statement-struct-select.h>
+#include <libgda/sql-parser/gda-statement-struct-parts.h>
 
 G_BEGIN_DECLS
 
diff --git a/libgda/sql-parser/gda-statement-struct-parts.h b/libgda/sql-parser/gda-statement-struct-parts.h
index bb7140a65..a46afd1ae 100644
--- a/libgda/sql-parser/gda-statement-struct-parts.h
+++ b/libgda/sql-parser/gda-statement-struct-parts.h
@@ -25,9 +25,9 @@
 
 #include <glib.h>
 #include <glib-object.h>
-#include <sql-parser/gda-statement-struct.h>
-#include <sql-parser/gda-statement-struct-pspec.h>
-#include <sql-parser/gda-statement-struct-decl.h>
+#include <libgda/sql-parser/gda-statement-struct.h>
+#include <libgda/sql-parser/gda-statement-struct-pspec.h>
+#include <libgda/sql-parser/gda-statement-struct-decl.h>
 #include <libgda/gda-meta-struct.h>
 
 G_BEGIN_DECLS
diff --git a/libgda/sql-parser/gda-statement-struct-select.h b/libgda/sql-parser/gda-statement-struct-select.h
index 6b2e51e05..5644174ae 100644
--- a/libgda/sql-parser/gda-statement-struct-select.h
+++ b/libgda/sql-parser/gda-statement-struct-select.h
@@ -23,8 +23,8 @@
 
 #include <glib.h>
 #include <glib-object.h>
-#include <sql-parser/gda-statement-struct-decl.h>
-#include <sql-parser/gda-statement-struct-parts.h>
+#include <libgda/sql-parser/gda-statement-struct-decl.h>
+#include <libgda/sql-parser/gda-statement-struct-parts.h>
 
 G_BEGIN_DECLS
 
diff --git a/libgda/sql-parser/gda-statement-struct-trans.h b/libgda/sql-parser/gda-statement-struct-trans.h
index 1fe5a0488..9065bc2e2 100644
--- a/libgda/sql-parser/gda-statement-struct-trans.h
+++ b/libgda/sql-parser/gda-statement-struct-trans.h
@@ -24,8 +24,8 @@
 #include <glib.h>
 #include <glib-object.h>
 #include <libgda/gda-enums.h>
-#include <sql-parser/gda-statement-struct-decl.h>
-#include <sql-parser/gda-statement-struct-parts.h>
+#include <libgda/sql-parser/gda-statement-struct-decl.h>
+#include <libgda/sql-parser/gda-statement-struct-parts.h>
 
 G_BEGIN_DECLS
 
diff --git a/libgda/sql-parser/gda-statement-struct-unknown.h 
b/libgda/sql-parser/gda-statement-struct-unknown.h
index e0aaf945f..dcd4aca9c 100644
--- a/libgda/sql-parser/gda-statement-struct-unknown.h
+++ b/libgda/sql-parser/gda-statement-struct-unknown.h
@@ -27,8 +27,8 @@
 
 #include <glib.h>
 #include <glib-object.h>
-#include <sql-parser/gda-statement-struct-decl.h>
-#include <sql-parser/gda-statement-struct-parts.h>
+#include <libgda/sql-parser/gda-statement-struct-decl.h>
+#include <libgda/sql-parser/gda-statement-struct-parts.h>
 
 G_BEGIN_DECLS
 
diff --git a/libgda/sql-parser/gda-statement-struct-update.h b/libgda/sql-parser/gda-statement-struct-update.h
index 43a355904..f5ba04d37 100644
--- a/libgda/sql-parser/gda-statement-struct-update.h
+++ b/libgda/sql-parser/gda-statement-struct-update.h
@@ -23,9 +23,9 @@
 
 #include <glib.h>
 #include <glib-object.h>
-#include <sql-parser/gda-statement-struct-decl.h>
-#include <sql-parser/gda-statement-struct-select.h>
-#include <sql-parser/gda-statement-struct-parts.h>
+#include <libgda/sql-parser/gda-statement-struct-decl.h>
+#include <libgda/sql-parser/gda-statement-struct-select.h>
+#include <libgda/sql-parser/gda-statement-struct-parts.h>
 
 G_BEGIN_DECLS
 
diff --git a/libgda/sql-parser/gda-statement-struct.h b/libgda/sql-parser/gda-statement-struct.h
index d23dabee2..a72a39248 100644
--- a/libgda/sql-parser/gda-statement-struct.h
+++ b/libgda/sql-parser/gda-statement-struct.h
@@ -23,7 +23,7 @@
 
 #include <glib.h>
 #include <glib-object.h>
-#include <sql-parser/gda-statement-struct-decl.h>
+#include <libgda/sql-parser/gda-statement-struct-decl.h>
 #include <libgda/gda-meta-store.h>
 
 G_BEGIN_DECLS
@@ -32,7 +32,7 @@ G_BEGIN_DECLS
  * GdaSqlStatement:
  * @sql: 
  * @stmt_type: type of statement 
- * @contents: contents, cast it depending on @stmt_type (for example to a #GdaSqlStatementSelect).
+ * contents: contents, cast it depending on @stmt_type (for example to a #GdaSqlStatementSelect).
  * @validity_meta_struct:
  *
  * This structure is the top level structure encapsulating several type of statements.
diff --git a/libgda/sqlite/gda-sqlite.h b/libgda/sqlite/gda-sqlite.h
index aab13da81..1b4864fac 100644
--- a/libgda/sqlite/gda-sqlite.h
+++ b/libgda/sqlite/gda-sqlite.h
@@ -27,6 +27,7 @@
 
 #include <glib.h>
 #include <libgda/libgda.h>
+#include <libgda/gda-data-handler.h>
 #include <libgda/gda-connection-private.h>
 
 #ifdef WITH_BDBSQLITE
diff --git a/libgda/sqlite/virtual/gda-vconnection-data-model.h 
b/libgda/sqlite/virtual/gda-vconnection-data-model.h
index 0e48346a5..b751e6a47 100644
--- a/libgda/sqlite/virtual/gda-vconnection-data-model.h
+++ b/libgda/sqlite/virtual/gda-vconnection-data-model.h
@@ -20,8 +20,8 @@
 #ifndef __GDA_VCONNECTION_DATA_MODEL_H__
 #define __GDA_VCONNECTION_DATA_MODEL_H__
 
-#include <virtual/gda-virtual-connection.h>
-#include <sql-parser/gda-statement-struct-parts.h>
+#include "gda-virtual-connection.h"
+#include <libgda/sql-parser/gda-statement-struct-parts.h>
 
 #define GDA_TYPE_VCONNECTION_DATA_MODEL            (gda_vconnection_data_model_get_type())
 #define GDA_VCONNECTION_DATA_MODEL(obj)            (G_TYPE_CHECK_INSTANCE_CAST (obj, 
GDA_TYPE_VCONNECTION_DATA_MODEL, GdaVconnectionDataModel))
diff --git a/libgda/sqlite/virtual/gda-vconnection-hub.h b/libgda/sqlite/virtual/gda-vconnection-hub.h
index cfbdd589a..11d2b95c4 100644
--- a/libgda/sqlite/virtual/gda-vconnection-hub.h
+++ b/libgda/sqlite/virtual/gda-vconnection-hub.h
@@ -20,7 +20,7 @@
 #ifndef __GDA_VCONNECTION_HUB_H__
 #define __GDA_VCONNECTION_HUB_H__
 
-#include <virtual/gda-vconnection-data-model.h>
+#include "gda-vconnection-data-model.h"
 
 #define GDA_TYPE_VCONNECTION_HUB            (gda_vconnection_hub_get_type())
 #define GDA_VCONNECTION_HUB(obj)            (G_TYPE_CHECK_INSTANCE_CAST (obj, GDA_TYPE_VCONNECTION_HUB, 
GdaVconnectionHub))
diff --git a/libgda/sqlite/virtual/gda-virtual-connection.h b/libgda/sqlite/virtual/gda-virtual-connection.h
index 42f0bd7be..6b321e3a3 100644
--- a/libgda/sqlite/virtual/gda-virtual-connection.h
+++ b/libgda/sqlite/virtual/gda-virtual-connection.h
@@ -21,7 +21,7 @@
 #define __GDA_VIRTUAL_CONNECTION_H__
 
 #include <libgda/gda-connection.h>
-#include <virtual/gda-virtual-provider.h>
+#include "gda-virtual-provider.h"
 
 #define GDA_TYPE_VIRTUAL_CONNECTION            (gda_virtual_connection_get_type())
 #define GDA_VIRTUAL_CONNECTION(obj)            (G_TYPE_CHECK_INSTANCE_CAST (obj, 
GDA_TYPE_VIRTUAL_CONNECTION, GdaVirtualConnection))
diff --git a/libgda/sqlite/virtual/gda-vprovider-data-model.h 
b/libgda/sqlite/virtual/gda-vprovider-data-model.h
index 68198bfc4..b63e37816 100644
--- a/libgda/sqlite/virtual/gda-vprovider-data-model.h
+++ b/libgda/sqlite/virtual/gda-vprovider-data-model.h
@@ -20,7 +20,7 @@
 #ifndef __GDA_VPROVIDER_DATA_MODEL_H__
 #define __GDA_VPROVIDER_DATA_MODEL_H__
 
-#include <virtual/gda-virtual-provider.h>
+#include "gda-virtual-provider.h"
 
 
 /* error reporting */
diff --git a/providers/ldap/gda-ldap-util.c b/providers/ldap/gda-ldap-util.c
index 7a32449fc..68b5ae5c1 100644
--- a/providers/ldap/gda-ldap-util.c
+++ b/providers/ldap/gda-ldap-util.c
@@ -23,7 +23,7 @@
 #include <glib/gi18n-lib.h>
 #include "gda-ldap.h"
 #include "gda-ldap-util.h"
-#include <gda-util.h>
+#include <libgda/gda-util.h>
 #include <libgda/gda-debug-macros.h>
 #include <libgda/gda-server-provider-private.h> /* for gda_server_provider_get_real_main_context () */
 #include <libgda/gda-connection-internal.h> /* for gda_connection_increase/decrease_usage() */
diff --git a/providers/postgres/gda-postgres-provider.c b/providers/postgres/gda-postgres-provider.c
index a82153b54..13f773997 100644
--- a/providers/postgres/gda-postgres-provider.c
+++ b/providers/postgres/gda-postgres-provider.c
@@ -828,7 +828,6 @@ gda_postgres_provider_create_operation (GdaServerProvider *provider, GdaConnecti
         gchar *file;
         GdaServerOperation *op;
         gchar *str;
-       gchar *dir;
        PostgresConnectionData *cdata = NULL;
 
        if (cnc) {
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]