r23880 by craig - Code cleanup across the board

scribus-commit scribus-commit at lists.scribus.net
Thu Jun 4 16:32:29 UTC 2020


Author: craig
Date: Thu Jun  4 16:32:28 2020
New Revision: 23880

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=23880
Log:
Code cleanup across the board

Modified:
    trunk/Scribus/scribus/downloadmanager/scdlmgr.cpp
    trunk/Scribus/scribus/fonts/sfnt.cpp
    trunk/Scribus/scribus/fonts/sfnt.h
    trunk/Scribus/scribus/imagedataloaders/scimgdataloader_tiff.cpp
    trunk/Scribus/scribus/openpalettemanager.h
    trunk/Scribus/scribus/pageitemsettersmanager.h
    trunk/Scribus/scribus/plugins/barcodegenerator/barcodegenerator.h
    trunk/Scribus/scribus/plugins/barcodegenerator/barcodegeneratorrenderthread.h
    trunk/Scribus/scribus/plugins/gettext/csvim/csvim.cpp
    trunk/Scribus/scribus/plugins/gettext/csvim/csvim.h
    trunk/Scribus/scribus/plugins/gettext/textfilter/tffilter.h
    trunk/Scribus/scribus/plugins/import/pdf/pdfimportoptions.h
    trunk/Scribus/scribus/plugins/import/xps/xpsimportoptions.h
    trunk/Scribus/scribus/plugins/imposition/imposition.h
    trunk/Scribus/scribus/plugins/picbrowser/imagedialog.h
    trunk/Scribus/scribus/plugins/picbrowser/multicombobox.h
    trunk/Scribus/scribus/plugins/picbrowser/picturebrowser.h
    trunk/Scribus/scribus/plugins/picbrowser/previewimage.h
    trunk/Scribus/scribus/plugins/scriptplugin/pconsole.h
    trunk/Scribus/scribus/plugins/scriptplugin/prefs_scripter.h
    trunk/Scribus/scribus/plugins/scriptplugin_py2x/pconsole.h
    trunk/Scribus/scribus/plugins/scriptplugin_py2x/prefs_scripter.h
    trunk/Scribus/scribus/plugins/short-words/prefs_shortwords.h
    trunk/Scribus/scribus/plugins/short-words/swdialog.h
    trunk/Scribus/scribus/plugins/tools/2geomtools/meshdistortion/meshdistortiondialog.cpp
    trunk/Scribus/scribus/pslib.cpp
    trunk/Scribus/scribus/schelptreemodel.h
    trunk/Scribus/scribus/scimagecachedir.h
    trunk/Scribus/scribus/scimagecachefile.h
    trunk/Scribus/scribus/third_party/rtf-qt/rtfreader.h
    trunk/Scribus/scribus/tt/simpletreemodel/treeitem.h
    trunk/Scribus/scribus/tt/simpletreemodel/treemodel.h
    trunk/Scribus/scribus/ui/AdapterWidget.h
    trunk/Scribus/scribus/ui/aligndistribute.h
    trunk/Scribus/scribus/ui/applytemplatedialog.h
    trunk/Scribus/scribus/ui/colorcombo.h
    trunk/Scribus/scribus/ui/colorlistbox.h
    trunk/Scribus/scribus/ui/colorlistmodel.h
    trunk/Scribus/scribus/ui/contextmenu.h
    trunk/Scribus/scribus/ui/copypagetomasterpagedialog.h
    trunk/Scribus/scribus/ui/cpalette.cpp
    trunk/Scribus/scribus/ui/cxfimportdialog.h
    trunk/Scribus/scribus/ui/fontcombo.h
    trunk/Scribus/scribus/ui/fontembeddingcombo.h
    trunk/Scribus/scribus/ui/fontembeddingmodel.h
    trunk/Scribus/scribus/ui/fontlistview.h
    trunk/Scribus/scribus/ui/inserttablecolumnsdialog.h
    trunk/Scribus/scribus/ui/inserttablerowsdialog.h
    trunk/Scribus/scribus/ui/loremipsum.h
    trunk/Scribus/scribus/ui/marginpresetlayout.h
    trunk/Scribus/scribus/ui/markinsert.h
    trunk/Scribus/scribus/ui/markvariabletext.h
    trunk/Scribus/scribus/ui/notesstyleseditor.h
    trunk/Scribus/scribus/ui/numformatcombo.h
    trunk/Scribus/scribus/ui/pageitemattributes.h
    trunk/Scribus/scribus/ui/pageitempositionsetter.h
    trunk/Scribus/scribus/ui/pageitemrotationsetter.h
    trunk/Scribus/scribus/ui/pageitemsetterbase.h
    trunk/Scribus/scribus/ui/pdfversioncombo.h
    trunk/Scribus/scribus/ui/pdfversionmodel.h
    trunk/Scribus/scribus/ui/propertiespalette_table.h
    trunk/Scribus/scribus/ui/propertywidget_dropcap.h
    trunk/Scribus/scribus/ui/propertywidget_pareffect.h
    trunk/Scribus/scribus/ui/query.h
    trunk/Scribus/scribus/ui/resourcemanagerlicense.h
    trunk/Scribus/scribus/ui/sccolorslider.h
    trunk/Scribus/scribus/ui/scdockpalette.h
    trunk/Scribus/scribus/ui/scinputdialog.h
    trunk/Scribus/scribus/ui/scprogressbar.h
    trunk/Scribus/scribus/ui/scrpalettebase.h
    trunk/Scribus/scribus/ui/sctablewidget.h
    trunk/Scribus/scribus/ui/shortcutwidget.h
    trunk/Scribus/scribus/ui/smcellstylewidget.h
    trunk/Scribus/scribus/ui/smcstylewidget.h
    trunk/Scribus/scribus/ui/smtablestylewidget.h
    trunk/Scribus/scribus/ui/smtextstyles.cpp
    trunk/Scribus/scribus/ui/splash.h
    trunk/Scribus/scribus/ui/stylemanager.h
    trunk/Scribus/scribus/ui/tablecolumnwidthsdialog.h
    trunk/Scribus/scribus/ui/tablerowheightsdialog.h
    trunk/Scribus/scribus/ui/unicodesearch.h
    trunk/Scribus/scribus/undogui.h

Modified: trunk/Scribus/scribus/downloadmanager/scdlmgr.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23880&path=/trunk/Scribus/scribus/downloadmanager/scdlmgr.cpp
==============================================================================
--- trunk/Scribus/scribus/downloadmanager/scdlmgr.cpp	(original)
+++ trunk/Scribus/scribus/downloadmanager/scdlmgr.cpp	Thu Jun  4 16:32:28 2020
@@ -15,9 +15,9 @@
 	: QObject(parent)
 {
 	m_thread=new ScDLThread();
-	connect(m_thread, SIGNAL(fileReceived(const QString &)), this, SLOT(dlReceived(const QString&)));
-	connect(m_thread, SIGNAL(fileFailed(const QString &)), this, SLOT(dlFailed(const QString&)));
-	connect(m_thread, SIGNAL(fileStarted(const QString &)), this, SLOT(dlStarted(const QString &)));
+	connect(m_thread, SIGNAL(fileReceived(const QString &)), this, SLOT(dlReceived(QString)));
+	connect(m_thread, SIGNAL(fileFailed(const QString &)), this, SLOT(dlFailed(QString)));
+	connect(m_thread, SIGNAL(fileStarted(const QString &)), this, SLOT(dlStarted(QString)));
 	connect(m_thread, SIGNAL(fileDownloadProgress(qint64,qint64)), this, SIGNAL(fileDownloadProgress(qint64,qint64)));
 	//connect(thread, SIGNAL(finished()), this, SIGNAL(finished()));
 	connect(m_thread, SIGNAL(finished()), this, SLOT(moveFinishedDownloads()));

Modified: trunk/Scribus/scribus/fonts/sfnt.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23880&path=/trunk/Scribus/scribus/fonts/sfnt.cpp
==============================================================================
--- trunk/Scribus/scribus/fonts/sfnt.cpp	(original)
+++ trunk/Scribus/scribus/fonts/sfnt.cpp	Thu Jun  4 16:32:28 2020
@@ -64,12 +64,12 @@
 		putWord16(bb, pos, val);
 	}
 	
-	const QByteArray tag(const QByteArray& bb, uint pos)
+	QByteArray tag(const QByteArray& bb, uint pos)
 	{
 		return QByteArray::fromRawData(bb.constData() + pos, 4);
 	}
 	
-	const QByteArray tag(uint word)
+	QByteArray tag(uint word)
 	{
 		QByteArray result;
 		result.resize(4);
@@ -522,7 +522,7 @@
 	}
 
 
-	const QByteArray getTable(const QByteArray& ttf, const QByteArray& ttfTag)
+	QByteArray getTable(const QByteArray& ttf, const QByteArray& ttfTag)
 	{
 		uint pos = getTableDirEntry(ttf, ttfTag);
 		if (pos <= 0)
@@ -619,7 +619,7 @@
 		return result;
 	}
 
