Renamed Time to Timing

because Time.h would clash with standard lib time.h
on case insensitive file systems

src/interface/modeler/ModelerCameras.cpp

@@ -7,7 +7,7 @@
 #include "AtmosphereDefinition.h"
 #include "FloatNode.h"
 #include "AtmosphereRenderer.h"
-#include "Time.h"
+#include "Timing.h"
 
 ModelerCameras::ModelerCameras(MainModelerWindow *parent) : QObject(parent), parent(parent) {
     render = new CameraDefinition();
@@ -69,7 +69,7 @@ void ModelerCameras::startSunTool(unsigned long duration) {
         active = tool;
     }
 
-    tool_auto_end = duration ? (Time::getRelativeTimeMs() + duration) : 0;
+    tool_auto_end = duration ? (Timing::getRelativeTimeMs() + duration) : 0;
 }
 
 void ModelerCameras::endTool() {
@@ -84,7 +84,7 @@ void ModelerCameras::timerEvent(QTimerEvent *) {
         parent->getScenery()->keepCameraAboveGround(current);
         parent->getRenderer()->setCamera(current);
     }
-    if (tool_auto_end > 0 and Time::getRelativeTimeMs() >= tool_auto_end) {
+    if (tool_auto_end > 0 and Timing::getRelativeTimeMs() >= tool_auto_end) {
         endTool();
     }
 }

src/render/software/RenderProgress.cpp

@@ -1,7 +1,7 @@
 #include "RenderProgress.h"
 
 #include "Mutex.h"
-#include "Time.h"
+#include "Timing.h"
 #include "Logs.h"
 
 RenderProgress::RenderProgress(int count) {
@@ -25,7 +25,7 @@ void RenderProgress::reset() {
         subs.pop();
     }
 
-    start_time = Time::getRelativeTimeMs();
+    start_time = Timing::getRelativeTimeMs();
 
     prev_est_spent = 0;
     prev_est_done = 0.0;
@@ -75,14 +75,14 @@ void RenderProgress::end() {
         Logs::error("Software") << subs.size() << " progress subs remaining at the end of render" << endl;
     }
 
-    end_time = Time::getRelativeTimeMs();
+    end_time = Timing::getRelativeTimeMs();
 }
 
 unsigned long RenderProgress::getDuration() const {
     if (end_time) {
         return end_time - start_time;
     } else {
-        return Time::getRelativeTimeMs() - start_time;
+        return Timing::getRelativeTimeMs() - start_time;
     }
 }
 

src/system/Logs.cpp

@@ -1,6 +1,6 @@
 #include "Logs.h"
 
-#include "Time.h"
+#include "Timing.h"
 
 #include <streambuf>
 #include <ostream>
@@ -59,7 +59,7 @@ ostream &Logs::error(const string &logger) {
 }
 
 void Logs::debugTimestamp(const string &logger, const string &message) {
-    debug(logger) << Time::getRelativeTimeMs() << " - " << message << endl;
+    debug(logger) << Timing::getRelativeTimeMs() << " - " << message << endl;
 }
 
 void Logs::disable() {

src/system/Timing.cpp

@@ -1,9 +1,9 @@
-#include "Time.h"
+#include "Timing.h"
 
 #include <QTime>
 
 static QTime EPOCH = QTime::currentTime();
 
-unsigned long Time::getRelativeTimeMs() {
+unsigned long Timing::getRelativeTimeMs() {
     return EPOCH.msecsTo(QTime::currentTime());
 }

src/system/Timing.h

@@ -1,12 +1,15 @@
-#ifndef TIME_H
+#ifndef TIMING_H
-#define TIME_H
+#define TIMING_H
 
 #include "system_global.h"
 
 namespace paysages {
 namespace system {
 
-class SYSTEMSHARED_EXPORT Time {
+/**
+ * Timing tools.
+ */
+class SYSTEMSHARED_EXPORT Timing {
   public:
     /**
      * Get a timestamp in milliseconds.

src/system/system_global.h

@@ -26,7 +26,7 @@ class Thread;
 class Mutex;
 class Semaphore;
 class PictureWriter;
-class Time;
+class Timing;
 class RandomGenerator;
 
 extern SYSTEMSHARED_EXPORT RandomGenerator &RandomGeneratorDefault;