Port to (and require) Qt 5.15. Drop KDE4 support, fix KDE5 (#2541)

* Port to (and require) Qt 5.15. Drop KDE4 support, implement KDE5 support where needed.
---------

Co-authored-by: Fabio Bas <fabio.bas@officineinformatiche.net>

5 files changed, 17 insertions, 20 deletions

diff --git a/src/modules/objects/KvsObject_painter.cpp b/src/modules/objects/KvsObject_painter.cpp
index 4918253d3..0b425d38b 100644
--- a/src/modules/objects/KvsObject_painter.cpp
+++ b/src/modules/objects/KvsObject_painter.cpp
@@ -887,7 +887,7 @@ KVSO_CLASS_FUNCTION(painter, drawRoundRect)
 	KVSO_PARAMETERS_END(c)
 	QString function = "$drawRoundRect";
 	KVSO_PARAMETERS_PAINTER(pXOrArray, iY, iW, iH)
-	m_pPainter->drawRoundRect(iX, iY, iW, iH, iXrnd, iYrnd);
+	m_pPainter->drawRoundedRect(iX, iY, iW, iH, iXrnd, iYrnd);
 	return true;
 }
 
@@ -1140,7 +1140,7 @@ KVSO_CLASS_FUNCTION(painter, fontMetricsWidth)
 	KVSO_PARAMETER("text", KVS_PT_STRING, 0, szText)
 	KVSO_PARAMETERS_END(c)
 	if(m_pPainter->isActive())
-		c->returnValue()->setInteger(m_pPainter->fontMetrics().width(szText));
+		c->returnValue()->setInteger(m_pPainter->fontMetrics().horizontalAdvance(szText));
 	else
 		c->warning(__tr2qs_ctx("$fontMetricsWidth: the painter is not active!", "objects"));
 	return true;
@@ -1193,7 +1193,7 @@ KVSO_CLASS_FUNCTION(painter, begin)
 				QPrintDialog printDialog(m_pPrinter, nullptr);
 				if(printDialog.exec() == QDialog::Accepted)
 				{
-					qDebug("papersize %d", m_pPrinter->paperSize());
+					qDebug("papersize %d", m_pPrinter->pageLayout().pageSize().id());
 					m_pPainter->begin(m_pPrinter);
 					return true;
 				}
diff --git a/src/modules/objects/KvsObject_pixmap.cpp b/src/modules/objects/KvsObject_pixmap.cpp
index e3ef0a5c8..9bd184479 100644
--- a/src/modules/objects/KvsObject_pixmap.cpp
+++ b/src/modules/objects/KvsObject_pixmap.cpp
@@ -668,7 +668,7 @@ KVSO_CLASS_FUNCTION(pixmap, grabWidget)
 	}
 	if(!m_pPixmap)
 		m_pPixmap = new QPixmap();
-	*m_pPixmap = QPixmap::grabWidget(((KvsObject_widget *)pObject)->widget());
+	*m_pPixmap = ((KvsObject_widget *)pObject)->widget()->grab();
 	return true;
 
 }
diff --git a/src/modules/objects/KvsObject_webView.cpp b/src/modules/objects/KvsObject_webView.cpp
index abb46faba..d61077532 100644
--- a/src/modules/objects/KvsObject_webView.cpp
+++ b/src/modules/objects/KvsObject_webView.cpp
@@ -1115,7 +1115,7 @@ KVSO_CLASS_FUNCTION(webView, hitTestContent)
 		return true;
 	KviKvsHash * pHash = new KviKvsHash();
 	pHash->set("imageurl", new KviKvsVariant(res.imageUrl().toString()));
-	pHash->set("linktitle", new KviKvsVariant(res.linkTitle().toString()));
+	pHash->set("linktitle", new KviKvsVariant(res.linkTitleString()));
 	pHash->set("linktext", new KviKvsVariant(res.linkText()));
 	pHash->set("linkelement", new KviKvsVariant((kvs_int_t)insertElement(res.linkElement())));
 	pHash->set("enclosingelement", new KviKvsVariant((kvs_int_t)insertElement(res.enclosingBlockElement())));
diff --git a/src/modules/objects/KvsObject_widget.cpp b/src/modules/objects/KvsObject_widget.cpp
index c41183d5b..3da0bc09b 100644
--- a/src/modules/objects/KvsObject_widget.cpp
+++ b/src/modules/objects/KvsObject_widget.cpp
@@ -38,7 +38,6 @@
 #include "KvsObject_painter.h"
 
 #include <QKeyEvent>
-#include <QDesktopWidget>
 #include <QWidget>
 #include <QToolTip>
 #include <QFont>
@@ -54,12 +53,9 @@
 #include <QPainter>
 #include <QApplication>
 #include <QPoint>
+#include <QScreen>
 #include <QContextMenuEvent>
 
