diff --git a/DataModel/AccessoryBase.h b/DataModel/AccessoryBase.h index 19272f81..93c2046e 100644 --- a/DataModel/AccessoryBase.h +++ b/DataModel/AccessoryBase.h @@ -123,7 +123,7 @@ namespace DataModel inverted(false), lastUsed(0), counter(0), - matchKey("") + matchKey("") { } diff --git a/DataModel/Feedback.h b/DataModel/Feedback.h index 7ace5a8d..d6d1b9d0 100644 --- a/DataModel/Feedback.h +++ b/DataModel/Feedback.h @@ -55,15 +55,15 @@ namespace DataModel inline Feedback(Manager* manager, const FeedbackID feedbackID) : LayoutItem(feedbackID), - controlID(ControlIdNone), - pin(FeedbackPinNone), + controlID(ControlIdNone), + pin(FeedbackPinNone), device(FeedbackDeviceNone), bus(FeedbackBusNone), - manager(manager), - feedbackType(FeedbackTypeDefault), - routeId(RouteNone), - inverted(false), - track(nullptr), + manager(manager), + feedbackType(FeedbackTypeDefault), + routeId(RouteNone), + inverted(false), + track(nullptr), stateCounter(0) { } diff --git a/DataModel/LockableItem.h b/DataModel/LockableItem.h index 75214433..a14d3c99 100644 --- a/DataModel/LockableItem.h +++ b/DataModel/LockableItem.h @@ -41,7 +41,7 @@ namespace DataModel inline LockableItem() : lockState(LockStateFree), - locoBaseIdentifier() + locoBaseIdentifier() { } diff --git a/DataModel/Object.h b/DataModel/Object.h index 0fb50cd8..aff9e24b 100644 --- a/DataModel/Object.h +++ b/DataModel/Object.h @@ -37,7 +37,7 @@ namespace DataModel inline Object() : objectID(ObjectNone), - name(std::to_string(objectID)) + name(std::to_string(objectID)) { } diff --git a/DataModel/Route.cpp b/DataModel/Route.cpp index 47cbbef1..827d3bce 100644 --- a/DataModel/Route.cpp +++ b/DataModel/Route.cpp @@ -36,8 +36,8 @@ namespace DataModel { Route::Route(Manager* manager, const std::string& serialized) : LockableItem(), - manager(manager), - executeAtUnlock(false) + manager(manager), + executeAtUnlock(false) { Deserialize(serialized); Track* track = manager->GetTrack(fromTrack); diff --git a/DataModel/Route.h b/DataModel/Route.h index de5720b8..a6fad8d7 100644 --- a/DataModel/Route.h +++ b/DataModel/Route.h @@ -61,8 +61,8 @@ namespace DataModel Route(Manager* manager, const RouteID routeID) : LayoutItem(routeID), - LockableItem(), - manager(manager), + LockableItem(), + manager(manager), executeAtUnlock(false), delay(0), pushpull(PushpullTypeBoth), diff --git a/DataTypes.h b/DataTypes.h index 28ab27f4..decf119c 100644 --- a/DataTypes.h +++ b/DataTypes.h @@ -321,7 +321,7 @@ enum TrainType : uint32_t TrainTypeHistoric = 0x00001000, TrainTypeExtra = 0x00002000, - TrainTypePassengerWithCargo = 0x00008000, + TrainTypePassengerWithCargo = 0x00008000, TrainTypePassenger = TrainTypeInternationalHighSpeed | TrainTypeNationalHighSpeed @@ -346,12 +346,12 @@ enum TrainType : uint32_t TrainTypeCargoWithPassenger = 0x00800000, - TrainTypeCargo = TrainTypeCargoLongDistance - | TrainTypeCargoLocal - | TrainTypeCargoBlock - | TrainTypeCargoTractor - | TrainTypeCargoExpress - | TrainTypeCargoWithPassenger, + TrainTypeCargo = TrainTypeCargoLongDistance + | TrainTypeCargoLocal + | TrainTypeCargoBlock + | TrainTypeCargoTractor + | TrainTypeCargoExpress + | TrainTypeCargoWithPassenger, TrainTypeRescue = 0x01000000, TrainTypeConstruction = 0x02000000, diff --git a/Hardware/CS2Tcp.cpp b/Hardware/CS2Tcp.cpp index 75957c77..c9109181 100644 --- a/Hardware/CS2Tcp.cpp +++ b/Hardware/CS2Tcp.cpp @@ -27,7 +27,7 @@ namespace Hardware : MaerklinCAN(params, "Maerklin Central Station 2 (CS2) TCP / " + params->GetName() + " at IP " + params->GetArg1(), params->GetName()), - connection(Network::TcpClient::GetTcpClientConnection(HardwareInterface::logger, params->GetArg1(), CS2Port)) + connection(Network::TcpClient::GetTcpClientConnection(HardwareInterface::logger, params->GetArg1(), CS2Port)) { HardwareInterface::logger->Info(Languages::TextStarting, GetFullName()); diff --git a/Hardware/CS2Udp.cpp b/Hardware/CS2Udp.cpp index c5a807fa..33f9a31a 100644 --- a/Hardware/CS2Udp.cpp +++ b/Hardware/CS2Udp.cpp @@ -27,8 +27,8 @@ namespace Hardware : MaerklinCAN(params, "Maerklin Central Station 2 (CS2) UDP / " + params->GetName() + " at IP " + params->GetArg1(), params->GetName()), - senderConnection(HardwareInterface::logger, params->GetArg1(), CS2SenderPort), - receiverConnection(HardwareInterface::logger, "0.0.0.0", CS2ReceiverPort) + senderConnection(HardwareInterface::logger, params->GetArg1(), CS2SenderPort), + receiverConnection(HardwareInterface::logger, "0.0.0.0", CS2ReceiverPort) { HardwareInterface::logger->Info(Languages::TextStarting, GetFullName()); diff --git a/Hardware/CcSchnitte.cpp b/Hardware/CcSchnitte.cpp index eeb61207..2a830a65 100644 --- a/Hardware/CcSchnitte.cpp +++ b/Hardware/CcSchnitte.cpp @@ -34,7 +34,7 @@ namespace Hardware : MaerklinCAN(params, "CC-Schnitte / " + params->GetName() + " at serial port " + params->GetArg1(), params->GetName()), - serialLine(HardwareInterface::logger, params->GetArg1(), B500000, 8, 'N', 1, true) + serialLine(HardwareInterface::logger, params->GetArg1(), B500000, 8, 'N', 1, true) { HardwareInterface::logger->Info(Languages::TextStarting, GetFullName()); diff --git a/Hardware/DccPpExSerial.cpp b/Hardware/DccPpExSerial.cpp index e5c36051..cb27362a 100644 --- a/Hardware/DccPpExSerial.cpp +++ b/Hardware/DccPpExSerial.cpp @@ -27,9 +27,9 @@ namespace Hardware : DccPpEx(params, "DCC-EX Serial / " + params->GetName() + " at serial port " + params->GetArg1(), params->GetName()), - serialLine(logger, params->GetArg1(), B115200, 8, 'N', 1, + serialLine(logger, params->GetArg1(), B115200, 8, 'N', 1, #ifdef __CYGWIN__ - false + false #else true #endif diff --git a/Hardware/DccPpExTcp.cpp b/Hardware/DccPpExTcp.cpp index 148935d4..103bf4d6 100644 --- a/Hardware/DccPpExTcp.cpp +++ b/Hardware/DccPpExTcp.cpp @@ -29,7 +29,7 @@ namespace Hardware : DccPpEx(params, "DCC-EX TCP / " + params->GetName() + " at IP " + params->GetArg1(), params->GetName()), - connection(Network::TcpClient::GetTcpClientConnection(logger, params->GetArg1(), Port)) + connection(Network::TcpClient::GetTcpClientConnection(logger, params->GetArg1(), Port)) { logger->Info(Languages::TextStarting, GetFullName()); diff --git a/Hardware/HardwareInterface.h b/Hardware/HardwareInterface.h index c8930357..79f75874 100644 --- a/Hardware/HardwareInterface.h +++ b/Hardware/HardwareInterface.h @@ -48,10 +48,10 @@ namespace Hardware const std::string& fullName, const std::string& shortName) : manager(manager), - controlID(controlID), - logger(Logger::Logger::GetLogger(shortName)), - fullName(fullName), - shortName(shortName), + controlID(controlID), + logger(Logger::Logger::GetLogger(shortName)), + fullName(fullName), + shortName(shortName), communicationError(false) { } diff --git a/Hardware/HardwareParams.h b/Hardware/HardwareParams.h index af725fc2..ef1664a2 100644 --- a/Hardware/HardwareParams.h +++ b/Hardware/HardwareParams.h @@ -42,7 +42,7 @@ namespace Hardware std::string arg4, std::string arg5) : manager(nullptr), - controlID(controlID), + controlID(controlID), hardwareType(hardwareType), name(name), arg1(arg1), diff --git a/Hardware/Hsi88.cpp b/Hardware/Hsi88.cpp index d641b195..69b9ea3a 100644 --- a/Hardware/Hsi88.cpp +++ b/Hardware/Hsi88.cpp @@ -35,7 +35,7 @@ namespace Hardware params->GetControlID(), "HSI-88 / " + params->GetName() + " at serial port " + params->GetArg1(), params->GetName()), - serialLine(logger, params->GetArg1(), B9600, 8, 'N', 1), + serialLine(logger, params->GetArg1(), B9600, 8, 'N', 1), run(false) { logger->Info(Languages::TextStarting, GetFullName()); diff --git a/Hardware/M6051.cpp b/Hardware/M6051.cpp index 564dbc0d..281d6527 100644 --- a/Hardware/M6051.cpp +++ b/Hardware/M6051.cpp @@ -35,7 +35,7 @@ namespace Hardware params->GetControlID(), "Maerklin Interface (6050/6051) / " + params->GetName() + " at serial port " + params->GetArg1(), params->GetName()), - serialLine(logger, params->GetArg1(), B2400, 8, 'N', 2), + serialLine(logger, params->GetArg1(), B2400, 8, 'N', 2), run(true) { logger->Info(Languages::TextStarting, GetFullName()); diff --git a/Hardware/Protocols/LocoNet.cpp b/Hardware/Protocols/LocoNet.cpp index b538ab2a..d18aa4ea 100644 --- a/Hardware/Protocols/LocoNet.cpp +++ b/Hardware/Protocols/LocoNet.cpp @@ -281,7 +281,7 @@ namespace Hardware } /** - * Reverse Engineered with a KM1 System control 7, but it does not work properly. + * Reverse Engineered with a KM1 System control 7, but it does not work properly. void LocoNet::ProgramMain(const Address address, const CvNumber cv, const CvValue value) diff --git a/Logger/Logger.h b/Logger/Logger.h index c1df271a..416a1344 100644 --- a/Logger/Logger.h +++ b/Logger/Logger.h @@ -42,7 +42,7 @@ namespace Logger Logger(LoggerServer& server, const std::string& component) : server(server), - component(component) + component(component) {} ~Logger() {}; diff --git a/Logger/LoggerServer.h b/Logger/LoggerServer.h index 87f8a6ee..af944a4d 100644 --- a/Logger/LoggerServer.h +++ b/Logger/LoggerServer.h @@ -75,7 +75,7 @@ namespace Logger private: inline LoggerServer() : fileLoggerStarted(false), - consoleLoggerStarted(false) + consoleLoggerStarted(false) { } diff --git a/Manager.cpp b/Manager.cpp index 46886c6c..7437d677 100644 --- a/Manager.cpp +++ b/Manager.cpp @@ -57,7 +57,7 @@ using Storage::StorageParams; Manager::Manager(Config& config) : logger(Logger::Logger::GetLogger(Languages::GetText(Languages::TextManager))), - boosterState(BoosterStateStop), + boosterState(BoosterStateStop), storage(nullptr), startupInitLocos(StartupInitLocosAll), defaultAccessoryDuration(DataModel::DefaultAccessoryPulseDuration), diff --git a/Network/TcpClient.cpp b/Network/TcpClient.cpp index e899bdf7..5e49b855 100644 --- a/Network/TcpClient.cpp +++ b/Network/TcpClient.cpp @@ -29,45 +29,45 @@ namespace Network { TcpConnection TcpClient::GetTcpClientConnection(Logger::Logger* logger, const std::string& host, const unsigned short port) { - struct sockaddr_storage address; - struct sockaddr_in* addressPointer = reinterpret_cast(&address); - addressPointer->sin_family = AF_INET; - addressPointer->sin_port = htons(port); - int ok = inet_pton(AF_INET, host.c_str(), &(addressPointer->sin_addr)); - if (ok <= 0) - { + struct sockaddr_storage address; + struct sockaddr_in* addressPointer = reinterpret_cast(&address); + addressPointer->sin_family = AF_INET; + addressPointer->sin_port = htons(port); + int ok = inet_pton(AF_INET, host.c_str(), &(addressPointer->sin_addr)); + if (ok <= 0) + { logger->Error(Languages::TextUnableToResolveAddress, host); - return TcpConnection(0); - } + return TcpConnection(0); + } - int sock = socket(AF_INET, SOCK_STREAM, 0); - if (sock < 0) - { + int sock = socket(AF_INET, SOCK_STREAM, 0); + if (sock < 0) + { logger->Error(Languages::TextUnableToCreateTcpSocket, host, port); - return TcpConnection(0); - } + return TcpConnection(0); + } - ok = ConnectWithTimeout(sock, reinterpret_cast(addressPointer), sizeof(address)); - if (ok < 0) - { - Languages::TextSelector text; - switch (errno) - { - case ECONNREFUSED: - text = Languages::TextConnectionRefused; - break; + ok = ConnectWithTimeout(sock, reinterpret_cast(addressPointer), sizeof(address)); + if (ok < 0) + { + Languages::TextSelector text; + switch (errno) + { + case ECONNREFUSED: + text = Languages::TextConnectionRefused; + break; - case ENETUNREACH: - text = Languages::TextNetworkUnreachable; - break; + case ENETUNREACH: + text = Languages::TextNetworkUnreachable; + break; - default: - text = Languages::TextConnectionFailed; - } + default: + text = Languages::TextConnectionFailed; + } logger->Error(text, host, port); - close(sock); - return TcpConnection(0); - } + close(sock); + return TcpConnection(0); + } return TcpConnection(sock, &address); } diff --git a/Network/TcpServer.cpp b/Network/TcpServer.cpp index f82d7b2b..7eb102b5 100644 --- a/Network/TcpServer.cpp +++ b/Network/TcpServer.cpp @@ -37,10 +37,10 @@ namespace Network const unsigned short port, const std::string& threadName) : run(false), - error(""), - address(address), - port(port), - threadName(threadName) + error(""), + address(address), + port(port), + threadName(threadName) { } diff --git a/Network/UdpServer.cpp b/Network/UdpServer.cpp index ccc0d429..01c936f2 100644 --- a/Network/UdpServer.cpp +++ b/Network/UdpServer.cpp @@ -40,10 +40,10 @@ namespace Network : logger(Logger::Logger::GetLogger(threadName)), run(false), error(""), - address(address), - port(port), - serverSocket(0), - threadName(threadName) + address(address), + port(port), + serverSocket(0), + threadName(threadName) { } diff --git a/Server/Web/HtmlTagSignal.cpp b/Server/Web/HtmlTagSignal.cpp index 9921fd2b..e24d6328 100644 --- a/Server/Web/HtmlTagSignal.cpp +++ b/Server/Web/HtmlTagSignal.cpp @@ -29,7 +29,7 @@ namespace Server { namespace Web { HtmlTagSignal::HtmlTagSignal(__attribute__((unused)) const Manager& manager, const DataModel::Signal* const signal) : HtmlTagLayoutItem(dynamic_cast(signal)), - signal(signal) + signal(signal) { image += ""; image += GetSignalImagePlain(signal); diff --git a/Server/Web/ResponseHtml.cpp b/Server/Web/ResponseHtml.cpp index a3e744a2..efaa9082 100644 --- a/Server/Web/ResponseHtml.cpp +++ b/Server/Web/ResponseHtml.cpp @@ -27,7 +27,7 @@ namespace Server { namespace Web { ResponseHtml::ResponseHtml(const ResponseCode responseCode, const std::string& title, const HtmlTag body) : Response(responseCode, body), - title(title) + title(title) { AddHeader("Cache-Control", "no-cache, must-revalidate"); AddHeader("Pragma", "no-cache"); diff --git a/Storage/Sqlite.cpp b/Storage/Sqlite.cpp index c40dc894..1dc54359 100644 --- a/Storage/Sqlite.cpp +++ b/Storage/Sqlite.cpp @@ -41,8 +41,8 @@ namespace Storage { SQLite::SQLite(const StorageParams* params) : filename(params->filename), - logger(Logger::Logger::GetLogger("SQLite")), - keepBackups(params->keepBackups) + logger(Logger::Logger::GetLogger("SQLite")), + keepBackups(params->keepBackups) { Utils::Utils::RemoveOldBackupFiles (logger, filename, keepBackups); logger->Info(Languages::TextOpeningSQLite, filename); diff --git a/Utils/Network.cpp b/Utils/Network.cpp index dd0484d0..6d4ea702 100644 --- a/Utils/Network.cpp +++ b/Utils/Network.cpp @@ -32,27 +32,27 @@ namespace Utils { char buffer[40] = { 0 }; unsigned short port = 0; - switch(sockaddr->ss_family) { - case AF_INET: - { - const struct sockaddr_in* sa4 = reinterpret_cast(sockaddr); - inet_ntop(AF_INET, &(sa4->sin_addr), buffer, sizeof(buffer)); - port = ntohs(sa4->sin_port); - break; - } - - case AF_INET6: - { - const struct sockaddr_in6* sa6 = reinterpret_cast(sockaddr); - inet_ntop(AF_INET6, &(sa6->sin6_addr), buffer, sizeof(buffer)); - port = ntohs(sa6->sin6_port); - break; - } - - default: - break; - } - return string("[") + string(buffer) + string("]:") + std::to_string(port); + switch(sockaddr->ss_family) { + case AF_INET: + { + const struct sockaddr_in* sa4 = reinterpret_cast(sockaddr); + inet_ntop(AF_INET, &(sa4->sin_addr), buffer, sizeof(buffer)); + port = ntohs(sa4->sin_port); + break; + } + + case AF_INET6: + { + const struct sockaddr_in6* sa6 = reinterpret_cast(sockaddr); + inet_ntop(AF_INET6, &(sa6->sin6_addr), buffer, sizeof(buffer)); + port = ntohs(sa6->sin6_port); + break; + } + + default: + break; + } + return string("[") + string(buffer) + string("]:") + std::to_string(port); } bool Network::CompareAddresses(const struct sockaddr_storage *address1, const struct sockaddr_storage *address2)