Changeset 3a0cee


Ignore:
Timestamp:
06/19/12 12:30:50 (11 months ago)
Author:
Micke Prag <micke.prag@…>
Branches:
('master', 'a231b56d57a69513303d0061f5fa3e3cd51c85c1')
Children:
110dcc2c574320d8673e61f20a4137157709913d
Parents:
75f21588e53683537e6a17a95749ae0f87ef4b4b
git-author:
Micke Prag <micke.prag@telldus.se>2012-06-19 11:57:22+02:00
git-committer:
Micke Prag <micke.prag@telldus.se>2012-06-19 12:30:50+02:00
Message:

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

Location:
telldus-core
Files:
37 edited

Legend:

Unmodified
Added
Removed

  • telldus-core/common/Event.cpp

    r8d0228 r3a0cee  
    66// 
    77#include "common/Event.h" 
     8#include <list> 
    89#include "common/EventHandler.h" 
    910#include "common/Mutex.h" 
    1011 
    11 #include <list> 
    1212 
    1313using namespace TelldusCore; 

  • telldus-core/common/Event.h

    ra4dfd2 r3a0cee  
    88#define TELLDUS_CORE_COMMON_EVENT_H_ 
    99 
    10 #include "Thread.h" 
    1110 
    12 #ifdef _WINDOWS 
    13 #include <windows.h> 
    14 #include <memory> 
     11#ifndef _WINDOWS 
     12        #include <tr1/memory> 
     13        typedef void* EVENT_T; 
     14#else 
     15        #include <windows.h> 
     16        #include <memory> 
    1517        typedef HANDLE EVENT_T; 
    16 #else 
    17 #include <tr1/memory> 
    18         typedef void* EVENT_T; 
    1918#endif 
    2019#include "common/Thread.h" 

  • telldus-core/common/Message.cpp

    r75f215 r3a0cee  
    55// 
    66// 
     7#include "common/Message.h" 
    78#include <wctype.h> 
    89#include <stdlib.h> 
    910#include <sstream> 
    10 #include "common/Message.h" 
    1111#include "common/Socket.h" 
    1212#include "common/Strings.h" 
    1313 
    1414using namespace TelldusCore; 
    15  
    1615 
    1716Message::Message() 

  • telldus-core/common/Socket.h

    r75f215 r3a0cee  
    88#define TELLDUS_CORE_COMMON_SOCKET_H_ 
    99 
    10 #include <string> 
    11  
    1210#ifdef _WINDOWS 
    1311        #include <windows.h> 
    … …  
    1614        typedef int SOCKET_T; 
    1715#endif 
     16 
     17#include <string> 
    1818 
    1919namespace TelldusCore { 

  • telldus-core/common/Strings.cpp

    r75f215 r3a0cee  
    77 
    88#include "common/Strings.h" 
     9#include <string.h> 
     10#include <stdio.h> 
     11 
     12#ifdef _WINDOWS 
     13#include <windows.h> 
     14#else 
     15#include <iconv.h> 
     16#endif 
    917#include <algorithm> 
    1018#include <sstream> 
    1119#include <string> 
    12 #include <string.h> 
    13 #include <stdio.h> 
    14  
    15 #ifdef _WINDOWS 
    16 #include <windows.h> 
    17 #else 
    18 #include <iconv.h> 
    19 #endif 
     20 
    2021 
    2122#ifdef _MACOSX 

  • telldus-core/common/Strings.h

    r75f215 r3a0cee  
    88#define TELLDUS_CORE_COMMON_STRINGS_H_ 
    99 
    10 #include <string> 
    1110#include <stdarg.h> 
    1211#ifdef _MSC_VER 
    … …  
    1817#include <stdint.h> 
    1918#endif 
     19#include <string> 
    2020 
    2121namespace TelldusCore { 

  • telldus-core/common/common.h

    re1608f r3a0cee  
    1717#include <unistd.h> 
    1818#endif 
    19 #include "Strings.h" 
    20 #include <fstream> 
     19#include <stdarg.h> 
    2120#include <stdlib.h> 
    2221#include <string.h> 
     22#include <fstream> 
    2323#include <string> 
    24 #include <stdarg.h> 
    2524#include "common/Strings.h" 
    2625 

  • telldus-core/service/ClientCommunicationHandler.cpp

    r75f215 r3a0cee  
    55// 
    66// 
    7 #include "ClientCommunicationHandler.h" 
     7#include "service/ClientCommunicationHandler.h" 
     8 
     9#include <stdlib.h> 
     10#include <string> 
     11 
    812#include "common/Message.h" 
    913#include "common/Strings.h" 
    10  
    11 #include <stdlib.h> 
    12 #include <string> 
    1314 
    1415class ClientCommunicationHandler::PrivateData { 

  • telldus-core/service/ConnectionListener_unix.cpp

    r75f215 r3a0cee  
    55// 
    66// 
    7 #include "service/ConnectionListener.h" 
    8 #include "common/Socket.h" 
    9  
    10 #include <string> 
    117#include <sys/socket.h> 
    128#include <sys/un.h> 
    139#include <sys/types.h> 
    1410#include <sys/stat.h> 
    15  
    16  
    1711#include <stdio.h> 
    1812#include <unistd.h> 
    1913#include <errno.h> 
     14#include <string> 
     15 
     16#include "service/ConnectionListener.h" 
     17#include "common/Socket.h" 
    2018 
    2119class ConnectionListener::PrivateData { 

  • telldus-core/service/Controller.h

    r0d25f0 r3a0cee  
    88#define TELLDUS_CORE_SERVICE_CONTROLLER_H_ 
    99 
     10#include <string> 
    1011#include "common/Event.h" 
    11 #include <string> 
    1212 
    1313class ControllerEventData : public TelldusCore::EventDataBase { 

  • telldus-core/service/ControllerManager.cpp

    r75f215 r3a0cee  
    66// 
    77#include "service/ControllerManager.h" 
     8 
     9#include <stdio.h> 
     10#include <list> 
     11#include <map> 
     12#include <string> 
     13 
    814#include "service/Controller.h" 
    915#include "common/Mutex.h" 
    … …  
    1521#include "service/EventUpdateManager.h" 
    1622#include "client/telldus-core.h" 
    17  
    18 #include <map> 
    19 #include <stdio.h> 
    2023 
    2124class ControllerDescriptor { 

  • telldus-core/service/ControllerManager.h

    r0d25f0 r3a0cee  
    88#define TELLDUS_CORE_SERVICE_CONTROLLERMANAGER_H_ 
    99 
     10#include <string> 
    1011#include "common/Event.h" 
    1112class Controller; 
    1213 
    13 #include <string> 
    1414 
    1515class ControllerManager { 

  • telldus-core/service/ControllerMessage.cpp

    r75f215 r3a0cee  
    66// 
    77#include "service/ControllerMessage.h" 
     8#include <map> 
     9#include <string> 
    810#include "service/Device.h" 
    911#include "common/Strings.h" 
    10  
    1112#include "common/common.h" 
    12  
    13 #include <map> 
    1413 
    1514class ControllerMessage::PrivateData { 

  • telldus-core/service/Device.h

    re1608f r3a0cee  
    88#define TELLDUS_CORE_SERVICE_DEVICE_H_ 
    99 
     10#include <list> 
     11#include <string> 
    1012#include "service/Controller.h" 
    1113#include "common/Mutex.h" 
    1214#include "service/Protocol.h" 
    13 #include <string> 
    14 #include <list> 
    1515 
    1616class Device : public TelldusCore::Mutex { 

  • telldus-core/service/DeviceManager.cpp

    r75f215 r3a0cee  
    66// 
    77#include "service/DeviceManager.h" 
     8#include <time.h> 
     9#include <list> 
     10#include <map> 
     11#include <memory> 
     12#include <set> 
     13#include <sstream> 
     14#include <string> 
     15 
    816#include "service/ControllerMessage.h" 
    917#include "common/Mutex.h" 
    … …  
    1321#include "common/Message.h" 
    1422#include "service/Log.h" 
    15  
    16 #include <map> 
    17 #include <memory> 
    18 #include <sstream> 
    19 #include <time.h> 
    2023 
    2124typedef std::map<int, Device *> DeviceMap; 

  • telldus-core/service/DeviceManager.h

    re1608f r3a0cee  
    88#define TELLDUS_CORE_SERVICE_DEVICEMANAGER_H_ 
    99 
     10#include <set> 
    1011#include <string> 
    1112#include "service/Device.h" 
    … …  
    1314#include "service/ControllerMessage.h" 
    1415#include "service/EventUpdateManager.h" 
    15 #include <set> 
    1616 
    1717class Sensor; 

  • telldus-core/service/EventUpdateManager.cpp

    r75f215 r3a0cee  
    77#include "service/EventUpdateManager.h" 
    88 
     9#include <list> 
     10#include <memory> 
     11 
    912#include "service/ConnectionListener.h" 
    1013#include "common/EventHandler.h" 
    1114#include "common/Message.h" 
    1215#include "common/Socket.h" 
    13  
    14 #include <list> 
    15 #include <memory> 
    1616 
    1717typedef std::list<TelldusCore::Socket *> SocketList; 

  • telldus-core/service/Protocol.cpp

    r75f215 r3a0cee  
    66// 
    77#include "service/Protocol.h" 
     8#include <list> 
     9#include <sstream> 
     10#include <string> 
     11 
    812#include "client/telldus-core.h" 
    9  
    1013#include "service/ControllerMessage.h" 
    1114#include "service/ProtocolBrateck.h" 
    … …  
    2831#include "service/ProtocolX10.h" 
    2932#include "service/ProtocolYidong.h" 
    30  
    3133#include "common/Strings.h" 
    32 #include <sstream> 
    3334 
    3435class Protocol::PrivateData { 

  • telldus-core/service/ProtocolComen.h

    r0d25f0 r3a0cee  
    88#define TELLDUS_CORE_SERVICE_PROTOCOLCOMEN_H_ 
    99 
     10#include <string> 
    1011#include "service/ProtocolNexa.h" 
    11 #include <string> 
    1212 
    1313class ProtocolComen : public ProtocolNexa { 

  • telldus-core/service/ProtocolEverflourish.cpp

    r75f215 r3a0cee  
    55// 
    66// 
    7 #include "ProtocolEverflourish.h" 
     7#include "service/ProtocolEverflourish.h" 
     8#include <stdio.h> 
    89#include <sstream> 
    9 #include <stdio.h> 
     10#include <string> 
    1011#include "service/ControllerMessage.h" 
    11 #include <string> 
    1212 
    1313int ProtocolEverflourish::methods() const { 

  • telldus-core/service/ProtocolFineoffset.cpp

    re1608f r3a0cee  
    66// 
    77#include "service/ProtocolFineoffset.h" 
     8#include <stdlib.h> 
     9#include <iomanip> 
     10#include <sstream> 
     11#include <string> 
    812#include "common/Strings.h" 
    9 #include <stdlib.h> 
    10 #include <sstream> 
    11 #include <iomanip> 
    1213 
    1314std::string ProtocolFineoffset::decodeData(ControllerMessage &dataMsg) { 

  • telldus-core/service/ProtocolHasta.cpp

    r75f215 r3a0cee  
    66// 
    77#include "service/ProtocolHasta.h" 
     8#include <stdio.h> 
    89#include <sstream> 
    9 #include <stdio.h> 
     10#include <string> 
    1011 
    1112int ProtocolHasta::methods() const { 

  • telldus-core/service/ProtocolIkea.cpp

    r75f215 r3a0cee  
    66// 
    77#include "service/ProtocolIkea.h" 
    8 #include "common/Strings.h" 
    9  
    108#include <stdlib.h> 
    119#include <string.h> 
     10#include <string> 
     11#include "common/Strings.h" 
    1212 
    1313int ProtocolIkea::methods() const { 

  • telldus-core/service/ProtocolMandolyn.cpp

    re1608f r3a0cee  
    66// 
    77#include "service/ProtocolMandolyn.h" 
     8#include <stdlib.h> 
     9#include <iomanip> 
     10#include <sstream> 
     11#include <string> 
    812#include "common/Strings.h" 
    9 #include <stdlib.h> 
    10 #include <sstream> 
    11 #include <iomanip> 
    1213 
    1314std::string ProtocolMandolyn::decodeData(ControllerMessage &dataMsg) { 

  • telldus-core/service/ProtocolNexa.cpp

    r75f215 r3a0cee  
    88#include <stdio.h> 
    99#include <sstream> 
     10#include <string> 
    1011#include "service/TellStick.h" 
    1112#include "common/Strings.h" 

  • telldus-core/service/ProtocolNexa.h

    r0d25f0 r3a0cee  
    88#define TELLDUS_CORE_SERVICE_PROTOCOLNEXA_H_ 
    99 
     10#include <string> 
    1011#include "service/ControllerMessage.h" 
    1112#include "service/Device.h" 
    12 #include <string> 
    1313 
    1414class ProtocolNexa : public Protocol { 

  • telldus-core/service/ProtocolOregon.cpp

    r75f215 r3a0cee  
    66// 
    77#include "service/ProtocolOregon.h" 
     8#include <stdlib.h> 
     9#include <iomanip> 
     10#include <sstream> 
     11#include <string> 
    812#include "common/Strings.h" 
    9 #include <stdlib.h> 
    10 #include <sstream> 
    11 #include <iomanip> 
    1213 
    1314std::string ProtocolOregon::decodeData(ControllerMessage &dataMsg) { 

  • telldus-core/service/ProtocolSartano.cpp

    re1608f r3a0cee  
    66// 
    77#include "service/ProtocolSartano.h" 
     8#include <stdio.h> 
    89#include <sstream> 
    9 #include <stdio.h> 
     10#include <string> 
    1011 
    1112int ProtocolSartano::methods() const { 

  • telldus-core/service/ProtocolWaveman.cpp

    r75f215 r3a0cee  
    66// 
    77#include "service/ProtocolWaveman.h" 
     8#include <stdio.h> 
    89#include <sstream> 
    9 #include <stdio.h> 
     10#include <string> 
    1011 
    1112int ProtocolWaveman::lastArctecCodeSwitchWasTurnOff=0; 

  • telldus-core/service/Sensor.cpp

    re1608f r3a0cee  
    66// 
    77#include "service/Sensor.h" 
     8#include <map> 
     9#include <string> 
    810#include "common/common.h" 
    911#include "client/telldus-core.h" 
    10 #include <map> 
    1112 
    1213class Sensor::PrivateData { 

  • telldus-core/service/Sensor.h

    re1608f r3a0cee  
    88#define TELLDUS_CORE_SERVICE_SENSOR_H_ 
    99 
     10#include <string> 
    1011#include "common/Mutex.h" 
    11 #include <string> 
    1212 
    1313class Sensor : public TelldusCore::Mutex { 

  • telldus-core/service/SettingsConfuse.cpp

    r75f215 r3a0cee  
    55// 
    66// 
    7 #include "Settings.h" 
    8 #include "client/telldus-core.h" 
     7#include <confuse.h> 
     8#include <stdlib.h> 
     9#include <string.h> 
     10#include <errno.h> 
     11#include <string> 
    912#include "service/Settings.h" 
    1013#include "service/SettingsConfusePaths.h" 
    1114#include "client/telldus-core.h" 
    1215#include "common/Strings.h" 
    13 #include <confuse.h> 
    14 #include <stdlib.h> 
    15 #include <string.h> 
    16 #include <errno.h> 
    1716 
    1817using namespace std; 

  • telldus-core/service/TellStick.cpp

    r75f215 r3a0cee  
    77#include "service/TellStick.h" 
    88 
     9#include <stdio.h> 
    910#include <map> 
    10 #include <stdio.h> 
     11#include <string> 
    1112 
    1213std::string TellStick::createTPacket( const std::string &msg ) { 

  • telldus-core/service/TellStick_libftdi.cpp

    r75f215 r3a0cee  
    55// 
    66// 
    7 #include "service/TellStick.h" 
    8 #include "client/telldus-core.h" 
     7#include <ftdi.h> 
    98#include <string.h> 
    109#include <stdlib.h> 
    1110#include <stdio.h> 
    1211#include <unistd.h> 
    13 #include <ftdi.h> 
    1412#include <list> 
    1513#include <string> 
     14 
     15#include "service/TellStick.h" 
    1616#include "service/Log.h" 
    1717#include "service/Settings.h" 
     18#include "client/telldus-core.h" 
    1819#include "common/Thread.h" 
    1920#include "common/Mutex.h" 
    2021#include "common/Strings.h" 
    2122#include "common/common.h" 
    22  
    23 #include <unistd.h> 
    2423 
    2524typedef struct _EVENT_HANDLE { 

  • telldus-core/service/TelldusMain.cpp

    r75f215 r3a0cee  
    66// 
    77#include "service/TelldusMain.h" 
     8 
     9#include <stdio.h> 
     10#include <list> 
     11#include <memory> 
     12 
    813#include "service/ConnectionListener.h" 
    914#include "common/EventHandler.h" 
    … …  
    1621#include "service/Log.h" 
    1722 
    18 #include <stdio.h> 
    19 #include <list> 
    20 #include <memory> 
    2123 
    2224class TelldusMain::PrivateData { 

  • telldus-core/service/Timer.cpp

    r75f215 r3a0cee  
    66// 
    77#include "service/Timer.h" 
    8 #include "common/Mutex.h" 
    98#ifdef _WINDOWS 
    109#else 
    … …  
    1211#include <errno.h> 
    1312#endif 
     13#include "common/Mutex.h" 
    1414 
    1515class Timer::PrivateData { 

  • telldus-core/service/main_unix.cpp

    r75f215 r3a0cee  
    55// 
    66// 
    7 #include "service/TelldusMain.h" 
    87#include <signal.h> 
    98#include <string.h> 
    … …  
    1716#include <string> 
    1817 
     18#include "service/TelldusMain.h" 
    1919#include "service/Settings.h" 
    2020#include "common/Strings.h" 
Note: See TracChangeset for help on using the changeset viewer.