From 80f7144d080e7e37f150a8bd4d70461a42aa3dab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= Date: Thu, 25 Nov 2021 10:32:48 +0000 Subject: osinfo: use consistent include syntax for public headers MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Daniel P. Berrangé --- osinfo/osinfo_avatar_format.h | 2 +- osinfo/osinfo_datamap.h | 2 +- osinfo/osinfo_datamaplist.h | 2 +- osinfo/osinfo_db.h | 2 +- osinfo/osinfo_deployment.h | 2 +- osinfo/osinfo_deploymentlist.h | 2 +- osinfo/osinfo_device.h | 2 +- osinfo/osinfo_device_driver.h | 2 +- osinfo/osinfo_device_driverlist.h | 2 +- osinfo/osinfo_devicelink.h | 2 +- osinfo/osinfo_devicelinkfilter.h | 2 +- osinfo/osinfo_devicelinklist.h | 2 +- osinfo/osinfo_devicelist.h | 2 +- osinfo/osinfo_entity.h | 2 +- osinfo/osinfo_firmware.h | 2 +- osinfo/osinfo_firmwarelist.h | 2 +- osinfo/osinfo_image.h | 2 +- osinfo/osinfo_imagelist.h | 2 +- osinfo/osinfo_install_config.h | 2 +- osinfo/osinfo_install_config_param.h | 2 +- osinfo/osinfo_install_config_paramlist.h | 2 +- osinfo/osinfo_install_scriptlist.h | 2 +- osinfo/osinfo_list.h | 2 +- osinfo/osinfo_loader.h | 2 +- osinfo/osinfo_media.h | 2 +- osinfo/osinfo_os.h | 2 +- osinfo/osinfo_os_variant.h | 2 +- osinfo/osinfo_os_variantlist.h | 2 +- osinfo/osinfo_oslist.h | 2 +- osinfo/osinfo_product.h | 2 +- osinfo/osinfo_productfilter.h | 2 +- osinfo/osinfo_productlist.h | 2 +- osinfo/osinfo_resources.h | 2 +- osinfo/osinfo_resourceslist.h | 2 +- osinfo/osinfo_tree.h | 2 +- osinfo/osinfo_treelist.h | 2 +- 36 files changed, 36 insertions(+), 36 deletions(-) diff --git a/osinfo/osinfo_avatar_format.h b/osinfo/osinfo_avatar_format.h index 7b14760..5d17e50 100644 --- a/osinfo/osinfo_avatar_format.h +++ b/osinfo/osinfo_avatar_format.h @@ -22,7 +22,7 @@ #include -#include "osinfo/osinfo_macros.h" +#include #define OSINFO_TYPE_AVATAR_FORMAT (osinfo_avatar_format_get_type ()) OSINFO_DECLARE_TYPE_WITH_PRIVATE_AND_CLASS(OsinfoAvatarFormat, diff --git a/osinfo/osinfo_datamap.h b/osinfo/osinfo_datamap.h index 6ce2f81..5695815 100644 --- a/osinfo/osinfo_datamap.h +++ b/osinfo/osinfo_datamap.h @@ -23,7 +23,7 @@ #include #include -#include "osinfo/osinfo_macros.h" +#include #define OSINFO_TYPE_DATAMAP (osinfo_datamap_get_type ()) OSINFO_DECLARE_TYPE_WITH_PRIVATE_AND_CLASS(OsinfoDatamap, diff --git a/osinfo/osinfo_datamaplist.h b/osinfo/osinfo_datamaplist.h index 4c31484..7ffaaf0 100644 --- a/osinfo/osinfo_datamaplist.h +++ b/osinfo/osinfo_datamaplist.h @@ -23,7 +23,7 @@ #include #include -#include "osinfo/osinfo_macros.h" +#include #define OSINFO_TYPE_DATAMAPLIST (osinfo_datamaplist_get_type ()) OSINFO_DECLARE_TYPE_WITH_PRIVATE_AND_CLASS(OsinfoDatamapList, diff --git a/osinfo/osinfo_db.h b/osinfo/osinfo_db.h index addd586..31ee7a0 100644 --- a/osinfo/osinfo_db.h +++ b/osinfo/osinfo_db.h @@ -29,7 +29,7 @@ #include #include -#include "osinfo/osinfo_macros.h" +#include #define OSINFO_TYPE_DB (osinfo_db_get_type ()) OSINFO_DECLARE_TYPE_WITH_PRIVATE_AND_CLASS(OsinfoDb, diff --git a/osinfo/osinfo_deployment.h b/osinfo/osinfo_deployment.h index bc6d0a5..f4b691c 100644 --- a/osinfo/osinfo_deployment.h +++ b/osinfo/osinfo_deployment.h @@ -24,7 +24,7 @@ #include #include -#include "osinfo/osinfo_macros.h" +#include #define OSINFO_TYPE_DEPLOYMENT (osinfo_deployment_get_type ()) OSINFO_DECLARE_TYPE_WITH_PRIVATE_AND_CLASS(OsinfoDeployment, diff --git a/osinfo/osinfo_deploymentlist.h b/osinfo/osinfo_deploymentlist.h index bf1cbde..04c2c96 100644 --- a/osinfo/osinfo_deploymentlist.h +++ b/osinfo/osinfo_deploymentlist.h @@ -24,7 +24,7 @@ #include #include -#include "osinfo/osinfo_macros.h" +#include #define OSINFO_TYPE_DEPLOYMENTLIST (osinfo_deploymentlist_get_type ()) OSINFO_DECLARE_TYPE_WITH_PRIVATE_AND_CLASS(OsinfoDeploymentList, diff --git a/osinfo/osinfo_device.h b/osinfo/osinfo_device.h index 0f6af69..841ad76 100644 --- a/osinfo/osinfo_device.h +++ b/osinfo/osinfo_device.h @@ -23,7 +23,7 @@ #include #include -#include "osinfo/osinfo_macros.h" +#include #define OSINFO_TYPE_DEVICE (osinfo_device_get_type ()) OSINFO_DECLARE_TYPE_WITH_PRIVATE_AND_CLASS(OsinfoDevice, diff --git a/osinfo/osinfo_device_driver.h b/osinfo/osinfo_device_driver.h index 68a297c..4b14ab8 100644 --- a/osinfo/osinfo_device_driver.h +++ b/osinfo/osinfo_device_driver.h @@ -25,7 +25,7 @@ #include #include -#include "osinfo/osinfo_macros.h" +#include #define OSINFO_TYPE_DEVICE_DRIVER (osinfo_device_driver_get_type ()) OSINFO_DECLARE_TYPE_WITH_PRIVATE_AND_CLASS(OsinfoDeviceDriver, diff --git a/osinfo/osinfo_device_driverlist.h b/osinfo/osinfo_device_driverlist.h index c715f24..388b0c6 100644 --- a/osinfo/osinfo_device_driverlist.h +++ b/osinfo/osinfo_device_driverlist.h @@ -23,7 +23,7 @@ #include #include -#include "osinfo/osinfo_macros.h" +#include #define OSINFO_TYPE_DEVICE_DRIVERLIST (osinfo_device_driverlist_get_type ()) OSINFO_DECLARE_TYPE_WITH_PRIVATE_AND_CLASS(OsinfoDeviceDriverList, diff --git a/osinfo/osinfo_devicelink.h b/osinfo/osinfo_devicelink.h index 42d35aa..39800e6 100644 --- a/osinfo/osinfo_devicelink.h +++ b/osinfo/osinfo_devicelink.h @@ -23,7 +23,7 @@ #include #include -#include "osinfo/osinfo_macros.h" +#include #define OSINFO_TYPE_DEVICELINK (osinfo_devicelink_get_type ()) OSINFO_DECLARE_TYPE_WITH_PRIVATE_AND_CLASS(OsinfoDeviceLink, diff --git a/osinfo/osinfo_devicelinkfilter.h b/osinfo/osinfo_devicelinkfilter.h index 0c0ad65..2cf93c0 100644 --- a/osinfo/osinfo_devicelinkfilter.h +++ b/osinfo/osinfo_devicelinkfilter.h @@ -20,7 +20,7 @@ #pragma once -#include "osinfo/osinfo_macros.h" +#include #define OSINFO_TYPE_DEVICELINKFILTER (osinfo_devicelinkfilter_get_type ()) OSINFO_DECLARE_TYPE_WITH_PRIVATE_AND_CLASS(OsinfoDeviceLinkFilter, diff --git a/osinfo/osinfo_devicelinklist.h b/osinfo/osinfo_devicelinklist.h index 906a588..60df84c 100644 --- a/osinfo/osinfo_devicelinklist.h +++ b/osinfo/osinfo_devicelinklist.h @@ -24,7 +24,7 @@ #include #include -#include "osinfo/osinfo_macros.h" +#include #define OSINFO_TYPE_DEVICELINKLIST (osinfo_devicelinklist_get_type ()) OSINFO_DECLARE_TYPE_WITH_PRIVATE_AND_CLASS(OsinfoDeviceLinkList, diff --git a/osinfo/osinfo_devicelist.h b/osinfo/osinfo_devicelist.h index b7cabca..fe4fad0 100644 --- a/osinfo/osinfo_devicelist.h +++ b/osinfo/osinfo_devicelist.h @@ -24,7 +24,7 @@ #include #include -#include "osinfo/osinfo_macros.h" +#include #define OSINFO_TYPE_DEVICELIST (osinfo_devicelist_get_type ()) OSINFO_DECLARE_TYPE_WITH_PRIVATE_AND_CLASS(OsinfoDeviceList, diff --git a/osinfo/osinfo_entity.h b/osinfo/osinfo_entity.h index 30d0750..e8b252a 100644 --- a/osinfo/osinfo_entity.h +++ b/osinfo/osinfo_entity.h @@ -22,7 +22,7 @@ #include -#include "osinfo/osinfo_macros.h" +#include #define OSINFO_TYPE_ENTITY (osinfo_entity_get_type ()) OSINFO_DECLARE_TYPE_WITH_PRIVATE_AND_CLASS(OsinfoEntity, diff --git a/osinfo/osinfo_firmware.h b/osinfo/osinfo_firmware.h index 1cbce94..5959788 100644 --- a/osinfo/osinfo_firmware.h +++ b/osinfo/osinfo_firmware.h @@ -24,7 +24,7 @@ #include #include -#include "osinfo/osinfo_macros.h" +#include #define OSINFO_TYPE_FIRMWARE (osinfo_firmware_get_type ()) OSINFO_DECLARE_TYPE_WITH_PRIVATE_AND_CLASS(OsinfoFirmware, diff --git a/osinfo/osinfo_firmwarelist.h b/osinfo/osinfo_firmwarelist.h index be24fe1..775412b 100644 --- a/osinfo/osinfo_firmwarelist.h +++ b/osinfo/osinfo_firmwarelist.h @@ -23,7 +23,7 @@ #include #include -#include "osinfo/osinfo_macros.h" +#include #define OSINFO_TYPE_FIRMWARELIST (osinfo_firmwarelist_get_type ()) OSINFO_DECLARE_TYPE_WITH_PRIVATE_AND_CLASS(OsinfoFirmwareList, diff --git a/osinfo/osinfo_image.h b/osinfo/osinfo_image.h index c6c75a0..49f008a 100644 --- a/osinfo/osinfo_image.h +++ b/osinfo/osinfo_image.h @@ -23,7 +23,7 @@ #include #include -#include "osinfo/osinfo_macros.h" +#include #define OSINFO_TYPE_IMAGE (osinfo_image_get_type ()) OSINFO_DECLARE_TYPE_WITH_PRIVATE_AND_CLASS(OsinfoImage, diff --git a/osinfo/osinfo_imagelist.h b/osinfo/osinfo_imagelist.h index 24b998f..34905fa 100644 --- a/osinfo/osinfo_imagelist.h +++ b/osinfo/osinfo_imagelist.h @@ -23,7 +23,7 @@ #include #include -#include "osinfo/osinfo_macros.h" +#include #define OSINFO_TYPE_IMAGELIST (osinfo_imagelist_get_type ()) OSINFO_DECLARE_TYPE_WITH_PRIVATE_AND_CLASS(OsinfoImageList, diff --git a/osinfo/osinfo_install_config.h b/osinfo/osinfo_install_config.h index b3e4036..d60b6bb 100644 --- a/osinfo/osinfo_install_config.h +++ b/osinfo/osinfo_install_config.h @@ -22,7 +22,7 @@ #include -#include "osinfo/osinfo_macros.h" +#include #define OSINFO_TYPE_INSTALL_CONFIG (osinfo_install_config_get_type ()) OSINFO_DECLARE_TYPE_WITH_PRIVATE_AND_CLASS(OsinfoInstallConfig, diff --git a/osinfo/osinfo_install_config_param.h b/osinfo/osinfo_install_config_param.h index c265969..15e8f88 100644 --- a/osinfo/osinfo_install_config_param.h +++ b/osinfo/osinfo_install_config_param.h @@ -22,7 +22,7 @@ #include -#include "osinfo/osinfo_macros.h" +#include #define OSINFO_TYPE_INSTALL_CONFIG_PARAM (osinfo_install_config_param_get_type ()) OSINFO_DECLARE_TYPE_WITH_PRIVATE_AND_CLASS(OsinfoInstallConfigParam, diff --git a/osinfo/osinfo_install_config_paramlist.h b/osinfo/osinfo_install_config_paramlist.h index de68416..51b0515 100644 --- a/osinfo/osinfo_install_config_paramlist.h +++ b/osinfo/osinfo_install_config_paramlist.h @@ -23,7 +23,7 @@ #include #include -#include "osinfo/osinfo_macros.h" +#include #define OSINFO_TYPE_INSTALL_CONFIG_PARAMLIST (osinfo_install_config_paramlist_get_type ()) OSINFO_DECLARE_TYPE_WITH_PRIVATE_AND_CLASS(OsinfoInstallConfigParamList, diff --git a/osinfo/osinfo_install_scriptlist.h b/osinfo/osinfo_install_scriptlist.h index 23dd138..8dfd724 100644 --- a/osinfo/osinfo_install_scriptlist.h +++ b/osinfo/osinfo_install_scriptlist.h @@ -23,7 +23,7 @@ #include #include -#include "osinfo/osinfo_macros.h" +#include #define OSINFO_TYPE_INSTALL_SCRIPTLIST (osinfo_install_scriptlist_get_type ()) OSINFO_DECLARE_TYPE_WITH_PRIVATE_AND_CLASS(OsinfoInstallScriptList, diff --git a/osinfo/osinfo_list.h b/osinfo/osinfo_list.h index 4e99c5a..2b79b6d 100644 --- a/osinfo/osinfo_list.h +++ b/osinfo/osinfo_list.h @@ -21,7 +21,7 @@ #pragma once #include -#include "osinfo/osinfo_macros.h" +#include #define OSINFO_TYPE_LIST (osinfo_list_get_type ()) OSINFO_DECLARE_TYPE_WITH_PRIVATE_AND_CLASS(OsinfoList, diff --git a/osinfo/osinfo_loader.h b/osinfo/osinfo_loader.h index 91cedb4..255a96a 100644 --- a/osinfo/osinfo_loader.h +++ b/osinfo/osinfo_loader.h @@ -23,7 +23,7 @@ #include #include -#include "osinfo/osinfo_macros.h" +#include #define OSINFO_TYPE_LOADER (osinfo_loader_get_type ()) OSINFO_DECLARE_TYPE_WITH_PRIVATE_AND_CLASS(OsinfoLoader, diff --git a/osinfo/osinfo_media.h b/osinfo/osinfo_media.h index b759c9a..f0369de 100644 --- a/osinfo/osinfo_media.h +++ b/osinfo/osinfo_media.h @@ -25,7 +25,7 @@ #include #include -#include "osinfo/osinfo_macros.h" +#include GQuark osinfo_media_error_quark (void) G_GNUC_CONST; diff --git a/osinfo/osinfo_os.h b/osinfo/osinfo_os.h index 72c2be5..62968e6 100644 --- a/osinfo/osinfo_os.h +++ b/osinfo/osinfo_os.h @@ -35,7 +35,7 @@ #include #include -#include "osinfo/osinfo_macros.h" +#include #define OSINFO_TYPE_OS (osinfo_os_get_type ()) OSINFO_DECLARE_TYPE_WITH_PRIVATE_AND_CLASS(OsinfoOs, diff --git a/osinfo/osinfo_os_variant.h b/osinfo/osinfo_os_variant.h index 6b3eda8..2f47ff1 100644 --- a/osinfo/osinfo_os_variant.h +++ b/osinfo/osinfo_os_variant.h @@ -24,7 +24,7 @@ #include #include -#include "osinfo/osinfo_macros.h" +#include #define OSINFO_TYPE_OS_VARIANT (osinfo_os_variant_get_type ()) OSINFO_DECLARE_TYPE_WITH_PRIVATE_AND_CLASS(OsinfoOsVariant, diff --git a/osinfo/osinfo_os_variantlist.h b/osinfo/osinfo_os_variantlist.h index b01a5b1..cd3c15d 100644 --- a/osinfo/osinfo_os_variantlist.h +++ b/osinfo/osinfo_os_variantlist.h @@ -23,7 +23,7 @@ #include #include -#include "osinfo/osinfo_macros.h" +#include #define OSINFO_TYPE_OS_VARIANTLIST (osinfo_os_variantlist_get_type ()) OSINFO_DECLARE_TYPE_WITH_PRIVATE_AND_CLASS(OsinfoOsVariantList, diff --git a/osinfo/osinfo_oslist.h b/osinfo/osinfo_oslist.h index 2ab2c2f..4fbf70d 100644 --- a/osinfo/osinfo_oslist.h +++ b/osinfo/osinfo_oslist.h @@ -24,7 +24,7 @@ #include #include -#include "osinfo/osinfo_macros.h" +#include #define OSINFO_TYPE_OSLIST (osinfo_oslist_get_type ()) OSINFO_DECLARE_TYPE_WITH_PRIVATE_AND_CLASS(OsinfoOsList, diff --git a/osinfo/osinfo_product.h b/osinfo/osinfo_product.h index 45919c0..d16dafd 100644 --- a/osinfo/osinfo_product.h +++ b/osinfo/osinfo_product.h @@ -23,7 +23,7 @@ #include #include -#include "osinfo/osinfo_macros.h" +#include #define OSINFO_TYPE_PRODUCT (osinfo_product_get_type ()) OSINFO_DECLARE_TYPE_WITH_PRIVATE_AND_CLASS(OsinfoProduct, diff --git a/osinfo/osinfo_productfilter.h b/osinfo/osinfo_productfilter.h index 8a5b440..e66fb09 100644 --- a/osinfo/osinfo_productfilter.h +++ b/osinfo/osinfo_productfilter.h @@ -20,7 +20,7 @@ #pragma once -#include "osinfo/osinfo_macros.h" +#include #define OSINFO_TYPE_PRODUCTFILTER (osinfo_productfilter_get_type ()) OSINFO_DECLARE_TYPE_WITH_PRIVATE_AND_CLASS(OsinfoProductFilter, diff --git a/osinfo/osinfo_productlist.h b/osinfo/osinfo_productlist.h index 58555de..6bfd4c8 100644 --- a/osinfo/osinfo_productlist.h +++ b/osinfo/osinfo_productlist.h @@ -24,7 +24,7 @@ #include #include -#include "osinfo/osinfo_macros.h" +#include #define OSINFO_TYPE_PRODUCTLIST (osinfo_productlist_get_type ()) OSINFO_DECLARE_TYPE_WITH_PRIVATE_AND_CLASS(OsinfoProductList, diff --git a/osinfo/osinfo_resources.h b/osinfo/osinfo_resources.h index 097516c..679f337 100644 --- a/osinfo/osinfo_resources.h +++ b/osinfo/osinfo_resources.h @@ -24,7 +24,7 @@ #include #include -#include "osinfo/osinfo_macros.h" +#include #define OSINFO_ARCHITECTURE_ALL "all" #define OSINFO_MEGAHERTZ 1000000 diff --git a/osinfo/osinfo_resourceslist.h b/osinfo/osinfo_resourceslist.h index 09f43d0..49d2ee5 100644 --- a/osinfo/osinfo_resourceslist.h +++ b/osinfo/osinfo_resourceslist.h @@ -23,7 +23,7 @@ #include #include -#include "osinfo/osinfo_macros.h" +#include #define OSINFO_TYPE_RESOURCESLIST (osinfo_resourceslist_get_type ()) OSINFO_DECLARE_TYPE_WITH_PRIVATE_AND_CLASS(OsinfoResourcesList, diff --git a/osinfo/osinfo_tree.h b/osinfo/osinfo_tree.h index 353dc0c..3d96f5a 100644 --- a/osinfo/osinfo_tree.h +++ b/osinfo/osinfo_tree.h @@ -24,7 +24,7 @@ #include #include -#include "osinfo/osinfo_macros.h" +#include GQuark osinfo_tree_error_quark (void) G_GNUC_CONST; diff --git a/osinfo/osinfo_treelist.h b/osinfo/osinfo_treelist.h index 8be8cbc..e06474b 100644 --- a/osinfo/osinfo_treelist.h +++ b/osinfo/osinfo_treelist.h @@ -23,7 +23,7 @@ #include #include -#include "osinfo/osinfo_macros.h" +#include #define OSINFO_TYPE_TREELIST (osinfo_treelist_get_type ()) OSINFO_DECLARE_TYPE_WITH_PRIVATE_AND_CLASS(OsinfoTreeList, -- cgit v1.2.1