r23652 by craig - Clean up const interators, virtual to override in plugins, various other

scribus-commit scribus-commit at lists.scribus.net
Sat Apr 25 22:03:32 UTC 2020


Author: craig
Date: Sat Apr 25 22:03:32 2020
New Revision: 23652

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=23652
Log:
Clean up const interators, virtual to override in plugins, various other
cleanups

Modified:
    trunk/Scribus/scribus/imagedataloaders/scimgdataloader.h
    trunk/Scribus/scribus/loadsaveplugin.cpp
    trunk/Scribus/scribus/pageitem_noteframe.cpp
    trunk/Scribus/scribus/palettes/paletteloader_cxf.cpp
    trunk/Scribus/scribus/plugins/barcodegenerator/barcode.h
    trunk/Scribus/scribus/plugins/colorwheel/colorwheel.h
    trunk/Scribus/scribus/plugins/export/pixmapexport/dialog.h
    trunk/Scribus/scribus/plugins/export/pixmapexport/export.h
    trunk/Scribus/scribus/plugins/export/svgexplugin/svgexplugin.h
    trunk/Scribus/scribus/plugins/export/xpsexport/xpsexplugin.h
    trunk/Scribus/scribus/plugins/fileloader/scribus12format/scribus12format.cpp
    trunk/Scribus/scribus/plugins/fileloader/scribus134format/scribus134format.cpp
    trunk/Scribus/scribus/plugins/fileloader/scribus13format/scribus13format.cpp
    trunk/Scribus/scribus/plugins/fontpreview/fontpreview.h
    trunk/Scribus/scribus/plugins/fontpreview/fontpreviewplugin.h
    trunk/Scribus/scribus/plugins/gettext/htmlim/htmlreader.cpp
    trunk/Scribus/scribus/plugins/gettext/sxwim/stylereader.cpp
    trunk/Scribus/scribus/plugins/import/ai/importai.cpp
    trunk/Scribus/scribus/plugins/import/emf/importemf.cpp
    trunk/Scribus/scribus/plugins/picbrowser/picturebrowserplugin.h
    trunk/Scribus/scribus/plugins/saveastemplateplugin/satemplate.h
    trunk/Scribus/scribus/plugins/short-words/shortwords.h
    trunk/Scribus/scribus/plugins/tools/2geomtools/meshdistortion/meshdistortion.h
    trunk/Scribus/scribus/plugins/tools/2geomtools/pathalongpath/pathalongpath.h
    trunk/Scribus/scribus/plugins/tools/flattenpath/flattenpath.h
    trunk/Scribus/scribus/plugins/tools/hunspellcheck/hunspellplugin.h
    trunk/Scribus/scribus/plugins/tools/lenseffects/lenseffects.h
    trunk/Scribus/scribus/plugins/tools/pathconnect/pathconnect.h
    trunk/Scribus/scribus/plugins/tools/pathcut/pathcut.h
    trunk/Scribus/scribus/plugins/tools/pathfinder/pathfinder.h
    trunk/Scribus/scribus/plugins/tools/pathstroker/pathstroker.h
    trunk/Scribus/scribus/plugins/tools/smoothpath/smoothpath.h
    trunk/Scribus/scribus/plugins/tools/subdivide/subdivide.h
    trunk/Scribus/scribus/prefsmanager.cpp
    trunk/Scribus/scribus/pslib.cpp
    trunk/Scribus/scribus/scimage.cpp
    trunk/Scribus/scribus/scplugin.cpp
    trunk/Scribus/scribus/scplugin.h
    trunk/Scribus/scribus/ui/aligndistribute.h
    trunk/Scribus/scribus/ui/checkDocument.h
    trunk/Scribus/scribus/ui/colorsandfills.cpp
    trunk/Scribus/scribus/ui/helpbrowser.h
    trunk/Scribus/scribus/ui/hruler.cpp
    trunk/Scribus/scribus/ui/hyask.cpp
    trunk/Scribus/scribus/ui/latexeditor.cpp
    trunk/Scribus/scribus/ui/latexeditor.h
    trunk/Scribus/scribus/ui/loremipsum.h
    trunk/Scribus/scribus/ui/measurements.cpp
    trunk/Scribus/scribus/ui/pagelayout.h
    trunk/Scribus/scribus/ui/pagepropertiesdialog.h
    trunk/Scribus/scribus/ui/propertiespalette_line.cpp
    trunk/Scribus/scribus/ui/scinputdialog.h
    trunk/Scribus/scribus/ui/scrpalettebase.h
    trunk/Scribus/scribus/ui/shadebutton.cpp
    trunk/Scribus/scribus/ui/vruler.cpp
    trunk/Scribus/scribus/undogui.h
    trunk/Scribus/scribus/undostate.cpp
    trunk/Scribus/scribus/util.cpp

Modified: trunk/Scribus/scribus/imagedataloaders/scimgdataloader.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23652&path=/trunk/Scribus/scribus/imagedataloaders/scimgdataloader.h
==============================================================================
--- trunk/Scribus/scribus/imagedataloaders/scimgdataloader.h	(original)
+++ trunk/Scribus/scribus/imagedataloaders/scimgdataloader.h	Sat Apr 25 22:03:32 2020
@@ -63,7 +63,7 @@
 	bool  issuedWarningMsg(void)    const { return (m_msgType == warningMsg); }
 	const QString& getMessage(void) const { return m_message; }
 
-	virtual void initialize(void);
+	void initialize(void);
 
 //	virtual void preloadAlphaChannel(const QString& fn, int res) = 0;
 	virtual bool preloadAlphaChannel(const QString& fn, int page, int res, bool& hasAlpha) = 0;

Modified: trunk/Scribus/scribus/loadsaveplugin.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23652&path=/trunk/Scribus/scribus/loadsaveplugin.cpp
==============================================================================
--- trunk/Scribus/scribus/loadsaveplugin.cpp	(original)
+++ trunk/Scribus/scribus/loadsaveplugin.cpp	Sat Apr 25 22:03:32 2020
@@ -103,7 +103,7 @@
 		qDebug("%s", tr("No File Loader Plugins Found").toLocal8Bit().data());
 	// Avoid duplicate entries in the list
 	QSet<QString> fSet = filterList.toSet();
-	filterList = fSet.toList();
+	filterList = fSet.values();
 	std::sort(filterList.begin(), filterList.end());
 	return filterList;
 }

Modified: trunk/Scribus/scribus/pageitem_noteframe.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23652&path=/trunk/Scribus/scribus/pageitem_noteframe.cpp
==============================================================================
--- trunk/Scribus/scribus/pageitem_noteframe.cpp	(original)
+++ trunk/Scribus/scribus/pageitem_noteframe.cpp	Sat Apr 25 22:03:32 2020
@@ -186,7 +186,7 @@
 		return;
 	if (itemText.length() == 0)
 		return;
-	if ((masterFrame() != nullptr) && masterFrame()->invalid)
+	if ((m_masterFrame != nullptr) && m_masterFrame->invalid)
 		return;
 
 	//while layouting notes frames undo should be disabled

Modified: trunk/Scribus/scribus/palettes/paletteloader_cxf.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23652&path=/trunk/Scribus/scribus/palettes/paletteloader_cxf.cpp
==============================================================================
--- trunk/Scribus/scribus/palettes/paletteloader_cxf.cpp	(original)
+++ trunk/Scribus/scribus/palettes/paletteloader_cxf.cpp	Sat Apr 25 22:03:32 2020
@@ -6,6 +6,7 @@
 */
 
 #include <QScopedPointer>
+#include <QVector>
 
 #include "lcms2.h"
 #include "paletteloader_cxf.h"
@@ -94,7 +95,7 @@
 		colorspaces = cxfImportDia->priorities();
 	}
 
-	QList<PaletteLoader_CxF::ColorImportFunction> importFunctions;
+	QVector<PaletteLoader_CxF::ColorImportFunction> importFunctions;
 	for (int i = 0; i < colorspaces.count(); ++i)
 	{
 		eColorSpaceType colorspace = colorspaces.at(i);

Modified: trunk/Scribus/scribus/plugins/barcodegenerator/barcode.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23652&path=/trunk/Scribus/scribus/plugins/barcodegenerator/barcode.h
==============================================================================
--- trunk/Scribus/scribus/plugins/barcodegenerator/barcode.h	(original)
+++ trunk/Scribus/scribus/plugins/barcodegenerator/barcode.h	Sat Apr 25 22:03:32 2020
@@ -24,12 +24,12 @@
 		virtual ~Barcode();
 		/*! \brief run the plug
 		\param target none usage here */
-		virtual bool run(ScribusDoc* doc, const QString& target = QString());
-		virtual const QString fullTrName() const;
-		virtual const AboutData* getAboutData() const;
-		virtual void deleteAboutData(const AboutData* about) const;
-		virtual void languageChange();
-		virtual void addToMainWindowMenu(ScribusMainWindow *) {};
+		bool run(ScribusDoc* doc, const QString& target = QString()) override;
+		const QString fullTrName() const override;
+		const AboutData* getAboutData() const override;
+		void deleteAboutData(const AboutData* about) const override;
+		void languageChange() override;
+		void addToMainWindowMenu(ScribusMainWindow *) override {};
 };
 
 extern "C" PLUGIN_API int barcodegenerator_getPluginAPIVersion();

