From d08d99a57b4eef7e167457429ae24db6eada6070 Mon Sep 17 00:00:00 2001 From: Ievgenii Meshcheriakov Date: Wed, 6 Sep 2023 14:05:52 +0200 Subject: [PATCH] qdbus_symbols: Use QFunctionPointer typedef This makes function declarations much easier to read. Change-Id: Ib05433cda97a39f4a3b8c2759c32309a60716bfb Reviewed-by: Thiago Macieira --- src/dbus/qdbus_symbols.cpp | 4 ++-- src/dbus/qdbus_symbols_p.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/dbus/qdbus_symbols.cpp b/src/dbus/qdbus_symbols.cpp index be6dfc13327..034ed0f2e0d 100644 --- a/src/dbus/qdbus_symbols.cpp +++ b/src/dbus/qdbus_symbols.cpp @@ -88,7 +88,7 @@ bool qdbus_loadLibDBus() #endif } -void (*qdbus_resolve_conditionally(const char *name))() +QFunctionPointer qdbus_resolve_conditionally(const char *name) { #if QT_CONFIG(library) if (qdbus_loadLibDBus()) @@ -99,7 +99,7 @@ void (*qdbus_resolve_conditionally(const char *name))() return nullptr; } -void (*qdbus_resolve_me(const char *name))() +QFunctionPointer qdbus_resolve_me(const char *name) { #if QT_CONFIG(library) if (Q_UNLIKELY(!qdbus_loadLibDBus())) diff --git a/src/dbus/qdbus_symbols_p.h b/src/dbus/qdbus_symbols_p.h index e3008be7619..481a8b16f3b 100644 --- a/src/dbus/qdbus_symbols_p.h +++ b/src/dbus/qdbus_symbols_p.h @@ -35,8 +35,8 @@ QT_BEGIN_NAMESPACE #if !defined QT_LINKED_LIBDBUS -void (*qdbus_resolve_conditionally(const char *name))(); // doesn't print a warning -void (*qdbus_resolve_me(const char *name))(); // prints a warning +QFunctionPointer qdbus_resolve_conditionally(const char *name); // doesn't print a warning +QFunctionPointer qdbus_resolve_me(const char *name); // prints a warning bool qdbus_loadLibDBus(); //# define TRACE_DBUS_CALLS