Ordered header files correctly according to Google style guidelines "build/include_order"

telldus-core/common/EventHandler_win.cpp

@@ -5,12 +5,12 @@
 //
 //
 #include "common/EventHandler.h"
-#include "common/Event.h"
-#include "common/Mutex.h"
-
 #include <windows.h>
 #include <list>
 
+#include "common/Event.h"
+#include "common/Mutex.h"
+
 namespace TelldusCore {
 
 class EventHandler::PrivateData {

telldus-core/common/Socket_win.cpp

@@ -4,11 +4,12 @@
 // Copyright: See COPYING file that comes with this distribution
 //
 //
-#include "common/Socket.h"
-#include "common/common.h"
-#include <windows.h>
 #include <AccCtrl.h>
 #include <Aclapi.h>
+#include <windows.h>
+
+#include "common/common.h"
+#include "common/Socket.h"
 
 #define BUFSIZE 512
 

telldus-core/common/common.h

@@ -9,11 +9,10 @@
 #define TELLDUS_CORE_COMMON_COMMON_H_
 
 #ifdef _WINDOWS
-#include <windows.h>
-#include <ole2.h>
-#include <fstream>
 #define strcasecmp _stricmp
 #define strncasecmp _strnicmp
+#include <ole2.h>
+#include <windows.h>
 #else
 #include <unistd.h>
 #endif
@@ -21,11 +20,14 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <time.h>
+
+#ifdef _WINDOWS
+#include <fstream>
+#endif
 #include <string>
 #include "common/Strings.h"
 
-#include <time.h>
-
 inline void msleep( const int msec) {
 #ifdef _WINDOWS
 	Sleep(msec);

telldus-core/service/ConnectionListener_win.cpp

@@ -5,12 +5,13 @@
 //
 //
 #include "service/ConnectionListener.h"
-#include "common/Event.h"
-#include "common/Socket.h"
 
-#include <windows.h>
 #include <AccCtrl.h>
 #include <Aclapi.h>
+#include <windows.h>
+
+#include "common/Event.h"
+#include "common/Socket.h"
 
 #define BUFSIZE 512
 

telldus-core/service/EventUpdateManager.cpp

@@ -16,9 +16,6 @@
 #include <sys/wait.h>
 #endif  // _LINUX
 
-#include "common/common.h" //debug
-#include <iostream> //debug
-#include <sstream> //debug
 #include <list>
 #include <map>
 #include <memory>
@@ -27,13 +24,14 @@
 #include <vector>
 #endif  // _LINUX
 
-#include "service/ConnectionListener.h"
+#include "common/common.h" //debug
-#include "service/config.h"
 #include "common/EventHandler.h"
 #include "common/Message.h"
 #include "common/Socket.h"
-#include "service/Log.h"
 #include "common/Strings.h"
+#include "service/config.h"
+#include "service/ConnectionListener.h"
+#include "service/Log.h"
 
 typedef std::list<TelldusCore::Socket *> SocketList;
 typedef std::list<std::string> StringList;
@@ -172,10 +170,6 @@ void EventUpdateManager::sendMessageToClients(EventUpdateData *data) {
 			it = d->clients.erase(it);
 		}
 	}
-	//printf("Sent message to %d connected clients", connected)
-	//std::stringstream strMessage;
-	//strMessage << "Sent message to " << connected << " clients" << std::endl;
-	//debuglogservice(0, strMessage.str());
 }
 
 void EventUpdateManager::executeScripts(EventUpdateData *data) {

telldus-core/service/SettingsWinRegistry.cpp

@@ -4,17 +4,17 @@
 // Copyright: See COPYING file that comes with this distribution
 //
 //
-#include "service/Settings.h"
-#include "common/Strings.h"
 #include <Windows.h>
+#include <fstream>
+#include <iostream>
 #include <sstream> 
 #include <string>
 #include <vector>
-#include <iostream>
-#include <fstream>
-#include "common/common.h"
 
 #include "../client/telldus-core.h"
+#include "common/common.h"
+#include "common/Strings.h"
+#include "service/Settings.h"
 
 const int intMaxRegValueLength = 1000;
 

telldus-core/service/TelldusMain.cpp

@@ -5,22 +5,20 @@
 //
 //
 #include "service/TelldusMain.h"
-#include "common/common.h" //debug
-
 #include <stdio.h>
 #include <list>
 #include <memory>
 
-#include "service/ConnectionListener.h"
+#include "common/common.h" //debug
 #include "common/EventHandler.h"
 #include "service/ClientCommunicationHandler.h"
-#include "service/DeviceManager.h"
+#include "service/ConnectionListener.h"
-#include "service/ControllerManager.h"
 #include "service/ControllerListener.h"
+#include "service/ControllerManager.h"
+#include "service/DeviceManager.h"
 #include "service/EventUpdateManager.h"
-#include "service/Timer.h"
 #include "service/Log.h"
-
+#include "service/Timer.h"
 
 class TelldusMain::PrivateData {
 public:

telldus-core/service/TelldusWinService_win.cpp

@@ -5,12 +5,13 @@
 //
 //
 #include "service/TelldusWinService_win.h"
-#include "service/TelldusMain.h"
-#include "service/Log.h"
 
 #include <Dbt.h>
-#include <string>
 #include <algorithm>
+#include <string>
+
+#include "service/Log.h"
+#include "service/TelldusMain.h"
 
 int g_argc;
 char **g_argv;

telldus-core/service/main_win.cpp

@@ -4,12 +4,11 @@
 // Copyright: See COPYING file that comes with this distribution
 //
 //
-#include "service/TelldusWinService_win.h"
-//#include <QCoreApplication>
-
 #include <windows.h>
 #include <Dbt.h>
 
+#include "service/TelldusWinService_win.h"
+//#include <QCoreApplication>
 
 int main(int argc, char **argv) {
 	g_argc = argc;