Skip to content

Commit a6d3c0c

Browse files
netfabnetfab
committed
Make DBusConnection pointer const.
1 parent 79b5892 commit a6d3c0c

16 files changed

+104
-87
lines changed

‎src/lib/dbus/GKDBus.cpp‎

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@ void GKDBus::checkForMessages(void) noexcept
164164
* --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- ---
165165
*/
166166

167-
void GKDBus::checkDBusMessage(DBusConnection* connection)
167+
void GKDBus::checkDBusMessage(DBusConnection* const connection)
168168
{
169169
const std::string object = this->getObjectFromObjectPath(toString(dbus_message_get_path(_message)));
170170

@@ -233,7 +233,10 @@ void GKDBus::checkDBusMessage(DBusConnection* connection)
233233
* was called. if yes, then run the corresponding callback function
234234
* and send DBus reply after appending the return value
235235
*/
236-
void GKDBus::checkForBusMessages(const BusConnection bus, DBusConnection* connection) noexcept {
236+
void GKDBus::checkForBusMessages(
237+
const BusConnection bus,
238+
DBusConnection* const connection) noexcept
239+
{
237240
GKDBusEvents::currentBus = bus; /* used on introspection */
238241

239242
uint16_t c = 0;
@@ -271,7 +274,8 @@ void GKDBus::checkForBusMessages(const BusConnection bus, DBusConnection* connec
271274
}
272275
}
273276

274-
void GKDBus::checkReleasedName(int ret) noexcept {
277+
void GKDBus::checkReleasedName(int ret) noexcept
278+
{
275279
switch(ret) {
276280
case DBUS_RELEASE_NAME_REPLY_RELEASED:
277281
LOG(DEBUG1) << "name released";
@@ -297,7 +301,8 @@ void GKDBus::checkReleasedName(int ret) noexcept {
297301
}
298302
}
299303

300-
void GKDBus::checkDBusError(const char* error) {
304+
void GKDBus::checkDBusError(const char* error)
305+
{
301306
if( dbus_error_is_set(&_error) ) {
302307
std::ostringstream buffer;
303308
buffer << error << " : " << _error.message;
@@ -306,7 +311,8 @@ void GKDBus::checkDBusError(const char* error) {
306311
}
307312
}
308313

309-
DBusConnection* GKDBus::getConnection(BusConnection bus) {
314+
DBusConnection* GKDBus::getConnection(BusConnection bus)
315+
{
310316
switch(bus) {
311317
case BusConnection::GKDBUS_SESSION :
312318
if(_sessionConnection == nullptr)

‎src/lib/dbus/GKDBus.hpp‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -105,8 +105,10 @@ class GKDBus
105105

106106
DBusMessage* _message;
107107

108-
void checkDBusMessage(DBusConnection* connection);
109-
void checkForBusMessages(const BusConnection bus, DBusConnection* connection) noexcept;
108+
void checkDBusMessage(DBusConnection* const connection);
109+
void checkForBusMessages(
110+
const BusConnection bus,
111+
DBusConnection* const connection) noexcept;
110112
void checkReleasedName(int ret) noexcept;
111113
void checkDBusError(const char* error);
112114
DBusConnection* getConnection(BusConnection bus);

‎src/lib/dbus/events/GKDBusEvent.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
*
33
* This file is part of GLogiK project.
44
* GLogiK, daemon to handle special features on gaming keyboards
5-
* Copyright (C) 2016-2018 Fabrice Delliaux <[email protected]>
5+
* Copyright (C) 2016-2021 Fabrice Delliaux <[email protected]>
66
*
77
* This program is free software: you can redistribute it and/or modify
88
* it under the terms of the GNU General Public License as published by
@@ -47,7 +47,7 @@ GKDBusEvent::~GKDBusEvent() {
4747
* exception was thrown while building reply
4848
*/
4949
void GKDBusEvent::sendReplyError(
50-
DBusConnection* connection,
50+
DBusConnection* const connection,
5151
DBusMessage* message,
5252
const char* error
5353
)
@@ -61,7 +61,7 @@ void GKDBusEvent::sendReplyError(
6161
* exception was thrown before or while running callback
6262
*/
6363
void GKDBusEvent::sendCallbackError(
64-
DBusConnection* connection,
64+
DBusConnection* const connection,
6565
DBusMessage* message,
6666
const char* error
6767
)

‎src/lib/dbus/events/GKDBusEvent.hpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
*
33
* This file is part of GLogiK project.
44
* GLogiK, daemon to handle special features on gaming keyboards
5-
* Copyright (C) 2016-2018 Fabrice Delliaux <[email protected]>
5+
* Copyright (C) 2016-2021 Fabrice Delliaux <[email protected]>
66
*
77
* This program is free software: you can redistribute it and/or modify
88
* it under the terms of the GNU General Public License as published by
@@ -61,7 +61,7 @@ class GKDBusEvent
6161
GKDBusEventType eventType;
6262
const bool introspectable;
6363

64-
virtual void runCallback(DBusConnection* connection, DBusMessage* message) = 0;
64+
virtual void runCallback(DBusConnection* const connection, DBusMessage* message) = 0;
6565

6666
virtual ~GKDBusEvent(void);
6767

@@ -74,13 +74,13 @@ class GKDBusEvent
7474
);
7575

7676
void sendReplyError(
77-
DBusConnection* connection,
77+
DBusConnection* const connection,
7878
DBusMessage* message,
7979
const char* error
8080
);
8181

8282
void sendCallbackError(
83-
DBusConnection* connection,
83+
DBusConnection* const connection,
8484
DBusMessage* message,
8585
const char* error
8686
);

‎src/lib/dbus/events/GKDBusEventTemplates.cpp‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
*
33
* This file is part of GLogiK project.
44
* GLogiK, daemon to handle special features on gaming keyboards
5-
* Copyright (C) 2016-2020 Fabrice Delliaux <[email protected]>
5+
* Copyright (C) 2016-2021 Fabrice Delliaux <[email protected]>
66
*
77
* This program is free software: you can redistribute it and/or modify
88
* it under the terms of the GNU General Public License as published by
@@ -28,7 +28,7 @@ using namespace NSGKUtils;
2828

2929
template <>
3030
void GKDBusCallbackEvent<VoidToVoid>::runCallback(
31-
DBusConnection* connection,
31+
DBusConnection* const connection,
3232
DBusMessage* message
3333
)
3434
{
@@ -47,7 +47,7 @@ template <>
4747

4848
template <>
4949
void GKDBusCallbackEvent<StringToVoid>::runCallback(
50-
DBusConnection* connection,
50+
DBusConnection* const connection,
5151
DBusMessage* message
5252
)
5353
{
@@ -85,7 +85,7 @@ template <>
8585

8686
template <>
8787
void GKDBusCallbackEvent<TwoStringsToVoid>::runCallback(
88-
DBusConnection* connection,
88+
DBusConnection* const connection,
8989
DBusMessage* message
9090
)
9191
{
@@ -124,7 +124,7 @@ template <>
124124

125125
template <>
126126
void GKDBusCallbackEvent<StringToBool>::runCallback(
127-
DBusConnection* connection,
127+
DBusConnection* const connection,
128128
DBusMessage* message
129129
)
130130
{
@@ -165,7 +165,7 @@ template <>
165165

166166
template <>
167167
void GKDBusCallbackEvent<TwoStringsToBool>::runCallback(
168-
DBusConnection* connection,
168+
DBusConnection* const connection,
169169
DBusMessage* message
170170
)
171171
{
@@ -207,7 +207,7 @@ template <>
207207

208208
template <>
209209
void GKDBusCallbackEvent<StringToString>::runCallback(
210-
DBusConnection* connection,
210+
DBusConnection* const connection,
211211
DBusMessage* message
212212
)
213213
{
@@ -254,7 +254,7 @@ template <>
254254

255255
template <>
256256
void GKDBusCallbackEvent<TwoStringsToString>::runCallback(
257-
DBusConnection* connection,
257+
DBusConnection* const connection,
258258
DBusMessage* message
259259
)
260260
{
@@ -296,7 +296,7 @@ template <>
296296

297297
template <>
298298
void GKDBusCallbackEvent<StringToStringsArray>::runCallback(
299-
DBusConnection* connection,
299+
DBusConnection* const connection,
300300
DBusMessage* message
301301
)
302302
{
@@ -337,7 +337,7 @@ template <>
337337

338338
template <>
339339
void GKDBusCallbackEvent<TwoStringsToStringsArray>::runCallback(
340-
DBusConnection* connection,
340+
DBusConnection* const connection,
341341
DBusMessage* message
342342
)
343343
{
@@ -379,7 +379,7 @@ template <>
379379

380380
template <>
381381
void GKDBusCallbackEvent<TwoStringsOneByteToBool>::runCallback(
382-
DBusConnection* connection,
382+
DBusConnection* const connection,
383383
DBusMessage* message
384384
)
385385
{
@@ -422,7 +422,7 @@ template <>
422422

423423
template <>
424424
void GKDBusCallbackEvent<TwoStringsThreeBytesToBool>::runCallback(
425-
DBusConnection* connection,
425+
DBusConnection* const connection,
426426
DBusMessage* message
427427
)
428428
{
@@ -467,7 +467,7 @@ template <>
467467

468468
template <>
469469
void GKDBusCallbackEvent<StringsArrayToVoid>::runCallback(
470-
DBusConnection* connection,
470+
DBusConnection* const connection,
471471
DBusMessage* message
472472
)
473473
{
@@ -489,7 +489,7 @@ template <>
489489

490490
template <>
491491
void GKDBusCallbackEvent<ThreeStringsOneByteToMacro>::runCallback(
492-
DBusConnection* connection,
492+
DBusConnection* const connection,
493493
DBusMessage* message
494494
)
495495
{
@@ -533,7 +533,7 @@ template <>
533533

534534
template <>
535535
void GKDBusCallbackEvent<TwoStringsToLCDPluginsPropertiesArray>::runCallback(
536-
DBusConnection* connection,
536+
DBusConnection* const connection,
537537
DBusMessage* message
538538
)
539539
{
@@ -575,7 +575,7 @@ template <>
575575

576576
template <>
577577
void GKDBusCallbackEvent<TwoStringsOneByteOneMacrosBankToBool>::runCallback(
578-
DBusConnection* connection,
578+
DBusConnection* const connection,
579579
DBusMessage* message
580580
)
581581
{
@@ -618,7 +618,7 @@ template <>
618618

619619
template <>
620620
void GKDBusCallbackEvent<TwoStringsOneByteOneUInt64ToBool>::runCallback(
621-
DBusConnection* connection,
621+
DBusConnection* const connection,
622622
DBusMessage* message
623623
)
624624
{

0 commit comments

Comments
 (0)