r23653 by craig - Code cleanup, especially unnecessary QString initialisation related.

scribus-commit scribus-commit at lists.scribus.net
Sat Apr 25 23:11:34 UTC 2020


Author: craig
Date: Sat Apr 25 23:11:34 2020
New Revision: 23653

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=23653
Log:
Code cleanup, especially unnecessary QString initialisation related.

Modified:
    trunk/Scribus/scribus/colormgmt/sclcms2colormgmtengineimpl.cpp
    trunk/Scribus/scribus/desaxe/saxfilter.cpp
    trunk/Scribus/scribus/desaxe/saxiohelper.cpp
    trunk/Scribus/scribus/downloadmanager/scdlmgr.cpp
    trunk/Scribus/scribus/fonts/ftface.h
    trunk/Scribus/scribus/fonts/scface.h
    trunk/Scribus/scribus/fonts/scface_ttf.cpp
    trunk/Scribus/scribus/imagedataloaders/scimgdataloader.cpp
    trunk/Scribus/scribus/imagedataloaders/scimgdataloader_gimp.cpp
    trunk/Scribus/scribus/notesstyles.h
    trunk/Scribus/scribus/pageitem.cpp
    trunk/Scribus/scribus/pageitem_line.cpp
    trunk/Scribus/scribus/pageitem_noteframe.cpp
    trunk/Scribus/scribus/pageitem_pathtext.cpp
    trunk/Scribus/scribus/pageitem_polyline.cpp
    trunk/Scribus/scribus/pageitem_spiral.cpp
    trunk/Scribus/scribus/pageitem_symbol.cpp
    trunk/Scribus/scribus/pageitem_textframe.cpp
    trunk/Scribus/scribus/pdflib_core.cpp
    trunk/Scribus/scribus/pslib.cpp
    trunk/Scribus/scribus/scfonts.h
    trunk/Scribus/scribus/scguardedptr.h
    trunk/Scribus/scribus/scimage.cpp
    trunk/Scribus/scribus/scpageoutput.cpp
    trunk/Scribus/scribus/scpreview.cpp
    trunk/Scribus/scribus/ui/charselect.cpp
    trunk/Scribus/scribus/ui/charselect.h
    trunk/Scribus/scribus/ui/colorlistmodel.cpp
    trunk/Scribus/scribus/ui/colorsandfills.cpp
    trunk/Scribus/scribus/ui/effectsdialog.h
    trunk/Scribus/scribus/ui/latexeditor.h
    trunk/Scribus/scribus/ui/pagepalette_masterpages.cpp
    trunk/Scribus/scribus/undomanager.h
    trunk/Scribus/scribus/undoobject.cpp
    trunk/Scribus/scribus/undoobject.h
    trunk/Scribus/scribus/undostate.cpp
    trunk/Scribus/scribus/undostate.h
    trunk/Scribus/scribus/undotransaction.h
    trunk/Scribus/scribus/upgradechecker.cpp
    trunk/Scribus/scribus/util.cpp
    trunk/Scribus/scribus/util.h
    trunk/Scribus/scribus/util_color.cpp
    trunk/Scribus/scribus/util_ghostscript.h
    trunk/Scribus/scribus/vgradient.h
    trunk/Scribus/scribus/vgradientex.h

Modified: trunk/Scribus/scribus/colormgmt/sclcms2colormgmtengineimpl.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23653&path=/trunk/Scribus/scribus/colormgmt/sclcms2colormgmtengineimpl.cpp
==============================================================================
--- trunk/Scribus/scribus/colormgmt/sclcms2colormgmtengineimpl.cpp	(original)
+++ trunk/Scribus/scribus/colormgmt/sclcms2colormgmtengineimpl.cpp	Sat Apr 25 23:11:34 2020
@@ -23,7 +23,7 @@
 QSharedPointer<ScColorTransformPool> ScLcms2ColorMgmtEngineImpl::m_transformPool;
 
 ScLcms2ColorMgmtEngineImpl::ScLcms2ColorMgmtEngineImpl()