-#ifdef COMPILE_KDE4_SUPPORT
-#include <KStatusBar>
-#endif
-
 KviKvsWidget::KviKvsWidget(KvsObject_widget * object, QWidget * par)
     : QWidget(par), m_pObject(object)
 {
@@ -104,9 +100,9 @@ const char * const widgetattributes_tbl[] = {
 
 const QPalette::ColorRole colorrole_cod[] = {
 	QPalette::Window,
-	QPalette::Background,
+	QPalette::Window,
+	QPalette::WindowText,
 	QPalette::WindowText,
-	QPalette::Foreground,
 	QPalette::Base,
 	QPalette::AlternateBase,
 	QPalette::Text,
@@ -1088,7 +1084,7 @@ KVSO_CLASS_FUNCTION(widget, fontMetricsWidth)
 	KVSO_PARAMETERS_BEGIN(c)
 	KVSO_PARAMETER("string", KVS_PT_STRING, 0, m_szStr)
 	KVSO_PARAMETERS_END(c)
-	c->returnValue()->setInteger(widget()->fontMetrics().width(m_szStr));
+	c->returnValue()->setInteger(widget()->fontMetrics().horizontalAdvance(m_szStr));
 	return true;
 }
 
@@ -1110,7 +1106,7 @@ KVSO_CLASS_FUNCTION(widget, screenResolution)
 {
 	CHECK_INTERNAL_POINTER(widget())
 	KviKvsArray * a = new KviKvsArray();
-	QRect rect = g_pApp->desktop()->screenGeometry(g_pApp->desktop()->primaryScreen());
+	QRect rect = g_pApp->primaryScreen()->availableGeometry();
 	a->set(0, new KviKvsVariant((kvs_int_t)rect.width()));
 	a->set(1, new KviKvsVariant((kvs_int_t)rect.height()));
 	c->returnValue()->setArray(a);
@@ -1241,7 +1237,7 @@ KVSO_CLASS_FUNCTION(widget, mapFromGlobal)
 KVSO_CLASS_FUNCTION(widget, centerToScreen)
 {
 	CHECK_INTERNAL_POINTER(widget())
-	QRect rect = g_pApp->desktop()->screenGeometry(g_pApp->desktop()->primaryScreen());
+	QRect rect = g_pApp->primaryScreen()->availableGeometry();
 	widget()->move((rect.width() - widget()->width()) / 2, (rect.height() - widget()->height()) / 2);
 	return true;
 }
@@ -1825,10 +1821,10 @@ KVSO_CLASS_FUNCTION(widget, setWFlags)
 	KVSO_PARAMETERS_BEGIN(c)
 	KVSO_PARAMETER("widget_flags", KVS_PT_STRINGLIST, KVS_PF_OPTIONAL, wflags)
 	KVSO_PARAMETERS_END(c)
-	Qt::WindowFlags flag, sum = nullptr;
+	Qt::WindowFlags flag, sum;
 	for(auto & it : wflags)
 	{
-		flag = nullptr;
+		flag = Qt::WindowFlags();
 		for(size_t j{}; j < widgettypes_num; j++)
 		{
 			if(KviQString::equalCI(it, widgettypes_tbl[j]))
@@ -2155,7 +2151,7 @@ KVSO_CLASS_FUNCTION(widget, grab)
 
 	QPixmap * pPixmap = new QPixmap();
 	qDebug("grabbing");
-	*pPixmap = QPixmap::grabWidget(((QWidget *)(ob->object())));
+	*pPixmap = ((QWidget *)(ob->object()))->grab();
 	KviKvsObjectClass * pClass = KviKvsKernel::instance()->objectController()->lookupClass("pixmap");
 	KviKvsVariantList params;
 	KviKvsObject * pObject = pClass->allocateInstance(nullptr, "internalpixmap", c->context(), &params);
diff --git a/src/modules/objects/qthttp/qhttpauthenticator.cpp b/src/modules/objects/qthttp/qhttpauthenticator.cpp
index 194fe856d..9acb7717b 100644
--- a/src/modules/objects/qthttp/qhttpauthenticator.cpp
+++ b/src/modules/objects/qthttp/qhttpauthenticator.cpp
@@ -50,6 +50,7 @@
 #include <qendian.h>
 #include <qstring.h>
 #include <qdatetime.h>
+#include <QRandomGenerator>
 
 //#define NTLMV1_CLIENT
 
@@ -284,7 +285,7 @@ void QHttpAuthenticator::detach()
 	if(!d)
 	{
 		d = new QHttpAuthenticatorPrivate;
-		d->ref.store(1);
+		d->ref.storeRelaxed(1);
 		return;
 	}
 
@@ -351,7 +352,7 @@ bool QHttpAuthenticator::isNull() const
 QHttpAuthenticatorPrivate::QHttpAuthenticatorPrivate()
     : ref(0), method(None), hasFailed(false), phase(Start), nonceCount(0)
 {
-	cnonce = QCryptographicHash::hash(QByteArray::number(qrand(), 16) + QByteArray::number(qrand(), 16),
+	cnonce = QCryptographicHash::hash(QByteArray::number(QRandomGenerator::global()->generate(), 16) + QByteArray::number(QRandomGenerator::global()->generate(), 16),
 	             QCryptographicHash::Md5)
 	             .toHex();
 	nonceCount = 0;