jeena/telldus
1
0
Fork 0
Code Issues Pull requests Projects Packages Wiki Activity Actions

Include directory when naming .h files, according to Google style guidelines "build/include"

Browse source
This commit is contained in:
Stefan Persson 2012-12-04 16:39:39 +01:00
parent d5e8c1f941
commit 7d0f3747fe
9 changed files with 23 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

6
telldus-core/common/EventHandler_win.cpp
View file

@ -4,9 +4,9 @@
// Copyright: See COPYING file that comes with this distribution // Copyright: See COPYING file that comes with this distribution
// //
// //
#include "EventHandler.h" #include "common/EventHandler.h"
#include "Event.h" #include "common/Event.h"
#include "Mutex.h" #include "common/Mutex.h"
#include <windows.h> #include <windows.h>
#include <list> #include <list>

4
telldus-core/common/Event_win.cpp
View file

@ -4,8 +4,8 @@
// Copyright: See COPYING file that comes with this distribution // Copyright: See COPYING file that comes with this distribution
// //
// //
#include "Event.h" #include "common/Event.h"
#include "Thread.h" #include "common/Thread.h"
using namespace TelldusCore; using namespace TelldusCore;

4
telldus-core/common/Socket_win.cpp
View file

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

6
telldus-core/service/CMakeLists.txt
View file

@ -136,14 +136,14 @@ ELSEIF (WIN32) #### Windows ####
TelldusWinService_win.cpp TelldusWinService_win.cpp
Messages.mc Messages.mc
${CMAKE_CURRENT_BINARY_DIR}/Messages.rc ${CMAKE_CURRENT_BINARY_DIR}/Messages.rc
${CMAKE_CURRENT_BINARY_DIR}/Messages.h ${CMAKE_CURRENT_BINARY_DIR}/service/Messages.h
) )
LIST(APPEND telldus-service_HDRS LIST(APPEND telldus-service_HDRS
TelldusWinService_win.h TelldusWinService_win.h
) )
ADD_CUSTOM_COMMAND( ADD_CUSTOM_COMMAND(
OUTPUT Messages.rc Messages.h OUTPUT Messages.rc service/Messages.h
COMMAND mc.exe -u -r \"${CMAKE_CURRENT_BINARY_DIR}\" -h \"${CMAKE_CURRENT_BINARY_DIR}\" \"${CMAKE_CURRENT_SOURCE_DIR}/Messages.mc\" COMMAND mc.exe -u -r \"${CMAKE_CURRENT_BINARY_DIR}\" -h \"${CMAKE_CURRENT_BINARY_DIR}/service\" \"${CMAKE_CURRENT_SOURCE_DIR}/Messages.mc\"
DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/Messages.mc DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/Messages.mc
DEPENDS Messages.rc DEPENDS Messages.rc
COMMENT "Compiling Messages Resource" COMMENT "Compiling Messages Resource"

4
telldus-core/service/ConnectionListener_win.cpp
View file

@ -4,8 +4,8 @@
// Copyright: See COPYING file that comes with this distribution // Copyright: See COPYING file that comes with this distribution
// //
// //
#include "ConnectionListener.h" #include "service/ConnectionListener.h"
#include "Event.h" #include "common/Event.h"
#include "common/Socket.h" #include "common/Socket.h"
#include <windows.h> #include <windows.h>

2
telldus-core/service/Log.cpp
View file

@ -12,7 +12,7 @@
#elif defined(_WINDOWS) #elif defined(_WINDOWS)
#include <windows.h> #include <windows.h>
#include "common/Strings.h" #include "common/Strings.h"
#include "Messages.h" #include "service/Messages.h"
#endif #endif
class Log::PrivateData { class Log::PrivateData {

12
telldus-core/service/SettingsWinRegistry.cpp
View file

@ -1,15 +1,15 @@
#include "Settings.h"
#include "common/Strings.h"
#include <Windows.h>
#include <sstream>
#include <string>
#include <vector>
// //
// Copyright (C) 2012 Telldus Technologies AB. All rights reserved. // Copyright (C) 2012 Telldus Technologies AB. All rights reserved.
// //
// Copyright: See COPYING file that comes with this distribution // Copyright: See COPYING file that comes with this distribution
// //
// //
#include "service/Settings.h"
#include "common/Strings.h"
#include <Windows.h>
#include <sstream>
#include <string>
#include <vector>
#include <iostream> #include <iostream>
#include <fstream> #include <fstream>
#include "common/common.h" #include "common/common.h"

6
telldus-core/service/TelldusWinService_win.cpp
View file

@ -4,9 +4,9 @@
// Copyright: See COPYING file that comes with this distribution // Copyright: See COPYING file that comes with this distribution
// //
// //
#include "TelldusWinService_win.h" #include "service/TelldusWinService_win.h"
#include "TelldusMain.h" #include "service/TelldusMain.h"
#include "Log.h" #include "service/Log.h"
#include <Dbt.h> #include <Dbt.h>
#include <string> #include <string>

2
telldus-core/service/main_win.cpp
View file

@ -4,7 +4,7 @@
// Copyright: See COPYING file that comes with this distribution // Copyright: See COPYING file that comes with this distribution
// //
// //
#include "TelldusWinService_win.h" #include "service/TelldusWinService_win.h"
//#include <QCoreApplication> //#include <QCoreApplication>
#include <windows.h> #include <windows.h>