Fix include header order according to Google style guidelines "build/include_order"

telldus-core/common/Event.cpp

@@ -5,10 +5,10 @@
 //
 //
 #include "common/Event.h"
+#include <list>
 #include "common/EventHandler.h"
 #include "common/Mutex.h"
 
-#include <list>
 
 using namespace TelldusCore;
 

telldus-core/common/Event.h

@@ -7,15 +7,14 @@
 #ifndef TELLDUS_CORE_COMMON_EVENT_H_
 #define TELLDUS_CORE_COMMON_EVENT_H_
 
-#include "Thread.h"
 
-#ifdef _WINDOWS
+#ifndef _WINDOWS
-#include <windows.h>
+	#include <tr1/memory>
-#include <memory>
-	typedef HANDLE EVENT_T;
-#else
-#include <tr1/memory>
 	typedef void* EVENT_T;
+#else
+	#include <windows.h>
+	#include <memory>
+	typedef HANDLE EVENT_T;
 #endif
 #include "common/Thread.h"
 

telldus-core/common/Message.cpp

@@ -4,16 +4,15 @@
 // Copyright: See COPYING file that comes with this distribution
 //
 //
+#include "common/Message.h"
 #include <wctype.h>
 #include <stdlib.h>
 #include <sstream>
-#include "common/Message.h"
 #include "common/Socket.h"
 #include "common/Strings.h"
 
 using namespace TelldusCore;
 
-
 Message::Message()
 	: std::wstring() {
 }

telldus-core/common/Socket.h

@@ -7,8 +7,6 @@
 #ifndef TELLDUS_CORE_COMMON_SOCKET_H_
 #define TELLDUS_CORE_COMMON_SOCKET_H_
 
-#include <string>
-
 #ifdef _WINDOWS
 	#include <windows.h>
 	typedef HANDLE SOCKET_T;
@@ -16,6 +14,8 @@
 	typedef int SOCKET_T;
 #endif
 
