update cpp header location in #include directive

for fullfile in $(cd include/; find gmapping/ -type f -print); do headerfile=$(basename $fullfile); echo $fullfile; for targetfile in $(find . -type f -not -path "*/.git/*" -print); do sed -i "s@$[\"<]$$headerfile$[>\"]$@\1$fullfile\2@g" $targetfile | grep $headerfile; done; done for fullfile in $(cd include/; find gmapping/ -type f -print); do headerfile=$(basename $fullfile); for targetfile in $(find . -type f -not -path "*/.git/*" -print); do sed -i "s@$[\"<]$[a-z0-9_/]*/$headerfile$[>\"]$@\1$fullfile\2@g" $targetfile | grep $headerfile; done; done
ros-perception · Mar 18, 2019 · a40d6f1 · a40d6f1
1 parent 66586ec
commit a40d6f1
Show file tree

Hide file tree

Showing 88 changed files with 175 additions and 175 deletions.
diff --git a/carmenwrapper/carmenwrapper.cpp b/carmenwrapper/carmenwrapper.cpp
@@ -21,7 +21,7 @@
  *****************************************************************/
 
 
-#include "carmenwrapper.h"
+#include "gmapping/carmenwrapper/carmenwrapper.h"
 
 using namespace GMapping;
 using namespace std;

diff --git a/configfile/configfile.cpp b/configfile/configfile.cpp
@@ -22,7 +22,7 @@
 
 
 #include <cstdlib>
-#include "configfile.h"
+#include "gmapping/configfile/configfile.h"
 
 #include <fstream>
 #include <iostream>

diff --git a/configfile/configfile_test.cpp b/configfile/configfile_test.cpp
@@ -23,7 +23,7 @@
 
 #include <cstdlib>
 #include <iostream>
-#include "configfile.h"
+#include "gmapping/configfile/configfile.h"
 
 using namespace std;
 using namespace GMapping;

diff --git a/gfs-carmen/gfs-carmen.cpp b/gfs-carmen/gfs-carmen.cpp
@@ -21,11 +21,11 @@
  *****************************************************************/
 
 
-#include <utils/commandline.h>
-#include <carmenwrapper/carmenwrapper.h>
-#include <gridfastslam/gridslamprocessor.h>
-#include <utils/orientedboundingbox.h>
-#include <configfile/configfile.h>
+#include <gmapping/utils/commandline.h>
+#include <gmapping/carmenwrapper/carmenwrapper.h>
+#include <gmapping/gridfastslam/gridslamprocessor.h>
+#include <gmapping/utils/orientedboundingbox.h>
+#include <gmapping/configfile/configfile.h>
 
 #define DEBUG cout << __PRETTY_FUNCTION__
 

diff --git a/grid/graphmap.cpp b/grid/graphmap.cpp
@@ -1,9 +1,9 @@
 #ifndef GRAPHMAP_H
 #define GRAPHMAP_H
 #include <list>
-#include <utils/point.h>
+#include <gmapping/utils/point.h>
 #include <utils/graph.h>
-#include <grid/map.h>
+#include <gmapping/grid/map.h>
 
 namespace GMapping {
 

diff --git a/grid/map_test.cpp b/grid/map_test.cpp
@@ -1,6 +1,6 @@
 #include <iostream>
-#include "map.h"
-#include "harray2d.h"
+#include "gmapping/grid/map.h"
+#include "gmapping/grid/harray2d.h"
 
 using namespace std;
 using namespace GMapping;

diff --git a/gridfastslam/gfs2log.cpp b/gridfastslam/gfs2log.cpp
@@ -4,8 +4,8 @@
 #include <sstream>
 #include <vector>
 #include <list>
-#include <utils/point.h>
-#include "gfsreader.h"
+#include <gmapping/utils/point.h>
+#include "gmapping/gridfastslam/gfsreader.h"
 
 #define MAX_LINE_LENGHT (1000000)
 

diff --git a/gridfastslam/gfs2rec.cpp b/gridfastslam/gfs2rec.cpp
@@ -4,7 +4,7 @@
 #include <sstream>
 #include <vector>
 #include <list>
-#include <utils/point.h>
+#include <gmapping/utils/point.h>
 
 #define MAX_LINE_LENGHT (1000000)
 

diff --git a/gridfastslam/gfs2stat.cpp b/gridfastslam/gfs2stat.cpp
@@ -1,8 +1,8 @@
-#include <utils/stat.h>
-#include <particlefilter/particlefilter.h>
+#include <gmapping/utils/stat.h>
+#include <gmapping/particlefilter/particlefilter.h>
 #include <iostream>
 #include <fstream>
-#include "gfsreader.h"
+#include "gmapping/gridfastslam/gfsreader.h"
 
 using namespace std;
 using namespace GMapping;

diff --git a/gridfastslam/gfs2stream.cpp b/gridfastslam/gfs2stream.cpp
@@ -3,9 +3,9 @@
 #include <sstream>
 #include <vector>
 #include <list>
-#include <utils/point.h>
-#include <utils/commandline.h>
-#include "gfsreader.h"
+#include <gmapping/utils/point.h>
+#include <gmapping/utils/commandline.h>
+#include "gmapping/gridfastslam/gfsreader.h"
 #define MAX_LINE_LENGHT (1000000)
 
 using namespace std;

diff --git a/gridfastslam/gfsreader.cpp b/gridfastslam/gfsreader.cpp
@@ -1,5 +1,5 @@
 #include <cstring>
-#include "gfsreader.h"
+#include "gmapping/gridfastslam/gfsreader.h"
 #include <iomanip>
 #include <limits>
 

diff --git a/gridfastslam/gridslamprocessor.cpp b/gridfastslam/gridslamprocessor.cpp
@@ -5,8 +5,8 @@
 #include <set>
 #include <fstream>
 #include <iomanip>
-#include <utils/stat.h>
-#include "gridslamprocessor.h"
+#include <gmapping/utils/stat.h>
+#include "gmapping/gridfastslam/gridslamprocessor.h"
 
 //#define MAP_CONSISTENCY_CHECK
 //#define GENERATE_TRAJECTORIES

diff --git a/gridfastslam/gridslamprocessor_tree.cpp b/gridfastslam/gridslamprocessor_tree.cpp
@@ -6,8 +6,8 @@
 #include <fstream>
 //#include <gsl/gsl_blas.h>
 
-#include <utils/stat.h>
-#include "gridslamprocessor.h"
+#include <gmapping/utils/stat.h>
+#include "gmapping/gridfastslam/gridslamprocessor.h"
 
 namespace GMapping {
 

diff --git a/gridfastslam/motionmodel.cpp b/gridfastslam/motionmodel.cpp
@@ -1,5 +1,5 @@
-#include "motionmodel.h"
-#include <utils/stat.h>
+#include "gmapping/gridfastslam/motionmodel.h"
+#include <gmapping/utils/stat.h>
 #include <iostream>
 
 #define MotionModelConditioningLinearCovariance 0.01

diff --git a/gui/gfs2img.cpp b/gui/gfs2img.cpp
@@ -1,12 +1,12 @@
 #include <cstdlib>
 #include <limits.h>
-#include <scanmatcher/scanmatcher.h>
-#include <gridfastslam/gfsreader.h>
+#include <gmapping/scanmatcher/scanmatcher.h>
+#include <gmapping/gridfastslam/gfsreader.h>
 #include <qpixmap.h>
 #include <qpainter.h>
 #include <qimage.h>
 #include <qapplication.h>
-#include <utils/commandline.h>
+#include <gmapping/utils/commandline.h>
 
 #define MAX_LASER_BEAMS 1024
 #define MAX_FILENAME 1024

diff --git a/gui/gfs_logplayer.cpp b/gui/gfs_logplayer.cpp
@@ -22,7 +22,7 @@
 
 
 #include <qapplication.h>
-#include "qparticleviewer.h"
+#include "gmapping/gui/qparticleviewer.h"
 
 int  main (int argc, char ** argv){
 	QApplication app(argc, argv);

diff --git a/gui/gfs_nogui.cpp b/gui/gfs_nogui.cpp
@@ -22,7 +22,7 @@
 
 
 #include <unistd.h>
-#include "gsp_thread.h"
+#include "gmapping/gui/gsp_thread.h"
 
 using namespace GMapping;
 

diff --git a/gui/gfs_simplegui.cpp b/gui/gfs_simplegui.cpp
@@ -21,8 +21,8 @@
  *****************************************************************/
 
 
-#include "qparticleviewer.h"
-#include "qgraphpainter.h"
+#include "gmapping/gui/qparticleviewer.h"
+#include "gmapping/gui/qgraphpainter.h"
 #include <qapplication.h>
 #include <qframe.h>
 #include <qlabel.h>

diff --git a/gui/gsp_thread.cpp b/gui/gsp_thread.cpp
@@ -21,13 +21,13 @@
  *****************************************************************/
 
 
-#include "gsp_thread.h"
-#include <utils/commandline.h>
-#include <utils/stat.h>
-#include <configfile/configfile.h>
+#include "gmapping/gui/gsp_thread.h"
+#include <gmapping/utils/commandline.h>
+#include <gmapping/utils/stat.h>
+#include <gmapping/configfile/configfile.h>
 
 #ifdef CARMEN_SUPPORT
-	#include <carmenwrapper/carmenwrapper.h>
+	#include <gmapping/carmenwrapper/carmenwrapper.h>
 #endif
 
 #define DEBUG cout << __PRETTY_FUNCTION__

diff --git a/gui/qgraphpainter.cpp b/gui/qgraphpainter.cpp
@@ -22,7 +22,7 @@
 
 
 #include <iostream>
-#include "qgraphpainter.h"
+#include "gmapping/gui/qgraphpainter.h"
 #include "moc_qgraphpainter.cpp"
 using namespace std;
 

diff --git a/gui/qmappainter.cpp b/gui/qmappainter.cpp
@@ -1,4 +1,4 @@
-#include "qmappainter.h"
+#include "gmapping/gui/qmappainter.h"
 #include "moc_qmappainter.cpp"
 
 QMapPainter::QMapPainter( QWidget * parent, const char * name, WFlags f):

diff --git a/gui/qnavigatorwidget.cpp b/gui/qnavigatorwidget.cpp
@@ -1,4 +1,4 @@
-#include "qnavigatorwidget.h"
+#include "gmapping/gui/qnavigatorwidget.h"
 #include <stdio.h>
 using namespace GMapping;
 

diff --git a/gui/qparticleviewer.cpp b/gui/qparticleviewer.cpp
@@ -21,7 +21,7 @@
  *****************************************************************/
 
 
-#include "qparticleviewer.h"
+#include "gmapping/gui/qparticleviewer.h"
 #include "moc_qparticleviewer.cpp"
 #include <qimage.h>
 

diff --git a/gui/qpixmapdumper.cpp b/gui/qpixmapdumper.cpp
@@ -1,4 +1,4 @@
-#include "qpixmapdumper.h"
+#include "gmapping/gui/qpixmapdumper.h"
 #include <cstdio>
 #include <cstring>
 

diff --git a/gui/qslamandnavwidget.cpp b/gui/qslamandnavwidget.cpp
@@ -1,4 +1,4 @@
-#include "qslamandnavwidget.h"
+#include "gmapping/gui/qslamandnavwidget.h"
 #include <stdio.h>
 using namespace GMapping;
 

diff --git a/include/gmapping/carmenwrapper/carmenwrapper.h b/include/gmapping/carmenwrapper/carmenwrapper.h
@@ -30,12 +30,12 @@
 #include <semaphore.h>
 #include <carmen/carmen.h>
 #include <carmen/global.h>
-#include <sensor/sensor_base/sensor.h>
-#include <log/carmenconfiguration.h>
-#include <log/sensorstream.h>
-#include <log/sensorlog.h>
-#include <sensor/sensor_range/rangesensor.h>
-#include <sensor/sensor_range/rangereading.h>
+#include <gmapping/sensor/sensor_base/sensor.h>
+#include <gmapping/log/carmenconfiguration.h>
+#include <gmapping/log/sensorstream.h>
+#include <gmapping/log/sensorlog.h>
+#include <gmapping/sensor/sensor_range/rangesensor.h>
+#include <gmapping/sensor/sensor_range/rangereading.h>
 
 namespace GMapping{
 

diff --git a/include/gmapping/grid/array2d.h b/include/gmapping/grid/array2d.h
@@ -2,8 +2,8 @@
 #define ARRAY2D_H
 
 #include <assert.h>
-#include <utils/point.h>
-#include "accessstate.h"
+#include <gmapping/utils/point.h>
+#include "gmapping/grid/accessstate.h"
 
 #include <iostream>
 

diff --git a/include/gmapping/grid/harray2d.h b/include/gmapping/grid/harray2d.h
@@ -1,9 +1,9 @@
 #ifndef HARRAY2D_H
 #define HARRAY2D_H
 #include <set>
-#include <utils/point.h>
-#include <utils/autoptr.h>
-#include "array2d.h"
+#include <gmapping/utils/point.h>
+#include <gmapping/utils/autoptr.h>
+#include "gmapping/grid/array2d.h"
 
 namespace GMapping {
 

diff --git a/include/gmapping/grid/map.h b/include/gmapping/grid/map.h
@@ -1,9 +1,9 @@
 #ifndef MAP_H
 #define MAP_H
-#include <utils/point.h>
+#include <gmapping/utils/point.h>
 #include <assert.h>
-#include "accessstate.h"
-#include "array2d.h"
+#include "gmapping/grid/accessstate.h"
+#include "gmapping/grid/array2d.h"
 
 namespace GMapping {
 /**

diff --git a/include/gmapping/gridfastslam/gfsreader.h b/include/gmapping/gridfastslam/gfsreader.h
@@ -6,7 +6,7 @@
 #include <sstream>
 #include <vector>
 #include <list>
-#include <utils/point.h>
+#include <gmapping/utils/point.h>
 
 #define MAX_LINE_LENGHT (1000000)
 

diff --git a/include/gmapping/gridfastslam/gridslamprocessor.h b/include/gmapping/gridfastslam/gridslamprocessor.h
@@ -6,14 +6,14 @@
 #include <fstream>
 #include <vector>
 #include <deque>
-#include <particlefilter/particlefilter.h>
-#include <utils/point.h>
-#include <utils/macro_params.h>
-#include <log/sensorlog.h>
-#include <sensor/sensor_range/rangesensor.h>
-#include <sensor/sensor_range/rangereading.h>
-#include <scanmatcher/scanmatcher.h>
-#include "motionmodel.h"
+#include <gmapping/particlefilter/particlefilter.h>
+#include <gmapping/utils/point.h>
+#include <gmapping/utils/macro_params.h>
+#include <gmapping/log/sensorlog.h>
+#include <gmapping/sensor/sensor_range/rangesensor.h>
+#include <gmapping/sensor/sensor_range/rangereading.h>
+#include <gmapping/scanmatcher/scanmatcher.h>
+#include "gmapping/gridfastslam/motionmodel.h"
 
 
 namespace GMapping {
@@ -328,7 +328,7 @@ namespace GMapping {
 typedef std::multimap<const GridSlamProcessor::TNode*, GridSlamProcessor::TNode*> TNodeMultimap;
 
 
-#include "gridslamprocessor.hxx"
+#include "gmapping/gridfastslam/gridslamprocessor.hxx"
 
 };
 

diff --git a/include/gmapping/gridfastslam/motionmodel.h b/include/gmapping/gridfastslam/motionmodel.h
@@ -1,9 +1,9 @@
 #ifndef MOTIONMODEL_H
 #define MOTIONMODEL_H
 
-#include <utils/point.h>
-#include <utils/stat.h>
-#include <utils/macro_params.h>
+#include <gmapping/utils/point.h>
+#include <gmapping/utils/stat.h>
+#include <gmapping/utils/macro_params.h>
 
 namespace  GMapping { 
 

diff --git a/include/gmapping/gui/gsp_thread.h b/include/gmapping/gui/gsp_thread.h
@@ -29,9 +29,9 @@
 #include <deque>
 #include <fstream>
 #include <iostream>
-#include <log/carmenconfiguration.h>
-#include <log/sensorstream.h>
-#include <gridfastslam/gridslamprocessor.h>
+#include <gmapping/log/carmenconfiguration.h>
+#include <gmapping/log/sensorstream.h>
+#include <gmapping/gridfastslam/gridslamprocessor.h>
 
 using namespace std;
 using namespace GMapping;

diff --git a/include/gmapping/gui/qgraphpainter.h b/include/gmapping/gui/qgraphpainter.h
@@ -30,7 +30,7 @@
 #include <qwidget.h>
 #include <qwmatrix.h>
 #include <deque>
-#include <utils/gvalues.h>
+#include <gmapping/utils/gvalues.h>
 
 typedef std::deque<double> DoubleDeque;
 

diff --git a/include/gmapping/gui/qmappainter.h b/include/gmapping/gui/qmappainter.h
@@ -5,8 +5,8 @@
 #include <qpixmap.h>
 #include <qstring.h>
 #include <qwidget.h>
-#include <utils/gvalues.h>
-#include <utils/point.h>
+#include <gmapping/utils/gvalues.h>
+#include <gmapping/utils/point.h>
 
 class QMapPainter :  public QWidget{
 	public: