Make StatisticsDialog Clang warning free

1 files changed, 19 insertions, 18 deletions

diff --git a/statisticsdialog.cpp b/statisticsdialog.cpp
index 1862513..d35d8db 100644
--- a/statisticsdialog.cpp
+++ b/statisticsdialog.cpp
@@ -5,17 +5,17 @@
   2 of the License, or (at your option) any later version.
 */
 
-#include <QtWidgets/QTabWidget>
-#include <QtWidgets/QVBoxLayout>
-#include <QtWidgets/QHBoxLayout>
+#include <QTabWidget>
+#include <QVBoxLayout>
+#include <QHBoxLayout>
 #include <QSqlQuery>
 #include <QVariant>
-#include <QtWidgets/QPushButton>
+#include <QPushButton>
 #include <QLocale>
 #include <QFile>
 #include <QFontMetrics>
 #include <QFont>
-#include <QtWidgets/QApplication>
+#include <QApplication>
 #include <QPainter>
 #include <QBrush>
 #include <QPen>
@@ -24,9 +24,9 @@
 #include <QColor>
 #include <QPainterPath>
 #include <QTextOption>
-#include <QtWidgets/QScrollArea>
+#include <QScrollArea>
 #include <QPalette>
-#include <QtWidgets/QLabel>
+#include <QLabel>
 
 class GraphWidget;
 
@@ -62,7 +62,7 @@ StatisticsDialog::StatisticsDialog(QWidget *parent, Qt::WindowFlags f) : SmDialo
 
 	//close button
 	QPushButton *close = new QPushButton(tr("Close"));
-	connect(close, SIGNAL(clicked()), this, SLOT(accept()));
+    connect(close, &QPushButton::clicked, this, &StatisticsDialog::accept);
 	QHBoxLayout *buttonLayout = new QHBoxLayout;
 	buttonLayout->setAlignment(Qt::AlignCenter);
 	buttonLayout->addWidget(close);
@@ -179,7 +179,7 @@ GraphWidget::GraphWidget(const QList<QList<QVariant> > data, const QString heade
 
 	//set percentage width
 	foreach(QList<QVariant> d, mData){
-		qreal percentage = d.at(1).toFloat() * 100.0 / static_cast<float>(mTotal);
+        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));
 		int width = fmd.size(Qt::TextSingleLine, pString).width();
 		if(width > mPercentageWidth){
@@ -193,7 +193,7 @@ GraphWidget::GraphWidget(const QList<QList<QVariant> > data, const QString heade
 
 	//set minimum size
 	setMinimumWidth(300);
-	setMinimumHeight(sizeHint().height());
+    setMinimumHeight(static_cast<int>(sizeHint().height()));
 }
 
 GraphWidget::GraphWidget(const QString &text, const QString header, QWidget *parent): QWidget(parent), mBarHeight(-1), mMargin(20), mHeader(header), mText(text), mIsText(true){
@@ -212,12 +212,13 @@ GraphWidget::GraphWidget(const QString &text, const QString header, QWidget *par
 
 	//set minimum size
 	setMinimumWidth(300);
-	setMinimumHeight(sizeHint().height());
+    setMinimumHeight(static_cast<int>(sizeHint().height()));
 }
 
 QSize GraphWidget::sizeHint() const {
 	if(mIsText){
-		return QSize(mDoc.size().width(), mDoc.size().height() + mHeaderSize.height() + mMargin);
+        QSize fSize(static_cast<int>(mDoc.size().width()), static_cast<int>(mDoc.size().height()) + static_cast<int>(mHeaderSize.height()) + mMargin);
+        return fSize;
 	}else{
 		int height = mData.size() * mBarHeight;
 		height += (mData.size() - 1) * mMargin; //margins between bars
@@ -265,7 +266,7 @@ void GraphWidget::paintEvent(QPaintEvent *event){
 	dataPen.setWidth(1);
 	p.setPen(dataPen);
 	if(mIsText){
-		int startx = (width() - mDoc.size().width()) / 2;
+        auto startx = (width() - mDoc.size().width()) / 2;
 		int starty = mHeaderSize.height() + mMargin;
 		p.translate(startx, starty);
 		mDoc.drawContents(&p);
@@ -283,8 +284,8 @@ void GraphWidget::paintEvent(QPaintEvent *event){
 			p.drawText(textRect, l.at(0).toString(), opt);
 			//draw data rect
 			int dstartx = mDescWidth + mMargin;
-			qreal dwidth = l.at(1).toFloat() * curWidth / mMaxValue;
-			QRectF dataRect(dstartx, 0, dwidth, mBarHeight);
+            auto dwidth = l.at(1).toDouble() * curWidth / mMaxValue;
+            QRectF dataRect(dstartx, 0, dwidth, mBarHeight);
 			QLinearGradient dataGradient(dataRect.x(), dataRect.y() + dataRect.height() / 2.0, curWidth, dataRect.y() + dataRect.height() / 2.0);
 			QColor dgc1(0, 70, 70);
 			QColor dgc2(0, 255, 255);
@@ -293,9 +294,9 @@ void GraphWidget::paintEvent(QPaintEvent *event){
 			p.fillRect(dataRect, dataGradient);
 			p.drawRect(dataRect);
 			//draw absolute and percentage
-			int pstartx = dataRect.width() + 2 * mMargin + mDescWidth;
-			QRect percentageRect(pstartx, 0, mPercentageWidth, 20);
-			qreal percent = l.at(1).toInt() * 100.0 / static_cast<float>(mTotal);
+            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));
 			p.drawText(percentageRect, pString, optLeft);
 			//translate