From 567b7f10405b8373dbae816a4952edac7f854e6a Mon Sep 17 00:00:00 2001 From: Philippe Renon Date: Sun, 27 Mar 2016 01:35:07 +0100 Subject: [PATCH] LP-29 move all utility classes to utils dir --- .../osgearth/osgQtQuick/OSGGeoTransformNode.cpp | 2 +- .../libs/osgearth/osgQtQuick/OSGShapeNode.cpp | 2 +- .../src/libs/osgearth/osgQtQuick/OSGTextNode.cpp | 2 +- .../src/libs/osgearth/osgQtQuick/OSGViewport.cpp | 4 ++-- .../osgQtQuick/ga/OSGGeoTransformManipulator.cpp | 2 +- ground/gcs/src/libs/osgearth/osgearth.cpp | 4 ++-- ground/gcs/src/libs/osgearth/osgearth.pro | 16 ++++++++-------- .../osgearth/{ => utils}/qtwindowingsystem.cpp | 0 .../osgearth/{ => utils}/qtwindowingsystem.h | 0 .../src/libs/osgearth/{ => utils}/shapeutils.cpp | 2 +- .../src/libs/osgearth/{ => utils}/shapeutils.h | 0 .../src/libs/osgearth/{ => utils}/utility.cpp | 2 +- .../gcs/src/libs/osgearth/{ => utils}/utility.h | 0 13 files changed, 18 insertions(+), 18 deletions(-) rename ground/gcs/src/libs/osgearth/{ => utils}/qtwindowingsystem.cpp (100%) rename ground/gcs/src/libs/osgearth/{ => utils}/qtwindowingsystem.h (100%) rename ground/gcs/src/libs/osgearth/{ => utils}/shapeutils.cpp (99%) rename ground/gcs/src/libs/osgearth/{ => utils}/shapeutils.h (100%) rename ground/gcs/src/libs/osgearth/{ => utils}/utility.cpp (99%) rename ground/gcs/src/libs/osgearth/{ => utils}/utility.h (100%) diff --git a/ground/gcs/src/libs/osgearth/osgQtQuick/OSGGeoTransformNode.cpp b/ground/gcs/src/libs/osgearth/osgQtQuick/OSGGeoTransformNode.cpp index e6f6b6f64..5e840f933 100644 --- a/ground/gcs/src/libs/osgearth/osgQtQuick/OSGGeoTransformNode.cpp +++ b/ground/gcs/src/libs/osgearth/osgQtQuick/OSGGeoTransformNode.cpp @@ -27,7 +27,7 @@ #include "OSGGeoTransformNode.hpp" -#include "../utility.h" +#include "utils/utility.h" #include diff --git a/ground/gcs/src/libs/osgearth/osgQtQuick/OSGShapeNode.cpp b/ground/gcs/src/libs/osgearth/osgQtQuick/OSGShapeNode.cpp index 829cf0966..7cbacb755 100644 --- a/ground/gcs/src/libs/osgearth/osgQtQuick/OSGShapeNode.cpp +++ b/ground/gcs/src/libs/osgearth/osgQtQuick/OSGShapeNode.cpp @@ -27,7 +27,7 @@ #include "OSGShapeNode.hpp" -#include "../shapeutils.h" +#include "utils/shapeutils.h" #include #include diff --git a/ground/gcs/src/libs/osgearth/osgQtQuick/OSGTextNode.cpp b/ground/gcs/src/libs/osgearth/osgQtQuick/OSGTextNode.cpp index d4aefccdb..daf2c430a 100644 --- a/ground/gcs/src/libs/osgearth/osgQtQuick/OSGTextNode.cpp +++ b/ground/gcs/src/libs/osgearth/osgQtQuick/OSGTextNode.cpp @@ -27,7 +27,7 @@ #include "OSGTextNode.hpp" -#include "../utility.h" +#include "utils/utility.h" #include #include diff --git a/ground/gcs/src/libs/osgearth/osgQtQuick/OSGViewport.cpp b/ground/gcs/src/libs/osgearth/osgQtQuick/OSGViewport.cpp index da7d6e32c..bb8cd675a 100644 --- a/ground/gcs/src/libs/osgearth/osgQtQuick/OSGViewport.cpp +++ b/ground/gcs/src/libs/osgearth/osgQtQuick/OSGViewport.cpp @@ -27,8 +27,8 @@ #include "OSGViewport.hpp" -#include "../osgearth.h" -#include "../utility.h" +#include "osgearth.h" +#include "utils/utility.h" #include "OSGNode.hpp" #include "OSGCamera.hpp" diff --git a/ground/gcs/src/libs/osgearth/osgQtQuick/ga/OSGGeoTransformManipulator.cpp b/ground/gcs/src/libs/osgearth/osgQtQuick/ga/OSGGeoTransformManipulator.cpp index 7c6eefdb9..596303200 100644 --- a/ground/gcs/src/libs/osgearth/osgQtQuick/ga/OSGGeoTransformManipulator.cpp +++ b/ground/gcs/src/libs/osgearth/osgQtQuick/ga/OSGGeoTransformManipulator.cpp @@ -28,7 +28,7 @@ #include "OSGGeoTransformManipulator.hpp" #include "../OSGNode.hpp" -#include "../../utility.h" +#include "utils/utility.h" #include #include diff --git a/ground/gcs/src/libs/osgearth/osgearth.cpp b/ground/gcs/src/libs/osgearth/osgearth.cpp index 18062c685..f085f0dac 100644 --- a/ground/gcs/src/libs/osgearth/osgearth.cpp +++ b/ground/gcs/src/libs/osgearth/osgearth.cpp @@ -27,8 +27,8 @@ #include "osgearth.h" -#include "utility.h" -#include "qtwindowingsystem.h" +#include "utils/utility.h" +#include "utils/qtwindowingsystem.h" #include "utils/pathutils.h" diff --git a/ground/gcs/src/libs/osgearth/osgearth.pro b/ground/gcs/src/libs/osgearth/osgearth.pro index 7b0fbd989..8780eafd2 100644 --- a/ground/gcs/src/libs/osgearth/osgearth.pro +++ b/ground/gcs/src/libs/osgearth/osgearth.pro @@ -35,16 +35,16 @@ QMAKE_CXXFLAGS += -Wno-unused-parameter HEADERS += \ osgearth_global.h \ - utility.h \ - shapeutils.h \ - qtwindowingsystem.h \ - osgearth.h + osgearth.h \ + utils/qtwindowingsystem.h \ + utils/utility.h \ + utils/shapeutils.h SOURCES += \ - utility.cpp \ - shapeutils.cpp \ - qtwindowingsystem.cpp \ - osgearth.cpp + osgearth.cpp \ + utils/qtwindowingsystem.cpp \ + utils/utility.cpp \ + utils/shapeutils.cpp HEADERS += \ osgQtQuick/Export.hpp \ diff --git a/ground/gcs/src/libs/osgearth/qtwindowingsystem.cpp b/ground/gcs/src/libs/osgearth/utils/qtwindowingsystem.cpp similarity index 100% rename from ground/gcs/src/libs/osgearth/qtwindowingsystem.cpp rename to ground/gcs/src/libs/osgearth/utils/qtwindowingsystem.cpp diff --git a/ground/gcs/src/libs/osgearth/qtwindowingsystem.h b/ground/gcs/src/libs/osgearth/utils/qtwindowingsystem.h similarity index 100% rename from ground/gcs/src/libs/osgearth/qtwindowingsystem.h rename to ground/gcs/src/libs/osgearth/utils/qtwindowingsystem.h diff --git a/ground/gcs/src/libs/osgearth/shapeutils.cpp b/ground/gcs/src/libs/osgearth/utils/shapeutils.cpp similarity index 99% rename from ground/gcs/src/libs/osgearth/shapeutils.cpp rename to ground/gcs/src/libs/osgearth/utils/shapeutils.cpp index 31fb6aedf..ed3cea5fc 100644 --- a/ground/gcs/src/libs/osgearth/shapeutils.cpp +++ b/ground/gcs/src/libs/osgearth/utils/shapeutils.cpp @@ -1,4 +1,4 @@ -#include "shapeutils.h" +#include "utils/shapeutils.h" #include diff --git a/ground/gcs/src/libs/osgearth/shapeutils.h b/ground/gcs/src/libs/osgearth/utils/shapeutils.h similarity index 100% rename from ground/gcs/src/libs/osgearth/shapeutils.h rename to ground/gcs/src/libs/osgearth/utils/shapeutils.h diff --git a/ground/gcs/src/libs/osgearth/utility.cpp b/ground/gcs/src/libs/osgearth/utils/utility.cpp similarity index 99% rename from ground/gcs/src/libs/osgearth/utility.cpp rename to ground/gcs/src/libs/osgearth/utils/utility.cpp index 5c4414e4c..3f15ecef7 100644 --- a/ground/gcs/src/libs/osgearth/utility.cpp +++ b/ground/gcs/src/libs/osgearth/utils/utility.cpp @@ -25,7 +25,7 @@ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include "utility.h" +#include "utils/utility.h" // osgQtQuick qml types #include "osgQtQuick/OSGNode.hpp" diff --git a/ground/gcs/src/libs/osgearth/utility.h b/ground/gcs/src/libs/osgearth/utils/utility.h similarity index 100% rename from ground/gcs/src/libs/osgearth/utility.h rename to ground/gcs/src/libs/osgearth/utils/utility.h