[core] Cleaned up dependencies between headers. JB#48413

impl headers only need to be included by derived classes and unit tests.
sailfishos · May 11, 2020 · 601e807 · 601e807
1 parent a30772a
commit 601e807
Show file tree

Hide file tree

Showing 16 changed files with 53 additions and 45 deletions.
diff --git a/core/include/nfc_target.h b/core/include/nfc_target.h
@@ -71,6 +71,15 @@ void
     NfcTarget* target,
     void* user_data);
 
+typedef
+void
+(*NfcTargetTransmitFunc)(
+    NfcTarget* target,
+    NFC_TRANSMIT_STATUS status,
+    const void* data,
+    guint len,
+    void* user_data);
+
 NfcTarget*
 nfc_target_ref(
     NfcTarget* target);
@@ -115,6 +124,26 @@ void
 nfc_target_sequence_free(
     NfcTargetSequence* seq); /* Since 1.0.17 */
 
+/*
+ * These functions can be used for sending internal requests (e.g. presence
+ * check) to take advantage of queueing provided by NfcTarget:
+ */
+
+guint
+nfc_target_transmit(
+    NfcTarget* target,
+    const void* data,
+    guint len,
+    NfcTargetSequence* seq,
+    NfcTargetTransmitFunc complete,
+    GDestroyNotify destroy,
+    void* user_data);
+
+gboolean
+nfc_target_cancel_transmit(
+    NfcTarget* target,
+    guint id);
+
 G_END_DECLS
 
 #endif /* NFC_TARGET_H */

diff --git a/core/include/nfc_target_impl.h b/core/include/nfc_target_impl.h
@@ -78,15 +78,6 @@ typedef struct nfc_target_class {
 #define NFC_TARGET_CLASS(klass) G_TYPE_CHECK_CLASS_CAST((klass), \
         NFC_TYPE_TARGET, NfcTargetClass)
 