Modified: trunk/Scribus/scribus/plugins/colorwheel/colorwheel.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23652&path=/trunk/Scribus/scribus/plugins/colorwheel/colorwheel.h
==============================================================================
--- trunk/Scribus/scribus/plugins/colorwheel/colorwheel.h	(original)
+++ trunk/Scribus/scribus/plugins/colorwheel/colorwheel.h	Sat Apr 25 22:03:32 2020
@@ -27,12 +27,12 @@
 		// Standard plugin implementation
 		ColorWheelPlugin();
 		virtual ~ColorWheelPlugin();
-		virtual bool run(ScribusDoc* doc, const QString& target = QString());
-		virtual const QString fullTrName() const;
-		virtual const AboutData* getAboutData() const;
-		virtual void deleteAboutData(const AboutData* about) const;
-		virtual void languageChange();
-		virtual void addToMainWindowMenu(ScribusMainWindow *) {};
+		bool run(ScribusDoc* doc, const QString& target = QString()) override;
+		const QString fullTrName() const override;
+		const AboutData* getAboutData() const override;
+		void deleteAboutData(const AboutData* about) const override;
+		void languageChange() override;
+		void addToMainWindowMenu(ScribusMainWindow *) override {};
 
 		// Special features (none)
 };

Modified: trunk/Scribus/scribus/plugins/export/pixmapexport/dialog.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23652&path=/trunk/Scribus/scribus/plugins/export/pixmapexport/dialog.h
==============================================================================
--- trunk/Scribus/scribus/plugins/export/pixmapexport/dialog.h	(original)
+++ trunk/Scribus/scribus/plugins/export/pixmapexport/dialog.h	Sat Apr 25 22:03:32 2020
@@ -33,10 +33,10 @@
 	int m_PageCount;
 
 protected slots:
-	virtual void createPageNumberRange();
-	virtual void languageChange();
-	virtual void readConfig();
-	virtual void writeConfig();
+	void createPageNumberRange();
+	void languageChange();
+	void readConfig();
+	void writeConfig();
 };
 
 #endif // EXPORTFORM_H

Modified: trunk/Scribus/scribus/plugins/export/pixmapexport/export.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23652&path=/trunk/Scribus/scribus/plugins/export/pixmapexport/export.h
==============================================================================
--- trunk/Scribus/scribus/plugins/export/pixmapexport/export.h	(original)
+++ trunk/Scribus/scribus/plugins/export/pixmapexport/export.h	Sat Apr 25 22:03:32 2020
@@ -23,12 +23,12 @@
 		// Standard plugin implementation
 		PixmapExportPlugin();
 		virtual ~PixmapExportPlugin();
-		virtual bool run(ScribusDoc* doc, const QString& target = QString());
-		virtual const QString fullTrName() const;
-		virtual const AboutData* getAboutData() const;
-		virtual void deleteAboutData(const AboutData* about) const;
-		virtual void languageChange();
-		virtual void addToMainWindowMenu(ScribusMainWindow *) {};
+		bool run(ScribusDoc* doc, const QString& target = QString()) override;
+		const QString fullTrName() const override;
+		const AboutData* getAboutData() const override;
+		void deleteAboutData(const AboutData* about) const override;
+		void languageChange() override;
+		void addToMainWindowMenu(ScribusMainWindow *) override {};
 
 		// Special features (none)
 };

Modified: trunk/Scribus/scribus/plugins/export/svgexplugin/svgexplugin.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23652&path=/trunk/Scribus/scribus/plugins/export/svgexplugin/svgexplugin.h
==============================================================================
--- trunk/Scribus/scribus/plugins/export/svgexplugin/svgexplugin.h	(original)
+++ trunk/Scribus/scribus/plugins/export/svgexplugin/svgexplugin.h	Sat Apr 25 22:03:32 2020
@@ -42,12 +42,12 @@
 	\param filename a file to export to
 	\retval bool true
 	*/
-	virtual bool run(ScribusDoc* doc=nullptr, const QString& filename = QString());
-	virtual const QString fullTrName() const;
-	virtual const AboutData* getAboutData() const;
-	virtual void deleteAboutData(const AboutData* about) const;
-	virtual void languageChange();
-	virtual void addToMainWindowMenu(ScribusMainWindow *) {};
+	bool run(ScribusDoc* doc=nullptr, const QString& filename = QString()) override;
+	const QString fullTrName() const override;
+	const AboutData* getAboutData() const override;
+	void deleteAboutData(const AboutData* about) const override;
+	void languageChange() override;
+	void addToMainWindowMenu(ScribusMainWindow *) override {};
 
 	// Special features (none)
 };

Modified: trunk/Scribus/scribus/plugins/export/xpsexport/xpsexplugin.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23652&path=/trunk/Scribus/scribus/plugins/export/xpsexport/xpsexplugin.h
==============================================================================
--- trunk/Scribus/scribus/plugins/export/xpsexport/xpsexplugin.h	(original)
+++ trunk/Scribus/scribus/plugins/export/xpsexport/xpsexplugin.h	Sat Apr 25 22:03:32 2020
@@ -44,12 +44,12 @@
 	\param filename a file to export to
 	\retval bool true
 	*/
-	virtual bool run(ScribusDoc* doc=nullptr, const QString& filename = QString());
-	virtual const QString fullTrName() const;
-	virtual const AboutData* getAboutData() const;
-	virtual void deleteAboutData(const AboutData* about) const;
-	virtual void languageChange();
-	virtual void addToMainWindowMenu(ScribusMainWindow *) {};
+	bool run(ScribusDoc* doc=nullptr, const QString& filename = QString()) override;
+	const QString fullTrName() const override;
+	const AboutData* getAboutData() const override;
+	void deleteAboutData(const AboutData* about) const override;
+	void languageChange() override;
+	void addToMainWindowMenu(ScribusMainWindow *) override {};
 };
 
 extern "C" PLUGIN_API int xpsexplugin_getPluginAPIVersion();

