Merge remote-tracking branch 'razor/master'

Razor-qt · Jun 23, 2013 · dd75eec · dd75eec
2 parents 1fe958d + 3877704
commit dd75eec
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/razorqt-config/razor-config-file-associations/busyindicator.cpp b/razorqt-config/razor-config-file-associations/busyindicator.cpp
@@ -43,7 +43,8 @@ BusyIndicator::BusyIndicator(QWidget *busyWidget) : QGraphicsView(busyWidget)
     QTimer *timer = new QTimer(this);
     connect(timer, SIGNAL(timeout()), this, SLOT(update()));
     timer->start(100);
-    startTime = QDateTime::currentMSecsSinceEpoch();
+
+    startTime.start();
     pendingResize = true;
 }
 
@@ -68,8 +69,8 @@ void BusyIndicator::update()
         center = QPointF(size().width()/2, size().height()/2);
         pendingResize = false;
     }
-    long timeGone = QDateTime::currentMSecsSinceEpoch() - startTime;
-    float angle = M_PI*timeGone/1000; // 2 seconds -> full circle
+
+    float angle = M_PI*startTime.elapsed()/1000; // 2 seconds -> full circle
     for (int i = 0; i < numberOfDots; i++)
     {
         moveDot(m_Dots[i], angle);

diff --git a/razorqt-config/razor-config-file-associations/busyindicator.h b/razorqt-config/razor-config-file-associations/busyindicator.h
@@ -11,6 +11,7 @@
 #include <QList>
 #include <QFutureWatcher>
 #include <QGraphicsView>
+#include <QTime>
 
 class QResizeEvent;
 class QGraphicsEllipseItem;
@@ -33,7 +34,7 @@ private slots:
 
     QPointF center;   
 
-    long startTime;
+    QTime startTime;
     bool pendingResize;
 
     QList<QGraphicsEllipseItem*> m_Dots;