summaryrefslogtreecommitdiffstats
path: root/statisticsdialog.cpp
diff options
context:
space:
mode:
authorArno <arno@disconnect.de>2022-04-15 13:27:34 +0200
committerArno <arno@disconnect.de>2022-04-15 13:27:34 +0200
commit856119c5a43b4781b051b93a0713c152cfd99f85 (patch)
tree4e2fde4e7a76179cc243e0665091c6ad429ea640 /statisticsdialog.cpp
parent62d3ca1482b202d2883eeb5e17e72300e8612477 (diff)
downloadSheMov-856119c5a43b4781b051b93a0713c152cfd99f85.tar.gz
SheMov-856119c5a43b4781b051b93a0713c152cfd99f85.tar.bz2
SheMov-856119c5a43b4781b051b93a0713c152cfd99f85.zip
Make it run with Qt6
This is a huge commit. Changes: * Obviously, make it compile * Make it run (only scarcely tested) * get rid of most of clang's warnings Let's see what surprises are in store...
Diffstat (limited to 'statisticsdialog.cpp')
-rw-r--r--statisticsdialog.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/statisticsdialog.cpp b/statisticsdialog.cpp
index d533414..ccb513d 100644
--- a/statisticsdialog.cpp
+++ b/statisticsdialog.cpp
@@ -165,7 +165,7 @@ GraphWidget::GraphWidget(const QList<QList<QVariant> > data, const QString heade
//calc max width of data, maxData and total
QFontMetrics fmd = QFontMetrics(mDataFont);
- for(QList<QVariant> d : mData){
+ for(const auto &d : mData){
int width = fmd.size(Qt::TextSingleLine, d.at(0).toString()).width();
if(width > mDescWidth){
mDescWidth = width;
@@ -178,9 +178,9 @@ GraphWidget::GraphWidget(const QList<QList<QVariant> > data, const QString heade
}
//set percentage width
- for(QList<QVariant> d : mData){
+ for(const auto &d : mData){
auto percentage = d.at(1).toDouble() * 100.0 / static_cast<double>(mTotal);
- QString pString = QString("%1 (%2%)").arg(QString::number(d.at(1).toInt())).arg(QString::number(percentage, 'f', 2));
+ QString pString = QString("%1 (%2%)").arg(QString::number(d.at(1).toInt()), QString::number(percentage, 'f', 2));
int width = fmd.size(Qt::TextSingleLine, pString).width();
if(width > mPercentageWidth){
mPercentageWidth = width;
@@ -278,7 +278,7 @@ void GraphWidget::paintEvent(QPaintEvent *event){
opt.setAlignment(Qt::AlignRight | Qt::AlignVCenter);
QTextOption optLeft;
opt.setAlignment(Qt::AlignLeft | Qt::AlignVCenter);
- for(QList<QVariant> l : mData){
+ for(const auto &l : mData){
//draw lead
QRect textRect(0, 0, mDescWidth, mBarHeight);
p.drawText(textRect, l.at(0).toString(), opt);
@@ -297,7 +297,7 @@ void GraphWidget::paintEvent(QPaintEvent *event){
auto pstartx = dataRect.width() + 2 * mMargin + mDescWidth;
QRectF percentageRect(pstartx, 0, mPercentageWidth, 20);
qreal percent = l.at(1).toInt() * 100.0 / static_cast<double>(mTotal);
- QString pString = QString("%1 (%2%)").arg(QString::number(l.at(1).toInt())).arg(QString::number(percent, 'f', 2));
+ QString pString = QString("%1 (%2%)").arg(QString::number(l.at(1).toInt()), QString::number(percent, 'f', 2));
p.drawText(percentageRect, pString, optLeft);
//translate
p.translate(0, mMargin + mBarHeight);