plugins: setup new helper macros to define plugins

We also remove the plugin headers completely as they are not really
required anywhere.

2 files changed, 5 insertions, 47 deletions

diff --git a/src/plugins/qcom-soc/mm-plugin-qcom-soc.c b/src/plugins/qcom-soc/mm-plugin-qcom-soc.c
index ae844dd6..0d2a5619 100644
--- a/src/plugins/qcom-soc/mm-plugin-qcom-soc.c
+++ b/src/plugins/qcom-soc/mm-plugin-qcom-soc.c
@@ -28,14 +28,12 @@
 #define _LIBMM_INSIDE_MM
 #include <libmm-glib.h>
 
-#include "mm-plugin-qcom-soc.h"
+#include "mm-plugin-common.h"
 #include "mm-broadband-modem-qmi-qcom-soc.h"
 #include "mm-log-object.h"
 
-G_DEFINE_TYPE (MMPluginQcomSoc, mm_plugin_qcom_soc, MM_TYPE_PLUGIN)
-
-MM_PLUGIN_DEFINE_MAJOR_VERSION
-MM_PLUGIN_DEFINE_MINOR_VERSION
+#define MM_TYPE_PLUGIN_QCOM_SOC mm_plugin_qcom_soc_get_type ()
+MM_DEFINE_PLUGIN (QCOM_SOC, qcom_soc, QcomSoc)
 
 /*****************************************************************************/
 
@@ -65,8 +63,8 @@ create_modem (MMPlugin     *self,
 
 /*****************************************************************************/
 
-G_MODULE_EXPORT MMPlugin *
-mm_plugin_create (void)
+MM_PLUGIN_NAMED_CREATOR_SCOPE MMPlugin *
+mm_plugin_create_qcom_soc (void)
 {
     static const gchar *subsystems[] = { "wwan", "rpmsg", "net", "qrtr", NULL };
     static const gchar *udev_tags[] = {
diff --git a/src/plugins/qcom-soc/mm-plugin-qcom-soc.h b/src/plugins/qcom-soc/mm-plugin-qcom-soc.h
deleted file mode 100644
index 54da154f..00000000
--- a/src/plugins/qcom-soc/mm-plugin-qcom-soc.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * 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
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details:
- *
- * Copyright (C) 2020 Aleksander Morgado <aleksander@aleksander.es>
- */
-
-#ifndef MM_PLUGIN_QCOM_SOC_H
-#define MM_PLUGIN_QCOM_SOC_H
-
-#include "mm-plugin.h"
-
-#define MM_TYPE_PLUGIN_QCOM_SOC            (mm_plugin_qcom_soc_get_type ())
-#define MM_PLUGIN_QCOM_SOC(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), MM_TYPE_PLUGIN_QCOM_SOC, MMPluginQcomSoc))
-#define MM_PLUGIN_QCOM_SOC_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass),  MM_TYPE_PLUGIN_QCOM_SOC, MMPluginQcomSocClass))
-#define MM_IS_PLUGIN_QCOM_SOC(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), MM_TYPE_PLUGIN_QCOM_SOC))
-#define MM_IS_PLUGIN_QCOM_SOC_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass),  MM_TYPE_PLUGIN_QCOM_SOC))
-#define MM_PLUGIN_QCOM_SOC_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj),  MM_TYPE_PLUGIN_QCOM_SOC, MMPluginQcomSocClass))
-
-typedef struct {
-    MMPlugin parent;
-} MMPluginQcomSoc;
-
-typedef struct {
-    MMPluginClass parent;
-} MMPluginQcomSocClass;
-
-GType mm_plugin_qcom_soc_get_type (void);
-
-G_MODULE_EXPORT MMPlugin *mm_plugin_create (void);
-
-#endif /* MM_PLUGIN_QCOM_SOC_H */