Skip to content

Commit b5411a7

Browse files
committed
fix: address clang-tidy warnings in examples
1 parent 0ad7ca6 commit b5411a7

3 files changed

Lines changed: 38 additions & 10 deletions

File tree

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ jobs:
9393
sudo update-alternatives --install /usr/bin/c++ c++ /usr/bin/clang++ 10
9494
- name: configure
9595
run: |
96-
cmake -B _build -DCMAKE_BUILD_TYPE=Debug -DCMAKE_CXX_FLAGS="-O0 -g" -DCMAKE_VERBOSE_MAKEFILE=ON -DSDBUSCPP_CLANG_TIDY=ON -DSDBUSCPP_BUILD_TESTS=ON -DSDBUSCPP_BUILD_PERF_TESTS=ON -DSDBUSCPP_BUILD_STRESS_TESTS=ON
96+
cmake -B _build -DCMAKE_BUILD_TYPE=Debug -DCMAKE_CXX_FLAGS="-O0 -g" -DCMAKE_VERBOSE_MAKEFILE=ON -DSDBUSCPP_CLANG_TIDY=ON -DSDBUSCPP_BUILD_TESTS=ON -DSDBUSCPP_BUILD_PERF_TESTS=ON -DSDBUSCPP_BUILD_STRESS_TESTS=ON -DSDBUSCPP_BUILD_EXAMPLES=ON
9797
- name: make
9898
run: |
9999
cmake --build _build -j4

examples/org.freedesktop.DBus.ObjectManager/obj-manager-client.cpp

Lines changed: 21 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,17 +12,26 @@
1212
#include "examplemanager-planet1-client-glue.h"
1313
#include <sdbus-c++/sdbus-c++.h>
1414
#include <iostream>
15-
#include <thread>
15+
#include <utility>
16+
#include <map>
17+
#include <string>
18+
#include <vector>
19+
#include <memory>
1620

1721
class PlanetProxy final : public sdbus::ProxyInterfaces< org::sdbuscpp::ExampleManager::Planet1_proxy >
1822
{
1923
public:
2024
PlanetProxy(sdbus::IConnection& connection, sdbus::ServiceName destination, sdbus::ObjectPath path)
21-
: ProxyInterfaces(connection, std::move(destination), std::move(path))
25+
: ProxyInterfaces(connection, std::move(destination), std::move(path))
2226
{
2327
registerProxy();
2428
}
2529

30+
PlanetProxy(const PlanetProxy&) = delete;
31+
PlanetProxy& operator=(const PlanetProxy&) = delete;
32+
PlanetProxy(PlanetProxy&&) = delete;
33+
PlanetProxy& operator=(PlanetProxy&&) = delete;
34+
2635
~PlanetProxy()
2736
{
2837
unregisterProxy();
@@ -35,11 +44,16 @@ class ManagerProxy final : public sdbus::ProxyInterfaces<sdbus::ObjectManager_pr
3544
ManagerProxy(sdbus::IConnection& connection, sdbus::ServiceName destination, sdbus::ObjectPath path)
3645
: ProxyInterfaces(connection, destination, std::move(path))
3746
, m_connection(connection)
38-
, m_destination(destination)
47+
, m_destination(std::move(destination))
3948
{
4049
registerProxy();
4150
}
4251

52+
ManagerProxy(const ManagerProxy&) = delete;
53+
ManagerProxy& operator=(const ManagerProxy&) = delete;
54+
ManagerProxy(ManagerProxy&&) = delete;
55+
ManagerProxy& operator=(ManagerProxy&&) = delete;
56+
4357
~ManagerProxy()
4458
{
4559
unregisterProxy();
@@ -61,7 +75,7 @@ class ManagerProxy final : public sdbus::ProxyInterfaces<sdbus::ObjectManager_pr
6175
for (const auto& [interface, _] : interfacesAndProperties) {
6276
std::cout << interface << " ";
6377
}
64-
std::cout << std::endl;
78+
std::cout << '\n';
6579

6680
// Parse and print some more info
6781
auto planetInterface = interfacesAndProperties.find(sdbus::InterfaceName{org::sdbuscpp::ExampleManager::Planet1_proxy::INTERFACE_NAME});
@@ -73,7 +87,7 @@ class ManagerProxy final : public sdbus::ProxyInterfaces<sdbus::ObjectManager_pr
7387
const auto& name = properties.at(sdbus::PropertyName{"Name"}).get<std::string>();
7488
// or create a proxy instance to the newly added object.
7589
PlanetProxy planet(m_connection, m_destination, objectPath);
76-
std::cout << name << " has a population of " << planet.GetPopulation() << ".\n" << std::endl;
90+
std::cout << name << " has a population of " << planet.GetPopulation() << ".\n" << '\n';
7791
}
7892

7993
void onInterfacesRemoved( const sdbus::ObjectPath& objectPath
@@ -83,7 +97,7 @@ class ManagerProxy final : public sdbus::ProxyInterfaces<sdbus::ObjectManager_pr
8397
for (const auto& interface : interfaces) {
8498
std::cout << interface << " ";
8599
}
86-
std::cout << std::endl;
100+
std::cout << '\n';
87101
}
88102

89103
sdbus::IConnection& m_connection;
@@ -102,7 +116,7 @@ int main()
102116
}
103117
catch (const sdbus::Error& e) {
104118
if (e.getName() == "org.freedesktop.DBus.Error.ServiceUnknown") {
105-
std::cout << "Waiting for server to start ..." << std::endl;
119+
std::cout << "Waiting for server to start ..." << '\n';
106120
}
107121
}
108122

examples/org.freedesktop.DBus.ObjectManager/obj-manager-server.cpp

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,9 @@
1818
#include <memory>
1919
#include <thread>
2020
#include <chrono>
21+
#include <utility>
22+
#include <string>
23+
#include <cstdint>
2124

2225
using sdbus::ObjectPath;
2326

@@ -30,6 +33,11 @@ class ManagerAdaptor : public sdbus::AdaptorInterfaces<sdbus::ObjectManager_adap
3033
registerAdaptor();
3134
}
3235