-	const QByteArray writeLoca(const QList<uint>& loca, bool longFormat)
+	QByteArray writeLoca(const QList<uint>& loca, bool longFormat)
 	{
 		QByteArray result;
 		if (longFormat)
@@ -808,7 +808,7 @@
 
 
 
-	const QByteArray writeCMap(const QMap<uint, uint>& cmap)
+	QByteArray writeCMap(const QMap<uint, uint>& cmap)
 	{
 		// we always write only one table: platform=3(MS), encoding=1(Unicode 16bit)
 		QByteArray result;

Modified: trunk/Scribus/scribus/fonts/sfnt.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23880&path=/trunk/Scribus/scribus/fonts/sfnt.h
==============================================================================
--- trunk/Scribus/scribus/fonts/sfnt.h	(original)
+++ trunk/Scribus/scribus/fonts/sfnt.h	Thu Jun  4 16:32:28 2020
@@ -31,8 +31,8 @@
 	void  putWord16(QByteArray & bb, uint pos, quint16 val);
 	void  appendWord16(QByteArray& bb, quint16 val);
 	bool  copy(QByteArray & dst, uint to, const QByteArray & src, uint from, uint len);
-	const QByteArray tag(QByteArray const & bb, uint pos);
-	const QByteArray getTable(const QByteArray& ttf, const QByteArray& ttfTag);
+	QByteArray tag(QByteArray const & bb, uint pos);
+	QByteArray getTable(const QByteArray& ttf, const QByteArray& ttfTag);
 	
 
 	QByteArray subsetFace(const QByteArray& ttf, QList<uint>& glyphs);

Modified: trunk/Scribus/scribus/imagedataloaders/scimgdataloader_tiff.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23880&path=/trunk/Scribus/scribus/imagedataloaders/scimgdataloader_tiff.cpp
==============================================================================
--- trunk/Scribus/scribus/imagedataloaders/scimgdataloader_tiff.cpp	(original)
+++ trunk/Scribus/scribus/imagedataloaders/scimgdataloader_tiff.cpp	Thu Jun  4 16:32:28 2020
@@ -1354,7 +1354,7 @@
 		return false;
 	}
 	channel_num = qMin(channel_num, (uint) 39);
-	uint components[40];
+	uint components[40] = {0};
 	for (uint channel = 0; channel < channel_num; channel++)
 	{
 		switch (layerInfo[layer].channelType[channel])

Modified: trunk/Scribus/scribus/openpalettemanager.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23880&path=/trunk/Scribus/scribus/openpalettemanager.h
==============================================================================
--- trunk/Scribus/scribus/openpalettemanager.h	(original)
+++ trunk/Scribus/scribus/openpalettemanager.h	Thu Jun  4 16:32:28 2020
@@ -60,7 +60,7 @@
 	/**
 	  * create a new OpenPalette
 	  */
-	static void newPalette(QWidget * parent = 0);
+	static void newPalette(QWidget* parent = nullptr);
 
 	/**
 	  * Return number of palettes

Modified: trunk/Scribus/scribus/pageitemsettersmanager.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23880&path=/trunk/Scribus/scribus/pageitemsettersmanager.h
==============================================================================
--- trunk/Scribus/scribus/pageitemsettersmanager.h	(original)
+++ trunk/Scribus/scribus/pageitemsettersmanager.h	Thu Jun  4 16:32:28 2020
@@ -41,7 +41,7 @@
 	static PageItemSettersManager * instance;
 	static PageItemSettersManager * that();
 
-	PageItemSettersManager(QObject * parent = 0);
+	PageItemSettersManager(QObject* parent = nullptr);
 
 	QList<PageItemSetterBase*> setters;
 	Selection * selection;

Modified: trunk/Scribus/scribus/plugins/barcodegenerator/barcodegenerator.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23880&path=/trunk/Scribus/scribus/plugins/barcodegenerator/barcodegenerator.h
==============================================================================
--- trunk/Scribus/scribus/plugins/barcodegenerator/barcodegenerator.h	(original)
+++ trunk/Scribus/scribus/plugins/barcodegenerator/barcodegenerator.h	Thu Jun  4 16:32:28 2020
@@ -63,7 +63,7 @@
 		/*! \brief Create modal BC dialog.
 		\param parent Parent of the dialog.
 		\param name name od the QObject to debug */
-		BarcodeGenerator(QWidget* parent = 0, const char* name = 0);
+		BarcodeGenerator(QWidget* parent = nullptr, const char* name = 0);
 		//! \brief Erase the temporary files here.
 		~BarcodeGenerator();
 

Modified: trunk/Scribus/scribus/plugins/barcodegenerator/barcodegeneratorrenderthread.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23880&path=/trunk/Scribus/scribus/plugins/barcodegenerator/barcodegeneratorrenderthread.h
==============================================================================
--- trunk/Scribus/scribus/plugins/barcodegenerator/barcodegeneratorrenderthread.h	(original)
+++ trunk/Scribus/scribus/plugins/barcodegenerator/barcodegeneratorrenderthread.h	Thu Jun  4 16:32:28 2020
@@ -18,7 +18,7 @@
 	Q_OBJECT
 
 public:
-	BarcodeGeneratorRenderThread(QObject *parent = 0);
+	BarcodeGeneratorRenderThread(QObject* parent = nullptr);
 	~BarcodeGeneratorRenderThread();
 	void render(const QString&);
 

Modified: trunk/Scribus/scribus/plugins/gettext/csvim/csvim.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23880&path=/trunk/Scribus/scribus/plugins/gettext/csvim/csvim.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/gettext/csvim/csvim.cpp	(original)
+++ trunk/Scribus/scribus/plugins/gettext/csvim/csvim.cpp	Thu Jun  4 16:32:28 2020
@@ -35,21 +35,16 @@
 
 /******* Class CsvIm **************************************************************/
 
-CsvIm::CsvIm(const QString& fname, const QString& enc, gtWriter *w, 
-             const QString& fdelim, const QString& vdelim, bool hasheader, bool usevdelim)
-{
-	fieldDelimiter = fdelim;
-	valueDelimiter = vdelim;
-	hasHeader = hasheader;
-	useVDelim = usevdelim;
-	filename = fname;
-	encoding = enc;
-	writer = w;
-	header = "";
-	data = "";
-	rowNumber = 0;
-	colIndex = 0;
-	colCount = 0;
+CsvIm::CsvIm(const QString& fname, const QString& enc, gtWriter *w,
+			 const QString& fdelim, const QString& vdelim, bool hasheader, bool usevdelim) :
+	fieldDelimiter(fdelim),
+	valueDelimiter(vdelim),
+	hasHeader(hasheader),
+	useVDelim(usevdelim),
+	filename(fname),
+	encoding(enc),
+	writer(w)
+{
 	setupPStyles();
 	loadFile();
 	setupTabulators();
@@ -59,18 +54,15 @@
 {
 	pstyleData = new gtParagraphStyle(*(writer->getDefaultStyle()));
 	pstyleData->setName(writer->getFrameName() + "-" + QObject::tr("CSV_data"));
-	if (hasHeader)
-	{
-		pstyleHeader = new gtParagraphStyle(*pstyleData);
-		pstyleHeader->setName(writer->getFrameName() + "-" + QObject::tr("CSV_header"));
-		pstyleHeader->setSpaceBelow(7.0);
-		int size = pstyleData->getFont()->getSize();
-		size += 10;
-		pstyleHeader->getFont()->setSize(size);
-		pstyleHeader->getFont()->setWeight(BOLD);
-	}
-	else
-		pstyleHeader = nullptr;
+	if (!hasHeader)
+		return;
+	pstyleHeader = new gtParagraphStyle(*pstyleData);
+	pstyleHeader->setName(writer->getFrameName() + "-" + QObject::tr("CSV_header"));
+	pstyleHeader->setSpaceBelow(7.0);
+	int size = pstyleData->getFont()->getSize();
+	size += 10;
+	pstyleHeader->getFont()->setSize(size);
+	pstyleHeader->getFont()->setWeight(BOLD);
 }
 
 void CsvIm::setFieldDelimiter(const QString& fdelim)

Modified: trunk/Scribus/scribus/plugins/gettext/csvim/csvim.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23880&path=/trunk/Scribus/scribus/plugins/gettext/csvim/csvim.h
==============================================================================
--- trunk/Scribus/scribus/plugins/gettext/csvim/csvim.h	(original)
+++ trunk/Scribus/scribus/plugins/gettext/csvim/csvim.h	Thu Jun  4 16:32:28 2020
@@ -43,14 +43,15 @@
 	bool useVDelim { true };
 	QString filename;
 	QString encoding;
-	gtWriter *writer { nullptr };
+	gtWriter *writer {nullptr};
+
 	QString header;
 	QString data;
-	int rowNumber { 0 };
-	int colIndex { 0 };
-	int colCount { 0 };
-	gtParagraphStyle *pstyleData { nullptr };
-	gtParagraphStyle *pstyleHeader { nullptr };
+	int rowNumber {0};
+	int colIndex {0};
+	int colCount {0};
+	gtParagraphStyle *pstyleData {nullptr};
+	gtParagraphStyle *pstyleHeader {nullptr};
 
 	void loadFile();
 	void parseLine(const QString& line, bool isHeader);

Modified: trunk/Scribus/scribus/plugins/gettext/textfilter/tffilter.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23880&path=/trunk/Scribus/scribus/plugins/gettext/textfilter/tffilter.h
==============================================================================
--- trunk/Scribus/scribus/plugins/gettext/textfilter/tffilter.h	(original)
+++ trunk/Scribus/scribus/plugins/gettext/textfilter/tffilter.h	Thu Jun  4 16:32:28 2020
@@ -76,7 +76,7 @@
 	tfFilter(QWidget *parent, const char *name,
              int action, const QString& regExp, const QString& replace, const QString& pstyleName,
              int less, int more, int style, bool match, bool enabled, bool regexp);
-	tfFilter(QWidget *parent = 0, const char *name = 0);
+	tfFilter(QWidget* parent = nullptr, const char *name = 0);
 	~tfFilter();
 	void setRemovable(bool b);
 	int getAction();

Modified: trunk/Scribus/scribus/plugins/import/pdf/pdfimportoptions.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23880&path=/trunk/Scribus/scribus/plugins/import/pdf/pdfimportoptions.h
==============================================================================
--- trunk/Scribus/scribus/plugins/import/pdf/pdfimportoptions.h	(original)
+++ trunk/Scribus/scribus/plugins/import/pdf/pdfimportoptions.h	Thu Jun  4 16:32:28 2020
@@ -19,7 +19,7 @@
 	Q_OBJECT
 	
 public:
-	explicit PdfImportOptions(QWidget *parent = 0);
+	explicit PdfImportOptions(QWidget* parent = nullptr);
 	~PdfImportOptions();
 	void setUpOptions(const QString& fileName, int actPage, int numPages, bool interact, bool cropPossible, PdfPlug* plug);
 	QString getPagesString();

Modified: trunk/Scribus/scribus/plugins/import/xps/xpsimportoptions.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23880&path=/trunk/Scribus/scribus/plugins/import/xps/xpsimportoptions.h
==============================================================================
--- trunk/Scribus/scribus/plugins/import/xps/xpsimportoptions.h	(original)
+++ trunk/Scribus/scribus/plugins/import/xps/xpsimportoptions.h	Thu Jun  4 16:32:28 2020
@@ -19,7 +19,7 @@
 	Q_OBJECT
 	
 public:
-	explicit XpsImportOptions(QWidget *parent = 0);
+	explicit XpsImportOptions(QWidget* parent = nullptr);
 	~XpsImportOptions();
 	void setUpOptions(const QString& fileName, int actPage, int numPages, bool interact);
 	QString getPagesString();

Modified: trunk/Scribus/scribus/plugins/imposition/imposition.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23880&path=/trunk/Scribus/scribus/plugins/imposition/imposition.h
==============================================================================
--- trunk/Scribus/scribus/plugins/imposition/imposition.h	(original)
+++ trunk/Scribus/scribus/plugins/imposition/imposition.h	Thu Jun  4 16:32:28 2020
@@ -41,7 +41,7 @@
   Q_OBJECT
 
 	public:
-		Imposition(QWidget* parent = 0, ScribusDoc* doc = 0);
+		Imposition(QWidget* parent = nullptr, ScribusDoc* doc = 0);
 		virtual ~Imposition();
 		
 		double unitRatio;

Modified: trunk/Scribus/scribus/plugins/picbrowser/imagedialog.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23880&path=/trunk/Scribus/scribus/plugins/picbrowser/imagedialog.h
==============================================================================
--- trunk/Scribus/scribus/plugins/picbrowser/imagedialog.h	(original)
+++ trunk/Scribus/scribus/plugins/picbrowser/imagedialog.h	Thu Jun  4 16:32:28 2020
@@ -23,7 +23,7 @@
 		Q_OBJECT
 
 	public:
-		Imagedialog ( const QString& imageFile, ScribusDoc* doc, QWidget *parent = 0 );
+		Imagedialog ( const QString& imageFile, ScribusDoc* doc, QWidget* parent = nullptr );
 		void resizeEvent ( QResizeEvent * event );
 
 		ScImage image;

Modified: trunk/Scribus/scribus/plugins/picbrowser/multicombobox.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23880&path=/trunk/Scribus/scribus/plugins/picbrowser/multicombobox.h
==============================================================================
--- trunk/Scribus/scribus/plugins/picbrowser/multicombobox.h	(original)
+++ trunk/Scribus/scribus/plugins/picbrowser/multicombobox.h	Thu Jun  4 16:32:28 2020
@@ -18,7 +18,7 @@
 {
 	Q_OBJECT
 	public:
-		multiComboboxModel ( QObject* parent = 0 );
+		multiComboboxModel ( QObject* parent = nullptr );
 		Qt::ItemFlags flags ( const QModelIndex& index ) const;
 };
 
@@ -27,7 +27,7 @@
 {
 	Q_OBJECT
 	public:
-		multiView ( QWidget* parent = 0 );
+		multiView ( QWidget* parent = nullptr );
 		multiView ( multiCombobox* parent );
 		bool eventFilter ( QObject* object, QEvent* event );
 
@@ -40,7 +40,7 @@
 {
 	Q_OBJECT
 	public:
-		multiCombobox ( QWidget *parent = 0 );
+		multiCombobox ( QWidget* parent = nullptr );
 
 		void setCheckstate ( int index, int checked );
 		int checkstate ( int index );

Modified: trunk/Scribus/scribus/plugins/picbrowser/picturebrowser.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23880&path=/trunk/Scribus/scribus/plugins/picbrowser/picturebrowser.h
==============================================================================
--- trunk/Scribus/scribus/plugins/picbrowser/picturebrowser.h	(original)
+++ trunk/Scribus/scribus/plugins/picbrowser/picturebrowser.h	Thu Jun  4 16:32:28 2020
@@ -99,7 +99,7 @@
 		Q_OBJECT
 
 	public:
-		PictureBrowser ( ScribusDoc* doc, QWidget *parent = 0 );
+		PictureBrowser ( ScribusDoc* doc, QWidget* parent = nullptr );
 		~PictureBrowser();
 		void closeEvent(QCloseEvent *e);
 		void changedDocument ( ScribusDoc* doc );

Modified: trunk/Scribus/scribus/plugins/picbrowser/previewimage.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23880&path=/trunk/Scribus/scribus/plugins/picbrowser/previewimage.h
==============================================================================
--- trunk/Scribus/scribus/plugins/picbrowser/previewimage.h	(original)
+++ trunk/Scribus/scribus/plugins/picbrowser/previewimage.h	Thu Jun  4 16:32:28 2020
@@ -142,7 +142,7 @@
 		Q_OBJECT
 
 	public:
-		PreviewImagesModel ( QObject *parent = 0 );
+		PreviewImagesModel ( QObject* parent = nullptr );
 		//saves pointer to calling PictureBrowser instance, for later access
 		PreviewImagesModel ( PictureBrowser *parent );
 

Modified: trunk/Scribus/scribus/plugins/scriptplugin/pconsole.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23880&path=/trunk/Scribus/scribus/plugins/scriptplugin/pconsole.h
==============================================================================
--- trunk/Scribus/scribus/plugins/scriptplugin/pconsole.h	(original)
+++ trunk/Scribus/scribus/plugins/scriptplugin/pconsole.h	Thu Jun  4 16:32:28 2020
@@ -30,7 +30,7 @@
 	Q_OBJECT
 
 	public:
-		PythonConsole( QWidget* parent = 0);
+		PythonConsole( QWidget* parent = nullptr);
 		~PythonConsole();
 		
 		void setFonts();

Modified: trunk/Scribus/scribus/plugins/scriptplugin/prefs_scripter.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23880&path=/trunk/Scribus/scribus/plugins/scriptplugin/prefs_scripter.h
==============================================================================
--- trunk/Scribus/scribus/plugins/scriptplugin/prefs_scripter.h	(original)
+++ trunk/Scribus/scribus/plugins/scriptplugin/prefs_scripter.h	Thu Jun  4 16:32:28 2020
@@ -17,7 +17,7 @@
 	Q_OBJECT
 
 	public:
-		Prefs_Scripter(QWidget* parent=0);
+		Prefs_Scripter(QWidget* parent=nullptr);
 		~Prefs_Scripter();
 
 		void restoreDefaults(struct ApplicationPrefs *prefsData) override;

Modified: trunk/Scribus/scribus/plugins/scriptplugin_py2x/pconsole.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23880&path=/trunk/Scribus/scribus/plugins/scriptplugin_py2x/pconsole.h
==============================================================================
--- trunk/Scribus/scribus/plugins/scriptplugin_py2x/pconsole.h	(original)
+++ trunk/Scribus/scribus/plugins/scriptplugin_py2x/pconsole.h	Thu Jun  4 16:32:28 2020
@@ -30,7 +30,7 @@
 	Q_OBJECT
 
 	public:
-		PythonConsole( QWidget* parent = 0);
+		PythonConsole( QWidget* parent = nullptr);
 		~PythonConsole();
 		
 		void setFonts();

Modified: trunk/Scribus/scribus/plugins/scriptplugin_py2x/prefs_scripter.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23880&path=/trunk/Scribus/scribus/plugins/scriptplugin_py2x/prefs_scripter.h
==============================================================================
--- trunk/Scribus/scribus/plugins/scriptplugin_py2x/prefs_scripter.h	(original)
+++ trunk/Scribus/scribus/plugins/scriptplugin_py2x/prefs_scripter.h	Thu Jun  4 16:32:28 2020
@@ -17,7 +17,7 @@
 	Q_OBJECT
 
 	public:
-		Prefs_Scripter(QWidget* parent=0);
+		Prefs_Scripter(QWidget* parent=nullptr);
 		~Prefs_Scripter();
 
 		void restoreDefaults(struct ApplicationPrefs *prefsData) override;

Modified: trunk/Scribus/scribus/plugins/short-words/prefs_shortwords.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23880&path=/trunk/Scribus/scribus/plugins/short-words/prefs_shortwords.h
==============================================================================
--- trunk/Scribus/scribus/plugins/short-words/prefs_shortwords.h	(original)
+++ trunk/Scribus/scribus/plugins/short-words/prefs_shortwords.h	Thu Jun  4 16:32:28 2020
@@ -16,7 +16,7 @@
 	Q_OBJECT
 
 	public:
-		Prefs_ShortWords(QWidget* parent=0);
+		Prefs_ShortWords(QWidget* parent=nullptr);
 		~Prefs_ShortWords();
 
 		void restoreDefaults(struct ApplicationPrefs *prefsData) override;

Modified: trunk/Scribus/scribus/plugins/short-words/swdialog.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23880&path=/trunk/Scribus/scribus/plugins/short-words/swdialog.h
==============================================================================
--- trunk/Scribus/scribus/plugins/short-words/swdialog.h	(original)
+++ trunk/Scribus/scribus/plugins/short-words/swdialog.h	Thu Jun  4 16:32:28 2020
@@ -40,7 +40,7 @@
 	Q_OBJECT
 
 	public:
-		SWDialog(QWidget* parent = 0);
+		SWDialog(QWidget* parent = nullptr);
 		~SWDialog();
 
 		int actionSelected();

Modified: trunk/Scribus/scribus/plugins/tools/2geomtools/meshdistortion/meshdistortiondialog.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23880&path=/trunk/Scribus/scribus/plugins/tools/2geomtools/meshdistortion/meshdistortiondialog.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/tools/2geomtools/meshdistortion/meshdistortiondialog.cpp	(original)
+++ trunk/Scribus/scribus/plugins/tools/2geomtools/meshdistortion/meshdistortiondialog.cpp	Thu Jun  4 16:32:28 2020
@@ -171,7 +171,7 @@
 						if(vi == 0 && ui == 0)
 							base = Geom::Point(w4, w4);
 						double dl = dot((handles[corner+4*i] - base), dir)/dot(dir,dir);
-						sb2[dim][i][corner] = dl/(ww/2.0)*pow(4.0f,((int)(ui+vi)));
+						sb2[dim][i][corner] = dl/(ww/2.0)*pow(4.0F,((int)(ui+vi)));
 					}
 				}
 			}
@@ -495,7 +495,7 @@
 						if(vi == 0 && ui == 0)
 							base = Geom::Point(w4, w4);
 						double dl = dot((handles[corner+4*i] - base), dir)/dot(dir,dir);
-						sb2[dim][i][corner] = dl/(ww/2.0)*pow(4.0f,((int)(ui+vi)));
+						sb2[dim][i][corner] = dl/(ww/2.0)*pow(4.0F,((int)(ui+vi)));
 					}
 				}
 			}