Modified: trunk/Scribus/scribus/plugins/fileloader/scribus12format/scribus12format.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23652&path=/trunk/Scribus/scribus/plugins/fileloader/scribus12format/scribus12format.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/fileloader/scribus12format/scribus12format.cpp	(original)
+++ trunk/Scribus/scribus/plugins/fileloader/scribus12format/scribus12format.cpp	Sat Apr 25 22:03:32 2020
@@ -1040,8 +1040,8 @@
 						for (int cx = 0; cx < obj.attribute("NUMGROUP", "0").toInt(); ++cx)
 						{
 							fg >> x;
-							gIt = groupRemap.find(x);
-							if (gIt != groupRemap.end())
+							gIt = groupRemap.constFind(x);
+							if (gIt != groupRemap.constEnd())
 								OB.Groups.push(gIt.value());
 							else
 							{
@@ -1939,7 +1939,7 @@
 				QString Nam2 = Nam;
 				int copyC = 1;
 				QHash<QString,multiLine>::ConstIterator mlit = m_Doc->MLineStyles.find(Nam2);
-				if (mlit != m_Doc->MLineStyles.end() && ml != mlit.value())
+				if (mlit != m_Doc->MLineStyles.constEnd() && ml != mlit.value())
 				{
 					while (m_Doc->MLineStyles.contains(Nam2))
 					{
@@ -2045,8 +2045,8 @@
 						for (int cx = 0; cx < obj.attribute("NUMGROUP", "0").toInt(); ++cx)
 						{
 							fg >> x;
-							gIt = groupRemap.find(x);
-							if (gIt != groupRemap.end())
+							gIt = groupRemap.constFind(x);
+							if (gIt != groupRemap.constEnd())
 								OB.Groups.push(gIt.value());
 							else
 							{
@@ -2465,11 +2465,11 @@
 					ml.push_back(sl);
 					MuLn = MuLn.nextSibling();
 				}
-				QString Nam = pg.attribute("Name");
-				QString Nam2 = Nam;
+				QString Nam(pg.attribute("Name"));
+				QString Nam2(Nam);
 				int copyC = 1;
 				QHash<QString,multiLine>::ConstIterator mlit = Sty->find(Nam2);
-				if (mlit != Sty->end() && ml != mlit.value())
+				if (mlit != Sty->constEnd() && ml != mlit.value())
 				{
 					while (Sty->contains(Nam2))
 					{

Modified: trunk/Scribus/scribus/plugins/fileloader/scribus134format/scribus134format.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23652&path=/trunk/Scribus/scribus/plugins/fileloader/scribus134format/scribus134format.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/fileloader/scribus134format/scribus134format.cpp	(original)
+++ trunk/Scribus/scribus/plugins/fileloader/scribus134format/scribus134format.cpp	Sat Apr 25 22:03:32 2020
@@ -3291,8 +3291,8 @@
 			QString mlName2 = mlName;
 			readMultiline(ml, reader);
 			int copyC = 1;
-			QHash<QString,multiLine>::ConstIterator mlit = m_Doc->MLineStyles.find(mlName2);
-			if (mlit != m_Doc->MLineStyles.end() && ml != mlit.value())
+			QHash<QString,multiLine>::ConstIterator mlit = m_Doc->MLineStyles.constFind(mlName2);
+			if (mlit != m_Doc->MLineStyles.constEnd() && ml != mlit.value())
 			{
 				while (m_Doc->MLineStyles.contains(mlName2))
 				{
@@ -3849,8 +3849,8 @@
 			QString mlName2 = mlName;
 			readMultiline(ml, reader);
 			int copyC = 1;
-			QHash<QString,multiLine>::ConstIterator mlit = styles->find(mlName2);
-			if (mlit != styles->end() && ml != mlit.value())
+			QHash<QString,multiLine>::ConstIterator mlit = styles->constFind(mlName2);
+			if (mlit != styles->constEnd() && ml != mlit.value())
 			{
 				while (styles->contains(mlName2))
 				{

Modified: trunk/Scribus/scribus/plugins/fileloader/scribus13format/scribus13format.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23652&path=/trunk/Scribus/scribus/plugins/fileloader/scribus13format/scribus13format.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/fileloader/scribus13format/scribus13format.cpp	(original)
+++ trunk/Scribus/scribus/plugins/fileloader/scribus13format/scribus13format.cpp	Sat Apr 25 22:03:32 2020
@@ -2163,7 +2163,7 @@
 				QString Nam2 = Nam;
 				int copyC = 1;
 				QHash<QString,multiLine>::ConstIterator mlit = m_Doc->MLineStyles.find(Nam2);
-				if (mlit != m_Doc->MLineStyles.end() && ml != mlit.value())
+				if (mlit != m_Doc->MLineStyles.constEnd() && ml != mlit.value())
 				{
 					while (m_Doc->MLineStyles.contains(Nam2))
 					{
@@ -2676,7 +2676,7 @@
 				QString Nam2 = Nam;
 				int copyC = 1;
 				QHash<QString,multiLine>::ConstIterator mlit = Sty->find(Nam2);
-				if (mlit != Sty->end() && ml != mlit.value())
+				if (mlit != Sty->constEnd() && ml != mlit.value())
 				{
 					while (Sty->contains(Nam2))
 					{

Modified: trunk/Scribus/scribus/plugins/fontpreview/fontpreview.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23652&path=/trunk/Scribus/scribus/plugins/fontpreview/fontpreview.h
==============================================================================
--- trunk/Scribus/scribus/plugins/fontpreview/fontpreview.h	(original)
+++ trunk/Scribus/scribus/plugins/fontpreview/fontpreview.h	Sat Apr 25 22:03:32 2020
@@ -79,7 +79,7 @@
 protected slots:
 	/*! \brief Sets the strings of the subwidgets using the current
 	language. */
-	virtual void languageChange();
+	void languageChange();
 
 	/** \brief Called after each text change.
 	It calls paintSample().

Modified: trunk/Scribus/scribus/plugins/fontpreview/fontpreviewplugin.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23652&path=/trunk/Scribus/scribus/plugins/fontpreview/fontpreviewplugin.h
==============================================================================
--- trunk/Scribus/scribus/plugins/fontpreview/fontpreviewplugin.h	(original)
+++ trunk/Scribus/scribus/plugins/fontpreview/fontpreviewplugin.h	Sat Apr 25 22:03:32 2020
@@ -20,13 +20,13 @@
 		// Standard plugin implementation
 		FontPreviewPlugin();
 		virtual ~FontPreviewPlugin();
-		virtual bool run(ScribusDoc* doc, const QString& target = QString());
-		virtual bool run(QWidget *parent, ScribusDoc* doc, const QString& target = QString());
-		virtual const QString fullTrName() const;
-		virtual const AboutData* getAboutData() const;
-		virtual void deleteAboutData(const AboutData* about) const;
-		virtual void languageChange();
-		virtual void addToMainWindowMenu(ScribusMainWindow *) {};
+		bool run(ScribusDoc* doc, const QString& target = QString()) override;
+		bool run(QWidget *parent, ScribusDoc* doc, const QString& target = QString()) override;
+		const QString fullTrName() const override;
+		const AboutData* getAboutData() const override;
+		void deleteAboutData(const AboutData* about) const override;
+		void languageChange() override;
+		void addToMainWindowMenu(ScribusMainWindow *) override {};
 
 		// Special features (none)
 };

Modified: trunk/Scribus/scribus/plugins/gettext/htmlim/htmlreader.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23652&path=/trunk/Scribus/scribus/plugins/gettext/htmlim/htmlreader.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/gettext/htmlim/htmlreader.cpp	(original)
+++ trunk/Scribus/scribus/plugins/gettext/htmlim/htmlreader.cpp	Sat Apr 25 22:03:32 2020
@@ -268,12 +268,12 @@
 			if (tmp.isEmpty())
 				return true;
 		}
-		QString chl = tmp.left(1), chr = tmp.right(1);
+		QString chl(tmp.at(0)), chr(tmp.right(1));
 		bool fcis = (chl.length() > 0 && chl[0].isSpace());
 		bool lcis = (chr.length() > 0 && chr[0].isSpace());
 		if (inPre)
 		{
-			if (tmp.left(1) == "\n")
+			if (tmp.at(0) == "\n")
 				tmp = tmp.right(tmp.length() - 2);
 		}
 		else

Modified: trunk/Scribus/scribus/plugins/gettext/sxwim/stylereader.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23652&path=/trunk/Scribus/scribus/plugins/gettext/sxwim/stylereader.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/gettext/sxwim/stylereader.cpp	(original)
+++ trunk/Scribus/scribus/plugins/gettext/sxwim/stylereader.cpp	Sat Apr 25 22:03:32 2020
@@ -256,11 +256,11 @@
 			currentStyle->getFont()->setHscale(static_cast<int>(getSize(attrs.value(i), -1.0)));
 		else if ((attrs.localName(i) == "style:text-position") &&
 				 (((attrs.value(i)).indexOf("sub") != -1) ||
-				  (((attrs.value(i)).left(1) == "-") && ((attrs.value(i)).left(1) != "0"))))
+				  (((attrs.value(i)).at(0) == "-") && ((attrs.value(i)).at(0) != "0"))))
 			currentStyle->getFont()->toggleEffect(SUBSCRIPT);
 		else if ((attrs.localName(i) == "style:text-position") &&
 				 (((attrs.value(i)).indexOf("super") != -1) ||
-				  (((attrs.value(i)).left(1) != "-") && ((attrs.value(i)).left(1) != "0"))))
+				  (((attrs.value(i)).at(0) != "-") && ((attrs.value(i)).at(0) != "0"))))
 			currentStyle->getFont()->toggleEffect(SUPERSCRIPT);
 		else if ((attrs.localName(i) == "fo:margin-top") && (pstyle != nullptr))
 			pstyle->setSpaceAbove(getSize(attrs.value(i)));
@@ -645,12 +645,12 @@
 	else if (key == "style:text-scale")
 		style->getFont()->setHscale(static_cast<int>(getSize(value, -1.0)));
 	else if ((key == "style:text-position") &&
-			 (((value).indexOf("sub") != -1) ||
-			  (((value).left(1) == "-") && ((value).left(1) != "0"))))
+			 ((value.indexOf("sub") != -1) ||
+			  ((value.at(0) == "-") && (value.at(0) != "0"))))
 		style->getFont()->toggleEffect(SUBSCRIPT);
 	else if ((key == "style:text-position") &&
-			 (((value).indexOf("super") != -1) ||
-			  (((value).left(1) != "-") && ((value).left(1) != "0"))))
+			 ((value.indexOf("super") != -1) ||
+			  ((value.at(0) != "-") && (value.at(0) != "0"))))
 		style->getFont()->toggleEffect(SUPERSCRIPT);
 	else if ((key == "fo:margin-top") && (pstyle != nullptr))
 		pstyle->setSpaceAbove(getSize(value));

Modified: trunk/Scribus/scribus/plugins/import/ai/importai.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23652&path=/trunk/Scribus/scribus/plugins/import/ai/importai.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/ai/importai.cpp	(original)
+++ trunk/Scribus/scribus/plugins/import/ai/importai.cpp	Sat Apr 25 22:03:32 2020
@@ -2151,8 +2151,8 @@
 			}
 			if (mKey == "N")
 			{
-				double cVal, mVal, yVal, kVal, coorX1, coorY1, coorX2, coorY2, coorX3, coorY3;
-				int dummy;
+				double cVal {0.0}, mVal {0.0}, yVal {0.0}, kVal {0.0}, coorX1 {0.0}, coorY1 {0.0}, coorX2 {0.0}, coorY2 {0.0}, coorX3 {0.0}, coorY3 {0.0};
+				int dummy {0};
 				meshNodeCounter++;
 				int ans = cmdLine.indexOf("[");
 				int ens = cmdLine.lastIndexOf("]");

Modified: trunk/Scribus/scribus/plugins/import/emf/importemf.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23652&path=/trunk/Scribus/scribus/plugins/import/emf/importemf.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/emf/importemf.cpp	(original)
+++ trunk/Scribus/scribus/plugins/import/emf/importemf.cpp	Sat Apr 25 22:03:32 2020
@@ -3858,12 +3858,12 @@
 	}
 	else if (brushType == U_BT_PathGradient)
 	{
-		quint32 gFlags, wrap, startCol, cCount, endCol;
+		quint32 gFlags {0}, wrap {0}, startCol {0}, cCount {0}, endCol {0};
 		ds >> gFlags >> wrap;
 		ds >> startCol;
 		QPointF p1 = getEMFPPoint(ds, false);
 		ds >> cCount;
-		for (quint32 a = 0; a < cCount; a++)
+		for (quint32 i = 0; i < cCount; i++)
 		{
 			ds >> endCol;
 		}

Modified: trunk/Scribus/scribus/plugins/picbrowser/picturebrowserplugin.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23652&path=/trunk/Scribus/scribus/plugins/picbrowser/picturebrowserplugin.h
==============================================================================
--- trunk/Scribus/scribus/plugins/picbrowser/picturebrowserplugin.h	(original)
+++ trunk/Scribus/scribus/plugins/picbrowser/picturebrowserplugin.h	Sat Apr 25 22:03:32 2020
@@ -23,17 +23,17 @@
 		//! \brief Standard plugin implementation
 		PictureBrowserPlugin();
 		virtual ~PictureBrowserPlugin();
-		virtual bool cleanupPlugin();
+		bool cleanupPlugin() override;
 		//! \brief main method to run the plug
-		virtual bool run ( ScribusDoc* doc, const QString& target = QString() );
-		virtual const QString fullTrName() const;
-		virtual const AboutData* getAboutData() const;
-		virtual void deleteAboutData ( const AboutData* about ) const;
-		virtual void languageChange();
-		virtual void addToMainWindowMenu ( ScribusMainWindow * ) {};
-		virtual void setDoc ( ScribusDoc* doc );
-		virtual void unsetDoc();
-		virtual void changedDoc ( ScribusDoc* doc );
+		bool run ( ScribusDoc* doc, const QString& target = QString() ) override;
+		const QString fullTrName() const override;
+		const AboutData* getAboutData() const override;
+		void deleteAboutData ( const AboutData* about ) const override;
+		void languageChange() override;
+		void addToMainWindowMenu ( ScribusMainWindow * ) override {};
+		void setDoc ( ScribusDoc* doc ) override;
+		void unsetDoc() override;
+		void changedDoc ( ScribusDoc* doc ) override;
 
 	public slots:
 		void closePictureBrowser();

Modified: trunk/Scribus/scribus/plugins/saveastemplateplugin/satemplate.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23652&path=/trunk/Scribus/scribus/plugins/saveastemplateplugin/satemplate.h
==============================================================================
--- trunk/Scribus/scribus/plugins/saveastemplateplugin/satemplate.h	(original)
+++ trunk/Scribus/scribus/plugins/saveastemplateplugin/satemplate.h	Sat Apr 25 22:03:32 2020
@@ -20,12 +20,12 @@
 		// Standard plugin implementation
 		SaveAsTemplatePlugin();
 		virtual ~SaveAsTemplatePlugin();
-		virtual bool run(ScribusDoc* doc, const QString& target = QString());
-		virtual const QString fullTrName() const;
-		virtual const AboutData* getAboutData() const;
-		virtual void deleteAboutData(const AboutData* about) const;
-		virtual void languageChange();
-		virtual void addToMainWindowMenu(ScribusMainWindow *) {};
+		bool run(ScribusDoc* doc, const QString& target = QString()) override;
+		const QString fullTrName() const override;
+		const AboutData* getAboutData() const override;
+		void deleteAboutData(const AboutData* about) const override;
+		void languageChange() override;
+		void addToMainWindowMenu(ScribusMainWindow *) override {};
 
 		// Special features (none)
 };

Modified: trunk/Scribus/scribus/plugins/short-words/shortwords.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23652&path=/trunk/Scribus/scribus/plugins/short-words/shortwords.h
==============================================================================
--- trunk/Scribus/scribus/plugins/short-words/shortwords.h	(original)
+++ trunk/Scribus/scribus/plugins/short-words/shortwords.h	Sat Apr 25 22:03:32 2020
@@ -27,14 +27,14 @@
 		// Standard plugin implementation
 		ShortWordsPlugin();
 		virtual ~ShortWordsPlugin();
-		virtual bool run(ScribusDoc* doc, const QString& target = QString());
-		virtual const QString fullTrName() const;
-		virtual const AboutData* getAboutData() const;
-		virtual void deleteAboutData(const AboutData* about) const;
-		virtual void languageChange();
-		virtual void addToMainWindowMenu(ScribusMainWindow *) {};
+		bool run(ScribusDoc* doc, const QString& target = QString()) override;
+		const QString fullTrName() const override;
+		const AboutData* getAboutData() const override;
+		void deleteAboutData(const AboutData* about) const override;
+		void languageChange() override;
+		void addToMainWindowMenu(ScribusMainWindow *) override {};
 		/*! \brief Preference widget */
-		virtual bool newPrefsPanelWidget(QWidget* parent, Prefs_Pane*& panel);
+		bool newPrefsPanelWidget(QWidget* parent, Prefs_Pane*& panel) override;
 		// Special features (none)
 };
 

Modified: trunk/Scribus/scribus/plugins/tools/2geomtools/meshdistortion/meshdistortion.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23652&path=/trunk/Scribus/scribus/plugins/tools/2geomtools/meshdistortion/meshdistortion.h
==============================================================================
--- trunk/Scribus/scribus/plugins/tools/2geomtools/meshdistortion/meshdistortion.h	(original)
+++ trunk/Scribus/scribus/plugins/tools/2geomtools/meshdistortion/meshdistortion.h	Sat Apr 25 22:03:32 2020
@@ -43,12 +43,12 @@
 		// Standard plugin implementation
 		MeshDistortionPlugin();
 		virtual ~MeshDistortionPlugin();
-		virtual bool run(ScribusDoc* doc, const QString& target = QString());
-		virtual const QString fullTrName() const;
-		virtual const AboutData* getAboutData() const;
-		virtual void deleteAboutData(const AboutData* about) const;
-		virtual void languageChange();
-		virtual void addToMainWindowMenu(ScribusMainWindow *) {};
+		bool run(ScribusDoc* doc, const QString& target = QString()) override;
+		const QString fullTrName() const override;
+		const AboutData* getAboutData() const override;
+		void deleteAboutData(const AboutData* about) const override;
+		void languageChange() override;
+		void addToMainWindowMenu(ScribusMainWindow *) override {};
 		
 	private:
 		PageItem *m_patternItem;

Modified: trunk/Scribus/scribus/plugins/tools/2geomtools/pathalongpath/pathalongpath.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23652&path=/trunk/Scribus/scribus/plugins/tools/2geomtools/pathalongpath/pathalongpath.h
==============================================================================
--- trunk/Scribus/scribus/plugins/tools/2geomtools/pathalongpath/pathalongpath.h	(original)
+++ trunk/Scribus/scribus/plugins/tools/2geomtools/pathalongpath/pathalongpath.h	Sat Apr 25 22:03:32 2020
@@ -60,13 +60,13 @@
 		// Standard plugin implementation
 		PathAlongPathPlugin();
 		virtual ~PathAlongPathPlugin();
-		virtual bool run(ScribusDoc* doc, const QString& target = QString());
-		virtual const QString fullTrName() const;
-		virtual const AboutData* getAboutData() const;
-		virtual void deleteAboutData(const AboutData* about) const;
-		virtual void languageChange();
-		virtual void addToMainWindowMenu(ScribusMainWindow *) {};
-		bool handleSelection(ScribusDoc* doc, int SelectedType);
+		bool run(ScribusDoc* doc, const QString& target = QString()) override;
+		const QString fullTrName() const override;
+		const AboutData* getAboutData() const override;
+		void deleteAboutData(const AboutData* about) const override;
+		void languageChange() override;
+		void addToMainWindowMenu(ScribusMainWindow *) override {};
+		bool handleSelection(ScribusDoc* doc, int SelectedType) override;
 	private:
 		void setUpEffect(Geom::Piecewise<Geom::D2<Geom::SBasis> > &pwd2_in, Geom::Piecewise<Geom::D2<Geom::SBasis> > &pattern, int effect, double offset, double offsetY, double gap, int rotate);
 		FPointArray doEffect_pwd2 (Geom::Piecewise<Geom::D2<Geom::SBasis> > & pattern);

Modified: trunk/Scribus/scribus/plugins/tools/flattenpath/flattenpath.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23652&path=/trunk/Scribus/scribus/plugins/tools/flattenpath/flattenpath.h
==============================================================================
--- trunk/Scribus/scribus/plugins/tools/flattenpath/flattenpath.h	(original)
+++ trunk/Scribus/scribus/plugins/tools/flattenpath/flattenpath.h	Sat Apr 25 22:03:32 2020
@@ -38,12 +38,12 @@
 		// Standard plugin implementation
 		FlattenPathPlugin();
 		virtual ~FlattenPathPlugin();
-		virtual bool run(ScribusDoc* doc, const QString& target = QString());
-		virtual const QString fullTrName() const;
-		virtual const AboutData* getAboutData() const;
-		virtual void deleteAboutData(const AboutData* about) const;
-		virtual void languageChange();
-		virtual void addToMainWindowMenu(ScribusMainWindow *) {};
+		bool run(ScribusDoc* doc, const QString& target = QString()) override;
+		const QString fullTrName() const override;
+		const AboutData* getAboutData() const override;
+		void deleteAboutData(const AboutData* about) const override;
+		void languageChange() override;
+		void addToMainWindowMenu(ScribusMainWindow *) override {};
 
 		// Special features (none)
 };

Modified: trunk/Scribus/scribus/plugins/tools/hunspellcheck/hunspellplugin.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23652&path=/trunk/Scribus/scribus/plugins/tools/hunspellcheck/hunspellplugin.h
==============================================================================
--- trunk/Scribus/scribus/plugins/tools/hunspellcheck/hunspellplugin.h	(original)
+++ trunk/Scribus/scribus/plugins/tools/hunspellcheck/hunspellplugin.h	Sat Apr 25 22:03:32 2020
@@ -23,13 +23,13 @@
 		HunspellPlugin();
 		virtual ~HunspellPlugin();
 		//! \brief main method to run the plug
-		virtual bool run(ScribusDoc* doc, const QString& target = QString());
-		virtual bool run(QWidget* p, ScribusDoc* doc, const QString& target = QString());
-		virtual const QString fullTrName() const;
-		virtual const AboutData* getAboutData() const;
-		virtual void deleteAboutData(const AboutData* about) const;
-		virtual void languageChange();
-		virtual void addToMainWindowMenu(ScribusMainWindow *) {};
+		bool run(ScribusDoc* doc, const QString& target = QString()) override;
+		bool run(QWidget* p, ScribusDoc* doc, const QString& target = QString()) override;
+		const QString fullTrName() const override;
+		const AboutData* getAboutData() const override;
+		void deleteAboutData(const AboutData* about) const override;
+		void languageChange() override;
+		void addToMainWindowMenu(ScribusMainWindow *) override {};
 
 		// Special features (none)
 };

Modified: trunk/Scribus/scribus/plugins/tools/lenseffects/lenseffects.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23652&path=/trunk/Scribus/scribus/plugins/tools/lenseffects/lenseffects.h
==============================================================================
--- trunk/Scribus/scribus/plugins/tools/lenseffects/lenseffects.h	(original)
+++ trunk/Scribus/scribus/plugins/tools/lenseffects/lenseffects.h	Sat Apr 25 22:03:32 2020
@@ -42,12 +42,12 @@
 		// Standard plugin implementation
 		LensEffectsPlugin();
 		virtual ~LensEffectsPlugin();
-		virtual bool run(ScribusDoc* doc, const QString& target = QString());
-		virtual const QString fullTrName() const;
-		virtual const AboutData* getAboutData() const;
-		virtual void deleteAboutData(const AboutData* about) const;
-		virtual void languageChange();
-		virtual void addToMainWindowMenu(ScribusMainWindow *) {};
+		bool run(ScribusDoc* doc, const QString& target = QString()) override;
+		const QString fullTrName() const override;
+		const AboutData* getAboutData() const override;
+		void deleteAboutData(const AboutData* about) const override;
+		void languageChange() override;
+		void addToMainWindowMenu(ScribusMainWindow *) override {};
 
 		// Special features (none)
 };

Modified: trunk/Scribus/scribus/plugins/tools/pathconnect/pathconnect.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23652&path=/trunk/Scribus/scribus/plugins/tools/pathconnect/pathconnect.h
==============================================================================
--- trunk/Scribus/scribus/plugins/tools/pathconnect/pathconnect.h	(original)
+++ trunk/Scribus/scribus/plugins/tools/pathconnect/pathconnect.h	Sat Apr 25 22:03:32 2020
@@ -46,12 +46,12 @@
 		// Standard plugin implementation
 		PathConnectPlugin();
 		virtual ~PathConnectPlugin();
-		virtual bool run(ScribusDoc* doc, const QString& target = QString());
-		virtual const QString fullTrName() const;
-		virtual const AboutData* getAboutData() const;
-		virtual void deleteAboutData(const AboutData* about) const;
-		virtual void languageChange();
-		virtual void addToMainWindowMenu(ScribusMainWindow *) {};
+		bool run(ScribusDoc* doc, const QString& target = QString()) override;
+		const QString fullTrName() const override;
+		const AboutData* getAboutData() const override;
+		void deleteAboutData(const AboutData* about) const override;
+		void languageChange() override;
+		void addToMainWindowMenu(ScribusMainWindow *) override {};
 
 		// Special features (none)
 	private:

Modified: trunk/Scribus/scribus/plugins/tools/pathcut/pathcut.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23652&path=/trunk/Scribus/scribus/plugins/tools/pathcut/pathcut.h
==============================================================================
--- trunk/Scribus/scribus/plugins/tools/pathcut/pathcut.h	(original)
+++ trunk/Scribus/scribus/plugins/tools/pathcut/pathcut.h	Sat Apr 25 22:03:32 2020
@@ -42,12 +42,12 @@
 		// Standard plugin implementation
 		PathCutPlugin();
 		virtual ~PathCutPlugin();
-		virtual bool run(ScribusDoc* doc, const QString& target = QString());
-		virtual const QString fullTrName() const;
-		virtual const AboutData* getAboutData() const;
-		virtual void deleteAboutData(const AboutData* about) const;
-		virtual void languageChange();
-		virtual void addToMainWindowMenu(ScribusMainWindow *) {};
+		bool run(ScribusDoc* doc, const QString& target = QString()) override;
+		const QString fullTrName() const override;
+		const AboutData* getAboutData() const override;
+		void deleteAboutData(const AboutData* about) const override;
+		void languageChange() override;
+		void addToMainWindowMenu(ScribusMainWindow *) override {};
 
 		// Special features (none)
 };

Modified: trunk/Scribus/scribus/plugins/tools/pathfinder/pathfinder.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23652&path=/trunk/Scribus/scribus/plugins/tools/pathfinder/pathfinder.h
==============================================================================
--- trunk/Scribus/scribus/plugins/tools/pathfinder/pathfinder.h	(original)
+++ trunk/Scribus/scribus/plugins/tools/pathfinder/pathfinder.h	Sat Apr 25 22:03:32 2020
@@ -43,12 +43,12 @@
 		// Standard plugin implementation
 		PathFinderPlugin();
 		virtual ~PathFinderPlugin();
-		virtual bool run(ScribusDoc* doc, const QString& target = QString());
-		virtual const QString fullTrName() const;
-		virtual const AboutData* getAboutData() const;
-		virtual void deleteAboutData(const AboutData* about) const;
-		virtual void languageChange();
-		virtual void addToMainWindowMenu(ScribusMainWindow *) {};
+		bool run(ScribusDoc* doc, const QString& target = QString()) override;
+		const QString fullTrName() const override;
+		const AboutData* getAboutData() const override;
+		void deleteAboutData(const AboutData* about) const override;
+		void languageChange() override;
+		void addToMainWindowMenu(ScribusMainWindow *) override {};
 
 		// Special features (none)
 };

Modified: trunk/Scribus/scribus/plugins/tools/pathstroker/pathstroker.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23652&path=/trunk/Scribus/scribus/plugins/tools/pathstroker/pathstroker.h
==============================================================================
--- trunk/Scribus/scribus/plugins/tools/pathstroker/pathstroker.h	(original)
+++ trunk/Scribus/scribus/plugins/tools/pathstroker/pathstroker.h	Sat Apr 25 22:03:32 2020
@@ -42,12 +42,12 @@
 		// Standard plugin implementation
 		PathStrokerPlugin();
 		virtual ~PathStrokerPlugin();
-		virtual bool run(ScribusDoc* doc, const QString& target = QString());
-		virtual const QString fullTrName() const;
-		virtual const AboutData* getAboutData() const;
-		virtual void deleteAboutData(const AboutData* about) const;
-		virtual void languageChange();
-		virtual void addToMainWindowMenu(ScribusMainWindow *) {};
+		bool run(ScribusDoc* doc, const QString& target = QString()) override;
+		const QString fullTrName() const override;
+		const AboutData* getAboutData() const override;
+		void deleteAboutData(const AboutData* about) const override;
+		void languageChange() override;
+		void addToMainWindowMenu(ScribusMainWindow *) override {};
 
 		// Special features (none)
 };

Modified: trunk/Scribus/scribus/plugins/tools/smoothpath/smoothpath.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23652&path=/trunk/Scribus/scribus/plugins/tools/smoothpath/smoothpath.h
==============================================================================
--- trunk/Scribus/scribus/plugins/tools/smoothpath/smoothpath.h	(original)
+++ trunk/Scribus/scribus/plugins/tools/smoothpath/smoothpath.h	Sat Apr 25 22:03:32 2020
@@ -38,12 +38,12 @@
 		// Standard plugin implementation
 		SmoothPathPlugin();
 		virtual ~SmoothPathPlugin();
-		virtual bool run(ScribusDoc* doc, const QString& target = QString());
-		virtual const QString fullTrName() const;
-		virtual const AboutData* getAboutData() const;
-		virtual void deleteAboutData(const AboutData* about) const;
-		virtual void languageChange();
-		virtual void addToMainWindowMenu(ScribusMainWindow *) {};
+		bool run(ScribusDoc* doc, const QString& target = QString()) override;
+		const QString fullTrName() const override;
+		const AboutData* getAboutData() const override;
+		void deleteAboutData(const AboutData* about) const override;
+		void languageChange() override;
+		void addToMainWindowMenu(ScribusMainWindow *) override {};
 
 		// Special features (none)
 };

Modified: trunk/Scribus/scribus/plugins/tools/subdivide/subdivide.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23652&path=/trunk/Scribus/scribus/plugins/tools/subdivide/subdivide.h
==============================================================================
--- trunk/Scribus/scribus/plugins/tools/subdivide/subdivide.h	(original)
+++ trunk/Scribus/scribus/plugins/tools/subdivide/subdivide.h	Sat Apr 25 22:03:32 2020
@@ -42,12 +42,12 @@
 		// Standard plugin implementation
 		SubdividePlugin();
 		virtual ~SubdividePlugin();
-		virtual bool run(ScribusDoc* doc, const QString& target = QString());
-		virtual const QString fullTrName() const;
-		virtual const AboutData* getAboutData() const;
-		virtual void deleteAboutData(const AboutData* about) const;
-		virtual void languageChange();
-		virtual void addToMainWindowMenu(ScribusMainWindow *) {};
+		bool run(ScribusDoc* doc, const QString& target = QString()) override;
+		const QString fullTrName() const override;
+		const AboutData* getAboutData() const override;
+		void deleteAboutData(const AboutData* about) const override;
+		void languageChange() override;
+		void addToMainWindowMenu(ScribusMainWindow *) override {};
 
 		// Special features (none)
 };

Modified: trunk/Scribus/scribus/prefsmanager.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23652&path=/trunk/Scribus/scribus/prefsmanager.cpp
==============================================================================
--- trunk/Scribus/scribus/prefsmanager.cpp	(original)
+++ trunk/Scribus/scribus/prefsmanager.cpp	Sat Apr 25 22:03:32 2020
@@ -512,7 +512,7 @@
 {
 	ActionManager::createDefaultShortcuts();
 	QMap<QString, QKeySequence > *map = ActionManager::defaultShortcuts();
-	for (QMap<QString, QKeySequence >::ConstIterator it = map->begin(); it != map->end(); ++it)
+	for (QMap<QString, QKeySequence >::ConstIterator it = map->constBegin(); it != map->constEnd(); ++it)
 	{
 		Keys& keyAction = appPrefs.keyShortcutPrefs.KeyActions[it.key()];
 		keyAction.actionName = it.key();

Modified: trunk/Scribus/scribus/pslib.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23652&path=/trunk/Scribus/scribus/pslib.cpp
==============================================================================
--- trunk/Scribus/scribus/pslib.cpp	(original)
+++ trunk/Scribus/scribus/pslib.cpp	Sat Apr 25 22:03:32 2020
@@ -189,7 +189,7 @@
 
 void PSPainter::drawRect(QRectF rect)
 {
-	double h, s, v, k;
+	double h {0.0}, s {0.0}, v {0.0}, k {0.0};
 	m_ps->PS_save();
 	applyTransform();
 	m_ps->PS_moveto(x() + rect.x(), -y() - rect.y());

Modified: trunk/Scribus/scribus/scimage.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23652&path=/trunk/Scribus/scribus/scimage.cpp
==============================================================================
--- trunk/Scribus/scribus/scimage.cpp	(original)
+++ trunk/Scribus/scribus/scimage.cpp	Sat Apr 25 22:03:32 2020
@@ -654,22 +654,20 @@
 
 bool ScImage::convolveImage(QImage *dest, const unsigned int order, const double *kernel)
 {
-	long widthk;
 	double red, green, blue, alpha;
-	double normalize, *normal_kernel;
 	const double *k;
 	unsigned int *q;
 	int x, y, mx, my, sx, sy;
 	long i;
 	int mcx, mcy;
-	widthk = order;
+	long widthk = order;
 	if ((widthk % 2) == 0)
 		return(false);
-	normal_kernel = (double *)malloc(widthk*widthk*sizeof(double));
+	double *normal_kernel = (double *)malloc(widthk*widthk*sizeof(double));
 	if (!normal_kernel)
 		return(false);
 	*dest = QImage(width(), height(), QImage::Format_ARGB32);
-	normalize=0.0;
+	double normalize=0.0;
 	for (i=0; i < (widthk*widthk); i++)
 		normalize += kernel[i];
 	if (fabs(normalize) <= 1.0e-12)

Modified: trunk/Scribus/scribus/scplugin.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23652&path=/trunk/Scribus/scribus/scplugin.cpp
==============================================================================
--- trunk/Scribus/scribus/scplugin.cpp	(original)
+++ trunk/Scribus/scribus/scplugin.cpp	Sat Apr 25 22:03:32 2020
@@ -78,30 +78,6 @@
 
 ScActionPlugin::ScActionPlugin() : ScPlugin()
 {
-	m_Doc = nullptr;
-
-	m_actionInfo.name = "";
-	m_actionInfo.text = "";
-	m_actionInfo.helpText = "";
-	m_actionInfo.keySequence = "";
-	m_actionInfo.menu = "";
-	m_actionInfo.menuAfterName = "";
-	m_actionInfo.parentMenu = "";
-	m_actionInfo.subMenuName = "";
-	m_actionInfo.toolbar = "";
-	m_actionInfo.toolBarName = "";
-	m_actionInfo.iconPath1 = QString();
-	m_actionInfo.iconPath2 = QString();
-	m_actionInfo.notSuitableFor.clear();
-	m_actionInfo.forAppMode.clear();
-	m_actionInfo.needsNumObjects = -1;
-	m_actionInfo.firstObjectType.clear();
-	m_actionInfo.secondObjectType.clear();
-	m_actionInfo.enabledOnStartup = false;
-	m_actionInfo.enabledForStoryEditor = false;
-	m_actionInfo.seMenu = "";
-	m_actionInfo.seParentMenu = "";
-	m_actionInfo.seKeySequence = "";
 }
 
 ScActionPlugin::~ScActionPlugin()

Modified: trunk/Scribus/scribus/scplugin.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23652&path=/trunk/Scribus/scribus/scplugin.h
==============================================================================
--- trunk/Scribus/scribus/scplugin.h	(original)
+++ trunk/Scribus/scribus/scplugin.h	Sat Apr 25 22:03:32 2020
@@ -277,8 +277,8 @@
 			QList<int> secondObjectType;	// when needsNumObjects is 2 this list contains the Object Types of the second object on the selection
 											// -1 indicates that any kind of object is possible. Otherwise the selection must contain the 2 Object Types
 											// for the Plugin Action to be enabled
-			bool enabledOnStartup;
-			bool enabledForStoryEditor;
+			bool enabledOnStartup {false};
+			bool enabledForStoryEditor {false};
 			QString seMenu;
 			QString seParentMenu;
 			QString seKeySequence;
@@ -431,7 +431,7 @@
 		ActionInfo m_actionInfo;
 		// Obsolete - see runResult()
 		QString m_runResult;
-		ScribusDoc* m_Doc;
+		ScribusDoc* m_Doc {nullptr};
 };
 
 /**

Modified: trunk/Scribus/scribus/ui/aligndistribute.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23652&path=/trunk/Scribus/scribus/ui/aligndistribute.h
==============================================================================
--- trunk/Scribus/scribus/ui/aligndistribute.h	(original)
+++ trunk/Scribus/scribus/ui/aligndistribute.h	Sat Apr 25 22:03:32 2020
@@ -73,7 +73,7 @@
 	
 protected slots:
 	virtual void iconSetChange();
-	virtual void languageChange();
+	void languageChange();
 	
 	void alignLeftOut();
 	void alignRightOut();

Modified: trunk/Scribus/scribus/ui/checkDocument.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23652&path=/trunk/Scribus/scribus/ui/checkDocument.h
==============================================================================
--- trunk/Scribus/scribus/ui/checkDocument.h	(original)
+++ trunk/Scribus/scribus/ui/checkDocument.h	Sat Apr 25 22:03:32 2020
@@ -108,8 +108,8 @@
 
 
 protected slots:
-    virtual void iconSetChange();
-	virtual void languageChange();
+	void iconSetChange();
+	void languageChange();
 
 protected:
 	QVBoxLayout* checkDocumentLayout;

Modified: trunk/Scribus/scribus/ui/colorsandfills.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23652&path=/trunk/Scribus/scribus/ui/colorsandfills.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/colorsandfills.cpp	(original)
+++ trunk/Scribus/scribus/ui/colorsandfills.cpp	Sat Apr 25 22:03:32 2020
@@ -756,18 +756,18 @@
 		{
 			ColorList dCols = m_colorList;
 			QString dColor = tr("Selected Colors");
-			for (int a = 0; a < usedColors.count(); a++)
-			{
-				dCols.remove(usedColors[a]);
+			for (int i = 0; i < usedColors.count(); i++)
+			{
+				dCols.remove(usedColors[i]);
 			}
 			dCols.insert(dColor , ScColor());
 			DelColor *dia = new DelColor(this, dCols, dColor, true);
 			if (dia->exec())
 			{
 				QString replacementColor(dia->getReplacementColor());
-				for (int a = 0; a < colors.count(); a++)
-				{
-					dColor = colors[a];
+				for (int i = 0; i < colors.count(); i++)
+				{
+					dColor = colors[i];
 					if (replacementColor == CommonStrings::tr_NoneColor)
 						replacementColor = CommonStrings::None;
 					if (replaceColorMap.values().contains(dColor))

Modified: trunk/Scribus/scribus/ui/helpbrowser.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23652&path=/trunk/Scribus/scribus/ui/helpbrowser.h
==============================================================================
--- trunk/Scribus/scribus/ui/helpbrowser.h	(original)
+++ trunk/Scribus/scribus/ui/helpbrowser.h	Sat Apr 25 22:03:32 2020
@@ -140,7 +140,7 @@
 	QMap<QAction*, histd2> m_history;
 	
 protected slots:
-	virtual void languageChange();
+	void languageChange();
 	void histChosen(QAction* i);
 	void loadHelp(const QString& fileName);
 	void loadMenu();

Modified: trunk/Scribus/scribus/ui/hruler.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23652&path=/trunk/Scribus/scribus/ui/hruler.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/hruler.cpp	(original)
+++ trunk/Scribus/scribus/ui/hruler.cpp	Sat Apr 25 22:03:32 2020
@@ -679,7 +679,6 @@
 					tx += QChar(0xBD);
 				if ((frac > 0.74) && (frac < 0.76))
 					tx += QChar(0xBE);
-				tx = tx;
 				break;
 			case SC_P:
 			case SC_C:

Modified: trunk/Scribus/scribus/ui/hyask.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23652&path=/trunk/Scribus/scribus/ui/hyask.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/hyask.cpp	(original)
+++ trunk/Scribus/scribus/ui/hyask.cpp	Sat Apr 25 22:03:32 2020
@@ -22,7 +22,7 @@
 void WortEdit::keyPressEvent ( QKeyEvent *k )
 {
 	int p = cursorPosition();
-	QChar cc = text() [p];
+	QChar cc = text().at(p);
 	if ( ( k->key() == Qt::Key_Left ) || ( k->key() == Qt::Key_Right ) )
 		QLineEdit::keyPressEvent ( k );
 	if ( k->key() == Qt::Key_Delete )
@@ -33,7 +33,7 @@
 	}
 	if ( ( k->key() == Qt::Key_Backspace ) && ( p != 0 ) )
 	{
-		cc = text() [p-1];
+		cc = text().at(p-1);
 		if ( cc == '-' )
 			QLineEdit::keyPressEvent ( k );
 		setCursorPosition ( p-1 );

Modified: trunk/Scribus/scribus/ui/latexeditor.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23652&path=/trunk/Scribus/scribus/ui/latexeditor.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/latexeditor.cpp	(original)
+++ trunk/Scribus/scribus/ui/latexeditor.cpp	Sat Apr 25 22:03:32 2020
@@ -678,14 +678,14 @@
 			m_description = xml->readI18nText();
 		}
 		
-		QString toString() const
+		QString toString() const override
 		{
 			if (value() == minimum() && !specialValueText().isEmpty())
 				return specialValueText();
 			return QString::number(value());
 		}
 		
-		void fromString(QString str)
+		void fromString(QString str) override
 		{
 			if (str == specialValueText())
 				setValue(minimum());
@@ -711,14 +711,14 @@
 			m_description = xml->readI18nText();
 		}
 		
-		QString toString() const
+		QString toString() const override
 		{
 			if (value() == minimum() && !specialValueText().isEmpty())
 				return specialValueText();
 			return QString::number(value());
 		}
 		
-		void fromString(QString str)
+		void fromString(QString str) override
 		{
 			if (str == specialValueText())
 				setValue(minimum());
@@ -734,11 +734,11 @@
 			fromString(m_defaultValue);
 		}
 		
-		QString toString() const {
+		QString toString() const override {
 			return text();
 		}
 		
-		void fromString(QString str) {
+		void fromString(QString str) override {
 			setText(str);
 		}
 };
@@ -750,11 +750,11 @@
 			fromString(m_defaultValue);
 		}
 		
-		QString toString() const {
+		QString toString() const override {
 			return toPlainText();
 		}
 		
-		void fromString(QString str) {
+		void fromString(QString str) override {
 			setPlainText(str);
 		}
 };
@@ -769,11 +769,11 @@
 			fromString(m_defaultValue);
 		}
 		
-		QString toString() const {
+		QString toString() const override {
 			return "Not implemented!";
 		}
 		
-		void fromString(QString str) {
+		void fromString(QString str) override {
 			qDebug() << "Color pickers are not implemented yet!";
 		}
 };
@@ -809,7 +809,7 @@
 			}
 		}
 		
-		QString toString() const {
+		QString toString() const override {
 			return itemData(currentIndex()).toString();
 		}
 		

Modified: trunk/Scribus/scribus/ui/latexeditor.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23652&path=/trunk/Scribus/scribus/ui/latexeditor.h
==============================================================================
--- trunk/Scribus/scribus/ui/latexeditor.h	(original)
+++ trunk/Scribus/scribus/ui/latexeditor.h	Sat Apr 25 22:03:32 2020
@@ -147,7 +147,7 @@
 		QString description() const { return m_description; }
 		QString defaultValue() const { return m_defaultValue; }
 		virtual QString toString() const { return ""; }
-		virtual void fromString(QString str){}
+		virtual void fromString(QString str) {}
 	protected:
 		QString m_name;
 		QString m_description;

Modified: trunk/Scribus/scribus/ui/loremipsum.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23652&path=/trunk/Scribus/scribus/ui/loremipsum.h
==============================================================================
--- trunk/Scribus/scribus/ui/loremipsum.h	(original)
+++ trunk/Scribus/scribus/ui/loremipsum.h	Sat Apr 25 22:03:32 2020
@@ -132,7 +132,7 @@
 	virtual void changeEvent(QEvent *e);
 
 protected slots:
-	virtual void languageChange();
+	void languageChange();
 
 };
 

Modified: trunk/Scribus/scribus/ui/measurements.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23652&path=/trunk/Scribus/scribus/ui/measurements.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/measurements.cpp	(original)
+++ trunk/Scribus/scribus/ui/measurements.cpp	Sat Apr 25 22:03:32 2020
@@ -77,14 +77,13 @@
 
 void Measurements::unitChanged()
 {
-	QString tmp;
 	int uInd = unitSwitch->currentIndex();
 	int uDec = unitGetDecimalsFromIndex(uInd);
 	if (uDec == 0)
 		uDec = 1; // Unlikely but avoid division by 0 if unitGetDecimalsFromIndex() returns 0
 	int uPrec = unitGetPrecisionFromIndex(uInd);
 	double uRatio = unitGetRatioFromIndex(uInd);
-	QString uStr  = unitGetStrFromIndex(uInd);
+	QString uStr(unitGetStrFromIndex(uInd));
 	const QLocale& l = LocaleManager::instance().userPreferredLocale();
 	x1Data->setText(l.toString(qRound(mX1 * uRatio * uDec) / static_cast<double>(uDec), 'f', uPrec) + " " + uStr);
 	y1Data->setText(l.toString(qRound(mY1 * uRatio * uDec) / static_cast<double>(uDec), 'f', uPrec) + " " + uStr);

Modified: trunk/Scribus/scribus/ui/pagelayout.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23652&path=/trunk/Scribus/scribus/ui/pagelayout.h
==============================================================================
--- trunk/Scribus/scribus/ui/pagelayout.h	(original)
+++ trunk/Scribus/scribus/ui/pagelayout.h	Sat Apr 25 22:03:32 2020
@@ -68,7 +68,7 @@
 	QVBoxLayout* layoutGroupLayout;
 
 protected slots:
-	virtual void languageChange();
+	void languageChange();
 
 };
 

Modified: trunk/Scribus/scribus/ui/pagepropertiesdialog.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23652&path=/trunk/Scribus/scribus/ui/pagepropertiesdialog.h
==============================================================================
--- trunk/Scribus/scribus/ui/pagepropertiesdialog.h	(original)
+++ trunk/Scribus/scribus/ui/pagepropertiesdialog.h	Sat Apr 25 22:03:32 2020
@@ -73,21 +73,21 @@
 
 public slots:
 	//! \brief as setOrientation for orientationQComboBox current item
-	virtual void setPageSize();
+	void setPageSize();
 	/*! \brief Sets page size and enables/disables size widgets.
 	\param gr A QString with name of the page size or "Custom" */
-	virtual void setSize(const QString & gr);
+	void setSize(const QString & gr);
 	/*! \brief Sets page orientation and sizes regarding the given value
 	\param  ori integer from orientationQComboBox item index */
-	virtual void setOrientation(int ori);
+	void setOrientation(int ori);
 	/*! \brief Recompute the page width for current unit.
 	It's called from width spinbox.
 	\param v new width */
-	virtual void setPageWidth(double v);
+	void setPageWidth(double v);
 	/*! \brief Recompute the page height for current unit.
 	It's called from width spinbox.
 	\param v new height */
-	virtual void setPageHeight(double v);
+	void setPageHeight(double v);
 
 private:
 	MarginWidget* marginWidget;

Modified: trunk/Scribus/scribus/ui/propertiespalette_line.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23652&path=/trunk/Scribus/scribus/ui/propertiespalette_line.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/propertiespalette_line.cpp	(original)
+++ trunk/Scribus/scribus/ui/propertiespalette_line.cpp	Sat Apr 25 22:03:32 2020
@@ -322,12 +322,8 @@
 	endArrowScale->blockSignals(false);
 	lineMode->blockSignals(false);
 
-	setter = false;
-
 	if ((m_item->isGroup()) && (!m_item->isSingleSel))
-	{
 		setEnabled(false);
-	}
 
 	m_haveItem = true;
 
@@ -335,13 +331,9 @@
 	showLineValues(m_item->lineStyle(), m_item->lineEnd(), m_item->lineJoin());
 
 	if (m_item->asOSGFrame())
-	{
 		setEnabled(false);
-	}
 	if (m_item->asSymbolFrame())
-	{
 		setEnabled(false);
-	}
 }
 
 void PropertiesPalette_Line::updateArrowStyles()
@@ -351,11 +343,10 @@
 
 void PropertiesPalette_Line::updateArrowStyles(ScribusDoc *doc)
 {
-	if (doc)
-	{
-		startArrow->rebuildList(&doc->arrowStyles());
-		endArrow->rebuildList(&doc->arrowStyles());
-	}
+	if (!doc)
+		return;
+	startArrow->rebuildList(&doc->arrowStyles());
+	endArrow->rebuildList(&doc->arrowStyles());
 }
 
 void PropertiesPalette_Line::updateLineStyles()

Modified: trunk/Scribus/scribus/ui/scinputdialog.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23652&path=/trunk/Scribus/scribus/ui/scinputdialog.h
==============================================================================
--- trunk/Scribus/scribus/ui/scinputdialog.h	(original)
+++ trunk/Scribus/scribus/ui/scinputdialog.h	Sat Apr 25 22:03:32 2020
@@ -48,7 +48,7 @@
 	QHBoxLayout* buttonLayout;
 
 protected slots:
-	virtual void languageChange();
+	void languageChange();
 };
 
 #endif // SCINPUTDIALOG_H

Modified: trunk/Scribus/scribus/ui/scrpalettebase.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23652&path=/trunk/Scribus/scribus/ui/scrpalettebase.h
==============================================================================
--- trunk/Scribus/scribus/ui/scrpalettebase.h	(original)
+++ trunk/Scribus/scribus/ui/scrpalettebase.h	Sat Apr 25 22:03:32 2020
@@ -59,7 +59,7 @@
 
 protected:
 	/** @brief Set the Preferences context to be used for storage of startup visibility and position and size */
-	virtual void setPrefsContext(const QString& context);
+	void setPrefsContext(const QString& context);
 	void storePosition();
 	void storePosition(int newX, int newY);
 	void storeSize();

Modified: trunk/Scribus/scribus/ui/shadebutton.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23652&path=/trunk/Scribus/scribus/ui/shadebutton.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/shadebutton.cpp	(original)
+++ trunk/Scribus/scribus/ui/shadebutton.cpp	Sat Apr 25 22:03:32 2020
@@ -19,7 +19,7 @@
 	setMenu(FillSh);
 	setPopupMode(QToolButton::InstantPopup);
 	setText("100 %");
-	FillSh->actions()[11]->setChecked(true);
+	FillSh->actions().at(11)->setChecked(true);
 	connect( FillSh, SIGNAL(triggered(QAction *)), this, SLOT(setShade(QAction *)));
 }
 
@@ -31,7 +31,7 @@
 	int b = 100;
 	for (a = 0; a < FillSh->actions().count(); ++a)
 	{
-		FillSh->actions()[a]->setChecked(false);
+		FillSh->actions().at(a)->setChecked(false);
 	}
 	act->setChecked(true);
 	QList<QAction*> actList = FillSh->actions();

Modified: trunk/Scribus/scribus/ui/vruler.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23652&path=/trunk/Scribus/scribus/ui/vruler.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/vruler.cpp	(original)
+++ trunk/Scribus/scribus/ui/vruler.cpp	Sat Apr 25 22:03:32 2020
@@ -129,7 +129,6 @@
 						tx += QChar(0xBD);
 					if ((frac > 0.74) && (frac < 0.76))
 						tx += QChar(0xBE);
-					tx = tx;
 				}
 				break;
 			case SC_P:

Modified: trunk/Scribus/scribus/undogui.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23652&path=/trunk/Scribus/scribus/undogui.h
==============================================================================
--- trunk/Scribus/scribus/undogui.h	(original)
+++ trunk/Scribus/scribus/undogui.h	Sat Apr 25 22:03:32 2020
@@ -76,7 +76,7 @@
 	virtual void clear() = 0;
 
 	/** @brief Sets GUI strings on language change */
-	virtual void languageChange();
+	void languageChange();
 	
 public slots:
 	/**

Modified: trunk/Scribus/scribus/undostate.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23652&path=/trunk/Scribus/scribus/undostate.cpp
==============================================================================
--- trunk/Scribus/scribus/undostate.cpp	(original)
+++ trunk/Scribus/scribus/undostate.cpp	Sat Apr 25 22:03:32 2020
@@ -109,8 +109,8 @@
 
 QVariant SimpleState::variant(const QString& key, const QVariant& def)
 {
-	QMap<QString, QVariant>::const_iterator it = m_values.find(key);
-	if (it != m_values.end())
+	QMap<QString, QVariant>::const_iterator it = m_values.constFind(key);
+	if (it != m_values.constEnd())
 		return it.value();
 
 	m_values[key] = def;
@@ -119,8 +119,8 @@
 
 QString SimpleState::get(const QString& key, const QString& def)
 {
-	QMap<QString, QVariant>::const_iterator it = m_values.find(key);
-	if (it != m_values.end())
+	QMap<QString, QVariant>::const_iterator it = m_values.constFind(key);
+	if (it != m_values.constEnd())
 		return it.value().toString();
 
 	m_values[key] = def;

Modified: trunk/Scribus/scribus/util.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23652&path=/trunk/Scribus/scribus/util.cpp
==============================================================================
--- trunk/Scribus/scribus/util.cpp	(original)
+++ trunk/Scribus/scribus/util.cpp	Sat Apr 25 22:03:32 2020
@@ -736,8 +736,8 @@
 		}
 		else if (token.indexOf("-") != -1) // import a range of source doc pages
 		{
-			int from = QString(token.left(token.indexOf("-"))).toInt();
-			int to = QString(token.right(token.length() - token.indexOf("-") - 1)).toInt();
+			int from = QStringRef(token.leftRef(token.indexOf("-"))).toInt();
+			int to = QStringRef(token.rightRef(token.length() - token.indexOf("-") - 1)).toInt();
 			if ((from != 0) && (to != 0))
 			{
 				if (from > sourcePageCount)




More information about the scribus-commit mailing list