r24895 by jghali - Qt6: fixes for ScElemMimeData functions inherited from QMimeData

[scribus-commit]

Author: jghali
Date: Fri Feb  4 08:34:23 2022
New Revision: 24895

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=24895
Log:
Qt6: fixes for ScElemMimeData functions inherited from QMimeData 

Modified:
    trunk/Scribus/scribus/scmimedata.cpp
    trunk/Scribus/scribus/scmimedata.h

Modified: trunk/Scribus/scribus/scmimedata.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24895&path=/trunk/Scribus/scribus/scmimedata.cpp
==============================================================================
--- trunk/Scribus/scribus/scmimedata.cpp	(original)
+++ trunk/Scribus/scribus/scmimedata.cpp	Fri Feb  4 08:34:23 2022
@@ -157,7 +157,7 @@
 #endif 
 }
 
-bool ScElemMimeData::hasFormat (const QString & mimeType) const
+bool ScElemMimeData::hasFormat(const QString & mimeType) const
 {
 	if (mimeType == ScMimeData::ScribusElemMimeType)
 	{
@@ -173,7 +173,7 @@
 	return QMimeData::hasFormat(mimeType);
 }
 
-QVariant ScElemMimeData::retrieveData (const QString &mimeType, QVariant::Type type) const
+QVariant ScElemMimeData::retrieveData(const QString &mimeType, QMetaType /*type*/) const
 {
 	if (mimeType == ScMimeData::ScribusElemMimeType)
 	{

Modified: trunk/Scribus/scribus/scmimedata.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24895&path=/trunk/Scribus/scribus/scmimedata.h
==============================================================================
--- trunk/Scribus/scribus/scmimedata.h	(original)
+++ trunk/Scribus/scribus/scmimedata.h	Fri Feb  4 08:34:23 2022
@@ -62,20 +62,20 @@
 {
 	Q_OBJECT
 
+public:
+	ScElemMimeData();
+
+	QStringList formats() const override { return m_formats; }
+	bool hasFormat(const QString & mimeType) const override;
+
+	void  setScribusElem(const QString& elem) { m_scribusElemData = elem; }
+	const QString& scribusElem(void) const    { return m_scribusElemData; }
+
 protected:
 	QString m_scribusElemData;
 	QStringList m_formats;
 
-	virtual QVariant retrieveData ( const QString & mimeType, QVariant::Type type ) const;
-
-public:
-	ScElemMimeData();
-
-	virtual QStringList formats() const { return m_formats; }
-	virtual bool hasFormat ( const QString & mimeType ) const;
-
-	void  setScribusElem(const QString& elem) { m_scribusElemData = elem; }
-	const QString& scribusElem(void) const    { return m_scribusElemData; }
+	QVariant retrieveData(const QString& mimeType, QMetaType type) const override;
 };
 
 class SCRIBUS_API ScTextMimeData : public QMimeData