-                         : ScColorMgmtEngineData("Littlecms v2", 1)
+	: ScColorMgmtEngineData("Littlecms v2", 1)
 {
 	if (!m_profileCache)
 		m_profileCache = QSharedPointer<ScColorProfileCache>(new ScColorProfileCache());

Modified: trunk/Scribus/scribus/desaxe/saxfilter.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23653&path=/trunk/Scribus/scribus/desaxe/saxfilter.cpp
==============================================================================
--- trunk/Scribus/scribus/desaxe/saxfilter.cpp	(original)
+++ trunk/Scribus/scribus/desaxe/saxfilter.cpp	Sat Apr 25 23:11:34 2020
@@ -54,7 +54,7 @@
 : SaxFilter(delegate), m_level(0), m_old(oldname), m_new(newname) {}
 
 RenameElem::RenameElem(SaxHandler* delegate, const Xml_string& newname)
-: SaxFilter(delegate), m_level(0), m_old(""), m_new(newname) {}
+: SaxFilter(delegate), m_level(0), m_new(newname) {}
 
 void RenameElem::begin(const Xml_string& tag, Xml_attr attr)
 {

Modified: trunk/Scribus/scribus/desaxe/saxiohelper.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23653&path=/trunk/Scribus/scribus/desaxe/saxiohelper.cpp
==============================================================================
--- trunk/Scribus/scribus/desaxe/saxiohelper.cpp	(original)
+++ trunk/Scribus/scribus/desaxe/saxiohelper.cpp	Sat Apr 25 23:11:34 2020
@@ -11,11 +11,11 @@
 #include "fpointarray.h"
 #include "scclocale.h"
 
-const Xml_string SaxIO::saxxDefaultElem("");
+const Xml_string SaxIO::saxxDefaultElem;
 
 Xml_string mkXMLName(const QString& any)
 {
-	QString result("");
+	QString result;
 	for (int i=0; i < any.length(); ++i)
 	{
 		unsigned int ch = any[i].unicode();
@@ -136,7 +136,7 @@
 
 Xml_string toXMLString(const QList<double>& doublelist)
 {
-	QString result = "";
+	QString result;
 	QList<double>::const_iterator dax;
 	for (dax = doublelist.begin(); dax != doublelist.end(); ++dax)
 		result += toXMLString(*dax) + " ";
@@ -145,7 +145,7 @@
 
 Xml_string toXMLString(const QList<float>& floatlist)
 {
-	QString result = "";
+	QString result;
 	for (auto dax = floatlist.cbegin(); dax != floatlist.cend(); ++dax)
 		result += toXMLString(*dax) + " ";
 	return result;
@@ -162,7 +162,7 @@
 
 Xml_string toXMLString(const QVector<double>& doublelist)
 {
-	QString result = "";
+	QString result;
 	for (auto dax = doublelist.cbegin(); dax != doublelist.cend(); ++dax)
 		result += toXMLString(*dax) + " ";
 	return result;
@@ -170,7 +170,7 @@
 
 Xml_string toXMLString(const QVector<float>& floatlist)
 {
-	QString result = "";
+	QString result;
 	for (auto dax = floatlist.cbegin(); dax != floatlist.cend(); ++dax)
 		result += toXMLString(*dax) + " ";
 	return result;
@@ -188,7 +188,7 @@
 
 Xml_string toXMLString(const QList<int>& intlist)
 {
-	QString result = "";
+	QString result;
 	for (auto dax = intlist.cbegin(); dax != intlist.cend(); ++dax)
 		result += toXMLString(*dax) + " ";
 	return result;
@@ -206,7 +206,7 @@
 
 Xml_string toXMLString(const QVector<int>& intlist)
 {
-	QString result = "";
+	QString result;
 	for (auto dax = intlist.cbegin(); dax != intlist.cend(); ++dax)
 		result += toXMLString(*dax) + " ";
 	return result;
@@ -235,7 +235,7 @@
 
 Xml_string toXMLString(const QStringList& list)
 {
-	QString result = "";
+	QString result;
 	for (auto dax = list.cbegin(); dax != list.cend(); ++dax)
 		result += *dax + " ";
 	return result;

Modified: trunk/Scribus/scribus/downloadmanager/scdlmgr.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23653&path=/trunk/Scribus/scribus/downloadmanager/scdlmgr.cpp
==============================================================================
--- trunk/Scribus/scribus/downloadmanager/scdlmgr.cpp	(original)
+++ trunk/Scribus/scribus/downloadmanager/scdlmgr.cpp	Sat Apr 25 23:11:34 2020
@@ -70,7 +70,6 @@
 		d.url=s;
 		d.downloadLocation=downloadLocation;
 		d.destinationLocation=destinationLocation;
-		d.destinationName="";
 		d.state=DownloadData::New;
 		m_fileList.append(d);
 	}

Modified: trunk/Scribus/scribus/fonts/ftface.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23653&path=/trunk/Scribus/scribus/fonts/ftface.h
==============================================================================
--- trunk/Scribus/scribus/fonts/ftface.h	(original)
+++ trunk/Scribus/scribus/fonts/ftface.h	Sat Apr 25 23:11:34 2020
@@ -77,23 +77,23 @@
 	QString italicAngleAsString()    const { return m_italicAngle; }
 
 	bool isItalic() const { return m_isItalic; }
-	bool isBold()   const { return m_isBold; }
+	bool isBold() const { return m_isBold; }
 
-//FIXME	QMap<QString,QString> fontDictionary(qreal sz=1.0)      const;
+//FIXME	QMap<QString,QString> fontDictionary(qreal sz=1.0) const;
 
-	ScFace::gid_type    char2CMap(uint ch)                         const;
+	ScFace::gid_type char2CMap(uint ch) const;
 
-//	GlyphMetrics glyphBBox (gid_type gl,               qreal sz) const;
+//	GlyphMetrics glyphBBox (gid_type gl, qreal sz) const;
 
-	void rawData   (QByteArray & bb)            const;
+	void rawData   (QByteArray & bb) const;
 
 	static bool hasMicrosoftUnicodeCmap(FT_Face face);
 	static QString adobeGlyphName(FT_ULong charcode);
 	virtual bool glyphNames(ScFace::FaceEncoding& GList) const;
 
-	void load      ()                           const;
-	void unload    ()                           const;
-	void loadGlyph (ScFace::gid_type gl)        const;
+	void load() const;
+	void unload() const;
+	void loadGlyph (ScFace::gid_type gl) const;
 
 protected:
 	mutable FT_Face m_face;

Modified: trunk/Scribus/scribus/fonts/scface.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23653&path=/trunk/Scribus/scribus/fonts/scface.h
==============================================================================
--- trunk/Scribus/scribus/fonts/scface.h	(original)
+++ trunk/Scribus/scribus/fonts/scface.h	Sat Apr 25 23:11:34 2020
@@ -178,7 +178,7 @@
 
 		// dummy implementations
 		virtual qreal ascent(qreal sz)           const { return sz; }
-		virtual QString pdfAscentAsString()      const { return "0" ; }
+		virtual QString pdfAscentAsString()      const { return "0"; }
 		virtual QString pdfDescentAsString()     const { return "0"; }
 		virtual QString pdfCapHeightAsString()   const { return "0"; }
 		virtual QString pdfFontBBoxAsString()    const { return "0 0 0 0"; }

Modified: trunk/Scribus/scribus/fonts/scface_ttf.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23653&path=/trunk/Scribus/scribus/fonts/scface_ttf.cpp
==============================================================================
--- trunk/Scribus/scribus/fonts/scface_ttf.cpp	(original)
+++ trunk/Scribus/scribus/fonts/scface_ttf.cpp	Sat Apr 25 23:11:34 2020
@@ -163,22 +163,19 @@
 
 bool ScFace_ttf::embedFont(QByteArray &str) const
 {
-    QByteArray bb;
-    FtFace::rawData(bb);
+	QByteArray bb;
+	FtFace::rawData(bb);
 	if (formatCode == ScFace::TYPE42)
 	{
 		//easy:
 		str = bb;
 		return true;
 	}
-    
-	QString tmp4;
-	QString tmp2 = "";
-	QString tmp3 = "";
+
 	int counter = 0;
 	char *buf[50];
-	FT_ULong  charcode;
-	FT_UInt   gindex;
+	FT_ULong charcode;
+	FT_UInt gindex;
 	FT_Face face = ftFace();
 	if (!face)
 		return false;
@@ -246,11 +243,12 @@
 	delete[] tmp;
 	gindex = 0;
 	charcode = FT_Get_First_Char(face, &gindex );
+	QString tmp2, tmp3, tmp4;
 	while (gindex != 0)
 	{
 		FT_Get_Glyph_Name(face, gindex, buf, 50);
-		tmp2 += "/"+QString(reinterpret_cast<char*>(buf))+" "+tmp3.setNum(gindex)+" def\n";
-		 charcode = FT_Get_Next_Char(face, charcode, &gindex );
+		tmp2 += "/"+QString(reinterpret_cast<char*>(buf)) + " " + tmp3.setNum(gindex) + " def\n";
+		charcode = FT_Get_Next_Char(face, charcode, &gindex );
 		counter++;
 	}
 	tmp4.setNum(counter);

Modified: trunk/Scribus/scribus/imagedataloaders/scimgdataloader.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23653&path=/trunk/Scribus/scribus/imagedataloaders/scimgdataloader.cpp
==============================================================================
--- trunk/Scribus/scribus/imagedataloaders/scimgdataloader.cpp	(original)
+++ trunk/Scribus/scribus/imagedataloaders/scimgdataloader.cpp	Sat Apr 25 23:11:34 2020
@@ -38,7 +38,7 @@
 {
 	uchar len, tmp;
 	uint adj;
-	QString ret = "";
+	QString ret;
 	s >> len;
 	if (len == 0)
 	{

Modified: trunk/Scribus/scribus/imagedataloaders/scimgdataloader_gimp.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23653&path=/trunk/Scribus/scribus/imagedataloaders/scimgdataloader_gimp.cpp
==============================================================================
--- trunk/Scribus/scribus/imagedataloaders/scimgdataloader_gimp.cpp	(original)
+++ trunk/Scribus/scribus/imagedataloaders/scimgdataloader_gimp.cpp	Sat Apr 25 23:11:34 2020
@@ -43,7 +43,7 @@
 		s >> patternWidth;
 		s >> patternHeight;
 		s >> patternType;
-		QString magic = "";
+		QString magic;
 		for (int i = 0; i < 4; i++)
 		{
 			s >> magicKey[i];

Modified: trunk/Scribus/scribus/notesstyles.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23653&path=/trunk/Scribus/scribus/notesstyles.h
==============================================================================
--- trunk/Scribus/scribus/notesstyles.h	(original)
+++ trunk/Scribus/scribus/notesstyles.h	Sat Apr 25 23:11:34 2020
@@ -95,7 +95,7 @@
 
 private:
 	//only ScribusDoc can create and delete notes
-	TextNote(NotesStyle *nStyle) : textLen(0), m_notesStyle(nStyle), m_noteMasterMark(NULL), m_noteFrameMark(NULL), m_number(0) { }
+	TextNote(NotesStyle *nStyle) : m_notesStyle(nStyle), m_noteMasterMark(NULL), m_noteFrameMark(NULL), m_number(0) { }
 	~TextNote() {}
 public:
 	void setNotesStyle (NotesStyle* ns) { m_notesStyle = ns; }
@@ -109,8 +109,9 @@
 	void setNoteMark(Mark* m) { m_noteFrameMark = m; }
 	const QString saxedText() { return m_noteSaxedText; }
 	void setSaxedText(const QString& string) { m_noteSaxedText = string; }
+	void clearSaxedText() { m_noteSaxedText.clear(); textLen = 0; }
 	bool isEndNote() { return m_notesStyle->isEndNotes(); }
-	int textLen;
+	int textLen {0};
 
 protected:
 	NotesStyle *m_notesStyle;

Modified: trunk/Scribus/scribus/pageitem.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23653&path=/trunk/Scribus/scribus/pageitem.cpp
==============================================================================
--- trunk/Scribus/scribus/pageitem.cpp	(original)
+++ trunk/Scribus/scribus/pageitem.cpp	Sat Apr 25 23:11:34 2020
@@ -482,7 +482,7 @@
 	GrStrokeFocalY = 0;
 	GrStrokeScale = 1;
 	GrStrokeSkew = 0;
-	gradientStrokeVal = "";
+	gradientStrokeVal.clear();
 	m_patternName = "";
 	patternScaleX = 100;
 	patternScaleY = 100;
@@ -2092,7 +2092,7 @@
 					else if (GrTypeStroke > 0)
 					{
 						if ((!gradientStrokeVal.isEmpty()) && (!m_Doc->docGradients.contains(gradientStrokeVal)))
-							gradientStrokeVal = "";
+							gradientStrokeVal.clear();
 						if (!(gradientStrokeVal.isEmpty()) && (m_Doc->docGradients.contains(gradientStrokeVal)))
 							stroke_gradient = m_Doc->docGradients[gradientStrokeVal];
 						if (stroke_gradient.stops() < 2) // fall back to solid stroking if there are not enough colorstops in the gradient.
@@ -9715,7 +9715,7 @@
 			else if (GrTypeStroke > 0)
 			{
 				if ((!gradientStrokeVal.isEmpty()) && (!m_Doc->docGradients.contains(gradientStrokeVal)))
-					gradientStrokeVal = "";
+					gradientStrokeVal.clear();
 				if (!(gradientStrokeVal.isEmpty()) && (m_Doc->docGradients.contains(gradientStrokeVal)))
 					stroke_gradient = m_Doc->docGradients[gradientStrokeVal];
 				if (stroke_gradient.stops() < 2) // fall back to solid stroking if there are not enough colorstops in the gradient.
@@ -10280,7 +10280,7 @@
 		return;
 	if (ContourLine.empty())
 		ContourLine = PoLine.copy();
-	int ph = static_cast<int>(qMax(1.0, lineWidth() / 2.0));
+//	int ph = static_cast<int>(qMax(1.0, lineWidth() / 2.0));
 	bool clipBackup = ClipEdited;
 	switch (itemType())
 	{

Modified: trunk/Scribus/scribus/pageitem_line.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23653&path=/trunk/Scribus/scribus/pageitem_line.cpp
==============================================================================
--- trunk/Scribus/scribus/pageitem_line.cpp	(original)
+++ trunk/Scribus/scribus/pageitem_line.cpp	Sat Apr 25 23:11:34 2020
@@ -83,7 +83,7 @@
 			else if (GrTypeStroke > 0)
 			{
 				if ((!gradientStrokeVal.isEmpty()) && (!m_Doc->docGradients.contains(gradientStrokeVal)))
-					gradientStrokeVal = "";
+					gradientStrokeVal.clear();
 				if (!(gradientStrokeVal.isEmpty()) && (m_Doc->docGradients.contains(gradientStrokeVal)))
 					stroke_gradient = m_Doc->docGradients[gradientStrokeVal];
 				if (stroke_gradient.stops() < 2) // fall back to solid stroking if there are not enough colorstops in the gradient.

Modified: trunk/Scribus/scribus/pageitem_noteframe.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23653&path=/trunk/Scribus/scribus/pageitem_noteframe.cpp
==============================================================================
--- trunk/Scribus/scribus/pageitem_noteframe.cpp	(original)
+++ trunk/Scribus/scribus/pageitem_noteframe.cpp	Sat Apr 25 23:11:34 2020
@@ -337,10 +337,12 @@
 							++offset;
 						int len = pos - startPos -offset;
 						if (len <= 0)
-							note->setSaxedText("");
+							note->clearSaxedText();
 						else
+						{
 							note->setSaxedText(getItemTextSaxed(startPos, len));
-						note->textLen = len;
+							note->textLen = len;
+						}
 						itemText.deselectAll();
 					}
 				}
@@ -360,10 +362,7 @@
 			note->textLen = pos - startPos;
 		}
 		else //empty note text (only note marker)
-		{
-			note->setSaxedText("");
-			note->textLen = 0;
-		}
+			note->clearSaxedText();
 	}
 	if (oldSelLen > 0)
 		itemText.select(oldSelStart, oldSelLen);

Modified: trunk/Scribus/scribus/pageitem_pathtext.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23653&path=/trunk/Scribus/scribus/pageitem_pathtext.cpp
==============================================================================
--- trunk/Scribus/scribus/pageitem_pathtext.cpp	(original)
+++ trunk/Scribus/scribus/pageitem_pathtext.cpp	Sat Apr 25 23:11:34 2020
@@ -106,7 +106,7 @@
 				else if (GrTypeStroke > 0)
 				{
 					if ((!gradientStrokeVal.isEmpty()) && (!m_Doc->docGradients.contains(gradientStrokeVal)))
-						gradientStrokeVal = "";
+						gradientStrokeVal.clear();
 					if (!(gradientStrokeVal.isEmpty()) && (m_Doc->docGradients.contains(gradientStrokeVal)))
 						stroke_gradient = m_Doc->docGradients[gradientStrokeVal];
 					if (stroke_gradient.stops() < 2) // fall back to solid stroking if there are not enough colorstops in the gradient.

Modified: trunk/Scribus/scribus/pageitem_polyline.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23653&path=/trunk/Scribus/scribus/pageitem_polyline.cpp
==============================================================================
--- trunk/Scribus/scribus/pageitem_polyline.cpp	(original)
+++ trunk/Scribus/scribus/pageitem_polyline.cpp	Sat Apr 25 23:11:34 2020
@@ -119,7 +119,7 @@
 			else if (GrTypeStroke > 0)
 			{
 				if ((!gradientStrokeVal.isEmpty()) && (!m_Doc->docGradients.contains(gradientStrokeVal)))
-					gradientStrokeVal = "";
+					gradientStrokeVal.clear();
 				if (!(gradientStrokeVal.isEmpty()) && (m_Doc->docGradients.contains(gradientStrokeVal)))
 					stroke_gradient = m_Doc->docGradients[gradientStrokeVal];
 				if (stroke_gradient.stops() < 2) // fall back to solid stroking if there are not enough colorstops in the gradient.

Modified: trunk/Scribus/scribus/pageitem_spiral.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23653&path=/trunk/Scribus/scribus/pageitem_spiral.cpp
==============================================================================
--- trunk/Scribus/scribus/pageitem_spiral.cpp	(original)
+++ trunk/Scribus/scribus/pageitem_spiral.cpp	Sat Apr 25 23:11:34 2020
@@ -121,7 +121,7 @@
 			else if (GrTypeStroke > 0)
 			{
 				if ((!gradientStrokeVal.isEmpty()) && (!m_Doc->docGradients.contains(gradientStrokeVal)))
-					gradientStrokeVal = "";
+					gradientStrokeVal.clear();
 				if (!(gradientStrokeVal.isEmpty()) && (m_Doc->docGradients.contains(gradientStrokeVal)))
 					stroke_gradient = m_Doc->docGradients[gradientStrokeVal];
 				if (stroke_gradient.stops() < 2) // fall back to solid stroking if there are not enough colorstops in the gradient.

Modified: trunk/Scribus/scribus/pageitem_symbol.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23653&path=/trunk/Scribus/scribus/pageitem_symbol.cpp
==============================================================================
--- trunk/Scribus/scribus/pageitem_symbol.cpp	(original)
+++ trunk/Scribus/scribus/pageitem_symbol.cpp	Sat Apr 25 23:11:34 2020
@@ -57,7 +57,7 @@
 	if (m_Doc->RePos)
 		return;
 	if (!m_Doc->docPatterns.contains(m_patternName))
-		m_patternName = "";
+		m_patternName.clear();
 	if (m_patternName.isEmpty())
 	{
 		if (m_Doc->guidesPrefs().framesShown)
@@ -98,7 +98,7 @@
 		else
 			p->setMaskMode(3);
 		if ((!gradientMask().isEmpty()) && (!m_Doc->docGradients.contains(gradientMask())))
-			gradientMaskVal = "";
+			gradientMaskVal.clear();
 		if (!(gradientMask().isEmpty()) && (m_Doc->docGradients.contains(gradientMask())))
 			mask_gradient = m_Doc->docGradients[gradientMask()];
 		p->mask_gradient = mask_gradient;

Modified: trunk/Scribus/scribus/pageitem_textframe.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23653&path=/trunk/Scribus/scribus/pageitem_textframe.cpp
==============================================================================
--- trunk/Scribus/scribus/pageitem_textframe.cpp	(original)
+++ trunk/Scribus/scribus/pageitem_textframe.cpp	Sat Apr 25 23:11:34 2020
@@ -3621,7 +3621,7 @@
 				else if (GrTypeStroke > 0)
 				{
 					if ((!gradientStrokeVal.isEmpty()) && (!m_Doc->docGradients.contains(gradientStrokeVal)))
-						gradientStrokeVal = "";
+						gradientStrokeVal.clear();
 					if (!(gradientStrokeVal.isEmpty()) && (m_Doc->docGradients.contains(gradientStrokeVal)))
 						stroke_gradient = m_Doc->docGradients[gradientStrokeVal];
 					if (stroke_gradient.stops() < 2) // fall back to solid stroking if there are not enough colorstops in the gradient.

Modified: trunk/Scribus/scribus/pdflib_core.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23653&path=/trunk/Scribus/scribus/pdflib_core.cpp
==============================================================================
--- trunk/Scribus/scribus/pdflib_core.cpp	(original)
+++ trunk/Scribus/scribus/pdflib_core.cpp	Sat Apr 25 23:11:34 2020
@@ -10264,7 +10264,7 @@
 		ext = getImageType(fn);
 	ScImage img;
 	QString BBox;
-	QChar  tc;
+//	QChar  tc;
 	bool   found = false;
 	bool   alphaM = false;
 	bool   realCMYK = false;

Modified: trunk/Scribus/scribus/pslib.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23653&path=/trunk/Scribus/scribus/pslib.cpp
==============================================================================
--- trunk/Scribus/scribus/pslib.cpp	(original)
+++ trunk/Scribus/scribus/pslib.cpp	Sat Apr 25 23:11:34 2020
@@ -65,24 +65,7 @@
 
 class PSPainter:public TextLayoutPainter
 {
-	ScribusDoc* m_Doc;
-	uint m_argh;
-	ScPage* m_page;
-	bool m_farb;
-	bool m_master;
-	PSLib* m_ps;
-
-	void applyTransform()
-	{
-		if (matrix() != QTransform())
-		{
-			m_ps->PutStream(m_ps->MatrixToStr(1.0, 0.0, 0.0, -1.0, x(), 0.0) + "\n");
-			m_ps->PutStream(m_ps->MatrixToStr(matrix().m11(), -matrix().m12(), matrix().m21(), -matrix().m22(), matrix().dx(), -matrix().dy()) + "\n");
-			m_ps->PutStream("[0.0 0.0 0.0 0.0 0.0 0.0] concatmatrix\nconcat\n");
-		}
-	}
-
-public:
+	public:
 	PSPainter(ScribusDoc* Doc, uint argh, ScPage* page, bool master, PSLib* ps):
 		m_Doc(Doc),
 		m_argh(argh),
@@ -96,6 +79,25 @@
 	void drawLine(QPointF start, QPointF end) override;
 	void drawRect(QRectF rect) override;
 	void drawObject(PageItem* item) override;
+
+	private:
+		ScribusDoc* m_Doc;
+		uint m_argh;
+		ScPage* m_page;
+		bool m_farb;
+		bool m_master;
+		PSLib* m_ps;
+
+		void applyTransform()
+		{
+			if (matrix() != QTransform())
+			{
+				m_ps->PutStream(m_ps->MatrixToStr(1.0, 0.0, 0.0, -1.0, x(), 0.0) + "\n");
+				m_ps->PutStream(m_ps->MatrixToStr(matrix().m11(), -matrix().m12(), matrix().m21(), -matrix().m22(), matrix().dx(), -matrix().dy()) + "\n");
+				m_ps->PutStream("[0.0 0.0 0.0 0.0 0.0 0.0] concatmatrix\nconcat\n");
+			}
+		}
+
 };
 
 void PSPainter::drawGlyph(const GlyphCluster& gc)

Modified: trunk/Scribus/scribus/scfonts.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23653&path=/trunk/Scribus/scribus/scfonts.h
==============================================================================
--- trunk/Scribus/scribus/scfonts.h	(original)
+++ trunk/Scribus/scribus/scfonts.h	Sat Apr 25 23:11:34 2020
@@ -59,7 +59,7 @@
 
 		/// maps family name to face variants
 		QMap<QString, QStringList> fontMap;
-		QMap<QString, QString>     rejectedFonts;
+		QMap<QString, QString> rejectedFonts;
 
 	private:
 		void readFontCache(const QString& pf);

Modified: trunk/Scribus/scribus/scguardedptr.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23653&path=/trunk/Scribus/scribus/scguardedptr.h
==============================================================================
--- trunk/Scribus/scribus/scguardedptr.h	(original)
+++ trunk/Scribus/scribus/scguardedptr.h	Sat Apr 25 23:11:34 2020
@@ -139,7 +139,7 @@
 template<typename T>
 ScGuardedObject<T>::ScGuardedObject(const ScGuardedObject& other)
 {
-	this->data = 0;
+	this->data = nullptr;
 	// Must never be used
 	assert(false);
 };

Modified: trunk/Scribus/scribus/scimage.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23653&path=/trunk/Scribus/scribus/scimage.cpp
==============================================================================
--- trunk/Scribus/scribus/scimage.cpp	(original)
+++ trunk/Scribus/scribus/scimage.cpp	Sat Apr 25 23:11:34 2020
@@ -1981,7 +1981,7 @@
 	bool gotAlpha = false;
 	QScopedPointer<ScImgDataLoader> pDataLoader;
 	imgInfo.valid = false;
-	imgInfo.clipPath = "";
+	imgInfo.clipPath.clear();
 	imgInfo.PDSpathData.clear();
 	imgInfo.layerInfo.clear();
 	QFileInfo fi = QFileInfo(fn);

Modified: trunk/Scribus/scribus/scpageoutput.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23653&path=/trunk/Scribus/scribus/scpageoutput.cpp
==============================================================================
--- trunk/Scribus/scribus/scpageoutput.cpp	(original)
+++ trunk/Scribus/scribus/scpageoutput.cpp	Sat Apr 25 23:11:34 2020
@@ -442,7 +442,7 @@
 				{
 					QString gradientStrokeVal = item->strokeGradient();
 					if ((!gradientStrokeVal.isEmpty()) && (!m_doc->docGradients.contains(gradientStrokeVal)))
-						gradientStrokeVal = "";
+						gradientStrokeVal.clear();
 					if (!(gradientStrokeVal.isEmpty()) && (m_doc->docGradients.contains(gradientStrokeVal)))
 						painter->m_strokeGradient = VGradientEx(m_doc->docGradients[gradientStrokeVal], *m_doc);
 					if (painter->m_strokeGradient.stops() < 2) // fall back to solid stroking if there are not enough colorstops in the gradient.
@@ -850,7 +850,7 @@
 		{
 			QString gradientStrokeVal = item->strokeGradient();
 			if ((!gradientStrokeVal.isEmpty()) && (!m_doc->docGradients.contains(gradientStrokeVal)))
-				gradientStrokeVal = "";
+				gradientStrokeVal.clear();
 			if (!(gradientStrokeVal.isEmpty()) && (m_doc->docGradients.contains(gradientStrokeVal)))
 				painter->m_strokeGradient = VGradientEx(m_doc->docGradients[gradientStrokeVal], *m_doc);
 			if (painter->m_strokeGradient.stops() < 2) // fall back to solid stroking if there are not enough colorstops in the gradient.
@@ -1191,7 +1191,7 @@
 		{
 			QString gradientStrokeVal = item->strokeGradient();
 			if ((!gradientStrokeVal.isEmpty()) && (!m_doc->docGradients.contains(gradientStrokeVal)))
-				gradientStrokeVal = "";
+				gradientStrokeVal.clear();
 			if (!(gradientStrokeVal.isEmpty()) && (m_doc->docGradients.contains(gradientStrokeVal)))
 				painter->m_strokeGradient = VGradientEx(m_doc->docGradients[gradientStrokeVal], *m_doc);
 			if (painter->m_strokeGradient.stops() < 2) // fall back to solid stroking if there are not enough colorstops in the gradient.
@@ -1358,7 +1358,7 @@
 		{
 			QString gradientStrokeVal = item->strokeGradient();
 			if ((!gradientStrokeVal.isEmpty()) && (!m_doc->docGradients.contains(gradientStrokeVal)))
-				gradientStrokeVal = "";
+				gradientStrokeVal.clear();
 			if (!(gradientStrokeVal.isEmpty()) && (m_doc->docGradients.contains(gradientStrokeVal)))
 				painter->m_strokeGradient = VGradientEx(m_doc->docGradients[gradientStrokeVal], *m_doc);
 			if (painter->m_strokeGradient.stops() < 2) // fall back to solid stroking if there are not enough colorstops in the gradient.

Modified: trunk/Scribus/scribus/scpreview.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23653&path=/trunk/Scribus/scribus/scpreview.cpp
==============================================================================
--- trunk/Scribus/scribus/scpreview.cpp	(original)
+++ trunk/Scribus/scribus/scpreview.cpp	Sat Apr 25 23:11:34 2020
@@ -20,7 +20,7 @@
 
 QImage ScPreview::createPreview(const QString& data)
 {
-	PrefsManager& prefsManager = PrefsManager::instance();
+//	PrefsManager& prefsManager = PrefsManager::instance();
 	double gx, gy, gw, gh;
 	ScriXmlDoc ss;
 	if (ss.readElemHeader(data, false, &gx, &gy, &gw, &gh))

Modified: trunk/Scribus/scribus/ui/charselect.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23653&path=/trunk/Scribus/scribus/ui/charselect.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/charselect.cpp	(original)
+++ trunk/Scribus/scribus/ui/charselect.cpp	Sat Apr 25 23:11:34 2020
@@ -23,7 +23,7 @@
 #include "util.h"
 #include "iconmanager.h"
 
-CharSelect::CharSelect(QWidget* parent) : ScrPaletteBase(parent, "CharSelect"), m_doc(nullptr), m_enhanced(nullptr), m_Item(nullptr)
+CharSelect::CharSelect(QWidget* parent) : ScrPaletteBase(parent, "CharSelect")
 {
 	setupUi(this);
 

Modified: trunk/Scribus/scribus/ui/charselect.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23653&path=/trunk/Scribus/scribus/ui/charselect.h
==============================================================================
--- trunk/Scribus/scribus/ui/charselect.h	(original)
+++ trunk/Scribus/scribus/ui/charselect.h	Sat Apr 25 23:11:34 2020
@@ -46,9 +46,7 @@
 	const QString & getCharacters();
 
 	//! Used for StoryEditor
-	CharTableModel * userTableModel() {
-		return m_userTableModel;
-	};
+	CharTableModel * userTableModel() { return m_userTableModel; }
 
 	virtual void changeEvent(QEvent *e);
 
@@ -62,19 +60,16 @@
 
 
 private:
-	ScribusDoc* m_doc;
+	ScribusDoc* m_doc {nullptr};
 	//! \brief m_userTable model
-	CharTableModel * m_userTableModel;
-	UnicodeSearchModel *m_unicodeSearchModel;
-
-	CharSelectEnhanced * m_enhanced;
+	CharTableModel * m_userTableModel {nullptr};
+	UnicodeSearchModel *m_unicodeSearchModel {nullptr};
+	CharSelectEnhanced * m_enhanced {nullptr};
 
 	//! Hold the "glyphs to insert" here.
 	QString chToIns;
-
 	QString paletteFileMask;
-
-	PageItem *m_Item;
+	PageItem *m_Item {nullptr};
 
 	void saveUserContent(const QString& f);
 	void loadUserContent(const QString& f);

Modified: trunk/Scribus/scribus/ui/colorlistmodel.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23653&path=/trunk/Scribus/scribus/ui/colorlistmodel.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/colorlistmodel.cpp	(original)
+++ trunk/Scribus/scribus/ui/colorlistmodel.cpp	Sat Apr 25 23:11:34 2020
@@ -10,7 +10,7 @@
 #include "colorlistbox.h"
 #include "commonstrings.h"
 
-ColorPixmapValue::ColorPixmapValue() : m_doc(nullptr), m_name("invalid")
+ColorPixmapValue::ColorPixmapValue() : m_name("invalid")
 {}
 
 ColorPixmapValue::ColorPixmapValue(const ColorPixmapValue& other) : m_color(other.m_color), m_doc(other.m_doc), m_name(other.m_name)

Modified: trunk/Scribus/scribus/ui/colorsandfills.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23653&path=/trunk/Scribus/scribus/ui/colorsandfills.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/colorsandfills.cpp	(original)
+++ trunk/Scribus/scribus/ui/colorsandfills.cpp	Sat Apr 25 23:11:34 2020
@@ -642,7 +642,7 @@
 		dialogGradients.insert(gradN, dialogGradients[it->text(0)]);
 		origNames.insert(gradN, gradN);
 		QString patternName = origNames[gradN];
-		QString newName = "";
+		QString newName;
 		gradientEditDialog *dia = new gradientEditDialog(this, gradN, dialogGradients[gradN], m_colorList, m_doc, &dialogGradients, false);
 		if (dia->exec())
 		{

Modified: trunk/Scribus/scribus/ui/effectsdialog.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23653&path=/trunk/Scribus/scribus/ui/effectsdialog.h
==============================================================================
--- trunk/Scribus/scribus/ui/effectsdialog.h	(original)
+++ trunk/Scribus/scribus/ui/effectsdialog.h	Sat Apr 25 23:11:34 2020
@@ -176,8 +176,8 @@
 	virtual void selectAvailEffectDbl(QListWidgetItem* c);
 
 protected:
-	ScribusDoc* m_doc;
-	PageItem*   m_item;
+	ScribusDoc* m_doc {nullptr};
+	PageItem* m_item {nullptr};
 
 	ScImage m_image;
 	double  m_imageScale;

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

Modified: trunk/Scribus/scribus/ui/pagepalette_masterpages.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23653&path=/trunk/Scribus/scribus/ui/pagepalette_masterpages.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/pagepalette_masterpages.cpp	(original)
+++ trunk/Scribus/scribus/ui/pagepalette_masterpages.cpp	Sat Apr 25 23:11:34 2020
@@ -224,7 +224,7 @@
 	name = getNonReservedName(name);
 	name = getUniqueName(name, m_doc->MasterNames);
 
-	PrefsManager& prefsManager = PrefsManager::instance();
+//	PrefsManager& prefsManager = PrefsManager::instance();
 	int inde = m_doc->MasterNames[m_currentPage];
 	int nr = m_doc->Pages->count();
 	ScPage* from = m_doc->Pages->at(inde);

Modified: trunk/Scribus/scribus/undomanager.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23653&path=/trunk/Scribus/scribus/undomanager.h
==============================================================================
--- trunk/Scribus/scribus/undomanager.h	(original)
+++ trunk/Scribus/scribus/undomanager.h	Sat Apr 25 23:11:34 2020
@@ -143,10 +143,10 @@
 	 * @param actionPixmap icon for the action performed by the transaction
 	 * @sa commit()
 	 */
-	UndoTransaction beginTransaction(const QString &targetName = "",
+	UndoTransaction beginTransaction(const QString &targetName = QString(),
 									 QPixmap *targetPixmap = nullptr,
-									 const QString &actionName = "",
-									 const QString &description = "",
+									 const QString &actionName = QString(),
+									 const QString &description = QString(),
 									 QPixmap *actionPixmap = nullptr);
 
 	UndoTransaction beginTransaction(const TransactionSettings& settings);

Modified: trunk/Scribus/scribus/undoobject.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23653&path=/trunk/Scribus/scribus/undoobject.cpp
==============================================================================
--- trunk/Scribus/scribus/undoobject.cpp	(original)
+++ trunk/Scribus/scribus/undoobject.cpp	Sat Apr 25 23:11:34 2020
@@ -35,15 +35,14 @@
 {
 	m_id = m_nextId;
 	++m_nextId;
-	m_uname = "";
 	m_upixmap = nullptr;
 }
 
 UndoObject::UndoObject(const UndoObject& other)
-		  : m_objectPtr(this)
+	: m_objectPtr(this)
 {
-	m_id      = other.m_id;
-	m_uname   = other.m_uname;
+	m_id = other.m_id;
+	m_uname = other.m_uname;
 	m_upixmap = other.m_upixmap;
 }
 

Modified: trunk/Scribus/scribus/undoobject.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23653&path=/trunk/Scribus/scribus/undoobject.h
==============================================================================
--- trunk/Scribus/scribus/undoobject.h	(original)
+++ trunk/Scribus/scribus/undoobject.h	Sat Apr 25 23:11:34 2020
@@ -145,7 +145,7 @@
 	 * When used together with an UndoAction that has an image is this image
 	 * drawn first then the action image is drawn on top of this.
 	 */
-	QPixmap *m_upixmap;
+	QPixmap *m_upixmap {nullptr};
 
 	/**
 	 * @brief Guarded pointer

Modified: trunk/Scribus/scribus/undostate.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23653&path=/trunk/Scribus/scribus/undostate.cpp
==============================================================================
--- trunk/Scribus/scribus/undostate.cpp	(original)
+++ trunk/Scribus/scribus/undostate.cpp	Sat Apr 25 23:11:34 2020
@@ -219,7 +219,7 @@
 
 /*** TransactionState *****************************************************/
 
-TransactionState::TransactionState() : UndoState("")
+TransactionState::TransactionState() : UndoState(QString())
 {
 	m_size = 0;
 }

Modified: trunk/Scribus/scribus/undostate.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23653&path=/trunk/Scribus/scribus/undostate.h
==============================================================================
--- trunk/Scribus/scribus/undostate.h	(original)
+++ trunk/Scribus/scribus/undostate.h	Sat Apr 25 23:11:34 2020
@@ -126,7 +126,7 @@
 	/** @brief Detailed description of the state (operation). */
 	QString m_actionDescription;
 	/** @brief Icon related to the state (operation) */
-	QPixmap *m_actionPixmap;
+	QPixmap *m_actionPixmap {nullptr};
 	/** @brief UndoObject this state belongs to */
 	UndoObjectPtr m_undoObject;
 };
@@ -175,7 +175,7 @@
 	 * from the map it will be added with the value described in the param
 	 * <code>def</code> which is then returned.
 	 */
-	QString get(const QString& key, const QString& def = "");
+	QString get(const QString& key, const QString& def = QString());
 
 	/**
 	 * @brief Returns the int value attached to the key.

Modified: trunk/Scribus/scribus/undotransaction.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23653&path=/trunk/Scribus/scribus/undotransaction.h
==============================================================================
--- trunk/Scribus/scribus/undotransaction.h	(original)
+++ trunk/Scribus/scribus/undotransaction.h	Sat Apr 25 23:11:34 2020
@@ -52,8 +52,8 @@
 	virtual bool cancel();
 	bool commit(const QString &targetName,
 				QPixmap *targetPixmap,
-				const QString &name = "",
-				const QString &description = "",
+				const QString &name = QString(),
+				const QString &description = QString(),
 				QPixmap *actionPixmap = nullptr);
 };
 

Modified: trunk/Scribus/scribus/upgradechecker.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23653&path=/trunk/Scribus/scribus/upgradechecker.cpp
==============================================================================
--- trunk/Scribus/scribus/upgradechecker.cpp	(original)
+++ trunk/Scribus/scribus/upgradechecker.cpp	Sat Apr 25 23:11:34 2020
@@ -36,8 +36,6 @@
 void UpgradeChecker::init()
 {
 	m_errorReported=false;
-	m_message="";
-	m_updates.clear();
 	m_version=(VERSION);
 	m_stability="unstablesvn";
 	QString versionStripped=m_version.toLower();

Modified: trunk/Scribus/scribus/util.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23653&path=/trunk/Scribus/scribus/util.cpp
==============================================================================
--- trunk/Scribus/scribus/util.cpp	(original)
+++ trunk/Scribus/scribus/util.cpp	Sat Apr 25 23:11:34 2020
@@ -205,15 +205,15 @@
 
 QString CompressStr(QString *in)
 {
-	QString out = "";
+	QString out;
 	QByteArray bb(in->length(), ' ');
 	if (bb.size() == in->length())
 	{
-		for (int ax = 0; ax < in->length(); ++ax)
+		for (int i = 0; i < in->length(); ++i)
 		{
 			// bb.insert(ax, in->at(ax)); JG monstruously inefficient due to frequent memory reallocation
-			bb[ax] = in->at(ax).cell();
-			assert(in->at(ax).row() == 0);
+			bb[i] = in->at(i).cell();
+			assert(in->at(i).row() == 0);
 		}
 		uLong exlen = (uLong)(bb.size() * 0.001 + 16) + bb.size();
 		QByteArray bc(exlen, ' ');

Modified: trunk/Scribus/scribus/util.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23653&path=/trunk/Scribus/scribus/util.h
==============================================================================
--- trunk/Scribus/scribus/util.h	(original)
+++ trunk/Scribus/scribus/util.h	Sat Apr 25 23:11:34 2020
@@ -95,7 +95,7 @@
    *
 */
 int SCRIBUS_API System(const QString& exename, const QStringList & args,
-					   const QString& fileStdErr = "", const QString& fileStdOut = "",
+					   const QString& fileStdErr = QString(), const QString& fileStdOut = QString(),
 					   const bool* cancel = nullptr);
 
 /*!
@@ -198,6 +198,6 @@
  * check if name exists in list
  * if exist then seprator and numbers are pre/append to name while it will be unique
 */
-void SCRIBUS_API getUniqueName(QString &name, const QStringList& list, const QString& separator = "", bool prepend = false);
+void SCRIBUS_API getUniqueName(QString &name, const QStringList& list, const QString& separator = QString(), bool prepend = false);
 
 #endif

Modified: trunk/Scribus/scribus/util_color.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23653&path=/trunk/Scribus/scribus/util_color.cpp
==============================================================================
--- trunk/Scribus/scribus/util_color.cpp	(original)
+++ trunk/Scribus/scribus/util_color.cpp	Sat Apr 25 23:11:34 2020
@@ -745,14 +745,12 @@
 		{
 			QByteArray docBytes("");
 			loadRawText(fileName, docBytes);
-			QString docText("");
-			docText = QString::fromUtf8(docBytes);
+			QString docText(QString::fromUtf8(docBytes));
 			QDomDocument docu("scridoc");
 			docu.setContent(docText);
 			ScColor lf = ScColor();
 			QDomElement elem = docu.documentElement();
-			QString dTag = "";
-			dTag = elem.tagName();
+			QString dTag(elem.tagName());
 			QString nameMask = "%1";
 			nameMask = elem.attribute("mask", "%1");
 			QDomNode PAGE = elem.firstChild();

Modified: trunk/Scribus/scribus/util_ghostscript.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23653&path=/trunk/Scribus/scribus/util_ghostscript.h
==============================================================================
--- trunk/Scribus/scribus/util_ghostscript.h	(original)
+++ trunk/Scribus/scribus/util_ghostscript.h	Sat Apr 25 23:11:34 2020
@@ -38,8 +38,8 @@
    * @param args_in Custom arguments to GhostScript
    * @param device GS device to use (defaults to an image device if omitted)
  */
-int     SCRIBUS_API callGS(const QStringList& args_in, const QString& device="", const QString& fileStdErr = "", const QString& fileStdOut = "");
-int     SCRIBUS_API callGS(const QString& args_in, const QString& device="");
+int     SCRIBUS_API callGS(const QStringList& args_in, const QString& device = QString(), const QString& fileStdErr = QString(), const QString& fileStdOut = QString());
+int     SCRIBUS_API callGS(const QString& args_in, const QString& device = QString());
 int     SCRIBUS_API convertPS2PS(const QString& in, const QString& out, const QStringList& opts, int level);
 int     SCRIBUS_API convertPS2PDF(const QString& in, const QString& out, const QStringList& opts);
 bool    SCRIBUS_API testGSAvailability();

Modified: trunk/Scribus/scribus/vgradient.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23653&path=/trunk/Scribus/scribus/vgradient.h
==============================================================================
--- trunk/Scribus/scribus/vgradient.h	(original)
+++ trunk/Scribus/scribus/vgradient.h	Sat Apr 25 23:11:34 2020
@@ -115,8 +115,8 @@
 
 	const QList<VColorStop*>& colorStops() const;
 	void addStop(const VColorStop& colorStop);
-	void addStop(const QColor &color, double rampPoint, double midPoint, double opa, const QString& name = "", int shade = 100);
-	void setStop(const QColor &color, double rampPoint, double midPoint, double opa, const QString& name = "", int shade = 100);
+	void addStop(const QColor &color, double rampPoint, double midPoint, double opa, const QString& name = QString(), int shade = 100);
+	void setStop(const QColor &color, double rampPoint, double midPoint, double opa, const QString& name = QString(), int shade = 100);
 	void removeStop(VColorStop& colorStop);
 	void removeStop(int n);
 	void clearStops();

Modified: trunk/Scribus/scribus/vgradientex.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23653&path=/trunk/Scribus/scribus/vgradientex.h
==============================================================================
--- trunk/Scribus/scribus/vgradientex.h	(original)
+++ trunk/Scribus/scribus/vgradientex.h	Sat Apr 25 23:11:34 2020
@@ -86,18 +86,18 @@
 public:
 	enum Type
 	{
-	    linear = 0,
-	    radial = 1,
-	    fourcolor  = 2,
-	    diamond = 3,
+		linear = 0,
+		radial = 1,
+		fourcolor  = 2,
+		diamond = 3,
 		mesh = 4,
 		freemesh = 5
 	};
 
 	enum RepeatMethod
 	{
-	    none    = 0,
-	    reflect = 1,
+		none    = 0,
+		reflect = 1,
 		repeat  = 2,
 		pad     = 3
 	};
@@ -117,11 +117,11 @@
 
 	const QList<VColorStopEx*> colorStops() const;
 	void addStop(const VColorStopEx& colorStop);
-	void addStop(const ScColor &color, double rampPoint, double midPoint, double opa, const QString& name = "", int shade = 100);
+	void addStop(const ScColor &color, double rampPoint, double midPoint, double opa, const QString& name = QString(), int shade = 100);
 	void removeStop(VColorStopEx& colorStop);
 	void removeStop(int n);
 	void clearStops();
-	int  stops() const { return m_colorStops.count(); }
+	int stops() const { return m_colorStops.count(); }
 
 	FPoint origin() const { return m_origin; }
 	void setOrigin(const FPoint &origin) { m_origin = origin; }
@@ -135,14 +135,14 @@
 	void transform(const QTransform& m);
 
 protected:
-	QList<VColorStopEx*>        m_colorStops;
+	QList<VColorStopEx*> m_colorStops;
 
 	int  compareItems(const VColorStopEx* item1, const VColorStopEx* item2) const;
 	void inSort(VColorStopEx* d);
 
 private:
-	VGradientEx::Type         m_type;
-	VGradientEx::RepeatMethod m_repeatMethod	: 3;
+	VGradientEx::Type m_type;
+	VGradientEx::RepeatMethod m_repeatMethod : 3;
 
 	// coordinates:
 	FPoint m_origin;




More information about the scribus-commit mailing list