Commit 81da0129 authored by Laurent Montel's avatar Laurent Montel 😁

Make it compiles against qt5.14

parent 9349390c
......@@ -24,7 +24,7 @@
#include <QObject>
#include <QVarLengthArray>
#include <QTime> // IDW testing
#include <QElapsedTimer> // IDW testing
class KGrTimer;
class KGrLevelGrid;
......@@ -466,7 +466,7 @@ private:
void showEnemyState (int); // Show enemy's co-ordinates and state.
/// TODO - Remove these ...
QTime t; // IDW testing
QElapsedTimer t; // IDW testing
int T; // IDW testing
};
......
......@@ -21,7 +21,7 @@
#include "kgrglobals.h"
#include <QObject>
#include <QTime> // IDW
#include <QElapsedTimer> // IDW
class KGrLevelPlayer;
class KGrLevelGrid;
......@@ -136,7 +136,7 @@ protected:
bool leftRightSearch; // KGoldrunner-rules enemy search-mode.
QTime t; // IDW
QElapsedTimer t; // IDW
};
......
......@@ -21,7 +21,7 @@
#include <QObject>
#include <QVector>
#include <QTime>
#include <QElapsedTimer>
#include <KgSound>
......@@ -94,7 +94,7 @@ private:
QVector<KgSound *> sounds;
QVector<int> startTime; // Start times of timed sounds, else 0.
bool muted;
QTime t;
QElapsedTimer t;
};
#endif // KGRSOUNDS_H
......@@ -22,7 +22,6 @@
KGrTimer::KGrTimer (QObject * parent, int pTickTime, float pScale)
:
QObject (parent),
t (QTime()),
ticker (new QTimer (parent)),
tickTime (pTickTime),
tickCount (0),
......
......@@ -18,7 +18,7 @@
#ifndef KGRTIMER_H
#define KGRTIMER_H
#include <QTime>
#include <QElapsedTimer>
#include <QTimer>
class KGrTimer : public QObject
......@@ -59,7 +59,7 @@ private Q_SLOTS:
void internalSlot();
private:
QTime t;
QElapsedTimer t;
QTimer * ticker;
int tickTime;
int scaledTime;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment