src/GUI/flowlayout.cpp

@@ -1,4 +1,4 @@
-#include <QWidget>
+#include <QtWidgets>
 #include "flowlayout.h"
 
 struct FlowLayoutItem

src/map/IMG/jls.cpp

@@ -322,7 +322,7 @@ bool JLS::decode(const SubFile *file, SubFile::Handle &hdl, Matrix<qint16> &img)
 		if (!readLine(bs))
 			return false;
 
-		memcpy(img.row(i), _current + 1, _w * sizeof(quint16));
+		memcpy(&img.at(i, 0), _current + 1, _w * sizeof(quint16));
 
 		quint16 *tmp = _last;
 		_last = _current;

src/map/matrix.h

@@ -21,7 +21,6 @@ public:
 	T &at(int n) {return _m[n];}
 	T &at(int i, int j) {return _m[_w * i + j];}
 	T const &at(int i, int j) const {return _m.at(_w * i + j);}
-	T *row(int i) {return &_m[_w * i];}
 
 	bool isNull() const {return (_h == 0 || _w == 0);}
 	int size() const {return _m.size();}

src/map/osm.cpp

@@ -1,5 +1,4 @@
-#include <cmath>
-#include <QtMath>
+#include <QtCore>
 #include "common/wgs84.h"
 #include "osm.h"
 

src/map/wmsmap.cpp

@@ -1,4 +1,4 @@
-#include <QtMath>
+#include <QtCore>
 #include <QDir>
 #include <QPainter>
 #include <QPixmapCache>

src/map/wmtsmap.cpp

@@ -1,4 +1,4 @@
-#include <QtMath>
+#include <QtCore>
 #include <QPainter>
 #include <QDir>
 #include <QPixmapCache>