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, 8 insertions, 46 deletions

diff --git a/src/plugins/intel/mm-plugin-intel.c b/src/plugins/intel/mm-plugin-intel.c
index d83edfba..62e23504 100644
--- a/src/plugins/intel/mm-plugin-intel.c
+++ b/src/plugins/intel/mm-plugin-intel.c
@@ -19,7 +19,7 @@
 #define _LIBMM_INSIDE_MM
 #include <libmm-glib.h>
 
-#include "mm-plugin-intel.h"
+#include "mm-plugin-common.h"
 #include "mm-log-object.h"
 #include "mm-broadband-modem.h"
 
@@ -27,10 +27,10 @@
 #include "mm-broadband-modem-mbim-intel.h"
 #endif
 
-G_DEFINE_TYPE (MMPluginIntel, mm_plugin_intel, MM_TYPE_PLUGIN)
+#define MM_TYPE_PLUGIN_INTEL mm_plugin_intel_get_type ()
+MM_DEFINE_PLUGIN (INTEL, intel, Intel)
 
-MM_PLUGIN_DEFINE_MAJOR_VERSION
-MM_PLUGIN_DEFINE_MINOR_VERSION
+/*****************************************************************************/
 
 static MMBaseModem *
 create_modem (MMPlugin      *self,
@@ -61,8 +61,10 @@ create_modem (MMPlugin      *self,
                                                   product));
 }
 
-G_MODULE_EXPORT MMPlugin *
-mm_plugin_create (void)
+/*****************************************************************************/
+
+MM_PLUGIN_NAMED_CREATOR_SCOPE MMPlugin *
+mm_plugin_create_intel (void)
 {
     static const gchar   *subsystems[] = { "net", "wwan", NULL };
     static const guint16  vendor_ids[]  = { 0x8086, 0 };
diff --git a/src/plugins/intel/mm-plugin-intel.h b/src/plugins/intel/mm-plugin-intel.h
deleted file mode 100644
index 3d2880b2..00000000
--- a/src/plugins/intel/mm-plugin-intel.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) 2021-2022 Intel Corporation
- */
-
-#ifndef MM_PLUGIN_INTEL_H
-#define MM_PLUGIN_INTEL_H
-
-#include "mm-plugin.h"
-
-#define MM_TYPE_PLUGIN_INTEL               (mm_plugin_intel_get_type ())
-#define MM_PLUGIN_INTEL(obj)               (G_TYPE_CHECK_INSTANCE_CAST ((obj), MM_TYPE_PLUGIN_INTEL, MMPluginIntel))
-#define MM_PLUGIN_INTEL_CLASS(klass)       (G_TYPE_CHECK_CLASS_CAST ((klass),  MM_TYPE_PLUGIN_INTEL, MMPluginIntelClass))
-#define MM_IS_PLUGIN_INTEL(obj)            (G_TYPE_CHECK_INSTANCE_TYPE ((obj), MM_TYPE_PLUGIN_INTEL))
-#define MM_IS_PLUGIN_INTEL_CLASS(klass)    (G_TYPE_CHECK_CLASS_TYPE ((klass),  MM_TYPE_PLUGIN_INTEL))
-#define MM_PLUGIN_INTEL_GET_CLASS(obj)     (G_TYPE_INSTANCE_GET_CLASS ((obj),  MM_TYPE_PLUGIN_INTEL, MMPluginIntelClass))
-
-typedef struct {
-    MMPlugin parent;
-} MMPluginIntel;
-
-typedef struct {
-    MMPluginClass parent;
-} MMPluginIntelClass;
-
-GType mm_plugin_intel_get_type (void);
-
-G_MODULE_EXPORT MMPlugin *mm_plugin_create (void);
-
-#endif /* MM_PLUGIN_INTEL_H */