+#include <string>
+
 namespace TelldusCore {
 	class Socket {
 	public:

telldus-core/common/Strings.cpp

@@ -6,9 +6,6 @@
 //
 
 #include "common/Strings.h"
-#include <algorithm>
-#include <sstream>
-#include <string>
 #include <string.h>
 #include <stdio.h>
 
@@ -17,6 +14,10 @@
 #else
 #include <iconv.h>
 #endif
+#include <algorithm>
+#include <sstream>
+#include <string>
+
 
 #ifdef _MACOSX
 #define WCHAR_T_ENCODING "UCS-4-INTERNAL"

telldus-core/common/Strings.h

@@ -7,7 +7,6 @@
 #ifndef TELLDUS_CORE_COMMON_STRINGS_H_
 #define TELLDUS_CORE_COMMON_STRINGS_H_
 
-#include <string>
 #include <stdarg.h>
 #ifdef _MSC_VER
 typedef unsigned __int8 uint8_t;
@@ -17,6 +16,7 @@ typedef unsigned __int64 uint64_t;
 #else
 #include <stdint.h>
 #endif
+#include <string>
 
 namespace TelldusCore {
 	std::wstring charToWstring(const char *value);

telldus-core/common/common.h

@@ -16,12 +16,11 @@
 #else
 #include <unistd.h>
 #endif
-#include "Strings.h"
+#include <stdarg.h>
-#include <fstream>
 #include <stdlib.h>
 #include <string.h>
+#include <fstream>
 #include <string>
-#include <stdarg.h>
 #include "common/Strings.h"
 
 inline void msleep( const int msec) {

telldus-core/service/ClientCommunicationHandler.cpp

@@ -4,13 +4,14 @@
 // Copyright: See COPYING file that comes with this distribution
 //
 //
-#include "ClientCommunicationHandler.h"
+#include "service/ClientCommunicationHandler.h"
-#include "common/Message.h"
-#include "common/Strings.h"
 
 #include <stdlib.h>
 #include <string>
 
+#include "common/Message.h"
+#include "common/Strings.h"
+
 class ClientCommunicationHandler::PrivateData {
 public:
 	TelldusCore::Socket *clientSocket;

telldus-core/service/ConnectionListener_unix.cpp

@@ -4,19 +4,17 @@
 // Copyright: See COPYING file that comes with this distribution
 //
 //
-#include "service/ConnectionListener.h"
-#include "common/Socket.h"
-
-#include <string>
 #include <sys/socket.h>
 #include <sys/un.h>
 #include <sys/types.h>
 #include <sys/stat.h>
-
-
 #include <stdio.h>
 #include <unistd.h>
 #include <errno.h>
+#include <string>
+
+#include "service/ConnectionListener.h"
+#include "common/Socket.h"
 
 class ConnectionListener::PrivateData {
 public:

telldus-core/service/Controller.h

@@ -7,8 +7,8 @@
 #ifndef TELLDUS_CORE_SERVICE_CONTROLLER_H_
 #define TELLDUS_CORE_SERVICE_CONTROLLER_H_
 
-#include "common/Event.h"
 #include <string>
+#include "common/Event.h"
 
 class ControllerEventData : public TelldusCore::EventDataBase {
 public:

telldus-core/service/ControllerManager.cpp

@@ -5,6 +5,12 @@
 //
 //
 #include "service/ControllerManager.h"
+
+#include <stdio.h>
+#include <list>
+#include <map>
+#include <string>
+
 #include "service/Controller.h"
 #include "common/Mutex.h"
 #include "service/TellStick.h"
@@ -15,9 +21,6 @@
 #include "service/EventUpdateManager.h"
 #include "client/telldus-core.h"
 
-#include <map>
-#include <stdio.h>
-
 class ControllerDescriptor {
 public:
 	std::wstring name, serial;

telldus-core/service/ControllerManager.h

@@ -7,10 +7,10 @@
 #ifndef TELLDUS_CORE_SERVICE_CONTROLLERMANAGER_H_
 #define TELLDUS_CORE_SERVICE_CONTROLLERMANAGER_H_
 
+#include <string>
 #include "common/Event.h"
 class Controller;
 
-#include <string>
 
 class ControllerManager {
 public:

telldus-core/service/ControllerMessage.cpp

@@ -5,13 +5,12 @@
 //
 //
 #include "service/ControllerMessage.h"
+#include <map>
+#include <string>
 #include "service/Device.h"
 #include "common/Strings.h"
-
 #include "common/common.h"
 
-#include <map>
-
 class ControllerMessage::PrivateData {
 public:
 	std::map<std::string, std::string> parameters;

telldus-core/service/Device.h

@@ -7,11 +7,11 @@
 #ifndef TELLDUS_CORE_SERVICE_DEVICE_H_
 #define TELLDUS_CORE_SERVICE_DEVICE_H_
 
+#include <list>
+#include <string>
 #include "service/Controller.h"
 #include "common/Mutex.h"
 #include "service/Protocol.h"
-#include <string>
-#include <list>
 
 class Device : public TelldusCore::Mutex {
 public:

telldus-core/service/DeviceManager.cpp

@@ -5,6 +5,14 @@
 //
 //
 #include "service/DeviceManager.h"
+#include <time.h>
+#include <list>
+#include <map>
+#include <memory>
+#include <set>
+#include <sstream>
+#include <string>
+
 #include "service/ControllerMessage.h"
 #include "common/Mutex.h"
 #include "service/Sensor.h"
@@ -13,11 +21,6 @@
 #include "common/Message.h"
 #include "service/Log.h"
 
-#include <map>
-#include <memory>
-#include <sstream>
-#include <time.h>
-
 typedef std::map<int, Device *> DeviceMap;
 
 class DeviceManager::PrivateData {

telldus-core/service/DeviceManager.h

@@ -7,12 +7,12 @@
 #ifndef TELLDUS_CORE_SERVICE_DEVICEMANAGER_H_
 #define TELLDUS_CORE_SERVICE_DEVICEMANAGER_H_
 
+#include <set>
 #include <string>
 #include "service/Device.h"
 #include "service/ControllerManager.h"
 #include "service/ControllerMessage.h"
 #include "service/EventUpdateManager.h"
-#include <set>
 
 class Sensor;
 

telldus-core/service/EventUpdateManager.cpp

@@ -6,14 +6,14 @@
 //
 #include "service/EventUpdateManager.h"
 
+#include <list>
+#include <memory>
+
 #include "service/ConnectionListener.h"
 #include "common/EventHandler.h"
 #include "common/Message.h"
 #include "common/Socket.h"
 
-#include <list>
-#include <memory>
-
 typedef std::list<TelldusCore::Socket *> SocketList;
 
 class EventUpdateManager::PrivateData {

telldus-core/service/Protocol.cpp

@@ -5,8 +5,11 @@
 //
 //
 #include "service/Protocol.h"
-#include "client/telldus-core.h"
+#include <list>
+#include <sstream>
+#include <string>
 
+#include "client/telldus-core.h"
 #include "service/ControllerMessage.h"
 #include "service/ProtocolBrateck.h"
 #include "service/ProtocolComen.h"
@@ -27,9 +30,7 @@
 #include "service/ProtocolWaveman.h"
 #include "service/ProtocolX10.h"
 #include "service/ProtocolYidong.h"
-
 #include "common/Strings.h"
-#include <sstream>
 
 class Protocol::PrivateData {
 public:

telldus-core/service/ProtocolComen.h

@@ -7,8 +7,8 @@
 #ifndef TELLDUS_CORE_SERVICE_PROTOCOLCOMEN_H_
 #define TELLDUS_CORE_SERVICE_PROTOCOLCOMEN_H_
 
-#include "service/ProtocolNexa.h"
 #include <string>
+#include "service/ProtocolNexa.h"
 
 class ProtocolComen : public ProtocolNexa {
 public:

telldus-core/service/ProtocolEverflourish.cpp

@@ -4,11 +4,11 @@
 // Copyright: See COPYING file that comes with this distribution
 //
 //
-#include "ProtocolEverflourish.h"
+#include "service/ProtocolEverflourish.h"
-#include <sstream>
 #include <stdio.h>
-#include "service/ControllerMessage.h"
+#include <sstream>
 #include <string>
+#include "service/ControllerMessage.h"
 
 int ProtocolEverflourish::methods() const {
 	return TELLSTICK_TURNON | TELLSTICK_TURNOFF | TELLSTICK_LEARN;

telldus-core/service/ProtocolFineoffset.cpp

@@ -5,10 +5,11 @@
 //
 //
 #include "service/ProtocolFineoffset.h"
-#include "common/Strings.h"
 #include <stdlib.h>
-#include <sstream>
 #include <iomanip>
+#include <sstream>
+#include <string>
+#include "common/Strings.h"
 
 std::string ProtocolFineoffset::decodeData(ControllerMessage &dataMsg) {
 	std::string data = dataMsg.getParameter("data");

telldus-core/service/ProtocolHasta.cpp

@@ -5,8 +5,9 @@
 //
 //
 #include "service/ProtocolHasta.h"
-#include <sstream>
 #include <stdio.h>
+#include <sstream>
+#include <string>
 
 int ProtocolHasta::methods() const {
 	return TELLSTICK_UP | TELLSTICK_DOWN | TELLSTICK_STOP | TELLSTICK_LEARN;

telldus-core/service/ProtocolIkea.cpp

@@ -5,10 +5,10 @@
 //
 //
 #include "service/ProtocolIkea.h"
-#include "common/Strings.h"
-
 #include <stdlib.h>
 #include <string.h>
+#include <string>
+#include "common/Strings.h"
 
 int ProtocolIkea::methods() const {
 	return TELLSTICK_TURNON | TELLSTICK_TURNOFF | TELLSTICK_DIM;

telldus-core/service/ProtocolMandolyn.cpp

@@ -5,10 +5,11 @@
 //
 //
 #include "service/ProtocolMandolyn.h"
-#include "common/Strings.h"
 #include <stdlib.h>
-#include <sstream>
 #include <iomanip>
+#include <sstream>
+#include <string>
+#include "common/Strings.h"
 
 std::string ProtocolMandolyn::decodeData(ControllerMessage &dataMsg) {
 	std::string data = dataMsg.getParameter("data");

telldus-core/service/ProtocolNexa.cpp

@@ -7,6 +7,7 @@
 #include "service/ProtocolNexa.h"
 #include <stdio.h>
 #include <sstream>
+#include <string>
 #include "service/TellStick.h"
 #include "common/Strings.h"
 

telldus-core/service/ProtocolNexa.h

@@ -7,9 +7,9 @@
 #ifndef TELLDUS_CORE_SERVICE_PROTOCOLNEXA_H_
 #define TELLDUS_CORE_SERVICE_PROTOCOLNEXA_H_
 
+#include <string>
 #include "service/ControllerMessage.h"
 #include "service/Device.h"
-#include <string>
 
 class ProtocolNexa : public Protocol {
 public:

telldus-core/service/ProtocolOregon.cpp

@@ -5,10 +5,11 @@
 //
 //
 #include "service/ProtocolOregon.h"
-#include "common/Strings.h"
 #include <stdlib.h>
-#include <sstream>
 #include <iomanip>
+#include <sstream>
+#include <string>
+#include "common/Strings.h"
 
 std::string ProtocolOregon::decodeData(ControllerMessage &dataMsg) {
 	std::string data = dataMsg.getParameter("data");

telldus-core/service/ProtocolSartano.cpp

@@ -5,8 +5,9 @@
 //
 //
 #include "service/ProtocolSartano.h"
-#include <sstream>
 #include <stdio.h>
+#include <sstream>
+#include <string>
 
 int ProtocolSartano::methods() const {
 	return TELLSTICK_TURNON | TELLSTICK_TURNOFF;

telldus-core/service/ProtocolWaveman.cpp

@@ -5,8 +5,9 @@
 //
 //
 #include "service/ProtocolWaveman.h"
-#include <sstream>
 #include <stdio.h>
+#include <sstream>
+#include <string>
 
 int ProtocolWaveman::lastArctecCodeSwitchWasTurnOff=0;
 

telldus-core/service/Sensor.cpp

@@ -5,9 +5,10 @@
 //
 //
 #include "service/Sensor.h"
+#include <map>
+#include <string>
 #include "common/common.h"
 #include "client/telldus-core.h"
-#include <map>
 
 class Sensor::PrivateData {
 public:

telldus-core/service/Sensor.h

@@ -7,8 +7,8 @@
 #ifndef TELLDUS_CORE_SERVICE_SENSOR_H_
 #define TELLDUS_CORE_SERVICE_SENSOR_H_
 
-#include "common/Mutex.h"
 #include <string>
+#include "common/Mutex.h"
 
 class Sensor : public TelldusCore::Mutex {
 public:

telldus-core/service/SettingsConfuse.cpp

@@ -4,16 +4,15 @@
 // Copyright: See COPYING file that comes with this distribution
 //
 //
-#include "Settings.h"
-#include "client/telldus-core.h"
-#include "service/Settings.h"
-#include "service/SettingsConfusePaths.h"
-#include "client/telldus-core.h"
-#include "common/Strings.h"
 #include <confuse.h>
 #include <stdlib.h>
 #include <string.h>
 #include <errno.h>
+#include <string>
+#include "service/Settings.h"
+#include "service/SettingsConfusePaths.h"
+#include "client/telldus-core.h"
+#include "common/Strings.h"
 
 using namespace std;
 

telldus-core/service/TellStick.cpp

@@ -6,8 +6,9 @@
 //
 #include "service/TellStick.h"
 
-#include <map>
 #include <stdio.h>
+#include <map>
+#include <string>
 
 std::string TellStick::createTPacket( const std::string &msg ) {
 	std::map<unsigned char, char> times;

telldus-core/service/TellStick_libftdi.cpp

@@ -4,24 +4,23 @@
 // Copyright: See COPYING file that comes with this distribution
 //
 //
-#include "service/TellStick.h"
+#include <ftdi.h>
-#include "client/telldus-core.h"
 #include <string.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include <unistd.h>
-#include <ftdi.h>
 #include <list>
 #include <string>
+
+#include "service/TellStick.h"
 #include "service/Log.h"
 #include "service/Settings.h"
+#include "client/telldus-core.h"
 #include "common/Thread.h"
 #include "common/Mutex.h"
 #include "common/Strings.h"
 #include "common/common.h"
 
-#include <unistd.h>
-
 typedef struct _EVENT_HANDLE {
 	pthread_cond_t eCondVar;
 	pthread_mutex_t eMutex;

telldus-core/service/TelldusMain.cpp

@@ -5,6 +5,11 @@
 //
 //
 #include "service/TelldusMain.h"
+
+#include <stdio.h>
+#include <list>
+#include <memory>
+
 #include "service/ConnectionListener.h"
 #include "common/EventHandler.h"
 #include "service/ClientCommunicationHandler.h"
@@ -15,9 +20,6 @@
 #include "service/Timer.h"
 #include "service/Log.h"
 
-#include <stdio.h>
-#include <list>
-#include <memory>
 
 class TelldusMain::PrivateData {
 public:

telldus-core/service/Timer.cpp

@@ -5,12 +5,12 @@
 //
 //
 #include "service/Timer.h"
-#include "common/Mutex.h"
 #ifdef _WINDOWS
 #else
 #include <sys/time.h>
 #include <errno.h>
 #endif
+#include "common/Mutex.h"
 
 class Timer::PrivateData {
 public:

telldus-core/service/main_unix.cpp

@@ -4,7 +4,6 @@
 // Copyright: See COPYING file that comes with this distribution
 //
 //
-#include "service/TelldusMain.h"
 #include <signal.h>
 #include <string.h>
 #include <stdio.h>
@@ -16,6 +15,7 @@
 #include <grp.h>
 #include <string>
 
+#include "service/TelldusMain.h"
 #include "service/Settings.h"
 #include "common/Strings.h"
 #include "service/Log.h"