Skip to content

Commit 287e8a9

Browse files
mvukovmvukov
committed
Normalize include paths
1 parent 600102e commit 287e8a9

File tree

686 files changed

+3321
-3320
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

686 files changed

+3321
-3320
lines changed

‎CMakeLists.txt

+2-1
Original file line numberDiff line numberDiff line change
@@ -123,6 +123,7 @@ INCLUDE(config/rtt_macros.cmake)
123123
###########################################################
124124

125125
INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
126+
INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR})
126127
ADD_SUBDIRECTORY(rtt)
127128
ADD_SUBDIRECTORY(doc)
128129
ADD_SUBDIRECTORY(tests)
@@ -154,7 +155,7 @@ set(IMPORTED_TARGET_PREFIX "imported_") # Prefix used in other projects to disti
154155
# Main package configuration file + target specific file
155156
CONFIGURE_FILE(orocos-rtt-config.cmake.in
156157
orocos-rtt-config-${OROCOS_TARGET}.cmake @ONLY)
157-
INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/orocos-rtt-config.cmake
158+
INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/orocos-rtt-config.cmake
158159
${CMAKE_CURRENT_BINARY_DIR}/orocos-rtt-config-${OROCOS_TARGET}.cmake
159160
DESTINATION "${CONFIG_FILE_PATH}")
160161

‎rtt/Activity.cpp

+7-7
Original file line numberDiff line numberDiff line change
@@ -40,13 +40,13 @@
4040
#ifdef ORO_PRAGMA_INTERFACE
4141
#pragma implementation
4242
#endif
43-
#include "Time.hpp"
44-
#include "Activity.hpp"
45-
#include "os/MutexLock.hpp"
46-
#include "os/traces.h"
47-
#include "Logger.hpp"
48-
#include "rtt-fwd.hpp"
49-
#include "os/fosi_internal_interface.hpp"
43+
#include "rtt/Time.hpp"
44+
#include "rtt/Activity.hpp"
45+
#include "rtt/os/MutexLock.hpp"
46+
#include "rtt/os/traces.h"
47+
#include "rtt/Logger.hpp"
48+
#include "rtt/rtt-fwd.hpp"
49+
#include "rtt/os/fosi_internal_interface.hpp"
5050

5151
#include <cmath>
5252

‎rtt/Activity.hpp

+6-6
Original file line numberDiff line numberDiff line change
@@ -39,12 +39,12 @@
3939
#ifndef ORO_ACTIVITY_HPP
4040
#define ORO_ACTIVITY_HPP
4141

42-
#include "Time.hpp"
43-
#include "base/RunnableInterface.hpp"
44-
#include "base/ActivityInterface.hpp"
45-
#include "os/Thread.hpp"
46-
#include "os/Mutex.hpp"
47-
#include "os/Condition.hpp"
42+
#include "rtt/Time.hpp"
43+
#include "rtt/base/RunnableInterface.hpp"
44+
#include "rtt/base/ActivityInterface.hpp"
45+
#include "rtt/os/Thread.hpp"
46+
#include "rtt/os/Mutex.hpp"
47+
#include "rtt/os/Condition.hpp"
4848

