From bb6b76107c6cb3ca830d1c028df7414c0f8d9589 Mon Sep 17 00:00:00 2001 From: Evangelos Ribeiro Tzaras Date: Sat, 21 Jan 2023 16:42:39 +0100 Subject: [PATCH] build: Rename util.{c,h} to calls-util.{c,h} "util" is a very generic name. This guards against accidentally including similarly named headers from elsewhere. --- doc/calls-docs.xml | 2 +- plugins/provider/mm/calls-mm-call.c | 2 +- plugins/provider/ofono/calls-ofono-provider.c | 2 +- plugins/provider/sip/calls-sip-call.c | 2 +- plugins/provider/sip/calls-sip-media-manager.c | 2 +- plugins/provider/sip/calls-sip-media-pipeline.c | 2 +- plugins/provider/sip/calls-srtp-utils.c | 2 +- src/calls-best-match.c | 2 +- src/calls-call-record-row.c | 2 +- src/calls-call-selector-item.c | 2 +- src/calls-call-window.c | 2 +- src/calls-call.c | 2 +- src/calls-contacts-provider.c | 2 +- src/calls-dbus-manager.c | 2 +- src/calls-history-box.c | 2 +- src/calls-main-window.c | 2 +- src/calls-manager.c | 2 +- src/calls-new-call-box.c | 2 +- src/calls-notifier.c | 2 +- src/calls-origin.c | 2 +- src/calls-provider.c | 2 +- src/calls-ussd.c | 2 +- src/{util.c => calls-util.c} | 2 +- src/{util.h => calls-util.h} | 0 src/meson.build | 2 +- tests/test-util.c | 2 +- 26 files changed, 25 insertions(+), 25 deletions(-) rename src/{util.c => calls-util.c} (99%) rename src/{util.h => calls-util.h} (100%) diff --git a/doc/calls-docs.xml b/doc/calls-docs.xml index 2103b79..c8f0a79 100644 --- a/doc/calls-docs.xml +++ b/doc/calls-docs.xml @@ -62,7 +62,7 @@ Utilities - + diff --git a/plugins/provider/mm/calls-mm-call.c b/plugins/provider/mm/calls-mm-call.c index 602ed0e..114b769 100644 --- a/plugins/provider/mm/calls-mm-call.c +++ b/plugins/provider/mm/calls-mm-call.c @@ -27,7 +27,7 @@ #include "calls-mm-call.h" #include "calls-call.h" #include "calls-message-source.h" -#include "util.h" +#include "calls-util.h" #include #include diff --git a/plugins/provider/ofono/calls-ofono-provider.c b/plugins/provider/ofono/calls-ofono-provider.c index 2370354..b9b187b 100644 --- a/plugins/provider/ofono/calls-ofono-provider.c +++ b/plugins/provider/ofono/calls-ofono-provider.c @@ -28,7 +28,7 @@ #include "calls-provider.h" #include "calls-ofono-origin.h" #include "calls-message-source.h" -#include "util.h" +#include "calls-util.h" #include #include diff --git a/plugins/provider/sip/calls-sip-call.c b/plugins/provider/sip/calls-sip-call.c index 5ad0c02..1736973 100644 --- a/plugins/provider/sip/calls-sip-call.c +++ b/plugins/provider/sip/calls-sip-call.c @@ -33,7 +33,7 @@ #include "calls-sip-media-manager.h" #include "calls-sip-media-pipeline.h" #include "calls-sip-util.h" -#include "util.h" +#include "calls-util.h" #include diff --git a/plugins/provider/sip/calls-sip-media-manager.c b/plugins/provider/sip/calls-sip-media-manager.c index 8d1b38c..e84db6b 100644 --- a/plugins/provider/sip/calls-sip-media-manager.c +++ b/plugins/provider/sip/calls-sip-media-manager.c @@ -29,7 +29,7 @@ #include "calls-sip-media-pipeline.h" #include "calls-srtp-utils.h" #include "gst-rfc3551.h" -#include "util.h" +#include "calls-util.h" #include #include diff --git a/plugins/provider/sip/calls-sip-media-pipeline.c b/plugins/provider/sip/calls-sip-media-pipeline.c index 42a0f5c..6b98262 100644 --- a/plugins/provider/sip/calls-sip-media-pipeline.c +++ b/plugins/provider/sip/calls-sip-media-pipeline.c @@ -29,7 +29,7 @@ #include "calls-media-pipeline-enums.h" #include "calls-sip-media-pipeline.h" #include "calls-srtp-utils.h" -#include "util.h" +#include "calls-util.h" #include #include diff --git a/plugins/provider/sip/calls-srtp-utils.c b/plugins/provider/sip/calls-srtp-utils.c index 1cde3f7..d744529 100644 --- a/plugins/provider/sip/calls-srtp-utils.c +++ b/plugins/provider/sip/calls-srtp-utils.c @@ -23,7 +23,7 @@ */ #include "calls-srtp-utils.h" -#include "util.h" +#include "calls-util.h" #include #include diff --git a/src/calls-best-match.c b/src/calls-best-match.c index 09d2953..12d8c89 100644 --- a/src/calls-best-match.c +++ b/src/calls-best-match.c @@ -26,7 +26,7 @@ #include "calls-contacts-provider.h" #include "calls-manager.h" #include "calls-vala.h" -#include "util.h" +#include "calls-util.h" #include diff --git a/src/calls-call-record-row.c b/src/calls-call-record-row.c index 5b15549..0569891 100644 --- a/src/calls-call-record-row.c +++ b/src/calls-call-record-row.c @@ -26,7 +26,7 @@ #include "calls-best-match.h" #include "calls-contacts-provider.h" #include "calls-manager.h" -#include "util.h" +#include "calls-util.h" #include #include diff --git a/src/calls-call-selector-item.c b/src/calls-call-selector-item.c index 6240141..65efa87 100644 --- a/src/calls-call-selector-item.c +++ b/src/calls-call-selector-item.c @@ -25,7 +25,7 @@ #include "calls-call-selector-item.h" #include "calls-call.h" #include "calls-ui-call-data.h" -#include "util.h" +#include "calls-util.h" #include #include diff --git a/src/calls-call-window.c b/src/calls-call-window.c index 0411e3f..191e816 100644 --- a/src/calls-call-window.c +++ b/src/calls-call-window.c @@ -33,7 +33,7 @@ #include "calls-in-app-notification.h" #include "calls-manager.h" #include "calls-ui-call-data.h" -#include "util.h" +#include "calls-util.h" #include #include diff --git a/src/calls-call.c b/src/calls-call.c index 4b0fa1a..7c2103b 100644 --- a/src/calls-call.c +++ b/src/calls-call.c @@ -25,7 +25,7 @@ #include "calls-call.h" #include "calls-message-source.h" #include "enum-types.h" -#include "util.h" +#include "calls-util.h" #include diff --git a/src/calls-contacts-provider.c b/src/calls-contacts-provider.c index 24b9da5..5ae014a 100644 --- a/src/calls-contacts-provider.c +++ b/src/calls-contacts-provider.c @@ -30,7 +30,7 @@ #include "calls-contacts-provider.h" #include "calls-best-match.h" #include "calls-settings.h" -#include "util.h" +#include "calls-util.h" #include #include diff --git a/src/calls-dbus-manager.c b/src/calls-dbus-manager.c index 9f00d6d..3ff6cce 100644 --- a/src/calls-dbus-manager.c +++ b/src/calls-dbus-manager.c @@ -14,7 +14,7 @@ #include "calls-dbus-manager.h" #include "calls-manager.h" #include "calls-ui-call-data.h" -#include "util.h" +#include "calls-util.h" /** * SECTION:calls-dbus-manager diff --git a/src/calls-history-box.c b/src/calls-history-box.c index e15fa92..7b2b466 100644 --- a/src/calls-history-box.c +++ b/src/calls-history-box.c @@ -28,7 +28,7 @@ #include "calls-call-record.h" #include "calls-call-record-row.h" #include "gtklistmodels/gtkmodels.h" -#include "util.h" +#include "calls-util.h" #include #include diff --git a/src/calls-main-window.c b/src/calls-main-window.c index b17c863..22f8b32 100644 --- a/src/calls-main-window.c +++ b/src/calls-main-window.c @@ -32,7 +32,7 @@ #include "calls-in-app-notification.h" #include "calls-manager.h" #include "calls-config.h" -#include "util.h" +#include "calls-util.h" #include "version.h" #include diff --git a/src/calls-manager.c b/src/calls-manager.c index eee32ba..be1ae94 100644 --- a/src/calls-manager.c +++ b/src/calls-manager.c @@ -35,7 +35,7 @@ #include "calls-settings.h" #include "calls-ui-call-data.h" #include "calls-ussd.h" -#include "util.h" +#include "calls-util.h" #include "enum-types.h" diff --git a/src/calls-new-call-box.c b/src/calls-new-call-box.c index 9634de3..8fb2468 100644 --- a/src/calls-new-call-box.c +++ b/src/calls-new-call-box.c @@ -30,7 +30,7 @@ #include "calls-new-call-box.h" #include "calls-settings.h" #include "calls-ussd.h" -#include "util.h" +#include "calls-util.h" #include #include diff --git a/src/calls-notifier.c b/src/calls-notifier.c index 7104d27..c691168 100644 --- a/src/calls-notifier.c +++ b/src/calls-notifier.c @@ -29,7 +29,7 @@ #include "calls-manager.h" #include "calls-notifier.h" #include "calls-ui-call-data.h" -#include "util.h" +#include "calls-util.h" #include diff --git a/src/calls-origin.c b/src/calls-origin.c index aa00aca..487a303 100644 --- a/src/calls-origin.c +++ b/src/calls-origin.c @@ -24,7 +24,7 @@ #include "calls-origin.h" #include "calls-message-source.h" -#include "util.h" +#include "calls-util.h" /** * SECTION:calls-origin diff --git a/src/calls-provider.c b/src/calls-provider.c index 7290313..a8d3de1 100644 --- a/src/calls-provider.c +++ b/src/calls-provider.c @@ -28,7 +28,7 @@ #include "calls-origin.h" #include "calls-message-source.h" #include "calls-config.h" -#include "util.h" +#include "calls-util.h" #include #include diff --git a/src/calls-ussd.c b/src/calls-ussd.c index fb678c7..97e7b15 100644 --- a/src/calls-ussd.c +++ b/src/calls-ussd.c @@ -24,7 +24,7 @@ #include "calls-ussd.h" #include "enum-types.h" -#include "util.h" +#include "calls-util.h" /** * SECTION:calls-ussd diff --git a/src/util.c b/src/calls-util.c similarity index 99% rename from src/util.c rename to src/calls-util.c index 074009f..ed41585 100644 --- a/src/util.c +++ b/src/calls-util.c @@ -22,7 +22,7 @@ * */ -#include "util.h" +#include "calls-util.h" #include #include diff --git a/src/util.h b/src/calls-util.h similarity index 100% rename from src/util.h rename to src/calls-util.h diff --git a/src/meson.build b/src/meson.build index 30af4b2..b180b4a 100644 --- a/src/meson.build +++ b/src/meson.build @@ -118,7 +118,7 @@ calls_sources = files([ 'calls-settings.c', 'calls-settings.h', 'calls-ui-call-data.c', 'calls-ui-call-data.h', 'calls-ussd.c', 'calls-ussd.h', - 'util.c', 'util.h', + 'calls-util.c', 'calls-util.h', ]) + calls_generated_sources + gtklistmodel_sources calls_config_data = config_data diff --git a/tests/test-util.c b/tests/test-util.c index 3ba0fb3..aa268c0 100644 --- a/tests/test-util.c +++ b/tests/test-util.c @@ -6,7 +6,7 @@ * Author: Evangelos Ribeiro Tzaras */ -#include "util.h" +#include "calls-util.h" #include