Adapted new "Utility" prefix.

Author: hmoenck

Src/Model/AreaDescriptor/AreaInfo.cpp

@@ -2,7 +2,7 @@
 
 #include "Rectification.h"
 
-#include "util/misc.h"
+#include "Utility/misc.h"
 #include <qvector.h>
 #include "AreaMemory.h"
 

Src/Model/AreaDescriptor/AreaMemory.cpp

@@ -1,6 +1,6 @@
 #include "AreaMemory.h"
 
-#include "util/misc.h"
+#include "Utility/misc.h"
 #include <qvector.h>
 #include <fstream>
 

Src/Model/AreaDescriptor/Rectification.cpp

@@ -3,7 +3,7 @@
 #include <limits>
 
 #include <opencv2/calib3d/calib3d.hpp>
-#include "util/misc.h"
+#include "Utility/misc.h"
 #include "util/types.h"
 #include "util/Config.h"
 

Src/Model/DataExporters/DataExporterCSV.cpp

@@ -1,6 +1,6 @@
 #include "DataExporterCSV.h"
 #include "util/types.h"
-#include "util/misc.h"
+#include "Utility/misc.h"
 #include <qdebug.h>
 #include <qfile.h>
 #include <qdatetime.h>

Src/Model/DataExporters/DataExporterGeneric.cpp

@@ -1,6 +1,6 @@
 #include "DataExporterGeneric.h"
 #include "util/types.h"
-#include "util/misc.h"
+#include "Utility/misc.h"
 #include <qdebug.h>
 #include <qfile.h>
 #include <qdatetime.h>

Src/Model/DataExporters/DataExporterJson.cpp

@@ -1,6 +1,6 @@
 #include "DataExporterJson.h"
 #include "util/types.h"
-#include "util/misc.h"
+#include "Utility/misc.h"
 #include <qdebug.h>
 #include <qfile.h>
 

Src/Model/DataExporters/DataExporterSerialize.cpp

@@ -1,6 +1,6 @@
 #include "DataExporterSerialize.h"
 #include "util/types.h"
-#include "util/misc.h"
+#include "Utility/misc.h"
 #include <qdebug.h>
 #include <qfile.h>
 

Src/Model/ImageStream.cpp

@@ -8,7 +8,7 @@
 
 #include "util/Exceptions.h"
 #include "QSharedPointer"
-#include "util/misc.h"
+#include "Utility/misc.h"
 #include "View/CameraDevice.h"
 #include "util/VideoCoder.h"
 

Src/Model/MediaPlayer.cpp

@@ -1,5 +1,5 @@
 #include "MediaPlayer.h"
-#include "util/misc.h"
+#include "Utility/misc.h"
 
 
 //Settings related

Src/View/AreaDesciptor/EllipseDescriptor.cpp

@@ -1,6 +1,6 @@
 #include "EllipseDescriptor.h"
 #include "Model/AreaDescriptor/AreaInfoElement.h"
-#include "util/misc.h"
+#include "Utility/misc.h"
 
 #include "QBrush"
 #include "QPainter"
@@ -102,9 +102,9 @@ void EllipseDescriptor::paint(QPainter *painter, const QStyleOptionGraphicsItem
 		init();
 
     //TODO remove hardcoding and code duplication
-    if (_dragVectorId >= 0) {
-        QColor transparentGray = Qt::gray;
-        transparentGray.setAlphaF(0.75);
+    if (_dragVectorId >= 0) {
+        QColor transparentGray = Qt::gray;
+        transparentGray.setAlphaF(0.75);
         painter->setPen(QPen(transparentGray, 1, Qt::SolidLine));
         painter->drawRect(_drag.x(), _drag.y(), 10, 10);