Skip to content

Commit 5afa24b

Browse files
sangelovicsangelovic
committed
refactor: remove unnecessary sdbus:: qualification
1 parent 2cb3e43 commit 5afa24b

File tree

14 files changed

+169
-169
lines changed

14 files changed

+169
-169
lines changed

‎include/sdbus-c++/ConvenienceApiClasses.inl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -427,7 +427,7 @@ namespace sdbus {
427427
{
428428
signal >> signalArgs;
429429
}
430-
catch (const sdbus::Error& e)
430+
catch (const Error& e)
431431
{
432432
// Pass message deserialization exceptions to the client via callback error parameter,
433433
// instead of propagating them up the message loop call stack.

‎include/sdbus-c++/IObject.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -414,7 +414,7 @@ namespace sdbus {
414414
*
415415
* @throws sdbus::Error in case of failure
416416
*/
417-
virtual void emitSignal(const sdbus::Signal& message) = 0;
417+
virtual void emitSignal(const Signal& message) = 0;
418418

419419
protected: // Internal API for efficiency reasons used by high-level API helper classes
420420
friend SignalEmitter;
@@ -474,7 +474,7 @@ namespace sdbus {
474474
* auto proxy = sdbus::createObject(connection, "/com/kistler/foo");
475475
* @endcode
476476
*/
477-
[[nodiscard]] std::unique_ptr<sdbus::IObject> createObject(sdbus::IConnection& connection, ObjectPath objectPath);
477+
[[nodiscard]] std::unique_ptr<IObject> createObject(IConnection& connection, ObjectPath objectPath);
478478

479479
} // namespace sdbus
480480

‎include/sdbus-c++/IProxy.h‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -857,9 +857,9 @@ namespace sdbus {
857857
* auto proxy = sdbus::createProxy(connection, "com.kistler.foo", "/com/kistler/foo");
858858
* @endcode
859859
*/
860-
[[nodiscard]] std::unique_ptr<sdbus::IProxy> createProxy( sdbus::IConnection& connection
861-
, ServiceName destination
862-
, ObjectPath objectPath );
860+
[[nodiscard]] std::unique_ptr<IProxy> createProxy( IConnection& connection
861+
, ServiceName destination
862+
, ObjectPath objectPath );
863863

864864
/*!
865865
* @brief Creates a proxy object for a specific remote D-Bus object
@@ -883,9 +883,9 @@ namespace sdbus {
883883
* auto proxy = sdbus::createProxy(std::move(connection), "com.kistler.foo", "/com/kistler/foo");
884884
* @endcode
885885
*/
886-
[[nodiscard]] std::unique_ptr<sdbus::IProxy> createProxy( std::unique_ptr<sdbus::IConnection>&& connection
887-
, ServiceName destination
888-
, ObjectPath objectPath );
886+
[[nodiscard]] std::unique_ptr<IProxy> createProxy( std::unique_ptr<IConnection>&& connection
887+
, ServiceName destination
888+
, ObjectPath objectPath );
889889

890890
/*!
891891
* @brief Creates a light-weight proxy object for a specific remote D-Bus object
@@ -910,19 +910,19 @@ namespace sdbus {
910910
* auto proxy = sdbus::createProxy(std::move(connection), "com.kistler.foo", "/com/kistler/foo", sdbus::dont_run_event_loop_thread);
911911
* @endcode
912912
*/
913-
[[nodiscard]] std::unique_ptr<sdbus::IProxy> createProxy( std::unique_ptr<sdbus::IConnection>&& connection
914-
, ServiceName destination
915-
, ObjectPath objectPath
916-
, dont_run_event_loop_thread_t );
913+
[[nodiscard]] std::unique_ptr<IProxy> createProxy( std::unique_ptr<IConnection>&& connection
914+
, ServiceName destination
915+
, ObjectPath objectPath
916+
, dont_run_event_loop_thread_t );
917917

918918
/*!
919919
* @brief Creates a light-weight proxy object for a specific remote D-Bus object
920920
*
921921
* Does the same thing as createProxy(std::unique_ptr<sdbus::IConnection>&&, ServiceName, ObjectPath, dont_run_event_loop_thread_t);
922922
*/
923-
[[nodiscard]] std::unique_ptr<sdbus::IProxy> createLightWeightProxy( std::unique_ptr<sdbus::IConnection>&& connection
924-
, ServiceName destination
925-
, ObjectPath objectPath );
923+
[[nodiscard]] std::unique_ptr<IProxy> createLightWeightProxy( std::unique_ptr<IConnection>&& connection
924+
, ServiceName destination
925+
, ObjectPath objectPath );
926926

927927
/*!
928928
* @brief Creates a proxy object for a specific remote D-Bus object
@@ -941,8 +941,8 @@ namespace sdbus {
941941
* auto proxy = sdbus::createProxy("com.kistler.foo", "/com/kistler/foo");
942942
* @endcode
943943
*/
944-
[[nodiscard]] std::unique_ptr<sdbus::IProxy> createProxy( ServiceName destination
945-
, ObjectPath objectPath );
944+
[[nodiscard]] std::unique_ptr<IProxy> createProxy( ServiceName destination
945+
, ObjectPath objectPath );
946946

947947
/*!
948948
* @brief Creates a light-weight proxy object for a specific remote D-Bus object
@@ -962,16 +962,16 @@ namespace sdbus {
962962
* auto proxy = sdbus::createProxy("com.kistler.foo", "/com/kistler/foo", sdbus::dont_run_event_loop_thread );
963963
* @endcode
964964
*/
965-
[[nodiscard]] std::unique_ptr<sdbus::IProxy> createProxy( ServiceName destination
966-
, ObjectPath objectPath
967-
, dont_run_event_loop_thread_t );
965+
[[nodiscard]] std::unique_ptr<IProxy> createProxy( ServiceName destination
966+
, ObjectPath objectPath
967+
, dont_run_event_loop_thread_t );
968968

969969
/*!
970970
* @brief Creates a light-weight proxy object for a specific remote D-Bus object
971971
*
972972
* Does the same thing as createProxy(ServiceName, ObjectPath, dont_run_event_loop_thread_t);
973973
*/
974-
[[nodiscard]] std::unique_ptr<sdbus::IProxy> createLightWeightProxy(ServiceName destination, ObjectPath objectPath);
974+
[[nodiscard]] std::unique_ptr<IProxy> createLightWeightProxy(ServiceName destination, ObjectPath objectPath);
975975

976976
} // namespace sdbus
977977

‎include/sdbus-c++/Message.h‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -278,7 +278,7 @@ namespace sdbus {
278278
[[nodiscard]] Slot send(void* callback, void* userData, uint64_t timeout, return_slot_t) const;
279279

280280
MethodReply createReply() const;
281-
MethodReply createErrorReply(const sdbus::Error& error) const;
281+
MethodReply createErrorReply(const Error& error) const;
282282

283283
void dontExpectReply();
284284
bool doesntExpectReply() const;
@@ -496,7 +496,7 @@ namespace sdbus {
496496
template <typename Element, typename... Elements>
497497
bool deserialize_variant(Message& msg, std::variant<Elements...>& value, const char* signature)
498498
{
499-
constexpr auto elemSignature = as_null_terminated(sdbus::signature_of_v<Element>);
499+
constexpr auto elemSignature = as_null_terminated(signature_of_v<Element>);
500500
if (std::strcmp(signature, elemSignature.data()) != 0)
501501
return false;
502502

@@ -578,7 +578,7 @@ namespace sdbus {
578578
size_t arraySize{};
579579
const ElementType* arrayPtr{};
580580

581-
constexpr auto signature = as_null_terminated(sdbus::signature_of_v<ElementType>);
581+
constexpr auto signature = as_null_terminated(signature_of_v<ElementType>);
582582
readArray(*signature.data(), reinterpret_cast<const void**>(&arrayPtr), &arraySize);
583583

584584
const size_t elementsInMsg = arraySize / sizeof(ElementType);
@@ -594,7 +594,7 @@ namespace sdbus {
594594
size_t arraySize{};
595595
const Element* arrayPtr{};
596596

597-
constexpr auto signature = as_null_terminated(sdbus::signature_of_v<Element>);
597+
constexpr auto signature = as_null_terminated(signature_of_v<Element>);
598598
readArray(*signature.data(), reinterpret_cast<const void**>(&arrayPtr), &arraySize);
599599

600600
// NOLINTNEXTLINE(cppcoreguidelines-pro-bounds-pointer-arithmetic)

‎include/sdbus-c++/ProxyInterfaces.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ namespace sdbus {
156156
* The proxy created this way becomes an owner of the connection.
157157
* For more information on its behavior, consult @ref createProxy(std::unique_ptr<sdbus::IConnection>&&,std::string,std::string)
158158
*/
159-
ProxyInterfaces(std::unique_ptr<sdbus::IConnection>&& connection, ServiceName destination, ObjectPath objectPath)
159+
ProxyInterfaces(std::unique_ptr<IConnection>&& connection, ServiceName destination, ObjectPath objectPath)
160160
: ProxyObjectHolder(createProxy(std::move(connection), std::move(destination), std::move(objectPath)))
161161
, Interfaces(getProxy())...
162162
{
@@ -172,7 +172,7 @@ namespace sdbus {
172172
* The proxy created this way becomes an owner of the connection.
173173
* For more information on its behavior, consult @ref createProxy(std::unique_ptr<sdbus::IConnection>&&,std::string,std::string,sdbus::dont_run_event_loop_thread_t)
174174
*/
175-
ProxyInterfaces(std::unique_ptr<sdbus::IConnection>&& connection, ServiceName destination, ObjectPath objectPath, dont_run_event_loop_thread_t)
175+
ProxyInterfaces(std::unique_ptr<IConnection>&& connection, ServiceName destination, ObjectPath objectPath, dont_run_event_loop_thread_t)
176176
: ProxyObjectHolder(createProxy(std::move(connection), std::move(destination), std::move(objectPath), dont_run_event_loop_thread))
177177
, Interfaces(getProxy())...
178178
{

0 commit comments

Comments
 (0)