r24943 by craig - Qt6 code cleanup

[scribus-commit]

Author: craig
Date: Fri Feb 18 12:31:13 2022
New Revision: 24943

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=24943
Log:
Qt6 code cleanup

Modified:
    trunk/Scribus/scribus/imagedataloaders/scimgdataloader_gmagick.cpp
    trunk/Scribus/scribus/pdflib_core.cpp
    trunk/Scribus/scribus/plugins/import/xfig/importxfig.cpp
    trunk/Scribus/scribus/third_party/rtf-qt/Tokenizer.cpp
    trunk/Scribus/scribus/ui/numformatcombo.cpp
    trunk/Scribus/scribus/ui/numformatcombo.h
    trunk/Scribus/scribus/ui/resourcemanager.cpp
    trunk/Scribus/scribus/ui/smstyleimport.cpp

Modified: trunk/Scribus/scribus/imagedataloaders/scimgdataloader_gmagick.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24943&path=/trunk/Scribus/scribus/imagedataloaders/scimgdataloader_gmagick.cpp
==============================================================================
--- trunk/Scribus/scribus/imagedataloaders/scimgdataloader_gmagick.cpp	(original)
+++ trunk/Scribus/scribus/imagedataloaders/scimgdataloader_gmagick.cpp	Fri Feb 18 12:31:13 2022
@@ -8,7 +8,7 @@
 #include <QFileInfo>
 #include <QObject>
 #include <QDebug>
-#include <setjmp.h>
+#include <csetjmp>
 #include "scimgdataloader_gmagick.h"
 #include "scconfig.h"
 

Modified: trunk/Scribus/scribus/pdflib_core.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24943&path=/trunk/Scribus/scribus/pdflib_core.cpp
==============================================================================
--- trunk/Scribus/scribus/pdflib_core.cpp	(original)
+++ trunk/Scribus/scribus/pdflib_core.cpp	Fri Feb 18 12:31:13 2022
@@ -6727,7 +6727,7 @@
 
 bool PDFLibCore::PDF_MeshGradientFill(QByteArray& output, PageItem *c)
 {
-	QList<double> StopVec;
+//	QList<double> StopVec;
 	QList<double> TransVec;
 	QStringList Gcolors;
 	QStringList colorNames;

Modified: trunk/Scribus/scribus/plugins/import/xfig/importxfig.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24943&path=/trunk/Scribus/scribus/plugins/import/xfig/importxfig.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/xfig/importxfig.cpp	(original)
+++ trunk/Scribus/scribus/plugins/import/xfig/importxfig.cpp	Fri Feb 18 12:31:13 2022
@@ -1639,7 +1639,7 @@
 		tmp = readLineFromDataStream(ts);
 		if (tmp.startsWith("#"))
 			tmp = readLineFromDataStream(ts);
-		QString resolution = tmp;
+//		QString resolution = tmp;
 		while (!ts.atEnd())
 		{
 			tmp = readLineFromDataStream(ts);

Modified: trunk/Scribus/scribus/third_party/rtf-qt/Tokenizer.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24943&path=/trunk/Scribus/scribus/third_party/rtf-qt/Tokenizer.cpp
==============================================================================
--- trunk/Scribus/scribus/third_party/rtf-qt/Tokenizer.cpp	(original)
+++ trunk/Scribus/scribus/third_party/rtf-qt/Tokenizer.cpp	Fri Feb 18 12:31:13 2022
@@ -16,7 +16,7 @@
  */
 
 #include "Tokenizer.h"
-#include <ctype.h>
+#include <cctype>
 #include <QDebug>
 
 namespace RtfReader

Modified: trunk/Scribus/scribus/ui/numformatcombo.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24943&path=/trunk/Scribus/scribus/ui/numformatcombo.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/numformatcombo.cpp	(original)
+++ trunk/Scribus/scribus/ui/numformatcombo.cpp	Fri Feb 18 12:31:13 2022
@@ -42,7 +42,7 @@
 	return (NumFormat) currData.toInt();
 }
 
-void NumFormatCombo::languageChange(void)
+void NumFormatCombo::languageChange()
 {
 	if (!m_showNoneFormat)
 		return;

Modified: trunk/Scribus/scribus/ui/numformatcombo.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24943&path=/trunk/Scribus/scribus/ui/numformatcombo.h
==============================================================================
--- trunk/Scribus/scribus/ui/numformatcombo.h	(original)
+++ trunk/Scribus/scribus/ui/numformatcombo.h	Fri Feb 18 12:31:13 2022
@@ -32,7 +32,7 @@
 	bool m_showNoneFormat { false };
 	
 	void changeEvent(QEvent *e) override;
-	void languageChange(void);
+	void languageChange();
 	void setupCombo();
 };
 

Modified: trunk/Scribus/scribus/ui/resourcemanager.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24943&path=/trunk/Scribus/scribus/ui/resourcemanager.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/resourcemanager.cpp	(original)
+++ trunk/Scribus/scribus/ui/resourcemanager.cpp	Fri Feb 18 12:31:13 2022
@@ -1035,7 +1035,7 @@
 						else
 						{
 							const QStringList zipFileContents(fun->files());
-							QStringList extractFiles(d.extractfiles.split(";", Qt::SkipEmptyParts));
+//							QStringList extractFiles(d.extractfiles.split(";", Qt::SkipEmptyParts));
 							QString toDir(ScPaths::userFontDir(false)+fi.baseName()+"/");
 							QDir dir(ScPaths::userFontDir(false));
 							if (!dir.exists(fi.baseName()))
@@ -1119,7 +1119,7 @@
 							else
 							{
 								const QStringList zipFileContents(fun->files());
-								QStringList extractFiles(d.extractfiles.split(";", Qt::SkipEmptyParts));
+//								QStringList extractFiles(d.extractfiles.split(";", Qt::SkipEmptyParts));
 								QString toDir(ScPaths::userHelpFilesDir(false)+d.lang+"/");
 								QDir dir(ScPaths::userHelpFilesDir(false));
 								if (!dir.exists(d.lang))

Modified: trunk/Scribus/scribus/ui/smstyleimport.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24943&path=/trunk/Scribus/scribus/ui/smstyleimport.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/smstyleimport.cpp	(original)
+++ trunk/Scribus/scribus/ui/smstyleimport.cpp	Fri Feb 18 12:31:13 2022
@@ -97,7 +97,6 @@
 
 void SMStyleImport::checkAll(bool allChecked)
 {
-	QStringList ret;
 	QTreeWidgetItemIterator it(styleWidget);
 
 	while (*it)