Skip to content

Commit 1b33b69

Browse files
restyled-commitslazarkov
authored andcommitted
Restyled by clang-format
1 parent 5f9140f commit 1b33b69

File tree

3 files changed

+24
-15
lines changed

3 files changed

+24
-15
lines changed

examples/tv-app/android/java/AppImpl.cpp

+9-5
Original file line numberDiff line numberDiff line change
@@ -381,7 +381,8 @@ class DevicePairedCommand : public Controller::DevicePairingDelegate
381381
if (pairingCommand)
382382
{
383383
ChipLogProgress(DeviceLayer,
384-
"OnDeviceConnectedFn - Updating ACL for node id: " ChipLogFormatX64 " and vendor id: %d and product id: %d",
384+
"OnDeviceConnectedFn - Updating ACL for node id: " ChipLogFormatX64
385+
" and vendor id: %d and product id: %d",
385386
ChipLogValueX64(cbContext->nodeId), cbContext->vendorId, cbContext->productId);
386387

387388
GetCommissionerDiscoveryController()->CommissioningSucceeded(cbContext->vendorId, cbContext->productId,
@@ -397,7 +398,8 @@ class DevicePairedCommand : public Controller::DevicePairingDelegate
397398
if (pairingCommand)
398399
{
399400
ChipLogProgress(DeviceLayer,
400-
"OnDeviceConnectionFailureFn - Not updating ACL for node id: " ChipLogFormatX64 " and vendor id: %d and product id: %d",
401+
"OnDeviceConnectionFailureFn - Not updating ACL for node id: " ChipLogFormatX64
402+
" and vendor id: %d and product id: %d",
401403
ChipLogValueX64(cbContext->nodeId), cbContext->vendorId, cbContext->productId);
402404
// TODO: Remove Node Id
403405
}
@@ -408,7 +410,8 @@ class DevicePairedCommand : public Controller::DevicePairingDelegate
408410
std::shared_ptr<CallbackContext> mContext;
409411
};
410412

411-
void refreshConnectedClientsAcl(uint16_t vendorId, uint16_t productId, ContentAppImpl * app) {
413+
void refreshConnectedClientsAcl(uint16_t vendorId, uint16_t productId, ContentAppImpl * app)
414+
{
412415

413416
std::set<NodeId> nodeIds = ContentAppPlatform::GetInstance().GetNodeIdsForContentApp(vendorId, productId);
414417

@@ -422,8 +425,9 @@ void refreshConnectedClientsAcl(uint16_t vendorId, uint16_t productId, ContentAp
422425
for (const auto & nodeId : nodeIds)
423426
{
424427

425-
ChipLogProgress(DeviceLayer, "Creating Pairing Command with node id: " ChipLogFormatX64 " and vendor id: %d and product id: %d", ChipLogValueX64(nodeId),
426-
vendorId, productId);
428+
ChipLogProgress(DeviceLayer,
429+
"Creating Pairing Command with node id: " ChipLogFormatX64 " and vendor id: %d and product id: %d",
430+
ChipLogValueX64(nodeId), vendorId, productId);
427431

428432
std::shared_ptr<DevicePairedCommand> pairingCommand = std::make_shared<DevicePairedCommand>(vendorId, productId, nodeId);
429433

examples/tv-app/tv-common/src/AppTv.cpp

+7-5
Original file line numberDiff line numberDiff line change
@@ -593,7 +593,8 @@ class DevicePairedCommand : public Controller::DevicePairingDelegate
593593
if (pairingCommand)
594594
{
595595
ChipLogProgress(DeviceLayer,
596-
"OnDeviceConnectedFn - Updating ACL for node id: " ChipLogFormatX64 " and vendor id: %d and product id: %d",
596+
"OnDeviceConnectedFn - Updating ACL for node id: " ChipLogFormatX64
597+
" and vendor id: %d and product id: %d",
597598
ChipLogValueX64(cbContext->nodeId), cbContext->vendorId, cbContext->productId);
598599

599600
GetCommissionerDiscoveryController()->CommissioningSucceeded(cbContext->vendorId, cbContext->productId,
@@ -609,7 +610,8 @@ class DevicePairedCommand : public Controller::DevicePairingDelegate
609610
if (pairingCommand)
610611
{
611612
ChipLogProgress(DeviceLayer,
612-
"OnDeviceConnectionFailureFn - Not updating ACL for node id: " ChipLogFormatX64 " and vendor id: %d and product id: %d",
613+
"OnDeviceConnectionFailureFn - Not updating ACL for node id: " ChipLogFormatX64
614+
" and vendor id: %d and product id: %d",
613615
ChipLogValueX64(cbContext->nodeId), cbContext->vendorId, cbContext->productId);
614616
// TODO: Remove Node Id
615617
}
@@ -689,15 +691,15 @@ void ContentAppFactoryImpl::InstallContentApp(uint16_t vendorId, uint16_t produc
689691
for (const auto & nodeId : nodeIds)
690692
{
691693

692-
ChipLogProgress(DeviceLayer, "Creating Pairing Command with node id: " ChipLogFormatX64 " and vendor id: %d and product id: %d", ChipLogValueX64(nodeId),
693-
vendorId, productId);
694+
ChipLogProgress(DeviceLayer,
695+
"Creating Pairing Command with node id: " ChipLogFormatX64 " and vendor id: %d and product id: %d",
696+
ChipLogValueX64(nodeId), vendorId, productId);
694697

695698
std::shared_ptr<DevicePairedCommand> pairingCommand = std::make_shared<DevicePairedCommand>(vendorId, productId, nodeId);
696699

697700
GetDeviceCommissioner()->GetConnectedDevice(nodeId, &pairingCommand->mOnDeviceConnectedCallback,
698701
&pairingCommand->mOnDeviceConnectionFailureCallback);
699702
}
700-
701703
}
702704

703705
bool ContentAppFactoryImpl::UninstallContentApp(uint16_t vendorId, uint16_t productId)

src/app/app-platform/ContentAppPlatform.cpp

+8-5
Original file line numberDiff line numberDiff line change
@@ -420,14 +420,17 @@ std::set<NodeId> ContentAppPlatform::GetNodeIdsForContentApp(uint16_t vendorId,
420420
return {};
421421
}
422422

423-
std::set<NodeId> ContentAppPlatform::GetNodeIdsForAllowVendorId(uint16_t vendorId) {
423+
std::set<NodeId> ContentAppPlatform::GetNodeIdsForAllowVendorId(uint16_t vendorId)
424+
{
424425
std::set<NodeId> result;
425426
std::string vendorPrefix = std::to_string(vendorId) + ":";
426427

427-
for (const auto& pair : mConnectedContentAppNodeIds) {
428-
const std::string& key = pair.first;
429-
if (key.find(vendorPrefix) == 0) { // Check if the key starts with the vendor prefix
430-
const std::set<NodeId>& nodeIds = pair.second;
428+
for (const auto & pair : mConnectedContentAppNodeIds)
429+
{
430+
const std::string & key = pair.first;
431+
if (key.find(vendorPrefix) == 0)
432+
{ // Check if the key starts with the vendor prefix
433+
const std::set<NodeId> & nodeIds = pair.second;
431434
result.insert(nodeIds.begin(), nodeIds.end());
432435
}
433436
}

0 commit comments

Comments
 (0)