Correct whitespace

DataModel/AccessoryBase.h

@@ -123,7 +123,7 @@ namespace DataModel
 				inverted(false),
 				lastUsed(0),
 				counter(0),
-			 	matchKey("")
+				matchKey("")
 			{
 			}
 

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)
 			{
 			}

DataModel/LockableItem.h

@@ -41,7 +41,7 @@ namespace DataModel
 
 			inline LockableItem()
 			:	lockState(LockStateFree),
-			 	locoBaseIdentifier()
+				locoBaseIdentifier()
 			{
 			}
 

DataModel/Object.h

@@ -37,7 +37,7 @@ namespace DataModel
 
 			inline Object()
 			:	objectID(ObjectNone),
-			 	name(std::to_string(objectID))
+				name(std::to_string(objectID))
 			{
 			}
 

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);

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),

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,

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());
 

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());
 

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());
 

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

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());
 

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)
 			{
 			}

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),

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());

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());

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)

Logger/Logger.h

@@ -42,7 +42,7 @@ namespace Logger
 
 			Logger(LoggerServer& server, const std::string& component)
 			:	server(server),
-			 	component(component)
+				component(component)
 			{}
 
 			~Logger() {};

Logger/LoggerServer.h

@@ -75,7 +75,7 @@ namespace Logger
 		private:
 			inline LoggerServer()
 			:	fileLoggerStarted(false),
-			 	consoleLoggerStarted(false)
+				consoleLoggerStarted(false)
 			{
 			}
 

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),

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<struct sockaddr_in*>(&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<struct sockaddr_in*>(&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<struct sockaddr*>(addressPointer), sizeof(address));
-	    if (ok < 0)
-	    {
-	    	Languages::TextSelector text;
-	    	switch (errno)
-	    	{
-	    		case ECONNREFUSED:
-	    			text = Languages::TextConnectionRefused;
-	    			break;
+		ok = ConnectWithTimeout(sock, reinterpret_cast<struct sockaddr*>(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);
 	}

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)
 	{
 	}
 

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)
 	{
 	}
 

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<const DataModel::LayoutItem*>(signal)),
-	 	signal(signal)
+		signal(signal)
 	{
 		image += "<polygon points=\"15,0 21,0 21,36 15,36\" fill=\"white\"/>";
 		image += GetSignalImagePlain(signal);

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");

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);