Modified: trunk/Scribus/scribus/pslib.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23880&path=/trunk/Scribus/scribus/pslib.cpp
==============================================================================
--- trunk/Scribus/scribus/pslib.cpp	(original)
+++ trunk/Scribus/scribus/pslib.cpp	Thu Jun  4 16:32:28 2020
@@ -207,13 +207,16 @@
 
 void PSPainter::drawLine(QPointF start, QPointF end)
 {
-	double h, s, v, k;
 	QVector<double> dum;
 	dum.clear();
 	m_ps->PS_save();
 	applyTransform();
 	if (fillColor().color != CommonStrings::None)
 	{
+		double h = 0.0;
+		double s = 0.0;
+		double v = 0.0;
+		double k = 0.0;
 		m_ps->PS_setcapjoin(Qt::FlatCap, Qt::MiterJoin);
 		m_ps->PS_setdash(Qt::SolidLine, 0, dum);
 		m_ps->SetColor(fillColor().color,fillColor().shade, &h, &s, &v, &k);

Modified: trunk/Scribus/scribus/schelptreemodel.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23880&path=/trunk/Scribus/scribus/schelptreemodel.h
==============================================================================
--- trunk/Scribus/scribus/schelptreemodel.h	(original)
+++ trunk/Scribus/scribus/schelptreemodel.h	Thu Jun  4 16:32:28 2020
@@ -56,7 +56,7 @@
 	Q_OBJECT
 
 public:
-	ScHelpTreeModel(const QString &dataFile, const QString &col1name, const QString &col2name, QMap<QString, QString>* indexToBuild, QObject *parent = 0);
+	ScHelpTreeModel(const QString &dataFile, const QString &col1name, const QString &col2name, QMap<QString, QString>* indexToBuild, QObject* parent = nullptr);
 	~ScHelpTreeModel() {};
 
 	void addRow(const QString&, const QString&, int i);

Modified: trunk/Scribus/scribus/scimagecachedir.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23880&path=/trunk/Scribus/scribus/scimagecachedir.h
==============================================================================
--- trunk/Scribus/scribus/scimagecachedir.h	(original)
+++ trunk/Scribus/scribus/scimagecachedir.h	Thu Jun  4 16:32:28 2020
@@ -42,7 +42,7 @@
 public:
 	typedef unsigned int AccessCounter;
 
-	ScImageCacheDir(const QString& dir, ScImageCacheDir *parent = 0, bool scanFiles = false, const QStringList & suffixList = QStringList());
+	ScImageCacheDir(const QString& dir, ScImageCacheDir* parent = nullptr, bool scanFiles = false, const QStringList & suffixList = QStringList());
 	~ScImageCacheDir();
 	ScImageCacheDir *newSubDir(const QString & dir, bool scanFiles = false, const QStringList & suffixList = QStringList());
 	const QString & name() const { return m_name; }

Modified: trunk/Scribus/scribus/scimagecachefile.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23880&path=/trunk/Scribus/scribus/scimagecachefile.h
==============================================================================
--- trunk/Scribus/scribus/scimagecachefile.h	(original)
+++ trunk/Scribus/scribus/scimagecachefile.h	Thu Jun  4 16:32:28 2020
@@ -39,7 +39,7 @@
 	Q_OBJECT
 
 public:
-	ScImageCacheFile(const QString & name, ScImageCacheDir *parent = 0);
+	ScImageCacheFile(const QString & name, ScImageCacheDir* parent = nullptr);
 	~ScImageCacheFile();
 
 	QString path(bool relative = false) const;

Modified: trunk/Scribus/scribus/third_party/rtf-qt/rtfreader.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23880&path=/trunk/Scribus/scribus/third_party/rtf-qt/rtfreader.h
==============================================================================
--- trunk/Scribus/scribus/third_party/rtf-qt/rtfreader.h	(original)
+++ trunk/Scribus/scribus/third_party/rtf-qt/rtfreader.h	Thu Jun  4 16:32:28 2020
@@ -54,7 +54,7 @@
     /**
        Normal constructor
     */
-    explicit Reader( QObject *parent = 0 );
+    explicit Reader( QObject* parent = nullptr );
 
     /**
        Open a document

Modified: trunk/Scribus/scribus/tt/simpletreemodel/treeitem.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23880&path=/trunk/Scribus/scribus/tt/simpletreemodel/treeitem.h
==============================================================================
--- trunk/Scribus/scribus/tt/simpletreemodel/treeitem.h	(original)
+++ trunk/Scribus/scribus/tt/simpletreemodel/treeitem.h	Thu Jun  4 16:32:28 2020
@@ -48,7 +48,7 @@
 class TreeItem
 {
 public:
-    TreeItem(const QList<QVariant> &data, TreeItem *parent = 0);
+    TreeItem(const QList<QVariant> &data, TreeItem* parent = nullptr);
     ~TreeItem();
 
 	void appendChild(TreeItem *item);

Modified: trunk/Scribus/scribus/tt/simpletreemodel/treemodel.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23880&path=/trunk/Scribus/scribus/tt/simpletreemodel/treemodel.h
==============================================================================
--- trunk/Scribus/scribus/tt/simpletreemodel/treemodel.h	(original)
+++ trunk/Scribus/scribus/tt/simpletreemodel/treemodel.h	Thu Jun  4 16:32:28 2020
@@ -54,8 +54,8 @@
     Q_OBJECT
 
 public:
-    TreeModel(const QString &data, QObject *parent = 0);
-    TreeModel(QObject *parent = 0); //Scribus Added for ScHelpTreeModel
+    TreeModel(const QString &data, QObject* parent = nullptr);
+    TreeModel(QObject* parent = nullptr); //Scribus Added for ScHelpTreeModel
     ~TreeModel();
 
     QVariant data(const QModelIndex &index, int role) const;

Modified: trunk/Scribus/scribus/ui/AdapterWidget.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23880&path=/trunk/Scribus/scribus/ui/AdapterWidget.h
==============================================================================
--- trunk/Scribus/scribus/ui/AdapterWidget.h	(original)
+++ trunk/Scribus/scribus/ui/AdapterWidget.h	Thu Jun  4 16:32:28 2020
@@ -25,7 +25,7 @@
 {
     Q_OBJECT
 	public:
-		AdapterWidget ( QWidget * parent = 0, const char * name = 0, const QGLWidget * shareWidget = 0);
+		AdapterWidget ( QWidget* parent = nullptr, const char * name = 0, const QGLWidget * shareWidget = 0);
 
 		virtual ~AdapterWidget() {}
 
@@ -53,7 +53,7 @@
 class ViewerQT : public osgViewer::Viewer, public AdapterWidget
 {
 	public:
-		ViewerQT ( QWidget * parent = 0, const char * name = 0, const QGLWidget * shareWidget = 0) : AdapterWidget ( parent, name, shareWidget)
+		ViewerQT ( QWidget* parent = nullptr, const char * name = 0, const QGLWidget * shareWidget = 0) : AdapterWidget ( parent, name, shareWidget)
 		{
 			getCamera()->setViewport ( new osg::Viewport ( 0,0,width(),height() ) );
 			getCamera()->setProjectionMatrixAsPerspective ( 30.0f, static_cast<double> ( width() ) /static_cast<double> ( height() ), 1.0f, 10000.0f );

Modified: trunk/Scribus/scribus/ui/aligndistribute.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23880&path=/trunk/Scribus/scribus/ui/aligndistribute.h
==============================================================================
--- trunk/Scribus/scribus/ui/aligndistribute.h	(original)
+++ trunk/Scribus/scribus/ui/aligndistribute.h	Thu Jun  4 16:32:28 2020
@@ -56,7 +56,7 @@
 	Q_OBJECT
 
 public:
-	AlignDistributePalette( QWidget* parent = 0, const char* name = 0);
+	AlignDistributePalette( QWidget* parent = nullptr, const char* name = 0);
 	~AlignDistributePalette();
 
 	virtual void setDoc( ScribusDoc* newDoc );

Modified: trunk/Scribus/scribus/ui/applytemplatedialog.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23880&path=/trunk/Scribus/scribus/ui/applytemplatedialog.h
==============================================================================
--- trunk/Scribus/scribus/ui/applytemplatedialog.h	(original)
+++ trunk/Scribus/scribus/ui/applytemplatedialog.h	Thu Jun  4 16:32:28 2020
@@ -39,7 +39,7 @@
 	Q_OBJECT
 
 public:
-	ApplyMasterPageDialog( QWidget* parent = 0 );
+	ApplyMasterPageDialog( QWidget* parent = nullptr );
 	~ApplyMasterPageDialog();
 	
 	virtual void changeEvent(QEvent *e);

Modified: trunk/Scribus/scribus/ui/colorcombo.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23880&path=/trunk/Scribus/scribus/ui/colorcombo.h
==============================================================================
--- trunk/Scribus/scribus/ui/colorcombo.h	(original)
+++ trunk/Scribus/scribus/ui/colorcombo.h	Thu Jun  4 16:32:28 2020
@@ -43,9 +43,9 @@
 		fancyPixmaps
 	};
 
-	ColorCombo( QWidget* parent=0 );
-	ColorCombo( ColorCombo::PixmapType type, QWidget* parent=0 );
-	ColorCombo( bool rw, QWidget* parent=0 );
+	ColorCombo( QWidget* parent=nullptr );
+	ColorCombo( ColorCombo::PixmapType type, QWidget* parent=nullptr );
+	ColorCombo( bool rw, QWidget* parent=nullptr );
 
 	QString currentColor() const;
 

Modified: trunk/Scribus/scribus/ui/colorlistbox.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23880&path=/trunk/Scribus/scribus/ui/colorlistbox.h
==============================================================================
--- trunk/Scribus/scribus/ui/colorlistbox.h	(original)
+++ trunk/Scribus/scribus/ui/colorlistbox.h	Thu Jun  4 16:32:28 2020
@@ -46,8 +46,8 @@
 
 		/*! \brief Standard QListBox like constructor.
 		Just there are initialized pixmaps for icon drawing. */
-		ColorListBox(QWidget * parent = 0);
-		ColorListBox(ColorListBox::PixmapType type, QWidget * parent = 0);
+		ColorListBox(QWidget* parent = nullptr);
+		ColorListBox(ColorListBox::PixmapType type, QWidget* parent = nullptr);
 		~ColorListBox();
 
 		virtual void changeEvent(QEvent *e);

Modified: trunk/Scribus/scribus/ui/colorlistmodel.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23880&path=/trunk/Scribus/scribus/ui/colorlistmodel.h
==============================================================================
--- trunk/Scribus/scribus/ui/colorlistmodel.h	(original)
+++ trunk/Scribus/scribus/ui/colorlistmodel.h	Thu Jun  4 16:32:28 2020
@@ -36,7 +36,7 @@
 
 public:
 	//! Constructor
-	ColorListModel(QObject *parent = 0);
+	ColorListModel(QObject* parent = nullptr);
 
 	enum SortRule
 	{

Modified: trunk/Scribus/scribus/ui/contextmenu.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23880&path=/trunk/Scribus/scribus/ui/contextmenu.h
==============================================================================
--- trunk/Scribus/scribus/ui/contextmenu.h	(original)
+++ trunk/Scribus/scribus/ui/contextmenu.h	Thu Jun  4 16:32:28 2020
@@ -30,8 +30,8 @@
 {
 	Q_OBJECT
 public:
-	ContextMenu(Selection &sel, ScribusMainWindow *actionsParent, ScribusDoc* doc, QWidget* parent=0);
-	ContextMenu(ScribusMainWindow *actionsParent, ScribusDoc* doc, double mx, double my, QWidget* parent=0);
+	ContextMenu(Selection &sel, ScribusMainWindow *actionsParent, ScribusDoc* doc, QWidget* parent=nullptr);
+	ContextMenu(ScribusMainWindow *actionsParent, ScribusDoc* doc, double mx, double my, QWidget* parent=nullptr);
 	~ContextMenu();
 	
 protected:

Modified: trunk/Scribus/scribus/ui/copypagetomasterpagedialog.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23880&path=/trunk/Scribus/scribus/ui/copypagetomasterpagedialog.h
==============================================================================
--- trunk/Scribus/scribus/ui/copypagetomasterpagedialog.h	(original)
+++ trunk/Scribus/scribus/ui/copypagetomasterpagedialog.h	Thu Jun  4 16:32:28 2020
@@ -15,7 +15,7 @@
 {
 Q_OBJECT
 public:
-	CopyPageToMasterPageDialog(int existingMasterNamesCount, const QStringList& pageLocations, int currentLocation = -1, QWidget *parent = 0);
+	CopyPageToMasterPageDialog(int existingMasterNamesCount, const QStringList& pageLocations, int currentLocation = -1, QWidget* parent = nullptr);
 	~CopyPageToMasterPageDialog();
 	
 	void values(QString &pageName, bool &copyAppliedMaster, int &pageLocation) const;

Modified: trunk/Scribus/scribus/ui/cpalette.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23880&path=/trunk/Scribus/scribus/ui/cpalette.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/cpalette.cpp	(original)
+++ trunk/Scribus/scribus/ui/cpalette.cpp	Thu Jun  4 16:32:28 2020
@@ -1024,7 +1024,7 @@
 		else if (number == 11)
 		{
 			stackedWidget_2->setCurrentIndex(2);
-			if ((currentItem->selectedMeshPointX > -1) && (currentItem->selectedMeshPointY > -1l))
+			if ((currentItem->selectedMeshPointX > -1) && (currentItem->selectedMeshPointY > -1L))
 			{
 				MeshPoint mp = currentItem->meshGradientArray[currentItem->selectedMeshPointX][currentItem->selectedMeshPointY];
 				setCurrentComboItem(colorMeshPoint, mp.colorName);
@@ -1181,8 +1181,8 @@
 		else if (gradientType->currentIndex() == 5)
 		{
 			stackedWidget_2->setCurrentIndex(2);
-			if ((currentItem->selectedMeshPointX > -1) && (currentItem->selectedMeshPointY > -1l))
-			{
+			if ((currentItem->selectedMeshPointX > -1) &&
+				(currentItem->selectedMeshPointY > -1L)) {
 				MeshPoint mp = currentItem->meshGradientArray[currentItem->selectedMeshPointX][currentItem->selectedMeshPointY];
 				setCurrentComboItem(colorMeshPoint, mp.colorName);
 				shadeMeshPoint->setValue(mp.shade);
@@ -1276,7 +1276,7 @@
 	else if (type == 5)
 	{
 		stackedWidget_2->setCurrentIndex(2);
-		if ((currentItem->selectedMeshPointX > -1) && (currentItem->selectedMeshPointY > -1l))
+		if ((currentItem->selectedMeshPointX > -1) && (currentItem->selectedMeshPointY > -1L))
 		{
 			MeshPoint mp = currentItem->meshGradientArray[currentItem->selectedMeshPointX][currentItem->selectedMeshPointY];
 			setCurrentComboItem(colorMeshPoint, mp.colorName);

Modified: trunk/Scribus/scribus/ui/cxfimportdialog.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23880&path=/trunk/Scribus/scribus/ui/cxfimportdialog.h
==============================================================================
--- trunk/Scribus/scribus/ui/cxfimportdialog.h	(original)
+++ trunk/Scribus/scribus/ui/cxfimportdialog.h	Thu Jun  4 16:32:28 2020
@@ -19,7 +19,7 @@
 	Q_OBJECT
 
 public:
-	CxfImportDialog(QWidget* parent = 0);
+	CxfImportDialog(QWidget* parent = nullptr);
 
 	QList<eColorSpaceType> priorities() const;
 

Modified: trunk/Scribus/scribus/ui/fontcombo.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23880&path=/trunk/Scribus/scribus/ui/fontcombo.h
==============================================================================
--- trunk/Scribus/scribus/ui/fontcombo.h	(original)
+++ trunk/Scribus/scribus/ui/fontcombo.h	Thu Jun  4 16:32:28 2020
@@ -137,7 +137,7 @@
 	Q_OBJECT
 
 public:
-	FontComboValidator(QObject* parent = 0);
+	FontComboValidator(QObject* parent = nullptr);
 	virtual State validate(QString & input, int & pos) const;
 };
 #endif

Modified: trunk/Scribus/scribus/ui/fontembeddingcombo.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23880&path=/trunk/Scribus/scribus/ui/fontembeddingcombo.h
==============================================================================
--- trunk/Scribus/scribus/ui/fontembeddingcombo.h	(original)
+++ trunk/Scribus/scribus/ui/fontembeddingcombo.h	Thu Jun  4 16:32:28 2020
@@ -23,7 +23,7 @@
 	Q_OBJECT
 
 public:
-	FontEmbeddingCombo(QWidget* parent=0);
+	FontEmbeddingCombo(QWidget* parent=nullptr);
 	~FontEmbeddingCombo();
 
 	PDFOptions::PDFFontEmbedding embeddingMode() const;

Modified: trunk/Scribus/scribus/ui/fontembeddingmodel.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23880&path=/trunk/Scribus/scribus/ui/fontembeddingmodel.h
==============================================================================
--- trunk/Scribus/scribus/ui/fontembeddingmodel.h	(original)
+++ trunk/Scribus/scribus/ui/fontembeddingmodel.h	Thu Jun  4 16:32:28 2020
@@ -20,7 +20,7 @@
 
 public:
 	//! Constructor
-	FontEmbeddingModel(QObject *parent = 0);
+	FontEmbeddingModel(QObject* parent = nullptr);
 
 	//! Remove all colors from list;
 	void clear();

Modified: trunk/Scribus/scribus/ui/fontlistview.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23880&path=/trunk/Scribus/scribus/ui/fontlistview.h
==============================================================================
--- trunk/Scribus/scribus/ui/fontlistview.h	(original)
+++ trunk/Scribus/scribus/ui/fontlistview.h	Thu Jun  4 16:32:28 2020
@@ -22,7 +22,7 @@
 	Q_OBJECT
 
 	public:
-		FontListView(QWidget * parent = 0);
+		FontListView(QWidget* parent = nullptr);
 
 		void setModel(QAbstractItemModel * model);
 		void setFonts(const SCFonts& f);

Modified: trunk/Scribus/scribus/ui/inserttablecolumnsdialog.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23880&path=/trunk/Scribus/scribus/ui/inserttablecolumnsdialog.h
==============================================================================
--- trunk/Scribus/scribus/ui/inserttablecolumnsdialog.h	(original)
+++ trunk/Scribus/scribus/ui/inserttablecolumnsdialog.h	Thu Jun  4 16:32:28 2020
@@ -29,7 +29,7 @@
 
 public:
 	/// Constructs a new dialog for inserting columns. @a appMode is the current application mode.
-	explicit InsertTableColumnsDialog(int appMode, QWidget *parent = 0);
+	explicit InsertTableColumnsDialog(int appMode, QWidget* parent = nullptr);
 
 	/// Returns the number of columns the user entered.
 	int numberOfColumns() const { return numColumns->value(); }

Modified: trunk/Scribus/scribus/ui/inserttablerowsdialog.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23880&path=/trunk/Scribus/scribus/ui/inserttablerowsdialog.h
==============================================================================
--- trunk/Scribus/scribus/ui/inserttablerowsdialog.h	(original)
+++ trunk/Scribus/scribus/ui/inserttablerowsdialog.h	Thu Jun  4 16:32:28 2020
@@ -29,7 +29,7 @@
 
 public:
 	/// Constructs a new dialog for inserting rows. @a appMode is the current application mode.
-	explicit InsertTableRowsDialog(int appMode, QWidget *parent = 0);
+	explicit InsertTableRowsDialog(int appMode, QWidget* parent = nullptr);
 
 	/// Returns the number of rows the user entered.
 	int numberOfRows() const { return numRows->value(); }

Modified: trunk/Scribus/scribus/ui/loremipsum.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23880&path=/trunk/Scribus/scribus/ui/loremipsum.h
==============================================================================
--- trunk/Scribus/scribus/ui/loremipsum.h	(original)
+++ trunk/Scribus/scribus/ui/loremipsum.h	Thu Jun  4 16:32:28 2020
@@ -87,7 +87,7 @@
 
 public:
 	/*! Reads all XML files in cfg directory. */
-	LoremManager(ScribusDoc* doc, QWidget* parent = 0);
+	LoremManager(ScribusDoc* doc, QWidget* parent = nullptr);
 
 	/*! Apply created LI into a frame
 	\param name filename of the selected LI

Modified: trunk/Scribus/scribus/ui/marginpresetlayout.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23880&path=/trunk/Scribus/scribus/ui/marginpresetlayout.h
==============================================================================
--- trunk/Scribus/scribus/ui/marginpresetlayout.h	(original)
+++ trunk/Scribus/scribus/ui/marginpresetlayout.h	Thu Jun  4 16:32:28 2020
@@ -22,7 +22,7 @@
 
 public:
 	/*! \brief QComboBox like constructor. Values/names are set here. Tooltip etc. too. */
-	PresetLayout(QWidget *parent = 0);
+	PresetLayout(QWidget* parent = nullptr);
 	~PresetLayout(){};
 
 	/*! \brief Compute the margins here.

Modified: trunk/Scribus/scribus/ui/markinsert.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23880&path=/trunk/Scribus/scribus/ui/markinsert.h
==============================================================================
--- trunk/Scribus/scribus/ui/markinsert.h	(original)
+++ trunk/Scribus/scribus/ui/markinsert.h	Thu Jun  4 16:32:28 2020
@@ -13,10 +13,10 @@
 	Q_OBJECT
 
 public:
-	MarkInsert(const QList<Mark*>&, QWidget *parent = 0) : QDialog(parent) {}
-	MarkInsert(const Mark*, QWidget *parent = 0) : QDialog(parent) {}
-	MarkInsert(const QList<NotesStyle*>&, QWidget *parent = 0) : QDialog(parent) {}
-	MarkInsert(QWidget *parent = 0) : QDialog(parent) {}
+	MarkInsert(const QList<Mark*>&, QWidget* parent = nullptr) : QDialog(parent) {}
+	MarkInsert(const Mark*, QWidget* parent = nullptr) : QDialog(parent) {}
+	MarkInsert(const QList<NotesStyle*>&, QWidget* parent = nullptr) : QDialog(parent) {}
+	MarkInsert(QWidget* parent = nullptr) : QDialog(parent) {}
 	~MarkInsert() {}
 
 	virtual void values(QString &label) {}

Modified: trunk/Scribus/scribus/ui/markvariabletext.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23880&path=/trunk/Scribus/scribus/ui/markvariabletext.h
==============================================================================
--- trunk/Scribus/scribus/ui/markvariabletext.h	(original)
+++ trunk/Scribus/scribus/ui/markvariabletext.h	Thu Jun  4 16:32:28 2020
@@ -10,8 +10,8 @@
 	Q_OBJECT
 
 public:
-	explicit MarkVariableText(const QList<Mark*>&, QWidget *parent = 0);
-	explicit MarkVariableText(const Mark*, QWidget *parent = 0);
+	explicit MarkVariableText(const QList<Mark*>&, QWidget* parent = nullptr);
+	explicit MarkVariableText(const Mark*, QWidget* parent = nullptr);
 	~MarkVariableText();
 
 	Mark* values(QString& label, QString& text) override;

Modified: trunk/Scribus/scribus/ui/notesstyleseditor.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23880&path=/trunk/Scribus/scribus/ui/notesstyleseditor.h
==============================================================================
--- trunk/Scribus/scribus/ui/notesstyleseditor.h	(original)
+++ trunk/Scribus/scribus/ui/notesstyleseditor.h	Thu Jun  4 16:32:28 2020
@@ -14,7 +14,7 @@
 	Q_OBJECT
 
 public:
-	explicit NotesStylesEditor(QWidget *parent = 0, const char *name = "notesStylesEditor");
+	explicit NotesStylesEditor(QWidget* parent = nullptr, const char *name = "notesStylesEditor");
 	~NotesStylesEditor();
 
 	virtual void changeEvent(QEvent *e);

Modified: trunk/Scribus/scribus/ui/numformatcombo.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23880&path=/trunk/Scribus/scribus/ui/numformatcombo.h
==============================================================================
--- trunk/Scribus/scribus/ui/numformatcombo.h	(original)
+++ trunk/Scribus/scribus/ui/numformatcombo.h	Thu Jun  4 16:32:28 2020
@@ -22,7 +22,7 @@
 	Q_OBJECT
 
 public:
-	NumFormatCombo(QWidget* parent=0);
+	NumFormatCombo(QWidget* parent=nullptr);
 	NumFormatCombo(QWidget* parent, bool showNone);
 
 	NumFormat currentFormat() const;

Modified: trunk/Scribus/scribus/ui/pageitemattributes.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23880&path=/trunk/Scribus/scribus/ui/pageitemattributes.h
==============================================================================
--- trunk/Scribus/scribus/ui/pageitemattributes.h	(original)
+++ trunk/Scribus/scribus/ui/pageitemattributes.h	Thu Jun  4 16:32:28 2020
@@ -13,7 +13,7 @@
 {
     Q_OBJECT
 	public:
-		PageItemAttributes( QWidget* parent = 0, const char* name = 0, bool modal = false);
+		PageItemAttributes( QWidget* parent = nullptr, const char* name = 0, bool modal = false);
 		~PageItemAttributes();
 
 		virtual ObjAttrVector * getNewAttributes();

Modified: trunk/Scribus/scribus/ui/pageitempositionsetter.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23880&path=/trunk/Scribus/scribus/ui/pageitempositionsetter.h
==============================================================================
--- trunk/Scribus/scribus/ui/pageitempositionsetter.h	(original)
+++ trunk/Scribus/scribus/ui/pageitempositionsetter.h	Thu Jun  4 16:32:28 2020
@@ -35,7 +35,7 @@
 	Selection* m_select;
 
 public:
-	PageItemPositionSetter(QWidget * parent = 0);
+	PageItemPositionSetter(QWidget* parent = nullptr);
 
 	void changeItem(Selection* sel);
 	PageItemSetterBase* clone();

Modified: trunk/Scribus/scribus/ui/pageitemrotationsetter.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23880&path=/trunk/Scribus/scribus/ui/pageitemrotationsetter.h
==============================================================================
--- trunk/Scribus/scribus/ui/pageitemrotationsetter.h	(original)
+++ trunk/Scribus/scribus/ui/pageitemrotationsetter.h	Thu Jun  4 16:32:28 2020
@@ -32,7 +32,7 @@
 	Selection * m_select;
 
 public:
-	PageItemRotationSetter(QWidget * parent = 0);
+	PageItemRotationSetter(QWidget* parent = nullptr);
 
 	void changeItem(Selection* sel);
 	PageItemSetterBase * clone();

Modified: trunk/Scribus/scribus/ui/pageitemsetterbase.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23880&path=/trunk/Scribus/scribus/ui/pageitemsetterbase.h
==============================================================================
--- trunk/Scribus/scribus/ui/pageitemsetterbase.h	(original)
+++ trunk/Scribus/scribus/ui/pageitemsetterbase.h	Thu Jun  4 16:32:28 2020
@@ -46,7 +46,7 @@
 	/**
 	  * Default constructor
 	  */
-	PageItemSetterBase(QWidget * parent = 0);
+	PageItemSetterBase(QWidget* parent = nullptr);
 
 	/**
 	*  Reset parameters and internal state to reflect properties of

Modified: trunk/Scribus/scribus/ui/pdfversioncombo.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23880&path=/trunk/Scribus/scribus/ui/pdfversioncombo.h
==============================================================================
--- trunk/Scribus/scribus/ui/pdfversioncombo.h	(original)
+++ trunk/Scribus/scribus/ui/pdfversioncombo.h	Thu Jun  4 16:32:28 2020
@@ -24,7 +24,7 @@
 	Q_OBJECT
 
 public:
-	PdfVersionCombo(QWidget* parent=0);
+	PdfVersionCombo(QWidget* parent=nullptr);
 	~PdfVersionCombo();
 
 	PDFVersion version() const;

Modified: trunk/Scribus/scribus/ui/pdfversionmodel.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23880&path=/trunk/Scribus/scribus/ui/pdfversionmodel.h
==============================================================================
--- trunk/Scribus/scribus/ui/pdfversionmodel.h	(original)
+++ trunk/Scribus/scribus/ui/pdfversionmodel.h	Thu Jun  4 16:32:28 2020
@@ -20,7 +20,7 @@
 
 public:
 	//! Constructor
-	PdfVersionModel(QObject *parent = 0);
+	PdfVersionModel(QObject* parent = nullptr);
 	
 	enum PdfVersionItem
 	{

Modified: trunk/Scribus/scribus/ui/propertiespalette_table.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23880&path=/trunk/Scribus/scribus/ui/propertiespalette_table.h
==============================================================================
--- trunk/Scribus/scribus/ui/propertiespalette_table.h	(original)
+++ trunk/Scribus/scribus/ui/propertiespalette_table.h	Thu Jun  4 16:32:28 2020
@@ -32,7 +32,7 @@
 	Q_OBJECT
 
 public:
-	explicit PropertiesPalette_Table(QWidget *parent = 0);
+	explicit PropertiesPalette_Table(QWidget* parent = nullptr);
 	~PropertiesPalette_Table() {}
 
 	/// Update the list of colors.

Modified: trunk/Scribus/scribus/ui/propertywidget_dropcap.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23880&path=/trunk/Scribus/scribus/ui/propertywidget_dropcap.h
==============================================================================
--- trunk/Scribus/scribus/ui/propertywidget_dropcap.h	(original)
+++ trunk/Scribus/scribus/ui/propertywidget_dropcap.h	Thu Jun  4 16:32:28 2020
@@ -14,7 +14,7 @@
     Q_OBJECT
 
 public:
-	PropertyWidget_DropCap(QWidget *parent = 0);
+	PropertyWidget_DropCap(QWidget* parent = nullptr);
 	~PropertyWidget_DropCap() {}
 
 	void updateStyle(const ParagraphStyle& newCurrent);
@@ -38,7 +38,7 @@
 	void setMainWindow(ScribusMainWindow *mw);
 	void setDoc(ScribusDoc *doc);
 
-	void handleAppModeChanged(int oldMode, int mode);
+	void handleAppModeChanged(int oldMode, int mode);
 	void handleSelectionChanged();
 	void handleUpdateRequest(int);
 

Modified: trunk/Scribus/scribus/ui/propertywidget_pareffect.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23880&path=/trunk/Scribus/scribus/ui/propertywidget_pareffect.h
==============================================================================
--- trunk/Scribus/scribus/ui/propertywidget_pareffect.h	(original)
+++ trunk/Scribus/scribus/ui/propertywidget_pareffect.h	Thu Jun  4 16:32:28 2020
@@ -18,7 +18,7 @@
 	Q_OBJECT
 
 public:
-	PropertyWidget_ParEffect(QWidget *parent = 0);
+	PropertyWidget_ParEffect(QWidget* parent = nullptr);
 	~PropertyWidget_ParEffect() {}
 
 	void updateStyle(const ParagraphStyle& newPStyle);

Modified: trunk/Scribus/scribus/ui/query.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23880&path=/trunk/Scribus/scribus/ui/query.h
==============================================================================
--- trunk/Scribus/scribus/ui/query.h	(original)
+++ trunk/Scribus/scribus/ui/query.h	Thu Jun  4 16:32:28 2020
@@ -23,7 +23,7 @@
 	Q_OBJECT
 
 public:
-	Query(QWidget* parent=0, const char* name=nullptr, bool modal = false, const QString& text=0, const QString& titel=0 );
+	Query(QWidget* parent=nullptr, const char* name=nullptr, bool modal = false, const QString& text=0, const QString& titel=0 );
 	~Query() {};
 
 	QString getEditText() const;

Modified: trunk/Scribus/scribus/ui/resourcemanagerlicense.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23880&path=/trunk/Scribus/scribus/ui/resourcemanagerlicense.h
==============================================================================
--- trunk/Scribus/scribus/ui/resourcemanagerlicense.h	(original)
+++ trunk/Scribus/scribus/ui/resourcemanagerlicense.h	Thu Jun  4 16:32:28 2020
@@ -37,7 +37,7 @@
 	Q_OBJECT
 
 	public:
-		ResourceManagerLicense(QWidget * parent = 0, Qt::WindowFlags f = 0);
+		ResourceManagerLicense(QWidget* parent = nullptr, Qt::WindowFlags f = Qt::WindowFlags());
 		~ResourceManagerLicense() {};
 
 		void setText(const QString& s);

Modified: trunk/Scribus/scribus/ui/sccolorslider.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23880&path=/trunk/Scribus/scribus/ui/sccolorslider.h
==============================================================================
--- trunk/Scribus/scribus/ui/sccolorslider.h	(original)
+++ trunk/Scribus/scribus/ui/sccolorslider.h	Thu Jun  4 16:32:28 2020
@@ -19,7 +19,7 @@
 	Q_OBJECT
 
 public: 
-	ScColorSlider(QWidget* parent = 0);
+	ScColorSlider(QWidget* parent = nullptr);
 	
 	virtual void paintEvent(QPaintEvent * p);
 };

Modified: trunk/Scribus/scribus/ui/scdockpalette.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23880&path=/trunk/Scribus/scribus/ui/scdockpalette.h
==============================================================================
--- trunk/Scribus/scribus/ui/scdockpalette.h	(original)
+++ trunk/Scribus/scribus/ui/scdockpalette.h	Thu Jun  4 16:32:28 2020
@@ -40,7 +40,7 @@
 Q_OBJECT
 
 public:
-	ScDockPalette( QWidget * parent = nullptr, const QString& prefsContext = QString(), Qt::WindowFlags f = 0 );
+	ScDockPalette( QWidget * parent = nullptr, const QString& prefsContext = QString(), Qt::WindowFlags f = Qt::WindowFlags() );
 	~ScDockPalette() {}
 	/** @brief Sample way to grab keystrokes, simply calls superclass at this point */
 	//virtual void keyPressEvent(QKeyEvent *keyEvent);

Modified: trunk/Scribus/scribus/ui/scinputdialog.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23880&path=/trunk/Scribus/scribus/ui/scinputdialog.h
==============================================================================
--- trunk/Scribus/scribus/ui/scinputdialog.h	(original)
+++ trunk/Scribus/scribus/ui/scinputdialog.h	Thu Jun  4 16:32:28 2020
@@ -27,7 +27,7 @@
 	Q_OBJECT
 
 public:
-	ScInputDialog( QWidget* parent = 0, const char* name = 0, bool modal = false);
+	ScInputDialog( QWidget* parent = nullptr, const char* name = 0, bool modal = false);
 	~ScInputDialog(){};
 	
 	virtual void changeEvent(QEvent *e);
@@ -40,7 +40,7 @@
 	static double getDouble(const QString &caption, const QString &label, double num = 0,
 							 double from = -2147483647, double to = 2147483647,
 							 int decimals = 1, const QString& suffix = "", bool *ok = 0,
-							 QWidget *parent = 0, const char *name = 0 );
+							 QWidget* parent = nullptr, const char *name = 0 );
 
 protected:
 	QVBoxLayout* ScInputDialogLayout;

Modified: trunk/Scribus/scribus/ui/scprogressbar.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23880&path=/trunk/Scribus/scribus/ui/scprogressbar.h
==============================================================================
--- trunk/Scribus/scribus/ui/scprogressbar.h	(original)
+++ trunk/Scribus/scribus/ui/scprogressbar.h	Thu Jun  4 16:32:28 2020
@@ -33,8 +33,8 @@
 	Q_OBJECT
 	
 	public:
-		ScProgressBar( bool showNumbers, QWidget *parent=0);
-		ScProgressBar( bool showNumbers, int totalSteps, QWidget* parent=0);
+		ScProgressBar( bool showNumbers, QWidget* parent=nullptr);
+		ScProgressBar( bool showNumbers, int totalSteps, QWidget* parent=nullptr);
 		virtual bool setIndicator( QString & indicator, int progress, int totalSteps );
 
 		~ScProgressBar();

Modified: trunk/Scribus/scribus/ui/scrpalettebase.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23880&path=/trunk/Scribus/scribus/ui/scrpalettebase.h
==============================================================================
--- trunk/Scribus/scribus/ui/scrpalettebase.h	(original)
+++ trunk/Scribus/scribus/ui/scrpalettebase.h	Thu Jun  4 16:32:28 2020
@@ -40,7 +40,7 @@
 Q_OBJECT
 
 public:
-	ScrPaletteBase( QWidget * parent = nullptr, const QString& prefsContext = QString(), bool modal = false, Qt::WindowFlags f = nullptr);
+	ScrPaletteBase( QWidget * parent = nullptr, const QString& prefsContext = QString(), bool modal = false, Qt::WindowFlags f = Qt::WindowFlags());
 	~ScrPaletteBase() {}
 	/** @brief Sample way to grab keystrokes, simply calls superclass at this point */
 	//virtual void keyPressEvent(QKeyEvent *keyEvent);

Modified: trunk/Scribus/scribus/ui/sctablewidget.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23880&path=/trunk/Scribus/scribus/ui/sctablewidget.h
==============================================================================
--- trunk/Scribus/scribus/ui/sctablewidget.h	(original)
+++ trunk/Scribus/scribus/ui/sctablewidget.h	Thu Jun  4 16:32:28 2020
@@ -18,8 +18,8 @@
 	Q_OBJECT
 
 	public:
-		ScTableWidget ( QWidget * parent = 0 );
-		ScTableWidget ( int rows, int columns, QWidget * parent = 0 );
+		ScTableWidget ( QWidget* parent = nullptr );
+		ScTableWidget ( int rows, int columns, QWidget* parent = nullptr );
 		~ScTableWidget ();
 		void setCellWidget ( int row, int column, QWidget * widget );
 		void removeCellWidget ( int row, int column );

Modified: trunk/Scribus/scribus/ui/shortcutwidget.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23880&path=/trunk/Scribus/scribus/ui/shortcutwidget.h
==============================================================================
--- trunk/Scribus/scribus/ui/shortcutwidget.h	(original)
+++ trunk/Scribus/scribus/ui/shortcutwidget.h	Thu Jun  4 16:32:28 2020
@@ -23,7 +23,7 @@
 	Q_OBJECT
 
 public:
-	ShortcutWidget(QWidget *parent = 0);
+	ShortcutWidget(QWidget* parent = nullptr);
 	~ShortcutWidget();
 	
 	

Modified: trunk/Scribus/scribus/ui/smcellstylewidget.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23880&path=/trunk/Scribus/scribus/ui/smcellstylewidget.h
==============================================================================
--- trunk/Scribus/scribus/ui/smcellstylewidget.h	(original)
+++ trunk/Scribus/scribus/ui/smcellstylewidget.h	Thu Jun  4 16:32:28 2020
@@ -26,7 +26,7 @@
 
 public:
 	/// Constructor.
-	SMCellStyleWidget(QWidget *parent = 0);
+	SMCellStyleWidget(QWidget* parent = nullptr);
 	/// Destructor.
 	~SMCellStyleWidget();
 

Modified: trunk/Scribus/scribus/ui/smcstylewidget.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23880&path=/trunk/Scribus/scribus/ui/smcstylewidget.h
==============================================================================
--- trunk/Scribus/scribus/ui/smcstylewidget.h	(original)
+++ trunk/Scribus/scribus/ui/smcstylewidget.h	Thu Jun  4 16:32:28 2020
@@ -19,7 +19,7 @@
 {
 	Q_OBJECT
 public:
-	SMCStyleWidget(QWidget *parent = 0);
+	SMCStyleWidget(QWidget* parent = nullptr);
 	~SMCStyleWidget();
 	
 	virtual void changeEvent(QEvent *e);

Modified: trunk/Scribus/scribus/ui/smtablestylewidget.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23880&path=/trunk/Scribus/scribus/ui/smtablestylewidget.h
==============================================================================
--- trunk/Scribus/scribus/ui/smtablestylewidget.h	(original)
+++ trunk/Scribus/scribus/ui/smtablestylewidget.h	Thu Jun  4 16:32:28 2020
@@ -25,7 +25,7 @@
 	Q_OBJECT
 public:
 	/// Constructor.
-	SMTableStyleWidget(QWidget *parent = 0);
+	SMTableStyleWidget(QWidget* parent = nullptr);
 	/// Destructor.
 	~SMTableStyleWidget();
 

Modified: trunk/Scribus/scribus/ui/smtextstyles.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23880&path=/trunk/Scribus/scribus/ui/smtextstyles.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/smtextstyles.cpp	(original)
+++ trunk/Scribus/scribus/ui/smtextstyles.cpp	Thu Jun  4 16:32:28 2020
@@ -1102,11 +1102,10 @@
 
 void SMParagraphStyle::slotNumName(const QString &str)
 {
-	QString bstr(str);
 	if (!str.isEmpty())
 	{
 		for (int i = 0; i < m_selection.count(); ++i)
-			m_selection[i]->setNumName(bstr);
+			m_selection[i]->setNumName(str);
 		m_pwidget->numComboBox->setCurrentItem(m_pwidget->numComboBox->findText(m_selection[0]->numName()));
 		m_pwidget->numLevelSpin->setValue(m_selection[0]->numLevel()+1);
 		NumStruct * numS = m_doc->numerations.value(m_selection[0]->numName());

Modified: trunk/Scribus/scribus/ui/splash.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23880&path=/trunk/Scribus/scribus/ui/splash.h
==============================================================================
--- trunk/Scribus/scribus/ui/splash.h	(original)
+++ trunk/Scribus/scribus/ui/splash.h	Thu Jun  4 16:32:28 2020
@@ -24,7 +24,7 @@
 		\author Franz Schmid
 		\brief Constructor for SplashScreen
 		 */
-		ScSplashScreen ( const QPixmap & pixmap = QPixmap(), Qt::WindowFlags f = 0 );
+		ScSplashScreen ( const QPixmap & pixmap = QPixmap(), Qt::WindowFlags f = Qt::WindowFlags() );
 		~ScSplashScreen() {}
 		/*!
 		\author Franz Schmid

Modified: trunk/Scribus/scribus/ui/stylemanager.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23880&path=/trunk/Scribus/scribus/ui/stylemanager.h
==============================================================================
--- trunk/Scribus/scribus/ui/stylemanager.h	(original)
+++ trunk/Scribus/scribus/ui/stylemanager.h	Thu Jun  4 16:32:28 2020
@@ -25,7 +25,7 @@
 {
 	Q_OBJECT
 public:
-	StyleManager(QWidget *parent = 0, const char *name = "StyleManager");
+	StyleManager(QWidget* parent = nullptr, const char *name = "StyleManager");
 	~StyleManager();
 	
 	virtual void changeEvent(QEvent *e);

Modified: trunk/Scribus/scribus/ui/tablecolumnwidthsdialog.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23880&path=/trunk/Scribus/scribus/ui/tablecolumnwidthsdialog.h
==============================================================================
--- trunk/Scribus/scribus/ui/tablecolumnwidthsdialog.h	(original)
+++ trunk/Scribus/scribus/ui/tablecolumnwidthsdialog.h	Thu Jun  4 16:32:28 2020
@@ -21,7 +21,7 @@
 	Q_OBJECT
 public:
 	/// Constructs a new dialog. The dialog will use the unit of @a doc.
-	explicit TableColumnWidthsDialog(ScribusDoc* doc, QWidget *parent = 0);
+	explicit TableColumnWidthsDialog(ScribusDoc* doc, QWidget* parent = nullptr);
 
 	/// Returns the column width the user entered.
 	double columnWidth() const;

Modified: trunk/Scribus/scribus/ui/tablerowheightsdialog.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23880&path=/trunk/Scribus/scribus/ui/tablerowheightsdialog.h
==============================================================================
--- trunk/Scribus/scribus/ui/tablerowheightsdialog.h	(original)
+++ trunk/Scribus/scribus/ui/tablerowheightsdialog.h	Thu Jun  4 16:32:28 2020
@@ -21,7 +21,7 @@
 	Q_OBJECT
 public:
 	/// Constructs a new dialog. The dialog will use the unit of @a doc.
-	explicit TableRowHeightsDialog(ScribusDoc* doc, QWidget *parent = 0);
+	explicit TableRowHeightsDialog(ScribusDoc* doc, QWidget* parent = nullptr);
 
 	/// Returns the row height the user entered.
 	double rowHeight() const;

Modified: trunk/Scribus/scribus/ui/unicodesearch.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23880&path=/trunk/Scribus/scribus/ui/unicodesearch.h
==============================================================================
--- trunk/Scribus/scribus/ui/unicodesearch.h	(original)
+++ trunk/Scribus/scribus/ui/unicodesearch.h	Thu Jun  4 16:32:28 2020
@@ -31,7 +31,7 @@
 	/*! \brief QDialog like constructor
 	\param parent standard qt widget
 	*/
-	UnicodeSearch(QWidget* parent = 0);
+	UnicodeSearch(QWidget* parent = nullptr);
 	~UnicodeSearch();
 
 signals:
@@ -71,7 +71,7 @@
 	Q_OBJECT
 
 	public:
-		UnicodeSearchModel(QObject * parent = 0);
+		UnicodeSearchModel(QObject* parent = nullptr);
 		~UnicodeSearchModel();
 
 		int rowCount(const QModelIndex & parent = QModelIndex()) const;

Modified: trunk/Scribus/scribus/undogui.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23880&path=/trunk/Scribus/scribus/undogui.h
==============================================================================
--- trunk/Scribus/scribus/undogui.h	(original)
+++ trunk/Scribus/scribus/undogui.h	Thu Jun  4 16:32:28 2020
@@ -67,7 +67,7 @@
 	 * @param name Name of the object
 	 * @param f widget flags
 	 */
-	UndoGui(QWidget* parent = 0, const char* name = "UndoGui", Qt::WindowFlags f = 0);
+	UndoGui(QWidget* parent = nullptr, const char* name = "UndoGui", Qt::WindowFlags f = Qt::WindowFlags());
 
 	/** @brief Destroys the widget */
 	virtual ~UndoGui() {}
@@ -164,7 +164,7 @@
 	void updateRedoMenu();
 public:
 	/** @brief Creates a new UndoWidget instance. */
-	UndoWidget(QWidget* parent = 0, const char* name = 0);
+	UndoWidget(QWidget* parent = nullptr, const char* name = 0);
 
 	/** @brief Destroys the widget */
 	virtual ~UndoWidget();
@@ -317,7 +317,7 @@
                  QPixmap *targetPixmap,
                  QPixmap *actionPixmap,
 		         bool isUndoAction,
-	             QListWidget * parent = 0);
+				 QListWidget* parent = nullptr);
 		~UndoItem();
 		/*void paint(QPainter *painter);
 		int height(const QListWidget*) const;
@@ -344,7 +344,7 @@
 	 * Creates a new UndoPalette instance. After creation of an UndoPalette it must
 	 * be registered to the UndoManager with UndoManager's registerGui() method.
 	 */
-	UndoPalette(QWidget* parent = 0, const char* name = 0);
+	UndoPalette(QWidget* parent = nullptr, const char* name = 0);
 
 	/** @brief Destroys the widget */
 	~UndoPalette();




More information about the scribus-commit mailing list