summaryrefslogtreecommitdiff
path: root/src/shared
diff options
context:
space:
mode:
Diffstat (limited to 'src/shared')
-rw-r--r--src/shared/deviceskin/deviceskin.cpp6
-rw-r--r--src/shared/qtgradienteditor/qtcolorline.h2
-rw-r--r--src/shared/qtgradienteditor/qtgradienteditor.cpp2
-rw-r--r--src/shared/qtgradienteditor/qtgradientview.cpp3
-rw-r--r--src/shared/qtgradienteditor/qtgradientwidget.cpp53
-rw-r--r--src/shared/qtpropertybrowser/qteditorfactory.cpp2
-rw-r--r--src/shared/qtpropertybrowser/qttreepropertybrowser.cpp1
-rw-r--r--src/shared/qtpropertybrowser/qttreepropertybrowser.h2
8 files changed, 36 insertions, 35 deletions
diff --git a/src/shared/deviceskin/deviceskin.cpp b/src/shared/deviceskin/deviceskin.cpp
index 603834dc6..b8649b9b3 100644
--- a/src/shared/deviceskin/deviceskin.cpp
+++ b/src/shared/deviceskin/deviceskin.cpp
@@ -50,7 +50,7 @@
#include <QtGui/QImage>
#include <QtCore/QTimer>
#include <QtCore/QDir>
-#include <QtCore/QRegExp>
+#include <QtCore/QRegularExpression>
#include <QtGui/QMouseEvent>
#include <QtCore/QDebug>
@@ -285,12 +285,14 @@ bool DeviceSkinParameters::read(QTextStream &ts, ReadMode rm, QString *errorMess
ts.readLine(); // eol
joystick = -1;
const QString Joystick = QLatin1String("Joystick");
+ const QRegularExpression splitRe(QLatin1String("[ \t][ \t]*"));
+ Q_ASSERT(splitRe.isValid());
while (i < nareas && !ts.atEnd() ) {
buttonAreas.push_back(DeviceSkinButtonArea());
DeviceSkinButtonArea &area = buttonAreas.back();
const QString line = ts.readLine();
if ( !line.isEmpty() && line[0] != QLatin1Char('#') ) {
- const QStringList tok = line.split(QRegExp(QLatin1String("[ \t][ \t]*")));
+ const QStringList tok = line.split(splitRe);
if ( tok.count()<6 ) {
*errorMessage = DeviceSkin::tr("Syntax error in area definition: %1").arg(line);
return false;
diff --git a/src/shared/qtgradienteditor/qtcolorline.h b/src/shared/qtgradienteditor/qtcolorline.h
index 606d0fa84..6d19ed4d9 100644
--- a/src/shared/qtgradienteditor/qtcolorline.h
+++ b/src/shared/qtgradienteditor/qtcolorline.h
@@ -54,7 +54,6 @@ class QtColorLine : public QWidget
Q_PROPERTY(bool backgroundCheckered READ isBackgroundCheckered WRITE setBackgroundCheckered)
Q_PROPERTY(ColorComponent colorComponent READ colorComponent WRITE setColorComponent)
Q_PROPERTY(Qt::Orientation orientation READ orientation WRITE setOrientation)
- Q_ENUMS(ColorComponent)
public:
enum ColorComponent {
@@ -66,6 +65,7 @@ public:
Value,
Alpha
};
+ Q_ENUM(ColorComponent)
QSize minimumSizeHint() const;
QSize sizeHint() const;
diff --git a/src/shared/qtgradienteditor/qtgradienteditor.cpp b/src/shared/qtgradienteditor/qtgradienteditor.cpp
index 25e9fdb2a..57d35b83a 100644
--- a/src/shared/qtgradienteditor/qtgradienteditor.cpp
+++ b/src/shared/qtgradienteditor/qtgradienteditor.cpp
@@ -41,6 +41,8 @@
#include "qtgradientstopscontroller.h"
#include "ui_qtgradienteditor.h"
+#include <QtWidgets/QButtonGroup>
+
QT_BEGIN_NAMESPACE
class QtGradientEditorPrivate
diff --git a/src/shared/qtgradienteditor/qtgradientview.cpp b/src/shared/qtgradienteditor/qtgradientview.cpp
index a0d4790e6..29c33574e 100644
--- a/src/shared/qtgradienteditor/qtgradientview.cpp
+++ b/src/shared/qtgradienteditor/qtgradientview.cpp
@@ -41,9 +41,10 @@
#include "qtgradientmanager.h"
#include "qtgradientdialog.h"
#include "qtgradientutils.h"
+#include <QtGui/QClipboard>
#include <QtGui/QPainter>
+#include <QtWidgets/QAction>
#include <QtWidgets/QMessageBox>
-#include <QtGui/QClipboard>
QT_BEGIN_NAMESPACE
diff --git a/src/shared/qtgradienteditor/qtgradientwidget.cpp b/src/shared/qtgradienteditor/qtgradientwidget.cpp
index 73c448578..24226384a 100644
--- a/src/shared/qtgradienteditor/qtgradientwidget.cpp
+++ b/src/shared/qtgradienteditor/qtgradientwidget.cpp
@@ -49,12 +49,7 @@
#define _USE_MATH_DEFINES
#endif
-
-#include "math.h"
-
-#ifndef M_PI
-#define M_PI 3.14159265358979323846
-#endif
+#include "qmath.h"
QT_BEGIN_NAMESPACE
@@ -343,7 +338,7 @@ void QtGradientWidget::mousePressEvent(QMouseEvent *e)
if (r1.contains(pF) || r2.contains(pF) || r3.contains(pF)) {
x = pF.x() / size().width() - d_ptr->m_centralRadial.x();
y = pF.y() / size().height() - d_ptr->m_centralRadial.y();
- double clickRadius = sqrt(x * x + y * y);
+ const double clickRadius = hypot(x, y);
//d_ptr->m_radiusOffset = d_ptr->m_radiusRadial - clickRadius;
d_ptr->m_radiusFactor = d_ptr->m_radiusRadial / clickRadius;
if (d_ptr->m_radiusFactor == 0)
@@ -382,7 +377,7 @@ void QtGradientWidget::mousePressEvent(QMouseEvent *e)
y = current.y() - central.y();
x /= size().width() / 2;
y /= size().height() / 2;
- double angle = atan2(-y, x) * 180 / M_PI;
+ const double angle = qRadiansToDegrees(atan2(-y, x));
d_ptr->m_angleOffset = d_ptr->m_angleConical - angle;
d_ptr->m_dragAngle = d_ptr->m_angleConical;
@@ -442,7 +437,7 @@ void QtGradientWidget::mouseMoveEvent(QMouseEvent *e)
} else {
x = pF.x() / size().width() - d_ptr->m_centralRadial.x();
y = pF.y() / size().height() - d_ptr->m_centralRadial.y();
- double moveRadius = sqrt(x * x + y * y);
+ const double moveRadius = hypot(x, y);
//double newRadius = moveRadius + d_ptr->m_radiusOffset;
double newRadius = moveRadius * d_ptr->m_radiusFactor;
if (newRadius > 2)
@@ -472,7 +467,7 @@ void QtGradientWidget::mouseMoveEvent(QMouseEvent *e)
x /= size().width() / 2;
y /= size().height() / 2;
- double angle = atan2(-y, x) * 180 / M_PI + d_ptr->m_angleOffset;
+ const double angle = qRadiansToDegrees(atan2(-y, x)) + d_ptr->m_angleOffset;
d_ptr->setAngleConical(angle);
}
}
@@ -619,28 +614,30 @@ void QtGradientWidget::paintEvent(QPaintEvent *e)
p.setBrush(Qt::NoBrush);
int pointCount = 2;
for (int i = 0; i < pointCount; i++) {
- QPointF ang(cos(M_PI * (i * 180.0 / pointCount + d_ptr->m_angleConical) / 180) * size().width() / 2,
- -sin(M_PI * (i * 180.0 / pointCount + d_ptr->m_angleConical) / 180) * size().height() / 2);
- double mod = sqrt(ang.x() * ang.x() + ang.y() * ang.y());
- p.drawLine(QPointF(central.x() + ang.x() * (radius - corr) / mod,
- central.y() + ang.y() * (radius - corr) / mod),
- QPointF(central.x() + ang.x() * (radius + corr) / mod,
- central.y() + ang.y() * (radius + corr) / mod));
- p.drawLine(QPointF(central.x() - ang.x() * (radius - corr) / mod,
- central.y() - ang.y() * (radius - corr) / mod),
- QPointF(central.x() - ang.x() * (radius + corr) / mod,
- central.y() - ang.y() * (radius + corr) / mod));
+ const qreal angle = qDegreesToRadians(i * 180.0 / pointCount + d_ptr->m_angleConical);
+ const QPointF ray(cos(angle) * size().width() / 2,
+ -sin(angle) * size().height() / 2);
+ const double mod = hypot(ray.x(), ray.y());
+ p.drawLine(QPointF(central.x() + ray.x() * (radius - corr) / mod,
+ central.y() + ray.y() * (radius - corr) / mod),
+ QPointF(central.x() + ray.x() * (radius + corr) / mod,
+ central.y() + ray.y() * (radius + corr) / mod));
+ p.drawLine(QPointF(central.x() - ray.x() * (radius - corr) / mod,
+ central.y() - ray.y() * (radius - corr) / mod),
+ QPointF(central.x() - ray.x() * (radius + corr) / mod,
+ central.y() - ray.y() * (radius + corr) / mod));
}
if (d_ptr->m_dragHandle == QtGradientWidgetPrivate::AngleConicalHandle) {
p.save();
p.setPen(dragPen);
- QPointF ang(cos(M_PI * (d_ptr->m_angleConical - d_ptr->m_angleOffset) / 180) * size().width() / 2,
- -sin(M_PI * (d_ptr->m_angleConical - d_ptr->m_angleOffset) / 180) * size().height() / 2);
- double mod = sqrt(ang.x() * ang.x() + ang.y() * ang.y());
- p.drawLine(QPointF(central.x() + ang.x() * (radius - corr) / mod,
- central.y() + ang.y() * (radius - corr) / mod),
- QPointF(central.x() + ang.x() * (radius + corr) / mod,
- central.y() + ang.y() * (radius + corr) / mod));
+ const qreal angle = qDegreesToRadians(d_ptr->m_angleConical - d_ptr->m_angleOffset);
+ const QPointF ray(cos(angle) * size().width() / 2,
+ -sin(angle) * size().height() / 2);
+ const double mod = hypot(ray.x(), ray.y());
+ p.drawLine(QPointF(central.x() + ray.x() * (radius - corr) / mod,
+ central.y() + ray.y() * (radius - corr) / mod),
+ QPointF(central.x() + ray.x() * (radius + corr) / mod,
+ central.y() + ray.y() * (radius + corr) / mod));
p.restore();
}
diff --git a/src/shared/qtpropertybrowser/qteditorfactory.cpp b/src/shared/qtpropertybrowser/qteditorfactory.cpp
index a87449faf..de852a740 100644
--- a/src/shared/qtpropertybrowser/qteditorfactory.cpp
+++ b/src/shared/qtpropertybrowser/qteditorfactory.cpp
@@ -1965,7 +1965,7 @@ public:
QMap<QtProperty *, QtProperty *> m_propertyToEnum;
QMap<QtProperty *, QtProperty *> m_enumToProperty;
- QMap<QtProperty *, QList<QWidget *> > m_enumToEditors;
+ QMap<QtProperty *, QWidgetList > m_enumToEditors;
QMap<QWidget *, QtProperty *> m_editorToEnum;
bool m_updatingEnum;
};
diff --git a/src/shared/qtpropertybrowser/qttreepropertybrowser.cpp b/src/shared/qtpropertybrowser/qttreepropertybrowser.cpp
index 6c1338c77..9bc5e4f21 100644
--- a/src/shared/qtpropertybrowser/qttreepropertybrowser.cpp
+++ b/src/shared/qtpropertybrowser/qttreepropertybrowser.cpp
@@ -402,7 +402,6 @@ static QIcon drawIndicatorIcon(const QPalette &palette, QStyle *style)
QPixmap pix(14, 14);
pix.fill(Qt::transparent);
QStyleOption branchOption;
- QRect r(QPoint(0, 0), pix.size());
branchOption.rect = QRect(2, 2, 9, 9); // ### hardcoded in qcommonstyle.cpp
branchOption.palette = palette;
branchOption.state = QStyle::State_Children;
diff --git a/src/shared/qtpropertybrowser/qttreepropertybrowser.h b/src/shared/qtpropertybrowser/qttreepropertybrowser.h
index a2ea777f6..9ff4d5f50 100644
--- a/src/shared/qtpropertybrowser/qttreepropertybrowser.h
+++ b/src/shared/qtpropertybrowser/qttreepropertybrowser.h
@@ -50,7 +50,6 @@ class QtTreePropertyBrowserPrivate;
class QtTreePropertyBrowser : public QtAbstractPropertyBrowser
{
Q_OBJECT
- Q_ENUMS(ResizeMode)
Q_PROPERTY(int indentation READ indentation WRITE setIndentation)
Q_PROPERTY(bool rootIsDecorated READ rootIsDecorated WRITE setRootIsDecorated)
Q_PROPERTY(bool alternatingRowColors READ alternatingRowColors WRITE setAlternatingRowColors)
@@ -67,6 +66,7 @@ public:
Fixed,
ResizeToContents
};
+ Q_ENUM(ResizeMode)
QtTreePropertyBrowser(QWidget *parent = 0);
~QtTreePropertyBrowser();
View Lorry Controller Status