LP-29 move all utility classes to utils dir

ground/gcs/src/libs/osgearth/osgQtQuick/OSGGeoTransformNode.cpp

@@ -27,7 +27,7 @@
 
 #include "OSGGeoTransformNode.hpp"
 
-#include "../utility.h"
+#include "utils/utility.h"
 
 #include <osg/ComputeBoundsVisitor>
 

ground/gcs/src/libs/osgearth/osgQtQuick/OSGShapeNode.cpp

@@ -27,7 +27,7 @@
 
 #include "OSGShapeNode.hpp"
 
-#include "../shapeutils.h"
+#include "utils/shapeutils.h"
 
 #include <osg/Geode>
 #include <osg/Group>

ground/gcs/src/libs/osgearth/osgQtQuick/OSGTextNode.cpp

@@ -27,7 +27,7 @@
 
 #include "OSGTextNode.hpp"
 
-#include "../utility.h"
+#include "utils/utility.h"
 
 #include <osgText/Text>
 #include <osg/Geode>

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"

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 <osg/Matrix>
 #include <osg/Node>

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"
 

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 \

ground/gcs/src/libs/osgearth/utils/shapeutils.cpp

@@ -1,4 +1,4 @@
-#include "shapeutils.h"
+#include "utils/shapeutils.h"
 
 #include <math.h>
 

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"