36+
ManagerAdaptor(const ManagerAdaptor&) = delete;
37+
ManagerAdaptor& operator=(const ManagerAdaptor&) = delete;
38+
ManagerAdaptor(ManagerAdaptor&&) = delete;
39+
ManagerAdaptor& operator=(ManagerAdaptor&&) = delete;
40+
3341
~ManagerAdaptor()
3442
{
3543
unregisterAdaptor();
@@ -50,6 +58,11 @@ class PlanetAdaptor final : public sdbus::AdaptorInterfaces< org::sdbuscpp::Exam
5058
emitInterfacesAddedSignal({sdbus::InterfaceName{org::sdbuscpp::ExampleManager::Planet1_adaptor::INTERFACE_NAME}});
5159
}
5260

61+
PlanetAdaptor(const PlanetAdaptor&) = delete;
62+
PlanetAdaptor& operator=(const PlanetAdaptor&) = delete;
63+
PlanetAdaptor(PlanetAdaptor&&) = delete;
64+
PlanetAdaptor& operator=(PlanetAdaptor&&) = delete;
65+
5366
~PlanetAdaptor()
5467
{
5568
emitInterfacesRemovedSignal({sdbus::InterfaceName{org::sdbuscpp::ExampleManager::Planet1_adaptor::INTERFACE_NAME}});
@@ -78,16 +91,17 @@ void printCountDown(const std::string& message, int seconds)
7891
std::this_thread::sleep_for(std::chrono::seconds(1));
7992
std::cout << i << " " << std::flush;
8093
}
81-
std::cout << std::endl;
94+
std::cout << '\n';
8295
}
8396

8497
int main()
8598
{
8699
auto connection = sdbus::createSessionBusConnection();
87-
sdbus::ServiceName serviceName{"org.sdbuscpp.examplemanager"};
100+
const sdbus::ServiceName serviceName{"org.sdbuscpp.examplemanager"};
88101
connection->requestName(serviceName);
89102
connection->enterEventLoopAsync();
90103

104+
// NOLINTNEXTLINE(clang-analyzer-deadcode.DeadStores)
91105
auto manager = std::make_unique<ManagerAdaptor>(*connection, ObjectPath{"/org/sdbuscpp/examplemanager"});
92106
while (true)
93107
{

0 commit comments

Comments
 (0)