-typedef
-void
-(*NfcTargetTransmitFunc)(
-    NfcTarget* target,
-    NFC_TRANSMIT_STATUS status,
-    const void* data,
-    guint len,
-    void* user_data);
-
 void
 nfc_target_transmit_done(
     NfcTarget* target,
@@ -102,26 +93,6 @@ void
 nfc_target_gone(
     NfcTarget* target);
 
-/*
- * These functions can be used for sending internal requests (e.g. presence
- * check) to take advantage of queueing provided by NfcTarget:
- */
-
-guint
-nfc_target_transmit(
-    NfcTarget* target,
-    const void* data,
-    guint len,
-    NfcTargetSequence* seq,
-    NfcTargetTransmitFunc complete,
-    GDestroyNotify destroy,
-    void* user_data);
-
-gboolean
-nfc_target_cancel_transmit(
-    NfcTarget* target,
-    guint id);
-
 G_END_DECLS
 
 #endif /* NFC_TARGET_IMPL_H */

diff --git a/core/src/nfc_adapter.c b/core/src/nfc_adapter.c
@@ -32,6 +32,7 @@
 
 #define GLIB_DISABLE_DEPRECATION_WARNINGS
 
+#include "nfc_adapter_impl.h"
 #include "nfc_adapter_p.h"
 #include "nfc_tag_p.h"
 #include "nfc_tag_t4_p.h"

diff --git a/core/src/nfc_adapter_p.h b/core/src/nfc_adapter_p.h
@@ -35,7 +35,7 @@
 
 #include "nfc_types_p.h"
 
-#include <nfc_adapter_impl.h>
+#include <nfc_adapter.h>
 
 void
 nfc_adapter_set_name(

diff --git a/core/src/nfc_plugin.c b/core/src/nfc_plugin.c
@@ -32,6 +32,7 @@
 
 #define GLIB_DISABLE_DEPRECATION_WARNINGS
 
+#include "nfc_plugin_impl.h"
 #include "nfc_plugin_p.h"
 
 struct nfc_plugin_priv {

diff --git a/core/src/nfc_plugin_p.h b/core/src/nfc_plugin_p.h
@@ -35,7 +35,7 @@
 
 #include "nfc_types_p.h"
 
-#include <nfc_plugin_impl.h>
+#include <nfc_plugin.h>
 
 gboolean
 nfc_plugin_start(

diff --git a/core/src/nfc_plugins.c b/core/src/nfc_plugins.c
@@ -32,6 +32,7 @@
 
 #include "nfc_plugin_p.h"
 #include "nfc_plugins.h"
+#include "nfc_version.h"
 #include "nfc_log.h"
 
 #include <gutil_strv.h>

diff --git a/core/src/nfc_target.c b/core/src/nfc_target.c
@@ -32,8 +32,8 @@
 
 #define GLIB_DISABLE_DEPRECATION_WARNINGS
 
+#include "nfc_target_impl.h"
 #include "nfc_target_p.h"
-#include "nfc_tag.h"
 #include "nfc_log.h"
 
 #include <gutil_misc.h>

diff --git a/core/src/nfc_target_p.h b/core/src/nfc_target_p.h
@@ -35,7 +35,7 @@
 
 #include "nfc_types_p.h"
 
-#include <nfc_target_impl.h>
+#include <nfc_target.h>
 
 void
 nfc_target_deactivate(

diff --git a/unit/core_adapter/test_core_adapter.c b/unit/core_adapter/test_core_adapter.c
@@ -1,6 +1,6 @@
 /*
- * Copyright (C) 2018-2019 Jolla Ltd.
- * Copyright (C) 2018-2019 Slava Monich <slava.monich@jolla.com>
+ * Copyright (C) 2018-2020 Jolla Ltd.
+ * Copyright (C) 2018-2020 Slava Monich <slava.monich@jolla.com>
  *
  * You may use this file under the terms of BSD license as follows:
  *
@@ -34,6 +34,7 @@
 #include "test_target.h"
 
 #include "nfc_adapter_p.h"
+#include "nfc_adapter_impl.h"
 #include "nfc_target_impl.h"
 #include "nfc_tag_t2.h"
 

diff --git a/unit/core_plugin/test_core_plugin.c b/unit/core_plugin/test_core_plugin.c
@@ -1,6 +1,6 @@
 /*
- * Copyright (C) 2018-2019 Jolla Ltd.
- * Copyright (C) 2018-2019 Slava Monich <slava.monich@jolla.com>
+ * Copyright (C) 2018-2020 Jolla Ltd.
+ * Copyright (C) 2018-2020 Slava Monich <slava.monich@jolla.com>
  *
  * You may use this file under the terms of BSD license as follows:
  *
@@ -32,6 +32,7 @@
 
 #include "test_common.h"
 
+#include "nfc_plugin_impl.h"
 #include "nfc_plugin_p.h"
 
 #include <gutil_log.h>

diff --git a/unit/core_tag/test_core_tag.c b/unit/core_tag/test_core_tag.c
@@ -1,6 +1,6 @@
 /*
- * Copyright (C) 2018-2019 Jolla Ltd.
- * Copyright (C) 2018-2019 Slava Monich <slava.monich@jolla.com>
+ * Copyright (C) 2018-2020 Jolla Ltd.
+ * Copyright (C) 2018-2020 Slava Monich <slava.monich@jolla.com>
  *
  * You may use this file under the terms of BSD license as follows:
  *
@@ -35,6 +35,7 @@
 
 #include "nfc_tag_p.h"
 #include "nfc_target_p.h"
+#include "nfc_target_impl.h"
 
 #include <gutil_log.h>
 

diff --git a/unit/core_tag_t2/test_core_tag_t2.c b/unit/core_tag_t2/test_core_tag_t2.c
@@ -1,6 +1,6 @@
 /*
- * Copyright (C) 2018-2019 Jolla Ltd.
- * Copyright (C) 2018-2019 Slava Monich <slava.monich@jolla.com>
+ * Copyright (C) 2018-2020 Jolla Ltd.
+ * Copyright (C) 2018-2020 Slava Monich <slava.monich@jolla.com>
  *
  * You may use this file under the terms of BSD license as follows:
  *
@@ -35,7 +35,7 @@
 #include "nfc_ndef.h"
 #include "nfc_tag_p.h"
 #include "nfc_tag_t2.h"
-#include "nfc_target_p.h"
+#include "nfc_target_impl.h"
 
 #include <gutil_log.h>
 #include <gutil_misc.h>

diff --git a/unit/core_tag_t4/test_core_tag_t4.c b/unit/core_tag_t4/test_core_tag_t4.c
@@ -35,7 +35,7 @@
 #include "nfc_ndef.h"
 #include "nfc_tag_p.h"
 #include "nfc_tag_t4_p.h"
-#include "nfc_target_p.h"
+#include "nfc_target_impl.h"
 
 #include <gutil_log.h>
 

diff --git a/unit/core_target/test_core_target.c b/unit/core_target/test_core_target.c
@@ -34,6 +34,7 @@
 
 #include "nfc_tag_p.h"
 #include "nfc_target_p.h"
+#include "nfc_target_impl.h"
 
 #include <gutil_log.h>
 

diff --git a/unit/plugins_dbus_service_adapter/test_plugins_dbus_service_adapter.c b/unit/plugins_dbus_service_adapter/test_plugins_dbus_service_adapter.c
@@ -1,6 +1,6 @@
 /*
- * Copyright (C) 2019 Jolla Ltd.
- * Copyright (C) 2019 Slava Monich <slava.monich@jolla.com>
+ * Copyright (C) 2019-2020 Jolla Ltd.
+ * Copyright (C) 2019-2020 Slava Monich <slava.monich@jolla.com>
  *
  * You may use this file under the terms of BSD license as follows:
  *
@@ -40,6 +40,7 @@
 #include "internal/nfc_manager_i.h"
 #include "nfc_plugins.h"
 #include "nfc_adapter_p.h"
+#include "nfc_adapter_impl.h"
 #include "nfc_target_impl.h"
 #include "nfc_tag.h"