4949
namespace RTT
5050
{

‎rtt/ArgumentDescription.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
***************************************************************************/
3737

3838

39-
#include "ArgumentDescription.hpp"
39+
#include "rtt/ArgumentDescription.hpp"
4040

4141
using namespace RTT;
4242

‎rtt/ArgumentDescription.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
#define ARGUMENTDESCRIPTION_HPP
4040

4141
#include <string>
42-
#include "rtt-config.h"
42+
#include "rtt/rtt-config.h"
4343

4444
namespace RTT
4545
{

‎rtt/Attribute.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,8 @@
3636
***************************************************************************/
3737

3838

39-
#include "Attribute.hpp"
40-
#include "rtt-fwd.hpp"
39+
#include "rtt/Attribute.hpp"
40+
#include "rtt/rtt-fwd.hpp"
4141

4242
namespace RTT
4343
{

‎rtt/Attribute.hpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,9 @@
3939
#ifndef ORO_CORELIB_ATTRIBUTE_HPP
4040
#define ORO_CORELIB_ATTRIBUTE_HPP
4141

42-
#include "internal/DataSource.hpp"
43-
#include "internal/DataSources.hpp"
44-
#include "base/AttributeBase.hpp"
42+
#include "rtt/internal/DataSource.hpp"
43+
#include "rtt/internal/DataSources.hpp"
44+
#include "rtt/base/AttributeBase.hpp"
4545

4646
namespace RTT
4747
{

‎rtt/BufferPolicy.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
* *
2727
***************************************************************************/
2828

29-
#include "BufferPolicy.hpp"
29+
#include "rtt/BufferPolicy.hpp"
3030
#include <iostream>
3131

3232
namespace RTT {

‎rtt/BufferPolicy.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
#ifndef ORO_BUFFER_POLICY_HPP
3131
#define ORO_BUFFER_POLICY_HPP
3232

33-
#include "rtt-config.h"
33+
#include "rtt/rtt-config.h"
3434
#include <iosfwd>
3535

3636
namespace RTT {

‎rtt/Component.hpp

+4-4
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,8 @@
5050
#include <string>
5151
#include <map>
5252
#include <vector>
53-
#include "rtt-fwd.hpp"
54-
#include "rtt-config.h"
53+
#include "rtt/rtt-fwd.hpp"
54+
#include "rtt/rtt-config.h"
5555

5656
namespace RTT
5757
{
@@ -126,7 +126,7 @@ namespace RTT
126126
* You can only use this macro \b once in a .cpp file for the whole shared library \b and
127127
* you may \b not link with another component library when using this macro. Use
128128
* ORO_CREATE_COMPONENT_LIBRARY if you are in that situation.
129-
*
129+
*
130130
* It adds a function 'createComponent', which will return a new instance of
131131
* the library's component type and a function 'getComponentType', which returns
132132
* the type (namespace::class) name of the component.
@@ -153,7 +153,7 @@ extern "C" { \
153153

154154
/**
155155
* Use this macro to create a component library which contains all components listed with
156-
* ORO_LIST_COMPONENT_TYPE.
156+
* ORO_LIST_COMPONENT_TYPE.
157157
*
158158
* It will add to your library an extern "C" function 'createComponentType' which can create a component of
159159
* each class added with ORO_LIST_COMPONENT_TYPE.

‎rtt/ConfigurationInterface.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,8 @@
3737

3838

3939

40-
#include "ConfigurationInterface.hpp"
41-
#include "internal/mystd.hpp"
40+
#include "rtt/ConfigurationInterface.hpp"
41+
#include "rtt/internal/mystd.hpp"
4242
#include <functional>
4343
#include <boost/bind.hpp>
4444

‎rtt/ConfigurationInterface.hpp

+5-5
Original file line numberDiff line numberDiff line change
@@ -41,11 +41,11 @@
4141

4242
#include <memory>
4343
#include <map>
44-
#include "Attribute.hpp"
45-
#include "internal/DataSources.hpp"
46-
#include "base/DataObjectInterface.hpp"
47-
#include "Property.hpp"
48-
#include "PropertyBag.hpp"
44+
#include "rtt/Attribute.hpp"
45+
#include "rtt/internal/DataSources.hpp"
46+
#include "rtt/base/DataObjectInterface.hpp"
47+
#include "rtt/Property.hpp"
48+
#include "rtt/PropertyBag.hpp"
4949

5050
namespace RTT
5151
{

‎rtt/ConnPolicy.cpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -43,9 +43,9 @@
4343
* Author: kaltan
4444
*/
4545

46-
#include "ConnPolicy.hpp"
47-
#include "Property.hpp"
48-
#include "PropertyBag.hpp"
46+
#include "rtt/ConnPolicy.hpp"
47+
#include "rtt/Property.hpp"
48+
#include "rtt/PropertyBag.hpp"
4949

5050
#include <boost/lexical_cast.hpp>
5151
#include <iostream>

‎rtt/ConnPolicy.hpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,9 @@
4141

4242
#include <string>
4343
#include <iosfwd>
44-
#include "rtt-fwd.hpp"
45-
#include "rtt-config.h"
46-
#include "BufferPolicy.hpp"
44+
#include "rtt/rtt-fwd.hpp"
45+
#include "rtt/rtt-config.h"
46+
#include "rtt/BufferPolicy.hpp"
4747

4848
namespace RTT {
4949

‎rtt/DataFlowInterface.cpp

+4-4
Original file line numberDiff line numberDiff line change
@@ -36,10 +36,10 @@
3636
***************************************************************************/
3737

3838

39-
#include "DataFlowInterface.hpp"
40-
#include "Logger.hpp"
41-
#include "Service.hpp"
42-
#include "TaskContext.hpp"
39+
#include "rtt/DataFlowInterface.hpp"
40+
#include "rtt/Logger.hpp"
41+
#include "rtt/Service.hpp"
42+
#include "rtt/TaskContext.hpp"
4343

4444
namespace RTT
4545
{

‎rtt/DataFlowInterface.hpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -42,9 +42,9 @@
4242
#include <vector>
4343
#include <map>
4444
#include <string>
45-
#include "base/InputPortInterface.hpp"
46-
#include "base/OutputPortInterface.hpp"
47-
#include "rtt-fwd.hpp"
45+
#include "rtt/base/InputPortInterface.hpp"
46+
#include "rtt/base/OutputPortInterface.hpp"
47+
#include "rtt/rtt-fwd.hpp"
4848
#include <boost/function.hpp>
4949

5050
namespace RTT

‎rtt/ExecutionEngine.cpp

+10-10
Original file line numberDiff line numberDiff line change
@@ -37,16 +37,16 @@
3737

3838

3939

40-
#include "Logger.hpp"
41-
#include "ExecutionEngine.hpp"
42-
#include "base/TaskCore.hpp"
43-
#include "rtt-fwd.hpp"
44-
#include "os/MutexLock.hpp"
45-
#include "internal/MWSRQueue.hpp"
46-
#include "TaskContext.hpp"
47-
#include "internal/CatchConfig.hpp"
48-
#include "extras/SlaveActivity.hpp"
49-
#include "os/traces.h"
40+
#include "rtt/Logger.hpp"
41+
#include "rtt/ExecutionEngine.hpp"
42+
#include "rtt/base/TaskCore.hpp"
43+
#include "rtt/rtt-fwd.hpp"
44+
#include "rtt/os/MutexLock.hpp"
45+
#include "rtt/internal/MWSRQueue.hpp"
46+
#include "rtt/TaskContext.hpp"
47+
#include "rtt/internal/CatchConfig.hpp"
48+
#include "rtt/extras/SlaveActivity.hpp"
49+
#include "rtt/os/traces.h"
5050

5151
#include <boost/bind.hpp>
5252
#include <algorithm>

‎rtt/ExecutionEngine.hpp

+10-10
Original file line numberDiff line numberDiff line change
@@ -39,19 +39,19 @@
3939
#ifndef ORO_EXECUTION_ENGINE_HPP
4040
#define ORO_EXECUTION_ENGINE_HPP
4141

42-
#include "os/Mutex.hpp"
43-
#include "os/MutexLock.hpp"
44-
#include "os/Condition.hpp"
45-
#include "base/RunnableInterface.hpp"
46-
#include "base/ActivityInterface.hpp"
47-
#include "base/DisposableInterface.hpp"
48-
#include "base/ExecutableInterface.hpp"
49-
#include "internal/List.hpp"
42+
#include "rtt/os/Mutex.hpp"
43+
#include "rtt/os/MutexLock.hpp"
44+
#include "rtt/os/Condition.hpp"
45+
#include "rtt/base/RunnableInterface.hpp"
46+
#include "rtt/base/ActivityInterface.hpp"
47+
#include "rtt/base/DisposableInterface.hpp"
48+
#include "rtt/base/ExecutableInterface.hpp"
49+
#include "rtt/internal/List.hpp"
5050
#include <vector>
5151
#include <boost/function.hpp>
5252

53-
#include "rtt-config.h"
54-
#include "internal/rtt-internal-fwd.hpp"
53+
#include "rtt/rtt-config.h"
54+
#include "rtt/internal/rtt-internal-fwd.hpp"
5555

5656
namespace RTT
5757
{

‎rtt/FactoryExceptions.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
***************************************************************************/
3737

3838

39-
#include "FactoryExceptions.hpp"
39+
#include "rtt/FactoryExceptions.hpp"
4040
#include <sstream>
4141

4242
namespace RTT {

‎rtt/FactoryExceptions.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040

4141
#include <string>
4242
#include <exception>
43-
#include "rtt-config.h"
43+
#include "rtt/rtt-config.h"
4444

4545
/**
4646
* \file FactoryExceptions.hpp This file contains some structs that can be thrown by both

‎rtt/FlowStatus.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
***************************************************************************/
3737

3838

39-
#include "FlowStatus.hpp"
39+
#include "rtt/FlowStatus.hpp"
4040
#include <string>
4141

4242
using namespace std;

‎rtt/FlowStatus.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
#include <ostream>
4343
#include <istream>
4444

45-
#include "rtt-config.h"
45+
#include "rtt/rtt-config.h"
4646

4747
namespace RTT {
4848
/**

‎rtt/Handle.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,8 @@
3636
***************************************************************************/
3737

3838

39-
#include "Handle.hpp"
40-
#include "rtt-fwd.hpp"
39+
#include "rtt/Handle.hpp"
40+
#include "rtt/rtt-fwd.hpp"
4141

4242

4343
namespace RTT {

‎rtt/Handle.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
#ifndef ORO_CORELIB_SIGNAL_HANDLE_HPP
4040
#define ORO_CORELIB_SIGNAL_HANDLE_HPP
4141

42-
#include "internal/SignalBase.hpp"
42+
#include "rtt/internal/SignalBase.hpp"
4343

4444
namespace RTT
4545
{

‎rtt/InputPort.hpp

+6-6
Original file line numberDiff line numberDiff line change
@@ -39,13 +39,13 @@
3939
#ifndef ORO_INPUT_PORT_HPP
4040
#define ORO_INPUT_PORT_HPP
4141

42-
#include "base/InputPortInterface.hpp"
43-
#include "internal/Channels.hpp"
44-
#include "internal/InputPortSource.hpp"
45-
#include "Service.hpp"
46-
#include "OperationCaller.hpp"
42+
#include "rtt/base/InputPortInterface.hpp"
43+
#include "rtt/internal/Channels.hpp"
44+
#include "rtt/internal/InputPortSource.hpp"
45+
#include "rtt/Service.hpp"
46+
#include "rtt/OperationCaller.hpp"
4747

48-
#include "OutputPort.hpp"
48+
#include "rtt/OutputPort.hpp"
4949

5050
namespace RTT
5151
{

‎rtt/Logger.cpp

+8-8
Original file line numberDiff line numberDiff line change
@@ -37,12 +37,12 @@
3737

3838
// to retrieve RTAI version, if any.
3939
//#define OROBLD_OS_LXRT_INTERNAL
40-
#include "os/StartStopManager.hpp"
41-
#include "os/MutexLock.hpp"
42-
#include "os/Mutex.hpp"
43-
#include "os/TimeService.hpp"
40+
#include "rtt/os/StartStopManager.hpp"
41+
#include "rtt/os/MutexLock.hpp"
42+
#include "rtt/os/Mutex.hpp"
43+
#include "rtt/os/TimeService.hpp"
4444

45-
#include "Logger.hpp"
45+
#include "rtt/Logger.hpp"
4646
#include <iomanip>
4747

4848
#ifdef OROSEM_PRINTF_LOGGING
@@ -57,13 +57,13 @@
5757
# endif
5858
# endif
5959
# ifdef OROSEM_REMOTE_LOGGING
60-
# include "base/BufferLockFree.hpp"
60+
#include "rtt/base/BufferLockFree.hpp"
6161
# endif
6262
#endif
6363

6464
#include <stdlib.h>
65-
#include "rtt-config.h"
66-
#include "rtt-fwd.hpp"
65+
#include "rtt/rtt-config.h"
66+
#include "rtt/rtt-fwd.hpp"
6767

6868
namespace RTT
6969
{

0 commit comments

Comments
 (0)