From e9aba076f4f3007e48af4d22287e92a1d589ac9f Mon Sep 17 00:00:00 2001 From: Markus Zehnder Date: Thu, 22 Oct 2020 12:36:53 +0200 Subject: [PATCH] refactor: Clang format for short functions --- .clang-format | 3 +++ src/openhab.h | 30 +++++++++++++++--------------- 2 files changed, 18 insertions(+), 15 deletions(-) diff --git a/.clang-format b/.clang-format index 8fcee4c..ee13ebf 100644 --- a/.clang-format +++ b/.clang-format @@ -9,3 +9,6 @@ ColumnLimit: 120 AccessModifierOffset: -3 AlignConsecutiveDeclarations: true + +AllowShortFunctionsOnASingleLine: Inline + diff --git a/src/openhab.h b/src/openhab.h index 7a2baa2..277b3df 100755 --- a/src/openhab.h +++ b/src/openhab.h @@ -119,19 +119,19 @@ class OpenHAB : public Integration { const QString* lookupComplexLightItem(const QString& entityId, LightDef::Attributes attr); private: - QNetworkAccessManager _sseNetworkManager; - QNetworkReply* _sseReply; - QTimer* _sseReconnectTimer; - QTimer _pollingTimer; - QString _url; - QNetworkAccessManager _nam; - QList _myEntities; // Entities of this integration - QMap _ohPlayers; // YIO player entities - QMap _ohPlayerItems; // OpenHAB items associated with player - QMap _ohLights; // YIO complex light entities - QMap _ohLightItems; // OpenHAB items associated with special lights - int _tries; - bool _userDisconnect; - bool _wasDisconnected; - bool _standby; + QNetworkAccessManager _sseNetworkManager; + QNetworkReply* _sseReply; + QTimer* _sseReconnectTimer; + QTimer _pollingTimer; + QString _url; + QNetworkAccessManager _nam; + QList _myEntities; // Entities of this integration + QMap _ohPlayers; // YIO player entities + QMap _ohPlayerItems; // OpenHAB items associated with player + QMap _ohLights; // YIO complex light entities + QMap _ohLightItems; // OpenHAB items associated with special lights + int _tries; + bool _userDisconnect; + bool _wasDisconnected; + bool _standby; };