r22639 by craig - clazy and clang fixes, part 17

scribus-commit scribus-commit at lists.scribus.net
Tue Aug 21 20:01:01 UTC 2018


Author: craig
Date: Tue Aug 21 20:01:01 2018
New Revision: 22639

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=22639
Log:
clazy and clang fixes, part 17

Modified:
    trunk/Scribus/scribus/actionmanager.cpp
    trunk/Scribus/scribus/canvasmode_objimport.cpp
    trunk/Scribus/scribus/colorsetmanager.cpp
    trunk/Scribus/scribus/desaxe/digester.cpp
    trunk/Scribus/scribus/exif.cpp
    trunk/Scribus/scribus/fpoint.cpp
    trunk/Scribus/scribus/fpointarray.cpp
    trunk/Scribus/scribus/gtwriter.cpp
    trunk/Scribus/scribus/guidesmodel.cpp
    trunk/Scribus/scribus/iconmanager.cpp
    trunk/Scribus/scribus/imagedataloaders/scimgdataloader_gimp.cpp
    trunk/Scribus/scribus/imagedataloaders/scimgdataloader_kra.cpp
    trunk/Scribus/scribus/imagedataloaders/scimgdataloader_ora.cpp
    trunk/Scribus/scribus/imagedataloaders/scimgdataloader_pdf.cpp
    trunk/Scribus/scribus/imagedataloaders/scimgdataloader_pgf.cpp
    trunk/Scribus/scribus/imagedataloaders/scimgdataloader_pict.cpp
    trunk/Scribus/scribus/imagedataloaders/scimgdataloader_qt.cpp
    trunk/Scribus/scribus/imagedataloaders/scimgdataloader_tiff.cpp
    trunk/Scribus/scribus/imagedataloaders/scimgdataloader_wpg.cpp
    trunk/Scribus/scribus/langmgr.cpp
    trunk/Scribus/scribus/latexhelpers.cpp
    trunk/Scribus/scribus/loadsaveplugin.cpp
    trunk/Scribus/scribus/localemgr.cpp
    trunk/Scribus/scribus/marks.cpp
    trunk/Scribus/scribus/menumanager.cpp
    trunk/Scribus/scribus/nodeeditcontext.cpp
    trunk/Scribus/scribus/pageitem.cpp
    trunk/Scribus/scribus/pageitem.h
    trunk/Scribus/scribus/pagesize.cpp
    trunk/Scribus/scribus/palettes/paletteloader_adobe_acb.cpp
    trunk/Scribus/scribus/palettes/paletteloader_adobe_aco.cpp
    trunk/Scribus/scribus/palettes/paletteloader_adobe_ase.cpp
    trunk/Scribus/scribus/palettes/paletteloader_autocad_acb.cpp
    trunk/Scribus/scribus/palettes/paletteloader_ps.cpp
    trunk/Scribus/scribus/palettes/paletteloader_sk1.cpp
    trunk/Scribus/scribus/pdf_analyzer.cpp
    trunk/Scribus/scribus/pdflib_core.cpp
    trunk/Scribus/scribus/pdfoptionsio.cpp
    trunk/Scribus/scribus/pluginmanager.cpp
    trunk/Scribus/scribus/plugins/barcodegenerator/barcode.cpp
    trunk/Scribus/scribus/plugins/export/pixmapexport/export.cpp
    trunk/Scribus/scribus/plugins/export/svgexplugin/svgexplugin.cpp
    trunk/Scribus/scribus/plugins/fileloader/scribus12format/scribus12format.cpp
    trunk/Scribus/scribus/plugins/fileloader/scribus12format/scribus12format.h
    trunk/Scribus/scribus/plugins/fileloader/scribus134format/scribus134format.cpp
    trunk/Scribus/scribus/plugins/fileloader/scribus134format/scribus134format.h
    trunk/Scribus/scribus/plugins/fileloader/scribus13format/scribus13format.cpp
    trunk/Scribus/scribus/plugins/fileloader/scribus13format/scribus13format.h
    trunk/Scribus/scribus/plugins/fileloader/scribus150format/scribus150format.cpp
    trunk/Scribus/scribus/plugins/fileloader/scribus150format/scribus150format.h
    trunk/Scribus/scribus/plugins/gettext/textfilter/tfdia.cpp
    trunk/Scribus/scribus/plugins/import/ai/importai.cpp
    trunk/Scribus/scribus/plugins/import/ai/importaiplugin.cpp
    trunk/Scribus/scribus/plugins/import/cdr/importcdr.cpp
    trunk/Scribus/scribus/plugins/import/cgm/importcgm.cpp
    trunk/Scribus/scribus/plugins/import/cgm/importcgmplugin.cpp
    trunk/Scribus/scribus/plugins/import/cvg/importcvg.cpp
    trunk/Scribus/scribus/plugins/import/cvg/importcvgplugin.cpp
    trunk/Scribus/scribus/plugins/import/drw/importdrw.cpp
    trunk/Scribus/scribus/plugins/import/drw/importdrwplugin.cpp
    trunk/Scribus/scribus/plugins/import/emf/importemf.cpp
    trunk/Scribus/scribus/plugins/import/emf/importemfplugin.cpp
    trunk/Scribus/scribus/plugins/import/fh/importfh.cpp
    trunk/Scribus/scribus/plugins/import/fh/importfhplugin.cpp
    trunk/Scribus/scribus/plugins/import/idml/importidml.cpp
    trunk/Scribus/scribus/plugins/import/idml/importidmlplugin.cpp
    trunk/Scribus/scribus/plugins/import/odg/importodg.cpp
    trunk/Scribus/scribus/plugins/import/odg/importodgplugin.cpp
    trunk/Scribus/scribus/plugins/import/oodraw/oodrawimp.cpp
    trunk/Scribus/scribus/plugins/import/pages/importpages.cpp
    trunk/Scribus/scribus/plugins/import/pages/importpagesplugin.cpp
    trunk/Scribus/scribus/plugins/import/pct/importpct.cpp
    trunk/Scribus/scribus/plugins/import/pct/importpctplugin.cpp
    trunk/Scribus/scribus/plugins/import/pdf/importpdfplugin.cpp
    trunk/Scribus/scribus/plugins/import/pm/importpm.cpp
    trunk/Scribus/scribus/plugins/import/pm/importpmplugin.cpp
    trunk/Scribus/scribus/plugins/import/pub/importpub.cpp
    trunk/Scribus/scribus/plugins/import/pub/importpubplugin.cpp
    trunk/Scribus/scribus/plugins/import/revenge/rawpainter.cpp
    trunk/Scribus/scribus/plugins/import/shape/importshape.cpp
    trunk/Scribus/scribus/plugins/import/shape/importshapeplugin.cpp
    trunk/Scribus/scribus/plugins/import/sml/importsml.cpp
    trunk/Scribus/scribus/plugins/import/sml/importsmlplugin.cpp
    trunk/Scribus/scribus/plugins/import/svg/svgplugin.cpp
    trunk/Scribus/scribus/plugins/import/svm/importsvm.cpp
    trunk/Scribus/scribus/plugins/import/svm/importsvmplugin.cpp
    trunk/Scribus/scribus/plugins/import/uniconvertor/uniconvplugin.cpp
    trunk/Scribus/scribus/plugins/import/viva/importviva.cpp
    trunk/Scribus/scribus/plugins/import/viva/importvivaplugin.cpp
    trunk/Scribus/scribus/plugins/import/vsd/importvsd.cpp
    trunk/Scribus/scribus/plugins/import/vsd/importvsdplugin.cpp
    trunk/Scribus/scribus/plugins/import/wmf/wmfimport.cpp
    trunk/Scribus/scribus/plugins/import/wmf/wmfimport.h
    trunk/Scribus/scribus/plugins/import/wmf/wmfimportplugin.cpp
    trunk/Scribus/scribus/plugins/import/wpg/importwpg.cpp
    trunk/Scribus/scribus/plugins/import/wpg/importwpgplugin.cpp
    trunk/Scribus/scribus/plugins/import/xar/importxar.cpp
    trunk/Scribus/scribus/plugins/import/xar/importxarplugin.cpp
    trunk/Scribus/scribus/plugins/import/xfig/importxfigplugin.cpp
    trunk/Scribus/scribus/plugins/import/xps/importxps.cpp
    trunk/Scribus/scribus/plugins/import/xps/importxpsplugin.cpp
    trunk/Scribus/scribus/plugins/picbrowser/picturebrowserplugin.cpp
    trunk/Scribus/scribus/plugins/saveastemplateplugin/satemplate.cpp
    trunk/Scribus/scribus/plugins/scriptplugin/cmdgetprop.cpp
    trunk/Scribus/scribus/plugins/scriptplugin/objprinter.cpp
    trunk/Scribus/scribus/plugins/scriptplugin/scriptplugin.cpp
    trunk/Scribus/scribus/plugins/shapes/shapeplugin.cpp
    trunk/Scribus/scribus/plugins/short-words/shortwords.cpp
    trunk/Scribus/scribus/plugins/short-words/swsyntaxhighlighter.cpp
    trunk/Scribus/scribus/plugins/tools/2geomtools/meshdistortion/meshdistortion.cpp
    trunk/Scribus/scribus/plugins/tools/2geomtools/pathalongpath/pathalongpath.cpp
    trunk/Scribus/scribus/plugins/tools/2geomtools/pathalongpath/pathdialog.cpp
    trunk/Scribus/scribus/plugins/tools/flattenpath/flattenpath.cpp
    trunk/Scribus/scribus/plugins/tools/hunspellcheck/hunspellplugin.cpp
    trunk/Scribus/scribus/plugins/tools/lenseffects/lenseffects.cpp
    trunk/Scribus/scribus/plugins/tools/pathconnect/pathconnect.cpp
    trunk/Scribus/scribus/plugins/tools/pathcut/pathcut.cpp
    trunk/Scribus/scribus/plugins/tools/pathfinder/pathfinder.cpp
    trunk/Scribus/scribus/plugins/tools/pathstroker/pathstroker.cpp
    trunk/Scribus/scribus/plugins/tools/smoothpath/smoothpath.cpp
    trunk/Scribus/scribus/plugins/tools/subdivide/subdivide.cpp
    trunk/Scribus/scribus/pslib.cpp
    trunk/Scribus/scribus/sccolor.cpp
    trunk/Scribus/scribus/scimage.cpp
    trunk/Scribus/scribus/sclayer.cpp
    trunk/Scribus/scribus/scpage.cpp
    trunk/Scribus/scribus/scpainterex_ps2.cpp
    trunk/Scribus/scribus/scribus.cpp
    trunk/Scribus/scribus/scribuscore.cpp
    trunk/Scribus/scribus/scribusdoc.cpp
    trunk/Scribus/scribus/scribusview.cpp
    trunk/Scribus/scribus/serializer.cpp
    trunk/Scribus/scribus/styles/paragraphstyle.cpp
    trunk/Scribus/scribus/text/sctext_shared.cpp
    trunk/Scribus/scribus/text/storytext.cpp
    trunk/Scribus/scribus/text/storytext.h
    trunk/Scribus/scribus/ui/annot.cpp
    trunk/Scribus/scribus/ui/bookmwin.cpp
    trunk/Scribus/scribus/ui/curvewidget.cpp
    trunk/Scribus/scribus/ui/customfdialog.cpp
    trunk/Scribus/scribus/ui/gtfiledialog.cpp
    trunk/Scribus/scribus/ui/guidemanager.cpp
    trunk/Scribus/scribus/ui/latexeditor.cpp
    trunk/Scribus/scribus/ui/marginwidget.cpp
    trunk/Scribus/scribus/ui/newmarginwidget.cpp
    trunk/Scribus/scribus/ui/nodeeditpalette.cpp
    trunk/Scribus/scribus/ui/pagepalette_masterpages.cpp
    trunk/Scribus/scribus/ui/prefs_pdfexport.cpp
    trunk/Scribus/scribus/ui/printdialog.cpp
    trunk/Scribus/scribus/ui/rulermover.cpp
    trunk/Scribus/scribus/ui/selectobjects.cpp
    trunk/Scribus/scribus/ui/smcellstyle.cpp
    trunk/Scribus/scribus/ui/smcellstylewidget.cpp
    trunk/Scribus/scribus/ui/smcstylewidget.cpp
    trunk/Scribus/scribus/ui/smlinestyle.cpp
    trunk/Scribus/scribus/ui/smlinestylewidget.cpp
    trunk/Scribus/scribus/ui/smtablestyle.cpp
    trunk/Scribus/scribus/ui/smtablestylewidget.cpp
    trunk/Scribus/scribus/ui/smtextstyles.cpp
    trunk/Scribus/scribus/ui/storyeditor.cpp

Modified: trunk/Scribus/scribus/actionmanager.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22639&path=/trunk/Scribus/scribus/actionmanager.cpp
==============================================================================
--- trunk/Scribus/scribus/actionmanager.cpp	(original)
+++ trunk/Scribus/scribus/actionmanager.cpp	Tue Aug 21 20:01:01 2018
@@ -90,9 +90,7 @@
 {
 	if (!scrActions->contains(actionName))
 		return false;
-	if (ks.matches((*scrActions)[actionName]->shortcut())==QKeySequence::ExactMatch)
-		return true;
-	return false;
+	return ks.matches((*scrActions)[actionName]->shortcut())==QKeySequence::ExactMatch;
 }
 
 bool ActionManager::compareKeySeqToShortcut(int k, Qt::KeyboardModifiers km, const QString& actionName)

Modified: trunk/Scribus/scribus/canvasmode_objimport.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22639&path=/trunk/Scribus/scribus/canvasmode_objimport.cpp
==============================================================================
--- trunk/Scribus/scribus/canvasmode_objimport.cpp	(original)
+++ trunk/Scribus/scribus/canvasmode_objimport.cpp	Tue Aug 21 20:01:01 2018
@@ -51,23 +51,19 @@
 
 CanvasMode_ObjImport::~CanvasMode_ObjImport()
 {
-	if (m_mimeData)
-		delete m_mimeData;
-	if (m_trSettings)
-		delete m_trSettings;
+	delete m_mimeData;
+	delete m_trSettings;
 }
 
 void CanvasMode_ObjImport::setMimeData(QMimeData* mimeData)
 {
-	if (m_mimeData)
-		delete m_mimeData;
+	delete m_mimeData;
 	m_mimeData = mimeData;
 }
 
 void CanvasMode_ObjImport:: setTransactionSettings(TransactionSettings* settings)
 {
-	if (m_trSettings)
-		delete m_trSettings;
+	delete m_trSettings;
 	m_trSettings = settings;
 }
 

Modified: trunk/Scribus/scribus/colorsetmanager.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22639&path=/trunk/Scribus/scribus/colorsetmanager.cpp
==============================================================================
--- trunk/Scribus/scribus/colorsetmanager.cpp	(original)
+++ trunk/Scribus/scribus/colorsetmanager.cpp	Tue Aug 21 20:01:01 2018
@@ -282,7 +282,7 @@
 
 bool ColorSetManager::paletteLocationLocked(const QString& palettePath)
 {
-	return (paletteLocationLocks.contains(palettePath) && paletteLocationLocks.value(palettePath)==true);
+	return (paletteLocationLocks.contains(palettePath) && paletteLocationLocks.value(palettePath));
 }
 
 bool ColorSetManager::checkPaletteFormat(const QString& paletteFileName)
@@ -302,9 +302,7 @@
 	}
 	f.close();
 	QDomElement elem = docu.documentElement();
-	if (elem.tagName() != "SCRIBUSCOLORS")
-		return false;
-	return true;
+	return elem.tagName() == "SCRIBUSCOLORS";
 }
 
 bool ColorSetManager::loadPalette(const QString& paletteFileName, ScribusDoc *doc, ColorList &colors, QHash<QString,VGradient> &gradients, QHash<QString, ScPattern> &patterns, bool merge)

Modified: trunk/Scribus/scribus/desaxe/digester.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22639&path=/trunk/Scribus/scribus/desaxe/digester.cpp
==============================================================================
--- trunk/Scribus/scribus/desaxe/digester.cpp	(original)
+++ trunk/Scribus/scribus/desaxe/digester.cpp	Tue Aug 21 20:01:01 2018
@@ -34,7 +34,7 @@
 	unsigned int ID;
 	std::vector<rule_t> rules;
 
-	DFA_State() : ID(0), rules() {}
+	DFA_State() : ID(0) {}
 };
 
 typedef DFA_State* dfa_state_t;
@@ -92,7 +92,7 @@
 };
 
 
-Digester::Digester() : m_objects(), m_storage(), m_errors() 
+Digester::Digester()
 { 
 	m_state = new RuleState();
 	m_result_.ptr = nullptr;
@@ -214,10 +214,10 @@
 }
 
 
-RuleState::RuleState() : rules(), dfa(nullptr), stateStack(), valid(false)
+RuleState::RuleState() : dfa(nullptr), valid(false)
 {}
 
-RuleState::RuleState(const RuleState& other) : rules(other.rules), dfa(nullptr), stateStack(), valid(false)
+RuleState::RuleState(const RuleState& other) : rules(other.rules), dfa(nullptr), valid(false)
 {}
 
 RuleState::~RuleState()

Modified: trunk/Scribus/scribus/exif.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22639&path=/trunk/Scribus/scribus/exif.cpp
==============================================================================
--- trunk/Scribus/scribus/exif.cpp	(original)
+++ trunk/Scribus/scribus/exif.cpp	Tue Aug 21 20:01:01 2018
@@ -908,12 +908,9 @@
 	if ( !f.open ( QIODevice::ReadOnly ) )
 		return false;
 	ret = ReadJpegSections ( f, READ_EXIF );
+	f.close();
 	if ( ret == false )
-	{
-		f.close();
 		return false;
-	}
-	f.close();
 
 	//now make the strings clean,
 	// for example my Casio is a "QV-4000   "

Modified: trunk/Scribus/scribus/fpoint.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22639&path=/trunk/Scribus/scribus/fpoint.cpp
==============================================================================
--- trunk/Scribus/scribus/fpoint.cpp	(original)
+++ trunk/Scribus/scribus/fpoint.cpp	Tue Aug 21 20:01:01 2018
@@ -84,7 +84,5 @@
 
 bool FPoint::isNull() const
 {
-	if (xp == 0.0 && yp == 0.0)
-		return true;
-	return false;
+	return xp == 0.0 && yp == 0.0;
 }

Modified: trunk/Scribus/scribus/fpointarray.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22639&path=/trunk/Scribus/scribus/fpointarray.cpp
==============================================================================
--- trunk/Scribus/scribus/fpointarray.cpp	(original)
+++ trunk/Scribus/scribus/fpointarray.cpp	Tue Aug 21 20:01:01 2018
@@ -318,10 +318,7 @@
 	if (p->xp != x3 || p->yp != y3)
 		return false;
 	++p; 
-	if (p->xp != x4 || p->yp != y4)
-		return false;
-	
-	return true;
+	return !(p->xp != x4 || p->yp != y4);
 }
 
 void FPointArray::addQuadPoint(double x1, double y1, double x2, double y2, double x3, double y3, double x4, double y4)
@@ -463,7 +460,6 @@
 	if( p )
 		*p = q[ 0 ];
 	delete[]( q );
-	return;
 }
 
 
@@ -614,8 +610,7 @@
 
 FPointArray::~FPointArray()
 {
-	if (m_svgState)
-		delete m_svgState;
+	delete m_svgState;
 }
 
 

Modified: trunk/Scribus/scribus/gtwriter.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22639&path=/trunk/Scribus/scribus/gtwriter.cpp
==============================================================================
--- trunk/Scribus/scribus/gtwriter.cpp	(original)
+++ trunk/Scribus/scribus/gtwriter.cpp	Tue Aug 21 20:01:01 2018
@@ -204,8 +204,6 @@
 {
 	if (!m_errorSet)
 		m_action->setProgressInfoDone();
-	if (m_action)
-		delete m_action;
-	if (m_defaultStyle)
-		delete m_defaultStyle;
-}
+	delete m_action;
+	delete m_defaultStyle;
+}

Modified: trunk/Scribus/scribus/guidesmodel.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22639&path=/trunk/Scribus/scribus/guidesmodel.cpp
==============================================================================
--- trunk/Scribus/scribus/guidesmodel.cpp	(original)
+++ trunk/Scribus/scribus/guidesmodel.cpp	Tue Aug 21 20:01:01 2018
@@ -10,10 +10,9 @@
 #include "units.h"
 
 
-GuidesModel::GuidesModel(QObject * /*parent*/)
-	: QAbstractTableModel(),
-		m_docUnitIndex(0),
-		m_docUnitDecimals(0)
+GuidesModel::GuidesModel(QObject * /*parent*/) :
+	m_docUnitIndex(0),
+	m_docUnitDecimals(0)
 {
 	m_rule = 0.0;
 	// debug

Modified: trunk/Scribus/scribus/iconmanager.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22639&path=/trunk/Scribus/scribus/iconmanager.cpp
==============================================================================
--- trunk/Scribus/scribus/iconmanager.cpp	(original)
+++ trunk/Scribus/scribus/iconmanager.cpp	Tue Aug 21 20:01:01 2018
@@ -45,8 +45,7 @@
 
 void IconManager::deleteInstance()
 {
-	if (m_instance)
-		delete m_instance;
+	delete m_instance;
 	m_instance = nullptr;
 }
 
@@ -64,9 +63,7 @@
 bool IconManager::initIcons()
 {
 	readIconConfigFiles();
-	if (m_iconSets.isEmpty() || m_activeSetBasename.isEmpty())
-		return false;
-	return true;
+	return !(m_iconSets.isEmpty() || m_activeSetBasename.isEmpty());
 }
 
 void IconManager::readIconConfigFiles()

Modified: trunk/Scribus/scribus/imagedataloaders/scimgdataloader_gimp.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22639&path=/trunk/Scribus/scribus/imagedataloaders/scimgdataloader_gimp.cpp
==============================================================================
--- trunk/Scribus/scribus/imagedataloaders/scimgdataloader_gimp.cpp	(original)
+++ trunk/Scribus/scribus/imagedataloaders/scimgdataloader_gimp.cpp	Tue Aug 21 20:01:01 2018
@@ -8,7 +8,7 @@
 #include <QFileInfo>
 #include "scimgdataloader_gimp.h"
 
-ScImgDataLoader_GIMP::ScImgDataLoader_GIMP() : ScImgDataLoader()
+ScImgDataLoader_GIMP::ScImgDataLoader_GIMP()
 {
 	initSupportedFormatList();
 }

Modified: trunk/Scribus/scribus/imagedataloaders/scimgdataloader_kra.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22639&path=/trunk/Scribus/scribus/imagedataloaders/scimgdataloader_kra.cpp
==============================================================================
--- trunk/Scribus/scribus/imagedataloaders/scimgdataloader_kra.cpp	(original)
+++ trunk/Scribus/scribus/imagedataloaders/scimgdataloader_kra.cpp	Tue Aug 21 20:01:01 2018
@@ -11,7 +11,7 @@
 #include "scimgdataloader_kra.h"
 #include "util_formats.h"
 
-ScImgDataLoader_KRA::ScImgDataLoader_KRA() : ScImgDataLoader()
+ScImgDataLoader_KRA::ScImgDataLoader_KRA()
 {
 	initSupportedFormatList();
 }

Modified: trunk/Scribus/scribus/imagedataloaders/scimgdataloader_ora.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22639&path=/trunk/Scribus/scribus/imagedataloaders/scimgdataloader_ora.cpp
==============================================================================
--- trunk/Scribus/scribus/imagedataloaders/scimgdataloader_ora.cpp	(original)
+++ trunk/Scribus/scribus/imagedataloaders/scimgdataloader_ora.cpp	Tue Aug 21 20:01:01 2018
@@ -11,7 +11,7 @@
 #include "scimgdataloader_ora.h"
 #include "util_formats.h"
 
-ScImgDataLoader_ORA::ScImgDataLoader_ORA() : ScImgDataLoader(),
+ScImgDataLoader_ORA::ScImgDataLoader_ORA() :
 	m_inSubLayer(0),
 	m_layerCount(0)
 {

Modified: trunk/Scribus/scribus/imagedataloaders/scimgdataloader_pdf.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22639&path=/trunk/Scribus/scribus/imagedataloaders/scimgdataloader_pdf.cpp
==============================================================================
--- trunk/Scribus/scribus/imagedataloaders/scimgdataloader_pdf.cpp	(original)
+++ trunk/Scribus/scribus/imagedataloaders/scimgdataloader_pdf.cpp	Tue Aug 21 20:01:01 2018
@@ -19,7 +19,7 @@
 #endif
 
 
-ScImgDataLoader_PDF::ScImgDataLoader_PDF() : ScImgDataLoader()
+ScImgDataLoader_PDF::ScImgDataLoader_PDF()
 {
 	initSupportedFormatList();
 }

Modified: trunk/Scribus/scribus/imagedataloaders/scimgdataloader_pgf.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22639&path=/trunk/Scribus/scribus/imagedataloaders/scimgdataloader_pgf.cpp
==============================================================================
--- trunk/Scribus/scribus/imagedataloaders/scimgdataloader_pgf.cpp	(original)
+++ trunk/Scribus/scribus/imagedataloaders/scimgdataloader_pgf.cpp	Tue Aug 21 20:01:01 2018
@@ -26,7 +26,7 @@
 #include <fcntl.h>
 }
 
-ScImgDataLoader_PGF::ScImgDataLoader_PGF() : ScImgDataLoader()
+ScImgDataLoader_PGF::ScImgDataLoader_PGF()
 {
 	initSupportedFormatList();
 }

Modified: trunk/Scribus/scribus/imagedataloaders/scimgdataloader_pict.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22639&path=/trunk/Scribus/scribus/imagedataloaders/scimgdataloader_pict.cpp
==============================================================================
--- trunk/Scribus/scribus/imagedataloaders/scimgdataloader_pict.cpp	(original)
+++ trunk/Scribus/scribus/imagedataloaders/scimgdataloader_pict.cpp	Tue Aug 21 20:01:01 2018
@@ -42,7 +42,7 @@
 #include "util_formats.h"
 #include "util_math.h"
 
-ScImgDataLoader_PICT::ScImgDataLoader_PICT() : ScImgDataLoader(),
+ScImgDataLoader_PICT::ScImgDataLoader_PICT() :
 	m_baseX(0),
 	m_baseY(0),
 	m_docWidth(0),

Modified: trunk/Scribus/scribus/imagedataloaders/scimgdataloader_qt.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22639&path=/trunk/Scribus/scribus/imagedataloaders/scimgdataloader_qt.cpp
==============================================================================
--- trunk/Scribus/scribus/imagedataloaders/scimgdataloader_qt.cpp	(original)
+++ trunk/Scribus/scribus/imagedataloaders/scimgdataloader_qt.cpp	Tue Aug 21 20:01:01 2018
@@ -12,7 +12,7 @@
 #include "scimgdataloader_qt.h"
 #include "util_formats.h"
 
-ScImgDataLoader_QT::ScImgDataLoader_QT() : ScImgDataLoader()
+ScImgDataLoader_QT::ScImgDataLoader_QT()
 {
 	initSupportedFormatList();
 }

Modified: trunk/Scribus/scribus/imagedataloaders/scimgdataloader_tiff.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22639&path=/trunk/Scribus/scribus/imagedataloaders/scimgdataloader_tiff.cpp
==============================================================================
--- trunk/Scribus/scribus/imagedataloaders/scimgdataloader_tiff.cpp	(original)
+++ trunk/Scribus/scribus/imagedataloaders/scimgdataloader_tiff.cpp	Tue Aug 21 20:01:01 2018
@@ -24,7 +24,7 @@
 	TIFFMergeFieldInfo(tiff, xtiffFieldInfo, sizeof (xtiffFieldInfo) / sizeof (xtiffFieldInfo[0]));
 }
 
-ScImgDataLoader_TIFF::ScImgDataLoader_TIFF() : ScImgDataLoader()
+ScImgDataLoader_TIFF::ScImgDataLoader_TIFF()
 {
 	m_photometric = PHOTOMETRIC_MINISBLACK;
 	m_samplesperpixel = 72;

Modified: trunk/Scribus/scribus/imagedataloaders/scimgdataloader_wpg.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22639&path=/trunk/Scribus/scribus/imagedataloaders/scimgdataloader_wpg.cpp
==============================================================================
--- trunk/Scribus/scribus/imagedataloaders/scimgdataloader_wpg.cpp	(original)
+++ trunk/Scribus/scribus/imagedataloaders/scimgdataloader_wpg.cpp	Tue Aug 21 20:01:01 2018
@@ -13,11 +13,11 @@
 #include <cmath>
 #include <cstdlib>
 
-#include <stdio.h>
+#include <cstdio>
 #include "scimgdataloader_wpg.h"
 #include "third_party/wpg/WPGStreamImplementation.h"
 
-ScrPainterIm::ScrPainterIm(): libwpg::WPGPaintInterface(),
+ScrPainterIm::ScrPainterIm() :
 	fillrule(false),
 	gradientAngle(0.0),
 	isGradient(false),
@@ -291,7 +291,7 @@
 }
 
 
-ScImgDataLoader_WPG::ScImgDataLoader_WPG() : ScImgDataLoader()
+ScImgDataLoader_WPG::ScImgDataLoader_WPG()
 {
 	initSupportedFormatList();
 }

Modified: trunk/Scribus/scribus/langmgr.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22639&path=/trunk/Scribus/scribus/langmgr.cpp
==============================================================================
--- trunk/Scribus/scribus/langmgr.cpp	(original)
+++ trunk/Scribus/scribus/langmgr.cpp	Tue Aug 21 20:01:01 2018
@@ -48,8 +48,7 @@
 
 void LanguageManager::deleteInstance()
 {
-	if (m_instance)
-		delete m_instance;
+	delete m_instance;
 	m_instance = nullptr;
 }
 
@@ -1021,9 +1020,7 @@
 bool LanguageManager::findSpellingDictionaries(QStringList &sl)
 {
 	sl=ScPaths::instance().spellDirs();
-	if (sl.count()==0)
-		return false;
-	return true;
+	return sl.count() != 0;
 }
 
 void LanguageManager::findSpellingDictionarySets(QStringList &dictionaryPaths, QMap<QString, QString> &dictionaryMap)
@@ -1099,9 +1096,7 @@
 bool LanguageManager::findHyphDictionaries(QStringList& sl)
 {
 	sl=ScPaths::instance().hyphDirs();
-	if (sl.count()==0)
-		return false;
-	return true;
+	return sl.count() != 0;
 }
 
 void LanguageManager::findHyphDictionarySets(QStringList& dictionaryPaths, QMap<QString, QString>& dictionaryMap)

Modified: trunk/Scribus/scribus/latexhelpers.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22639&path=/trunk/Scribus/scribus/latexhelpers.cpp
==============================================================================
--- trunk/Scribus/scribus/latexhelpers.cpp	(original)
+++ trunk/Scribus/scribus/latexhelpers.cpp	Tue Aug 21 20:01:01 2018
@@ -126,9 +126,7 @@
 	if (xml.hasError())
 		formatError(xml.errorString());
 	f.close();
-	if (!m_error.isEmpty())
-		return false;
-	return true;
+	return m_error.isEmpty();
 }
 
 void LatexConfigParser::parseElements()

Modified: trunk/Scribus/scribus/loadsaveplugin.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22639&path=/trunk/Scribus/scribus/loadsaveplugin.cpp
==============================================================================
--- trunk/Scribus/scribus/loadsaveplugin.cpp	(original)
+++ trunk/Scribus/scribus/loadsaveplugin.cpp	Tue Aug 21 20:01:01 2018
@@ -15,8 +15,7 @@
 
 QList<FileFormat> LoadSavePlugin::formats;
 
-LoadSavePlugin::LoadSavePlugin()
-	: ScPlugin(),
+LoadSavePlugin::LoadSavePlugin() :
 	m_Doc(nullptr),
 	m_View(nullptr),
 	m_ScMW(nullptr),

Modified: trunk/Scribus/scribus/localemgr.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22639&path=/trunk/Scribus/scribus/localemgr.cpp
==============================================================================
--- trunk/Scribus/scribus/localemgr.cpp	(original)
+++ trunk/Scribus/scribus/localemgr.cpp	Tue Aug 21 20:01:01 2018
@@ -47,8 +47,7 @@
 
 void LocaleManager::deleteInstance()
 {
-	if (m_instance)
-		delete m_instance;
+	delete m_instance;
 	m_instance = nullptr;
 }
 

Modified: trunk/Scribus/scribus/marks.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22639&path=/trunk/Scribus/scribus/marks.cpp
==============================================================================
--- trunk/Scribus/scribus/marks.cpp	(original)
+++ trunk/Scribus/scribus/marks.cpp	Tue Aug 21 20:01:01 2018
@@ -78,7 +78,6 @@
 }
 
 BulNumMark::BulNumMark()
-	: Mark()
 {
 	label = "BullNumMark";
 	typ = MARKBullNumType;

Modified: trunk/Scribus/scribus/menumanager.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22639&path=/trunk/Scribus/scribus/menumanager.cpp
==============================================================================
--- trunk/Scribus/scribus/menumanager.cpp	(original)
+++ trunk/Scribus/scribus/menumanager.cpp	Tue Aug 21 20:01:01 2018
@@ -86,7 +86,6 @@
 
 void MenuManager::setMenuEnabled(const QString &menuName, const bool enabled)
 {
-	return;
 	// OSX UI rules don't allow this so let's not do it elsewhere.
 	//if (menuBarMenus.contains(menuName) && menuBarMenus.value(menuName)!=nullptr)
 	//	menuBarMenus.value(menuName)->setEnabled(enabled);

Modified: trunk/Scribus/scribus/nodeeditcontext.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22639&path=/trunk/Scribus/scribus/nodeeditcontext.cpp
==============================================================================
--- trunk/Scribus/scribus/nodeeditcontext.cpp	(original)
+++ trunk/Scribus/scribus/nodeeditcontext.cpp	Tue Aug 21 20:01:01 2018
@@ -15,7 +15,6 @@
 	m_SegP2(-1),
 	m_EdPoints(true),
 	m_MoveSym(false),
-	m_SelNode(),
 	m_oldItemX(0.0),
 	m_oldItemY(0.0),
 	m_preview(false)

Modified: trunk/Scribus/scribus/pageitem.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22639&path=/trunk/Scribus/scribus/pageitem.cpp
==============================================================================
--- trunk/Scribus/scribus/pageitem.cpp	(original)
+++ trunk/Scribus/scribus/pageitem.cpp	Tue Aug 21 20:01:01 2018
@@ -8795,20 +8795,20 @@
 }
 
 //Moved from View
-void PageItem::SetFrameShape(int count, double *vals)
+void PageItem::SetFrameShape(int count, const double *vals)
 {
 	PoLine.resize(0);
-	for (int a = 0; a < count-3; a += 4)
-	{
-		if (vals[a] < 0)
+	for (int i = 0; i < count-3; i += 4)
+	{
+		if (vals[i] < 0)
 		{
 			PoLine.setMarker();
 			continue;
 		}
-		double x1 = m_width * vals[a] / 100.0;
-		double y1 = m_height * vals[a+1] / 100.0;
-		double x2 = m_width * vals[a+2] / 100.0;
-		double y2 = m_height * vals[a+3] / 100.0;
+		double x1 = m_width * vals[i] / 100.0;
+		double y1 = m_height * vals[i+1] / 100.0;
+		double x2 = m_width * vals[i+2] / 100.0;
+		double y2 = m_height * vals[i+3] / 100.0;
 		PoLine.addPoint(x1, y1);
 		PoLine.addPoint(x2, y2);
 	}

Modified: trunk/Scribus/scribus/pageitem.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22639&path=/trunk/Scribus/scribus/pageitem.h
==============================================================================
--- trunk/Scribus/scribus/pageitem.h	(original)
+++ trunk/Scribus/scribus/pageitem.h	Tue Aug 21 20:01:01 2018
@@ -382,7 +382,7 @@
 
 
 
-	void SetFrameShape(int count, double *vals);
+	void SetFrameShape(int count, const double *vals);
 	void SetRectFrame();
 	void SetOvalFrame();
 	void SetFrameRound();

Modified: trunk/Scribus/scribus/pagesize.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22639&path=/trunk/Scribus/scribus/pagesize.cpp
==============================================================================
--- trunk/Scribus/scribus/pagesize.cpp	(original)
+++ trunk/Scribus/scribus/pagesize.cpp	Tue Aug 21 20:01:01 2018
@@ -73,7 +73,7 @@
 	else //build based on translated value.
 	{
 		PageSizeInfoMap::Iterator it;
-		for (it=m_pageSizeList.begin();it!=m_pageSizeList.end() && valuesSet!=true;++it)
+		for (it=m_pageSizeList.begin();it!=m_pageSizeList.end() && !valuesSet;++it)
 		{
 			if (sizeName==it.value().trSizeName)
 			{

Modified: trunk/Scribus/scribus/palettes/paletteloader_adobe_acb.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22639&path=/trunk/Scribus/scribus/palettes/paletteloader_adobe_acb.cpp
==============================================================================
--- trunk/Scribus/scribus/palettes/paletteloader_adobe_acb.cpp	(original)
+++ trunk/Scribus/scribus/palettes/paletteloader_adobe_acb.cpp	Tue Aug 21 20:01:01 2018
@@ -18,7 +18,6 @@
 #include "util_formats.h"
 
 PaletteLoader_Adobe_acb::PaletteLoader_Adobe_acb()
-                       : PaletteLoader()
 {
 
 }

Modified: trunk/Scribus/scribus/palettes/paletteloader_adobe_aco.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22639&path=/trunk/Scribus/scribus/palettes/paletteloader_adobe_aco.cpp
==============================================================================
--- trunk/Scribus/scribus/palettes/paletteloader_adobe_aco.cpp	(original)
+++ trunk/Scribus/scribus/palettes/paletteloader_adobe_aco.cpp	Tue Aug 21 20:01:01 2018
@@ -19,7 +19,6 @@
 #include "util_formats.h"
 
 PaletteLoader_Adobe_aco::PaletteLoader_Adobe_aco()
-                       : PaletteLoader()
 {
 
 }

Modified: trunk/Scribus/scribus/palettes/paletteloader_adobe_ase.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22639&path=/trunk/Scribus/scribus/palettes/paletteloader_adobe_ase.cpp
==============================================================================
--- trunk/Scribus/scribus/palettes/paletteloader_adobe_ase.cpp	(original)
+++ trunk/Scribus/scribus/palettes/paletteloader_adobe_ase.cpp	Tue Aug 21 20:01:01 2018
@@ -18,7 +18,6 @@
 #include "util_formats.h"
 
 PaletteLoader_Adobe_ase::PaletteLoader_Adobe_ase()
-                       : PaletteLoader()
 {
 
 }

Modified: trunk/Scribus/scribus/palettes/paletteloader_autocad_acb.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22639&path=/trunk/Scribus/scribus/palettes/paletteloader_autocad_acb.cpp
==============================================================================
--- trunk/Scribus/scribus/palettes/paletteloader_autocad_acb.cpp	(original)
+++ trunk/Scribus/scribus/palettes/paletteloader_autocad_acb.cpp	Tue Aug 21 20:01:01 2018
@@ -20,7 +20,6 @@
 #include "util_formats.h"
 
 PaletteLoader_Autocad_acb::PaletteLoader_Autocad_acb()
-                       : PaletteLoader()
 {
 
 }

Modified: trunk/Scribus/scribus/palettes/paletteloader_ps.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22639&path=/trunk/Scribus/scribus/palettes/paletteloader_ps.cpp
==============================================================================
--- trunk/Scribus/scribus/palettes/paletteloader_ps.cpp	(original)
+++ trunk/Scribus/scribus/palettes/paletteloader_ps.cpp	Tue Aug 21 20:01:01 2018
@@ -18,7 +18,6 @@
 #include "util_formats.h"
 
 PaletteLoader_PS::PaletteLoader_PS()
-                : PaletteLoader()
 {
 
 }

Modified: trunk/Scribus/scribus/palettes/paletteloader_sk1.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22639&path=/trunk/Scribus/scribus/palettes/paletteloader_sk1.cpp
==============================================================================
--- trunk/Scribus/scribus/palettes/paletteloader_sk1.cpp	(original)
+++ trunk/Scribus/scribus/palettes/paletteloader_sk1.cpp	Tue Aug 21 20:01:01 2018
@@ -20,7 +20,6 @@
 #include "util_formats.h"
 
 PaletteLoader_sK1::PaletteLoader_sK1()
-                 : PaletteLoader()
 {
 
 }

Modified: trunk/Scribus/scribus/pdf_analyzer.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22639&path=/trunk/Scribus/scribus/pdf_analyzer.cpp
==============================================================================
--- trunk/Scribus/scribus/pdf_analyzer.cpp	(original)
+++ trunk/Scribus/scribus/pdf_analyzer.cpp	Tue Aug 21 20:01:01 2018
@@ -65,7 +65,7 @@
 }
 
 
-PDFAnalyzer::PDFAnalyzer(QString & filename) : QObject()
+PDFAnalyzer::PDFAnalyzer(QString & filename)
 {
 	static bool nameMapInited = false;
 	if (!nameMapInited)
@@ -90,8 +90,7 @@
 
 PDFAnalyzer::~PDFAnalyzer()
 {
-	if (m_doc)
-		delete m_doc;
+	delete m_doc;
 }
 
 bool PDFAnalyzer::inspectPDF(int pageNum, QList<PDFColorSpace> & usedColorSpaces, bool & hasTransparency, QList<PDFFont> & usedFonts, QList<PDFImage> & imgs)

Modified: trunk/Scribus/scribus/pdflib_core.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22639&path=/trunk/Scribus/scribus/pdflib_core.cpp
==============================================================================
--- trunk/Scribus/scribus/pdflib_core.cpp	(original)
+++ trunk/Scribus/scribus/pdflib_core.cpp	Tue Aug 21 20:01:01 2018
@@ -513,19 +513,10 @@
 	Options(doc.pdfOptions()),
 	Bvie(nullptr),
 	ucs2Codec(nullptr),
-//	ObjCounter(7),
 	ResNam("RE"),
 	ResCount(0),
 	NDnam("LI"),
 	NDnum(0),
-//	KeyGen(""),
-//	OwnerKey(""),
-//	UserKey(""),
-//	FileID(""),
-//	EncryKey(""),
-//	Encrypt(0),
-//	KeyLen(5),
-	colorsToUse(),
 	spotNam("Spot"),
 	spotCount(0),
 	progressDialog(nullptr),
@@ -5560,7 +5551,7 @@
 	QByteArray colString = SetColor(color, shade);
 	ScColor tmpC;
 	tmpC = doc.PageColors[color];
-	if (((tmpC.isSpotColor()) || (tmpC.isRegistrationColor())) && ((Options.isGrayscale == false) && (Options.UseRGB == false))  && (Options.UseSpotColors))
+	if (((tmpC.isSpotColor()) || (tmpC.isRegistrationColor())) && ((!Options.isGrayscale) && (!Options.UseRGB))  && (Options.UseSpotColors))
 	{
 		if ((color != CommonStrings::None) && (spotMap.contains(color)))
 		{

Modified: trunk/Scribus/scribus/pdfoptionsio.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22639&path=/trunk/Scribus/scribus/pdfoptionsio.cpp
==============================================================================
--- trunk/Scribus/scribus/pdfoptionsio.cpp	(original)
+++ trunk/Scribus/scribus/pdfoptionsio.cpp	Tue Aug 21 20:01:01 2018
@@ -16,8 +16,6 @@
 const int PDFOptionsIO::formatVersion = 1300;
 
 PDFOptionsIO::PDFOptionsIO(PDFOptions& opts) :
-	m_doc(),
-	m_root(),
 	m_includePasswords(false),
 	m_error()
 {

Modified: trunk/Scribus/scribus/pluginmanager.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22639&path=/trunk/Scribus/scribus/pluginmanager.cpp
==============================================================================
--- trunk/Scribus/scribus/pluginmanager.cpp	(original)
+++ trunk/Scribus/scribus/pluginmanager.cpp	Tue Aug 21 20:01:01 2018
@@ -35,9 +35,6 @@
 #else
 #include <QLibrary>
 #endif
-
-
-extern ScribusQApp *ScQApp;
 
 PluginManager::PluginManager() :
 	QObject(nullptr),

Modified: trunk/Scribus/scribus/plugins/barcodegenerator/barcode.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22639&path=/trunk/Scribus/scribus/plugins/barcodegenerator/barcode.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/barcodegenerator/barcode.cpp	(original)
+++ trunk/Scribus/scribus/plugins/barcodegenerator/barcode.cpp	Tue Aug 21 20:01:01 2018
@@ -12,7 +12,7 @@
 #include "iconmanager.h"
 #include "scpaths.h"
 
-Barcode::Barcode() : ScActionPlugin()
+Barcode::Barcode()
 {
 	languageChange();
 }

Modified: trunk/Scribus/scribus/plugins/export/pixmapexport/export.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22639&path=/trunk/Scribus/scribus/plugins/export/pixmapexport/export.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/export/pixmapexport/export.cpp	(original)
+++ trunk/Scribus/scribus/plugins/export/pixmapexport/export.cpp	Tue Aug 21 20:01:01 2018
@@ -42,7 +42,7 @@
 	delete plug;
 }
 
-PixmapExportPlugin::PixmapExportPlugin() : ScActionPlugin()
+PixmapExportPlugin::PixmapExportPlugin()
 {
 	// Set action info in languageChange, so we only have to do
 	// it in one place. This includes registering file formats.

Modified: trunk/Scribus/scribus/plugins/export/svgexplugin/svgexplugin.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22639&path=/trunk/Scribus/scribus/plugins/export/svgexplugin/svgexplugin.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/export/svgexplugin/svgexplugin.cpp	(original)
+++ trunk/Scribus/scribus/plugins/export/svgexplugin/svgexplugin.cpp	Tue Aug 21 20:01:01 2018
@@ -79,7 +79,7 @@
 
 using namespace TableUtils;
 
-SVGExportPlugin::SVGExportPlugin() : ScActionPlugin()
+SVGExportPlugin::SVGExportPlugin()
 {
 	// Set action info in languageChange, so we only have to do
 	// it in one place.

Modified: trunk/Scribus/scribus/plugins/fileloader/scribus12format/scribus12format.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22639&path=/trunk/Scribus/scribus/plugins/fileloader/scribus12format/scribus12format.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/fileloader/scribus12format/scribus12format.cpp	(original)
+++ trunk/Scribus/scribus/plugins/fileloader/scribus12format/scribus12format.cpp	Tue Aug 21 20:01:01 2018
@@ -1808,7 +1808,7 @@
 	obj->itemText.applyCharStyle(last->StyleStart, obj->itemText.length()-last->StyleStart, last->Style);
 }
 
-bool Scribus12Format::loadPage(const QString & fileName, int pageNumber, bool Mpage, QString /*renamedPageName*/)
+bool Scribus12Format::loadPage(const QString & fileName, int pageNumber, bool Mpage, const QString& /*renamedPageName*/)
 {
 //	qDebug() << QString("loading page %2 from file '%1' from 1.2.x plugin").arg(fileName).arg(pageNumber);
 	if (m_Doc==nullptr || m_View==nullptr || m_AvailableFonts==nullptr)

Modified: trunk/Scribus/scribus/plugins/fileloader/scribus12format/scribus12format.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22639&path=/trunk/Scribus/scribus/plugins/fileloader/scribus12format/scribus12format.h
==============================================================================
--- trunk/Scribus/scribus/plugins/fileloader/scribus12format/scribus12format.h	(original)
+++ trunk/Scribus/scribus/plugins/fileloader/scribus12format/scribus12format.h	Tue Aug 21 20:01:01 2018
@@ -41,7 +41,7 @@
 		virtual void addToMainWindowMenu(ScribusMainWindow *) {};
 
 		// Special features - .sla page extraction support
-		virtual bool loadPage(const QString & fileName, int pageNumber, bool Mpage, QString renamedPageName=QString::null);
+		virtual bool loadPage(const QString & fileName, int pageNumber, bool Mpage, const QString& renamedPageName=QString::null);
 		virtual bool readStyles(const QString& fileName, ScribusDoc* doc, StyleSet<ParagraphStyle> &docParagraphStyles);
 		virtual bool readLineStyles(const QString& fileName, QHash<QString, multiLine> *Sty);
 		virtual bool readColors(const QString& fileName, ColorList & colors);

Modified: trunk/Scribus/scribus/plugins/fileloader/scribus134format/scribus134format.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22639&path=/trunk/Scribus/scribus/plugins/fileloader/scribus134format/scribus134format.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/fileloader/scribus134format/scribus134format.cpp	(original)
+++ trunk/Scribus/scribus/plugins/fileloader/scribus134format/scribus134format.cpp	Tue Aug 21 20:01:01 2018
@@ -3129,7 +3129,7 @@
 	return !reader.hasError();
 }
 
-bool Scribus134Format::loadPage(const QString & fileName, int pageNumber, bool Mpage, QString renamedPageName)
+bool Scribus134Format::loadPage(const QString & fileName, int pageNumber, bool Mpage, const QString& renamedPageName)
 {
 // 	qDebug() << QString("loading page %2 from file '%1' from 1.3.x plugin").arg(fileName).arg(pageNumber);
 	if (m_Doc==nullptr || m_AvailableFonts==nullptr)

Modified: trunk/Scribus/scribus/plugins/fileloader/scribus134format/scribus134format.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22639&path=/trunk/Scribus/scribus/plugins/fileloader/scribus134format/scribus134format.h
==============================================================================
--- trunk/Scribus/scribus/plugins/fileloader/scribus134format/scribus134format.h	(original)
+++ trunk/Scribus/scribus/plugins/fileloader/scribus134format/scribus134format.h	Tue Aug 21 20:01:01 2018
@@ -50,7 +50,7 @@
 		virtual void addToMainWindowMenu(ScribusMainWindow *) {};
 
 		// Special features - .sla page extraction support
-		virtual bool loadPage(const QString & fileName, int pageNumber, bool Mpage, QString renamedPageName=QString::null);
+		virtual bool loadPage(const QString & fileName, int pageNumber, bool Mpage, const QString& renamedPageName=QString::null);
 		virtual bool readStyles(const QString& fileName, ScribusDoc* doc, StyleSet<ParagraphStyle> &docParagraphStyles);
 		virtual bool readCharStyles(const QString& fileName, ScribusDoc* doc, StyleSet<CharStyle> &docCharStyles);
 		virtual bool readLineStyles(const QString& fileName, QHash<QString, multiLine> *Sty);

Modified: trunk/Scribus/scribus/plugins/fileloader/scribus13format/scribus13format.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22639&path=/trunk/Scribus/scribus/plugins/fileloader/scribus13format/scribus13format.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/fileloader/scribus13format/scribus13format.cpp	(original)
+++ trunk/Scribus/scribus/plugins/fileloader/scribus13format/scribus13format.cpp	Tue Aug 21 20:01:01 2018
@@ -2022,7 +2022,7 @@
 	return currItem;
 }
 
-bool Scribus13Format::loadPage(const QString & fileName, int pageNumber, bool Mpage, QString renamedPageName)
+bool Scribus13Format::loadPage(const QString & fileName, int pageNumber, bool Mpage, const QString& renamedPageName)
 {
 // 	qDebug() << QString("loading page %2 from file '%1' from 1.3.3.x plugin").arg(fileName).arg(pageNumber);
 	if (m_Doc==nullptr || m_AvailableFonts==nullptr)

Modified: trunk/Scribus/scribus/plugins/fileloader/scribus13format/scribus13format.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22639&path=/trunk/Scribus/scribus/plugins/fileloader/scribus13format/scribus13format.h
==============================================================================
--- trunk/Scribus/scribus/plugins/fileloader/scribus13format/scribus13format.h	(original)
+++ trunk/Scribus/scribus/plugins/fileloader/scribus13format/scribus13format.h	Tue Aug 21 20:01:01 2018
@@ -39,7 +39,7 @@
 		virtual void addToMainWindowMenu(ScribusMainWindow *) {};
 
 		// Special features - .sla page extraction support
-		virtual bool loadPage(const QString & fileName, int pageNumber, bool Mpage, QString renamedPageName=QString::null);
+		virtual bool loadPage(const QString & fileName, int pageNumber, bool Mpage, const QString& renamedPageName=QString::null);
 		virtual bool readStyles(const QString& fileName, ScribusDoc* doc, StyleSet<ParagraphStyle> &docParagraphStyles);
 		virtual bool readLineStyles(const QString& fileName, QHash<QString, multiLine> *Sty);
 		virtual bool readColors(const QString& fileName, ColorList & colors);

Modified: trunk/Scribus/scribus/plugins/fileloader/scribus150format/scribus150format.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22639&path=/trunk/Scribus/scribus/plugins/fileloader/scribus150format/scribus150format.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/fileloader/scribus150format/scribus150format.cpp	(original)
+++ trunk/Scribus/scribus/plugins/fileloader/scribus150format/scribus150format.cpp	Tue Aug 21 20:01:01 2018
@@ -5966,7 +5966,7 @@
 	return !reader.hasError();
 }
 
-bool Scribus150Format::loadPage(const QString & fileName, int pageNumber, bool Mpage, QString renamedPageName)
+bool Scribus150Format::loadPage(const QString & fileName, int pageNumber, bool Mpage, const QString& renamedPageName)
 {
 // 	qDebug() << QString("loading page %2 from file '%1' from 1.3.x plugin").arg(fileName).arg(pageNumber);
 	if (m_Doc==nullptr || m_AvailableFonts==nullptr)

Modified: trunk/Scribus/scribus/plugins/fileloader/scribus150format/scribus150format.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22639&path=/trunk/Scribus/scribus/plugins/fileloader/scribus150format/scribus150format.h
==============================================================================
--- trunk/Scribus/scribus/plugins/fileloader/scribus150format/scribus150format.h	(original)
+++ trunk/Scribus/scribus/plugins/fileloader/scribus150format/scribus150format.h	Tue Aug 21 20:01:01 2018
@@ -56,7 +56,7 @@
 		virtual void addToMainWindowMenu(ScribusMainWindow *) {};
 
 		// Special features - .sla page extraction support
-		virtual bool loadPage(const QString & fileName, int pageNumber, bool Mpage, QString renamedPageName=QString::null);
+		virtual bool loadPage(const QString & fileName, int pageNumber, bool Mpage, const QString& renamedPageName=QString::null);
 		virtual bool readStyles(const QString& fileName, ScribusDoc* doc, StyleSet<ParagraphStyle> &docParagraphStyles);
 		virtual bool readCharStyles(const QString& fileName, ScribusDoc* doc, StyleSet<CharStyle> &docCharStyles);
 		virtual bool readLineStyles(const QString& fileName, QHash<QString, multiLine> *Sty);

Modified: trunk/Scribus/scribus/plugins/gettext/textfilter/tfdia.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22639&path=/trunk/Scribus/scribus/plugins/gettext/textfilter/tfdia.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/gettext/textfilter/tfdia.cpp	(original)
+++ trunk/Scribus/scribus/plugins/gettext/textfilter/tfdia.cpp	Tue Aug 21 20:01:01 2018
@@ -28,7 +28,7 @@
 #include "iconmanager.h"
 #include "util.h"
 
-tfDia::tfDia() : QDialog()
+tfDia::tfDia()
 {
 	setModal(true);
 	setWindowIcon(QIcon(IconManager::instance()->loadIcon("AppIcon.png")));

Modified: trunk/Scribus/scribus/plugins/import/ai/importai.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22639&path=/trunk/Scribus/scribus/plugins/import/ai/importai.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/ai/importai.cpp	(original)
+++ trunk/Scribus/scribus/plugins/import/ai/importai.cpp	Tue Aug 21 20:01:01 2018
@@ -61,8 +61,6 @@
 #ifdef HAVE_PODOFO
 	#include <podofo/podofo.h>
 #endif
-
-extern SCRIBUS_API ScribusQApp * ScQApp;
 
 AIPlug::AIPlug(ScribusDoc* doc, int flags) :
 	progressDialog(nullptr),

Modified: trunk/Scribus/scribus/plugins/import/ai/importaiplugin.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22639&path=/trunk/Scribus/scribus/plugins/import/ai/importaiplugin.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/ai/importaiplugin.cpp	(original)
+++ trunk/Scribus/scribus/plugins/import/ai/importaiplugin.cpp	Tue Aug 21 20:01:01 2018
@@ -45,7 +45,7 @@
 	delete plug;
 }
 
-ImportAIPlugin::ImportAIPlugin() : LoadSavePlugin(),
+ImportAIPlugin::ImportAIPlugin() :
 	importAction(new ScrAction(ScrAction::DLL, "", QKeySequence(), this))
 {
 	// Set action info in languageChange, so we only have to do it in one

Modified: trunk/Scribus/scribus/plugins/import/cdr/importcdr.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22639&path=/trunk/Scribus/scribus/plugins/import/cdr/importcdr.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/cdr/importcdr.cpp	(original)
+++ trunk/Scribus/scribus/plugins/import/cdr/importcdr.cpp	Tue Aug 21 20:01:01 2018
@@ -50,8 +50,6 @@
 #include "util.h"
 #include "util_formats.h"
 #include "util_math.h"
-
-extern SCRIBUS_API ScribusQApp * ScQApp;
 
 CdrPlug::CdrPlug(ScribusDoc* doc, int flags)
 {

Modified: trunk/Scribus/scribus/plugins/import/cgm/importcgm.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22639&path=/trunk/Scribus/scribus/plugins/import/cgm/importcgm.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/cgm/importcgm.cpp	(original)
+++ trunk/Scribus/scribus/plugins/import/cgm/importcgm.cpp	Tue Aug 21 20:01:01 2018
@@ -52,9 +52,6 @@
 #include "util.h"
 #include "util_formats.h"
 #include "util_math.h"
-
-
-extern SCRIBUS_API ScribusQApp * ScQApp;
 
 ScBitReader::ScBitReader(QByteArray &data)
 {

Modified: trunk/Scribus/scribus/plugins/import/cgm/importcgmplugin.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22639&path=/trunk/Scribus/scribus/plugins/import/cgm/importcgmplugin.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/cgm/importcgmplugin.cpp	(original)
+++ trunk/Scribus/scribus/plugins/import/cgm/importcgmplugin.cpp	Tue Aug 21 20:01:01 2018
@@ -46,7 +46,7 @@
 	delete plug;
 }
 
-ImportCgmPlugin::ImportCgmPlugin() : LoadSavePlugin(),
+ImportCgmPlugin::ImportCgmPlugin() :
 	importAction(new ScrAction(ScrAction::DLL, QPixmap(), QPixmap(), "", QKeySequence(), this))
 {
 	// Set action info in languageChange, so we only have to do it in one

Modified: trunk/Scribus/scribus/plugins/import/cvg/importcvg.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22639&path=/trunk/Scribus/scribus/plugins/import/cvg/importcvg.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/cvg/importcvg.cpp	(original)
+++ trunk/Scribus/scribus/plugins/import/cvg/importcvg.cpp	Tue Aug 21 20:01:01 2018
@@ -46,9 +46,6 @@
 #include "util.h"
 #include "util_formats.h"
 #include "util_math.h"
-
-
-extern SCRIBUS_API ScribusQApp * ScQApp;
 
 CvgPlug::CvgPlug(ScribusDoc* doc, int flags)
 {

Modified: trunk/Scribus/scribus/plugins/import/cvg/importcvgplugin.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22639&path=/trunk/Scribus/scribus/plugins/import/cvg/importcvgplugin.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/cvg/importcvgplugin.cpp	(original)
+++ trunk/Scribus/scribus/plugins/import/cvg/importcvgplugin.cpp	Tue Aug 21 20:01:01 2018
@@ -39,7 +39,7 @@
 	delete plug;
 }
 
-ImportCvgPlugin::ImportCvgPlugin() : LoadSavePlugin(),
+ImportCvgPlugin::ImportCvgPlugin() :
 	importAction(new ScrAction(ScrAction::DLL, "", QKeySequence(), this))
 {
 	// Set action info in languageChange, so we only have to do it in one

Modified: trunk/Scribus/scribus/plugins/import/drw/importdrw.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22639&path=/trunk/Scribus/scribus/plugins/import/drw/importdrw.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/drw/importdrw.cpp	(original)
+++ trunk/Scribus/scribus/plugins/import/drw/importdrw.cpp	Tue Aug 21 20:01:01 2018
@@ -55,9 +55,6 @@
 #include "util.h"
 #include "util_formats.h"
 #include "util_math.h"
-
-
-extern SCRIBUS_API ScribusQApp * ScQApp;
 
 DrwPlug::DrwPlug(ScribusDoc* doc, int flags)
 {

Modified: trunk/Scribus/scribus/plugins/import/drw/importdrwplugin.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22639&path=/trunk/Scribus/scribus/plugins/import/drw/importdrwplugin.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/drw/importdrwplugin.cpp	(original)
+++ trunk/Scribus/scribus/plugins/import/drw/importdrwplugin.cpp	Tue Aug 21 20:01:01 2018
@@ -46,7 +46,7 @@
 	delete plug;
 }
 
-ImportDrwPlugin::ImportDrwPlugin() : LoadSavePlugin(),
+ImportDrwPlugin::ImportDrwPlugin() :
 	importAction(new ScrAction(ScrAction::DLL, QPixmap(), QPixmap(), "", QKeySequence(), this))
 {
 	// Set action info in languageChange, so we only have to do it in one

Modified: trunk/Scribus/scribus/plugins/import/emf/importemf.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22639&path=/trunk/Scribus/scribus/plugins/import/emf/importemf.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/emf/importemf.cpp	(original)
+++ trunk/Scribus/scribus/plugins/import/emf/importemf.cpp	Tue Aug 21 20:01:01 2018
@@ -424,8 +424,6 @@
 #define   U_RNDT_Path                   0x10000001
 #define   U_RNDT_Empty                  0x10000002
 #define   U_RNDT_Infinite               0x10000003
-
-extern SCRIBUS_API ScribusQApp * ScQApp;
 
 EmfPlug::EmfPlug(ScribusDoc* doc, int flags)
 	: clipGroup(nullptr),

Modified: trunk/Scribus/scribus/plugins/import/emf/importemfplugin.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22639&path=/trunk/Scribus/scribus/plugins/import/emf/importemfplugin.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/emf/importemfplugin.cpp	(original)
+++ trunk/Scribus/scribus/plugins/import/emf/importemfplugin.cpp	Tue Aug 21 20:01:01 2018
@@ -45,7 +45,7 @@
 	delete plug;
 }
 
-ImportEmfPlugin::ImportEmfPlugin() : LoadSavePlugin(), importAction(new ScrAction(ScrAction::DLL, "", QKeySequence(), this))
+ImportEmfPlugin::ImportEmfPlugin() : importAction(new ScrAction(ScrAction::DLL, "", QKeySequence(), this))
 {
 	// Set action info in languageChange, so we only have to do it in one
 	// place. This includes registering file format support.

Modified: trunk/Scribus/scribus/plugins/import/fh/importfh.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22639&path=/trunk/Scribus/scribus/plugins/import/fh/importfh.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/fh/importfh.cpp	(original)
+++ trunk/Scribus/scribus/plugins/import/fh/importfh.cpp	Tue Aug 21 20:01:01 2018
@@ -50,8 +50,6 @@
 #include "util.h"
 #include "util_formats.h"
 #include "util_math.h"
-
-extern SCRIBUS_API ScribusQApp * ScQApp;
 
 FhPlug::FhPlug(ScribusDoc* doc, int flags)
 {

Modified: trunk/Scribus/scribus/plugins/import/fh/importfhplugin.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22639&path=/trunk/Scribus/scribus/plugins/import/fh/importfhplugin.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/fh/importfhplugin.cpp	(original)
+++ trunk/Scribus/scribus/plugins/import/fh/importfhplugin.cpp	Tue Aug 21 20:01:01 2018
@@ -39,7 +39,7 @@
 	delete plug;
 }
 
-ImportFhPlugin::ImportFhPlugin() : LoadSavePlugin(),
+ImportFhPlugin::ImportFhPlugin() :
 	importAction(new ScrAction(ScrAction::DLL, QPixmap(), QPixmap(), "", QKeySequence(), this))
 {
 	// Set action info in languageChange, so we only have to do it in one

Modified: trunk/Scribus/scribus/plugins/import/idml/importidml.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22639&path=/trunk/Scribus/scribus/plugins/import/idml/importidml.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/idml/importidml.cpp	(original)
+++ trunk/Scribus/scribus/plugins/import/idml/importidml.cpp	Tue Aug 21 20:01:01 2018
@@ -60,9 +60,6 @@
 #include "util.h"
 #include "util_formats.h"
 #include "util_math.h"
-
-
-extern SCRIBUS_API ScribusQApp * ScQApp;
 
 IdmlPlug::IdmlPlug(ScribusDoc* doc, int flags)
 {
@@ -874,7 +871,6 @@
 			}
 		}
 	}
-	return;
 }
 
 bool IdmlPlug::parseStylesXML(const QDomElement& sElem)
@@ -961,7 +957,6 @@
 			}
 		}
 	}
-	return;
 }
 
 void IdmlPlug::parseObjectStyle(const QDomElement& styleElem)
@@ -1510,7 +1505,6 @@
 		baseX = m_Doc->currentPage()->xOffset();
 		baseY = m_Doc->currentPage()->yOffset() + m_Doc->currentPage()->height() / 2.0;
 	}
-	return;
 }
 
 bool IdmlPlug::parseSpreadXML(const QDomElement& spElem)
@@ -2762,7 +2756,6 @@
 			item->itemText.trim();
 		}
 	}
-	return;
 }
 
 void IdmlPlug::parseParagraphStyleRange(QDomElement &ste, PageItem* item)

Modified: trunk/Scribus/scribus/plugins/import/idml/importidmlplugin.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22639&path=/trunk/Scribus/scribus/plugins/import/idml/importidmlplugin.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/idml/importidmlplugin.cpp	(original)
+++ trunk/Scribus/scribus/plugins/import/idml/importidmlplugin.cpp	Tue Aug 21 20:01:01 2018
@@ -45,7 +45,7 @@
 	delete plug;
 }
 
-ImportIdmlPlugin::ImportIdmlPlugin() : LoadSavePlugin(),
+ImportIdmlPlugin::ImportIdmlPlugin() :
 	importAction(new ScrAction(ScrAction::DLL, "", QKeySequence(), this))
 {
 	// Set action info in languageChange, so we only have to do it in one

Modified: trunk/Scribus/scribus/plugins/import/odg/importodg.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22639&path=/trunk/Scribus/scribus/plugins/import/odg/importodg.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/odg/importodg.cpp	(original)
+++ trunk/Scribus/scribus/plugins/import/odg/importodg.cpp	Tue Aug 21 20:01:01 2018
@@ -68,9 +68,6 @@
 #include "util_file.h"
 #include "util_formats.h"
 #include "util_math.h"
-
-
-extern SCRIBUS_API ScribusQApp * ScQApp;
 
 OdgPlug::OdgPlug(ScribusDoc* doc, int flags)
 {
@@ -3114,7 +3111,6 @@
 	{
 		path.cubicTo(curvePoints[i], curvePoints[i+1], curvePoints[i+2]);
 	}
-	return;
 }
 
 int OdgPlug::arcToCurve(double rx, double ry, double startAngle, double sweepAngle, const QPointF & offset, QPointF * curvePoints)

Modified: trunk/Scribus/scribus/plugins/import/odg/importodgplugin.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22639&path=/trunk/Scribus/scribus/plugins/import/odg/importodgplugin.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/odg/importodgplugin.cpp	(original)
+++ trunk/Scribus/scribus/plugins/import/odg/importodgplugin.cpp	Tue Aug 21 20:01:01 2018
@@ -45,7 +45,7 @@
 	delete plug;
 }
 
-ImportOdgPlugin::ImportOdgPlugin() : LoadSavePlugin(),
+ImportOdgPlugin::ImportOdgPlugin() :
 	importAction(new ScrAction(ScrAction::DLL, "", QKeySequence(), this))
 {
 	// Set action info in languageChange, so we only have to do it in one

Modified: trunk/Scribus/scribus/plugins/import/oodraw/oodrawimp.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22639&path=/trunk/Scribus/scribus/plugins/import/oodraw/oodrawimp.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/oodraw/oodrawimp.cpp	(original)
+++ trunk/Scribus/scribus/plugins/import/oodraw/oodrawimp.cpp	Tue Aug 21 20:01:01 2018
@@ -73,7 +73,6 @@
 }
 
 OODrawImportPlugin::OODrawImportPlugin() :
-	LoadSavePlugin(),
 	importAction(new ScrAction(ScrAction::DLL, "", QKeySequence(), this))
 {
 	// Set action info in languageChange, so we only have to do

Modified: trunk/Scribus/scribus/plugins/import/pages/importpages.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22639&path=/trunk/Scribus/scribus/plugins/import/pages/importpages.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/pages/importpages.cpp	(original)
+++ trunk/Scribus/scribus/plugins/import/pages/importpages.cpp	Tue Aug 21 20:01:01 2018
@@ -463,9 +463,6 @@
 #include "util.h"
 #include "util_formats.h"
 #include "util_math.h"
-
-
-extern SCRIBUS_API ScribusQApp * ScQApp;
 
 PagesPlug::PagesPlug(ScribusDoc* doc, int flags)
 	: baseX(0.0),

Modified: trunk/Scribus/scribus/plugins/import/pages/importpagesplugin.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22639&path=/trunk/Scribus/scribus/plugins/import/pages/importpagesplugin.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/pages/importpagesplugin.cpp	(original)
+++ trunk/Scribus/scribus/plugins/import/pages/importpagesplugin.cpp	Tue Aug 21 20:01:01 2018
@@ -45,7 +45,7 @@
 	delete plug;
 }
 
-ImportPagesPlugin::ImportPagesPlugin() : LoadSavePlugin(),
+ImportPagesPlugin::ImportPagesPlugin() :
 	importAction(new ScrAction(ScrAction::DLL, "", QKeySequence(), this))
 {
 	// Set action info in languageChange, so we only have to do it in one

Modified: trunk/Scribus/scribus/plugins/import/pct/importpct.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22639&path=/trunk/Scribus/scribus/plugins/import/pct/importpct.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/pct/importpct.cpp	(original)
+++ trunk/Scribus/scribus/plugins/import/pct/importpct.cpp	Tue Aug 21 20:01:01 2018
@@ -49,9 +49,6 @@
 #include "util.h"
 #include "util_formats.h"
 #include "util_math.h"
-
-
-extern SCRIBUS_API ScribusQApp * ScQApp;
 
 PctPlug::PctPlug(ScribusDoc* doc, int flags)
 {

Modified: trunk/Scribus/scribus/plugins/import/pct/importpctplugin.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22639&path=/trunk/Scribus/scribus/plugins/import/pct/importpctplugin.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/pct/importpctplugin.cpp	(original)
+++ trunk/Scribus/scribus/plugins/import/pct/importpctplugin.cpp	Tue Aug 21 20:01:01 2018
@@ -39,7 +39,7 @@
 	delete plug;
 }
 
-ImportPctPlugin::ImportPctPlugin() : LoadSavePlugin(),
+ImportPctPlugin::ImportPctPlugin() :
 	importAction(new ScrAction(ScrAction::DLL, "", QKeySequence(), this))
 {
 	// Set action info in languageChange, so we only have to do it in one

Modified: trunk/Scribus/scribus/plugins/import/pdf/importpdfplugin.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22639&path=/trunk/Scribus/scribus/plugins/import/pdf/importpdfplugin.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/pdf/importpdfplugin.cpp	(original)
+++ trunk/Scribus/scribus/plugins/import/pdf/importpdfplugin.cpp	Tue Aug 21 20:01:01 2018
@@ -45,7 +45,7 @@
 	delete plug;
 }
 
-ImportPdfPlugin::ImportPdfPlugin() : LoadSavePlugin(),
+ImportPdfPlugin::ImportPdfPlugin() :
 	importAction(new ScrAction(ScrAction::DLL, QPixmap(), QPixmap(), "", QKeySequence(), this))
 {
 	// Set action info in languageChange, so we only have to do it in one

Modified: trunk/Scribus/scribus/plugins/import/pm/importpm.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22639&path=/trunk/Scribus/scribus/plugins/import/pm/importpm.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/pm/importpm.cpp	(original)
+++ trunk/Scribus/scribus/plugins/import/pm/importpm.cpp	Tue Aug 21 20:01:01 2018
@@ -50,8 +50,6 @@
 #include "util.h"
 #include "util_formats.h"
 #include "util_math.h"
-
-extern SCRIBUS_API ScribusQApp * ScQApp;
 
 PmPlug::PmPlug(ScribusDoc* doc, int flags)
 {

Modified: trunk/Scribus/scribus/plugins/import/pm/importpmplugin.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22639&path=/trunk/Scribus/scribus/plugins/import/pm/importpmplugin.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/pm/importpmplugin.cpp	(original)
+++ trunk/Scribus/scribus/plugins/import/pm/importpmplugin.cpp	Tue Aug 21 20:01:01 2018
@@ -39,7 +39,7 @@
 	delete plug;
 }
 
-ImportPmPlugin::ImportPmPlugin() : LoadSavePlugin(),
+ImportPmPlugin::ImportPmPlugin() :
 	importAction(new ScrAction(ScrAction::DLL, QPixmap(), QPixmap(), "", QKeySequence(), this))
 {
 	// Set action info in languageChange, so we only have to do it in one

Modified: trunk/Scribus/scribus/plugins/import/pub/importpub.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22639&path=/trunk/Scribus/scribus/plugins/import/pub/importpub.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/pub/importpub.cpp	(original)
+++ trunk/Scribus/scribus/plugins/import/pub/importpub.cpp	Tue Aug 21 20:01:01 2018
@@ -53,9 +53,6 @@
 #include "util.h"
 #include "util_formats.h"
 #include "util_math.h"
-
-
-extern SCRIBUS_API ScribusQApp * ScQApp;
 
 PubPlug::PubPlug(ScribusDoc* doc, int flags)
 {

Modified: trunk/Scribus/scribus/plugins/import/pub/importpubplugin.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22639&path=/trunk/Scribus/scribus/plugins/import/pub/importpubplugin.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/pub/importpubplugin.cpp	(original)
+++ trunk/Scribus/scribus/plugins/import/pub/importpubplugin.cpp	Tue Aug 21 20:01:01 2018
@@ -39,7 +39,7 @@
 	delete plug;
 }
 
-ImportPubPlugin::ImportPubPlugin() : LoadSavePlugin(),
+ImportPubPlugin::ImportPubPlugin() :
 	importAction(new ScrAction(ScrAction::DLL, QPixmap(), QPixmap(), "", QKeySequence(), this))
 {
 	// Set action info in languageChange, so we only have to do it in one

Modified: trunk/Scribus/scribus/plugins/import/revenge/rawpainter.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22639&path=/trunk/Scribus/scribus/plugins/import/revenge/rawpainter.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/revenge/rawpainter.cpp	(original)
+++ trunk/Scribus/scribus/plugins/import/revenge/rawpainter.cpp	Tue Aug 21 20:01:01 2018
@@ -47,9 +47,6 @@
 #include "util_formats.h"
 #include "util_math.h"
 #include "rawpainter.h"
-
-
-extern SCRIBUS_API ScribusQApp * ScQApp;
 
 #if HAVE_REVENGE
 

Modified: trunk/Scribus/scribus/plugins/import/shape/importshape.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22639&path=/trunk/Scribus/scribus/plugins/import/shape/importshape.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/shape/importshape.cpp	(original)
+++ trunk/Scribus/scribus/plugins/import/shape/importshape.cpp	Tue Aug 21 20:01:01 2018
@@ -50,8 +50,6 @@
 #include "util_formats.h"
 #include "util_math.h"
 
-extern SCRIBUS_API ScribusQApp * ScQApp;
-
 ShapePlug::ShapePlug(ScribusDoc* doc, int flags)
 {
 	tmpSel=new Selection(this, false);

Modified: trunk/Scribus/scribus/plugins/import/shape/importshapeplugin.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22639&path=/trunk/Scribus/scribus/plugins/import/shape/importshapeplugin.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/shape/importshapeplugin.cpp	(original)
+++ trunk/Scribus/scribus/plugins/import/shape/importshapeplugin.cpp	Tue Aug 21 20:01:01 2018
@@ -39,7 +39,7 @@
 	delete plug;
 }
 
-ImportShapePlugin::ImportShapePlugin() : LoadSavePlugin(),
+ImportShapePlugin::ImportShapePlugin() :
 	importAction(new ScrAction(ScrAction::DLL, QPixmap(), QPixmap(), "", QKeySequence(), this))
 {
 	// Set action info in languageChange, so we only have to do it in one

Modified: trunk/Scribus/scribus/plugins/import/sml/importsml.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22639&path=/trunk/Scribus/scribus/plugins/import/sml/importsml.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/sml/importsml.cpp	(original)
+++ trunk/Scribus/scribus/plugins/import/sml/importsml.cpp	Tue Aug 21 20:01:01 2018
@@ -48,9 +48,6 @@
 #include "util_formats.h"
 #include "util_math.h"
 
-
-extern SCRIBUS_API ScribusQApp * ScQApp;
-
 SmlPlug::SmlPlug(ScribusDoc* doc, int flags)
 {
 	tmpSel=new Selection(this, false);

Modified: trunk/Scribus/scribus/plugins/import/sml/importsmlplugin.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22639&path=/trunk/Scribus/scribus/plugins/import/sml/importsmlplugin.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/sml/importsmlplugin.cpp	(original)
+++ trunk/Scribus/scribus/plugins/import/sml/importsmlplugin.cpp	Tue Aug 21 20:01:01 2018
@@ -39,7 +39,7 @@
 	delete plug;
 }
 
-ImportSmlPlugin::ImportSmlPlugin() : LoadSavePlugin(),
+ImportSmlPlugin::ImportSmlPlugin() :
 	importAction(new ScrAction(ScrAction::DLL, QPixmap(), QPixmap(), "", QKeySequence(), this))
 {
 	// Set action info in languageChange, so we only have to do it in one

Modified: trunk/Scribus/scribus/plugins/import/svg/svgplugin.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22639&path=/trunk/Scribus/scribus/plugins/import/svg/svgplugin.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/svg/svgplugin.cpp	(original)
+++ trunk/Scribus/scribus/plugins/import/svg/svgplugin.cpp	Tue Aug 21 20:01:01 2018
@@ -72,7 +72,7 @@
 	delete plug;
 }
 
-SVGImportPlugin::SVGImportPlugin() : LoadSavePlugin(),
+SVGImportPlugin::SVGImportPlugin() :
 	importAction(new ScrAction(ScrAction::DLL, "", QKeySequence(), this))
 {
 	// Set action info in languageChange, so we only have to do

Modified: trunk/Scribus/scribus/plugins/import/svm/importsvm.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22639&path=/trunk/Scribus/scribus/plugins/import/svm/importsvm.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/svm/importsvm.cpp	(original)
+++ trunk/Scribus/scribus/plugins/import/svm/importsvm.cpp	Tue Aug 21 20:01:01 2018
@@ -280,8 +280,6 @@
 #define   U_RNDT_Path                   0x10000001
 #define   U_RNDT_Empty                  0x10000002
 #define   U_RNDT_Infinite               0x10000003
-
-extern SCRIBUS_API ScribusQApp * ScQApp;
 
 SvmPlug::SvmPlug(ScribusDoc* doc, int flags)
 {

Modified: trunk/Scribus/scribus/plugins/import/svm/importsvmplugin.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22639&path=/trunk/Scribus/scribus/plugins/import/svm/importsvmplugin.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/svm/importsvmplugin.cpp	(original)
+++ trunk/Scribus/scribus/plugins/import/svm/importsvmplugin.cpp	Tue Aug 21 20:01:01 2018
@@ -45,7 +45,8 @@
 	delete plug;
 }
 
-ImportSvmPlugin::ImportSvmPlugin() : LoadSavePlugin(), importAction(new ScrAction(ScrAction::DLL, "", QKeySequence(), this))
+ImportSvmPlugin::ImportSvmPlugin() :
+	importAction(new ScrAction(ScrAction::DLL, "", QKeySequence(), this))
 {
 	// Set action info in languageChange, so we only have to do it in one
 	// place. This includes registering file format support.

Modified: trunk/Scribus/scribus/plugins/import/uniconvertor/uniconvplugin.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22639&path=/trunk/Scribus/scribus/plugins/import/uniconvertor/uniconvplugin.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/uniconvertor/uniconvplugin.cpp	(original)
+++ trunk/Scribus/scribus/plugins/import/uniconvertor/uniconvplugin.cpp	Tue Aug 21 20:01:01 2018
@@ -50,7 +50,7 @@
 	delete plug;
 }
 
-UniconvImportPlugin::UniconvImportPlugin() : LoadSavePlugin()
+UniconvImportPlugin::UniconvImportPlugin()
 {
 	// Set action info in languageChange, so we only have to do
 	// it in one place. This includes registering file format

Modified: trunk/Scribus/scribus/plugins/import/viva/importviva.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22639&path=/trunk/Scribus/scribus/plugins/import/viva/importviva.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/viva/importviva.cpp	(original)
+++ trunk/Scribus/scribus/plugins/import/viva/importviva.cpp	Tue Aug 21 20:01:01 2018
@@ -63,8 +63,6 @@
 #include "util.h"
 #include "util_formats.h"
 #include "util_math.h"
-
-extern SCRIBUS_API ScribusQApp * ScQApp;
 
 VivaPlug::VivaPlug(ScribusDoc* doc, int flags)
 {
@@ -640,7 +638,6 @@
 			gradientTypeMap.insert(grName, grTyp);
 		}
 	}
-	return;
 }
 
 void VivaPlug::parsePreferencesXML(const QDomElement& spNode)

Modified: trunk/Scribus/scribus/plugins/import/viva/importvivaplugin.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22639&path=/trunk/Scribus/scribus/plugins/import/viva/importvivaplugin.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/viva/importvivaplugin.cpp	(original)
+++ trunk/Scribus/scribus/plugins/import/viva/importvivaplugin.cpp	Tue Aug 21 20:01:01 2018
@@ -45,7 +45,7 @@
 	delete plug;
 }
 
-ImportVivaPlugin::ImportVivaPlugin() : LoadSavePlugin(),
+ImportVivaPlugin::ImportVivaPlugin() :
 	importAction(new ScrAction(ScrAction::DLL, "", QKeySequence(), this))
 {
 	// Set action info in languageChange, so we only have to do it in one

Modified: trunk/Scribus/scribus/plugins/import/vsd/importvsd.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22639&path=/trunk/Scribus/scribus/plugins/import/vsd/importvsd.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/vsd/importvsd.cpp	(original)
+++ trunk/Scribus/scribus/plugins/import/vsd/importvsd.cpp	Tue Aug 21 20:01:01 2018
@@ -53,9 +53,6 @@
 #include "util.h"
 #include "util_formats.h"
 #include "util_math.h"
-
-
-extern SCRIBUS_API ScribusQApp * ScQApp;
 
 VsdPlug::VsdPlug(ScribusDoc* doc, int flags)
 {

Modified: trunk/Scribus/scribus/plugins/import/vsd/importvsdplugin.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22639&path=/trunk/Scribus/scribus/plugins/import/vsd/importvsdplugin.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/vsd/importvsdplugin.cpp	(original)
+++ trunk/Scribus/scribus/plugins/import/vsd/importvsdplugin.cpp	Tue Aug 21 20:01:01 2018
@@ -39,7 +39,7 @@
 	delete plug;
 }
 
-ImportVsdPlugin::ImportVsdPlugin() : LoadSavePlugin(),
+ImportVsdPlugin::ImportVsdPlugin() :
 	importAction(new ScrAction(ScrAction::DLL, QPixmap(), QPixmap(), "", QKeySequence(), this))
 {
 	// Set action info in languageChange, so we only have to do it in one

Modified: trunk/Scribus/scribus/plugins/import/wmf/wmfimport.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22639&path=/trunk/Scribus/scribus/plugins/import/wmf/wmfimport.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/wmf/wmfimport.cpp	(original)
+++ trunk/Scribus/scribus/plugins/import/wmf/wmfimport.cpp	Tue Aug 21 20:01:01 2018
@@ -1112,7 +1112,7 @@
 	m_context.setBackgroundColor( colorFromParam( params ) );
 }
 
-void WMFImport::setBkMode( QList<PageItem*>& /*items*/, long, short* params )
+void WMFImport::setBkMode(QList<PageItem*>& /*items*/, long, short* params )
 {
 	if ( params[ 0 ]==1 ) 
 		m_context.setBackgroundMode( Qt::TransparentMode );
@@ -1284,7 +1284,7 @@
 	m_context.restore();
 }
 
-void WMFImport::selectObject( QList<PageItem*>& items, long num, short* params )
+void WMFImport::selectObject(QList<PageItem*>& items, long num, short* params )
 {
 	int idx = params[ 0 ];
 	if ( idx >= 0 && idx < MAX_OBJHANDLE && m_ObjHandleTab[ idx ] )
@@ -1453,7 +1453,7 @@
 	return i;
 }
 
-unsigned int WMFImport::toDWord( short* params )
+unsigned int WMFImport::toDWord( const short* params )
 {
 	unsigned int l;
 #if !defined( WORDS_BIGENDIAN )

Modified: trunk/Scribus/scribus/plugins/import/wmf/wmfimport.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22639&path=/trunk/Scribus/scribus/plugins/import/wmf/wmfimport.h
==============================================================================
--- trunk/Scribus/scribus/plugins/import/wmf/wmfimport.h	(original)
+++ trunk/Scribus/scribus/plugins/import/wmf/wmfimport.h	Tue Aug 21 20:01:01 2018
@@ -119,7 +119,7 @@
     virtual int findFunc( unsigned short aFunc ) const;
 
 	/** Converts two parameters to long */
-	unsigned int toDWord( short* params );
+	unsigned int toDWord( const short* params );
 
 public:
 
@@ -134,7 +134,7 @@
     /** move pen to coord */
     void moveTo( QList<PageItem*>& items, long num, short* params );
     /** draw ellipse */
-    void ellipse( QList<PageItem*>& items, long num, short* params );
+	void ellipse(QList<PageItem*>& items, long num, short* params );
     /** draw polygon */
     void polygon( QList<PageItem*>& items, long num, short* params );
     /** draw a list of polygons */
@@ -156,11 +156,11 @@
     /** set background pen color */
     void setBkColor( QList<PageItem*>& items, long num, short* params );
     /** set background pen mode */
-    void setBkMode( QList<PageItem*>& items, long num, short* params );
+	void setBkMode( QList<PageItem*>& items, long num, short* params );
     /** save device context */
     void saveDC( QList<PageItem*>& items, long num, short* params );
     /** restore device context */
-    void restoreDC( QList<PageItem*>& items, long num, short* params );
+	void restoreDC( QList<PageItem*>& items, long num, short* params );
     /**  clipping region is the intersection of this region and the original region */
     void intersectClipRect( QList<PageItem*>& items, long num, short* params );
     /** delete a clipping rectangle of the original region */
@@ -177,7 +177,7 @@
 
     /****************** Object handle *******************/
     /** Activate object handle */
-    void selectObject( QList<PageItem*>& items, long num, short* params );
+	void selectObject( QList<PageItem*>& items, long num, short* params );
     /** Free object handle */
     void deleteObject( QList<PageItem*>& items, long num, short* params );
     /** create an empty object in the object list */

Modified: trunk/Scribus/scribus/plugins/import/wmf/wmfimportplugin.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22639&path=/trunk/Scribus/scribus/plugins/import/wmf/wmfimportplugin.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/wmf/wmfimportplugin.cpp	(original)
+++ trunk/Scribus/scribus/plugins/import/wmf/wmfimportplugin.cpp	Tue Aug 21 20:01:01 2018
@@ -57,7 +57,7 @@
 	delete plug;
 }
 
-WMFImportPlugin::WMFImportPlugin() : LoadSavePlugin(),
+WMFImportPlugin::WMFImportPlugin() :
 	importAction(new ScrAction(ScrAction::DLL, "", QKeySequence(), this))
 {
 	// Set action info in languageChange, so we only have to do

Modified: trunk/Scribus/scribus/plugins/import/wpg/importwpg.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22639&path=/trunk/Scribus/scribus/plugins/import/wpg/importwpg.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/wpg/importwpg.cpp	(original)
+++ trunk/Scribus/scribus/plugins/import/wpg/importwpg.cpp	Tue Aug 21 20:01:01 2018
@@ -16,7 +16,7 @@
 #include <QDebug>
 
 #include <cstdlib>
-#include <stdio.h>
+#include <cstdio>
 
 #include "importwpg.h"
 
@@ -50,11 +50,7 @@
 #include "util_formats.h"
 #include "util_math.h"
 
-
-
-extern SCRIBUS_API ScribusQApp * ScQApp;
-
-ScrPainter::ScrPainter(): libwpg::WPGPaintInterface()
+ScrPainter::ScrPainter()
 {
 }
 

Modified: trunk/Scribus/scribus/plugins/import/wpg/importwpgplugin.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22639&path=/trunk/Scribus/scribus/plugins/import/wpg/importwpgplugin.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/wpg/importwpgplugin.cpp	(original)
+++ trunk/Scribus/scribus/plugins/import/wpg/importwpgplugin.cpp	Tue Aug 21 20:01:01 2018
@@ -39,7 +39,7 @@
 	delete plug;
 }
 
-ImportWpgPlugin::ImportWpgPlugin() : LoadSavePlugin(),
+ImportWpgPlugin::ImportWpgPlugin() :
 	importAction(new ScrAction(ScrAction::DLL, QPixmap(), QPixmap(), "", QKeySequence(), this))
 {
 	// Set action info in languageChange, so we only have to do it in one

Modified: trunk/Scribus/scribus/plugins/import/xar/importxar.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22639&path=/trunk/Scribus/scribus/plugins/import/xar/importxar.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/xar/importxar.cpp	(original)
+++ trunk/Scribus/scribus/plugins/import/xar/importxar.cpp	Tue Aug 21 20:01:01 2018
@@ -57,9 +57,6 @@
 #include "util.h"
 #include "util_formats.h"
 #include "util_math.h"
-
-
-extern SCRIBUS_API ScribusQApp * ScQApp;
 
 XarPlug::XarPlug(ScribusDoc* doc, int flags)
 {

Modified: trunk/Scribus/scribus/plugins/import/xar/importxarplugin.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22639&path=/trunk/Scribus/scribus/plugins/import/xar/importxarplugin.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/xar/importxarplugin.cpp	(original)
+++ trunk/Scribus/scribus/plugins/import/xar/importxarplugin.cpp	Tue Aug 21 20:01:01 2018
@@ -39,7 +39,7 @@
 	delete plug;
 }
 
-ImportXarPlugin::ImportXarPlugin() : LoadSavePlugin(),
+ImportXarPlugin::ImportXarPlugin() :
 	importAction(new ScrAction(ScrAction::DLL, QPixmap(), QPixmap(), "", QKeySequence(), this))
 {
 	// Set action info in languageChange, so we only have to do it in one

Modified: trunk/Scribus/scribus/plugins/import/xfig/importxfigplugin.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22639&path=/trunk/Scribus/scribus/plugins/import/xfig/importxfigplugin.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/xfig/importxfigplugin.cpp	(original)
+++ trunk/Scribus/scribus/plugins/import/xfig/importxfigplugin.cpp	Tue Aug 21 20:01:01 2018
@@ -39,7 +39,7 @@
 	delete plug;
 }
 
-ImportXfigPlugin::ImportXfigPlugin() : LoadSavePlugin(),
+ImportXfigPlugin::ImportXfigPlugin() :
 	importAction(new ScrAction(ScrAction::DLL, "", QKeySequence(), this))
 {
 	// Set action info in languageChange, so we only have to do it in one

Modified: trunk/Scribus/scribus/plugins/import/xps/importxps.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22639&path=/trunk/Scribus/scribus/plugins/import/xps/importxps.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/xps/importxps.cpp	(original)
+++ trunk/Scribus/scribus/plugins/import/xps/importxps.cpp	Tue Aug 21 20:01:01 2018
@@ -63,9 +63,6 @@
 #include "util_formats.h"
 #include "util_math.h"
 #include "xpsimportoptions.h"
-
-
-extern SCRIBUS_API ScribusQApp * ScQApp;
 
 XpsPlug::XpsPlug(ScribusDoc* doc, int flags)
 {

Modified: trunk/Scribus/scribus/plugins/import/xps/importxpsplugin.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22639&path=/trunk/Scribus/scribus/plugins/import/xps/importxpsplugin.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/xps/importxpsplugin.cpp	(original)
+++ trunk/Scribus/scribus/plugins/import/xps/importxpsplugin.cpp	Tue Aug 21 20:01:01 2018
@@ -45,7 +45,7 @@
 	delete plug;
 }
 
-ImportXpsPlugin::ImportXpsPlugin() : LoadSavePlugin(),
+ImportXpsPlugin::ImportXpsPlugin() :
 	importAction(new ScrAction(ScrAction::DLL, "", QKeySequence(), this))
 {
 	// Set action info in languageChange, so we only have to do it in one

Modified: trunk/Scribus/scribus/plugins/picbrowser/picturebrowserplugin.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22639&path=/trunk/Scribus/scribus/plugins/picbrowser/picturebrowserplugin.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/picbrowser/picturebrowserplugin.cpp	(original)
+++ trunk/Scribus/scribus/plugins/picbrowser/picturebrowserplugin.cpp	Tue Aug 21 20:01:01 2018
@@ -11,7 +11,7 @@
 // Please don't implement the functionality of your plugin here; do that
 // in mypluginimpl.h and mypluginimpl.cpp .
 
-PictureBrowserPlugin::PictureBrowserPlugin() : ScActionPlugin()
+PictureBrowserPlugin::PictureBrowserPlugin()
 {
 	// Set action info in languageChange, so we only have to do
 	// it in one place.

Modified: trunk/Scribus/scribus/plugins/saveastemplateplugin/satemplate.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22639&path=/trunk/Scribus/scribus/plugins/saveastemplateplugin/satemplate.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/saveastemplateplugin/satemplate.cpp	(original)
+++ trunk/Scribus/scribus/plugins/saveastemplateplugin/satemplate.cpp	Tue Aug 21 20:01:01 2018
@@ -37,7 +37,7 @@
 	delete plug;
 }
 
-SaveAsTemplatePlugin::SaveAsTemplatePlugin() : ScActionPlugin()
+SaveAsTemplatePlugin::SaveAsTemplatePlugin()
 {
 	// Set action info in languageChange, so we only have to do
 	// it in one place.

Modified: trunk/Scribus/scribus/plugins/scriptplugin/cmdgetprop.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22639&path=/trunk/Scribus/scribus/plugins/scriptplugin/cmdgetprop.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/scriptplugin/cmdgetprop.cpp	(original)
+++ trunk/Scribus/scribus/plugins/scriptplugin/cmdgetprop.cpp	Tue Aug 21 20:01:01 2018
@@ -295,14 +295,14 @@
 	int typ = -1;
 	uint counter = 0;
 	uint counter2 = 0;
-	uint pageNr = ScCore->primaryMainWindow()->doc->currentPageNumber();
+	int pageNr = ScCore->primaryMainWindow()->doc->currentPageNumber();
 	char *kwlist[] = {const_cast<char*>(""), const_cast<char*>("page"), nullptr};
 
 
 	if (!PyArg_ParseTupleAndKeywords(args, keywds, "|ii", kwlist, &typ, &pageNr))
 		return nullptr;
 
-	uint numpages = ScCore->primaryMainWindow()->doc->Pages->count();
+	int numpages = ScCore->primaryMainWindow()->doc->Pages->count();
 	if(pageNr < 0 || pageNr >= numpages){
 		PyErr_SetString(PyExc_RuntimeError, QObject::tr("page number is invalid.","python error").toLocal8Bit().constData());
 		return nullptr;

Modified: trunk/Scribus/scribus/plugins/scriptplugin/objprinter.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22639&path=/trunk/Scribus/scribus/plugins/scriptplugin/objprinter.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/scriptplugin/objprinter.cpp	(original)
+++ trunk/Scribus/scribus/plugins/scriptplugin/objprinter.cpp	Tue Aug 21 20:01:01 2018
@@ -402,7 +402,7 @@
 //    ReOrderText(ScCore->primaryMainWindow()->doc, ScCore->primaryMainWindow()->view);
 	prn = QString(PyString_AsString(self->printer));
 	fna = QString(PyString_AsString(self->file));
-	fil = (QString(PyString_AsString(self->printer)) == QString("File")) ? true : false;
+	fil = QString(PyString_AsString(self->printer)) == QString("File");
 	std::vector<int> pageNs;
 	PrintOptions options;
 	for (int i = 0; i < PyList_Size(self->pages); ++i) {
@@ -414,7 +414,7 @@
 	options.prnEngine = (PrintEngine) self->pslevel;
 	options.toFile    = fil;
 	options.separationName = SepName;
-	options.outputSeparations = (SepName == QString("No")) ?  false : true;
+	options.outputSeparations = SepName != QString("No");
 	options.useColor = self->color;
 	options.mirrorH  = self->mph;
 	options.mirrorV  = self->mpv;

Modified: trunk/Scribus/scribus/plugins/scriptplugin/scriptplugin.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22639&path=/trunk/Scribus/scribus/plugins/scriptplugin/scriptplugin.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/scriptplugin/scriptplugin.cpp	(original)
+++ trunk/Scribus/scribus/plugins/scriptplugin/scriptplugin.cpp	Tue Aug 21 20:01:01 2018
@@ -111,7 +111,7 @@
 	delete plug;
 }
 
-ScriptPlugin::ScriptPlugin() : ScPersistentPlugin()
+ScriptPlugin::ScriptPlugin()
 {
 	// Set action info in languageChange, so we only have to do
 	// it in one place.
@@ -600,7 +600,6 @@
 	qDebug("Scripter setup failed (%s:%i)", fileName, lineNo);
 	if (PyErr_Occurred())
 		PyErr_Print();
-	return;
 }
 
 void initscribus(ScribusMainWindow *pl)

Modified: trunk/Scribus/scribus/plugins/shapes/shapeplugin.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22639&path=/trunk/Scribus/scribus/plugins/shapes/shapeplugin.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/shapes/shapeplugin.cpp	(original)
+++ trunk/Scribus/scribus/plugins/shapes/shapeplugin.cpp	Tue Aug 21 20:01:01 2018
@@ -51,7 +51,7 @@
 	delete plug;
 }
 
-ShapePlugin::ShapePlugin() : ScPersistentPlugin()
+ShapePlugin::ShapePlugin()
 {
 	sc_palette = nullptr;
 }

Modified: trunk/Scribus/scribus/plugins/short-words/shortwords.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22639&path=/trunk/Scribus/scribus/plugins/short-words/shortwords.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/short-words/shortwords.cpp	(original)
+++ trunk/Scribus/scribus/plugins/short-words/shortwords.cpp	Tue Aug 21 20:01:01 2018
@@ -58,7 +58,7 @@
 	delete plug;
 }
 
-ShortWordsPlugin::ShortWordsPlugin() : ScActionPlugin()
+ShortWordsPlugin::ShortWordsPlugin()
 {
 	// Set action info in languageChange, so we only have to do
 	// it in one place.

Modified: trunk/Scribus/scribus/plugins/short-words/swsyntaxhighlighter.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22639&path=/trunk/Scribus/scribus/plugins/short-words/swsyntaxhighlighter.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/short-words/swsyntaxhighlighter.cpp	(original)
+++ trunk/Scribus/scribus/plugins/short-words/swsyntaxhighlighter.cpp	Tue Aug 21 20:01:01 2018
@@ -30,6 +30,5 @@
 		myClassFormat.setForeground(Qt::gray);
 		setFormat(0, text.length(), myClassFormat);
 	}
-	return;
 }
 

Modified: trunk/Scribus/scribus/plugins/tools/2geomtools/meshdistortion/meshdistortion.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22639&path=/trunk/Scribus/scribus/plugins/tools/2geomtools/meshdistortion/meshdistortion.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/tools/2geomtools/meshdistortion/meshdistortion.cpp	(original)
+++ trunk/Scribus/scribus/plugins/tools/2geomtools/meshdistortion/meshdistortion.cpp	Tue Aug 21 20:01:01 2018
@@ -51,7 +51,7 @@
 	delete plug;
 }
 
-MeshDistortionPlugin::MeshDistortionPlugin() : ScActionPlugin()
+MeshDistortionPlugin::MeshDistortionPlugin()
 {
 	m_doc = nullptr;
 	m_patternItem = nullptr;

Modified: trunk/Scribus/scribus/plugins/tools/2geomtools/pathalongpath/pathalongpath.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22639&path=/trunk/Scribus/scribus/plugins/tools/2geomtools/pathalongpath/pathalongpath.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/tools/2geomtools/pathalongpath/pathalongpath.cpp	(original)
+++ trunk/Scribus/scribus/plugins/tools/2geomtools/pathalongpath/pathalongpath.cpp	Tue Aug 21 20:01:01 2018
@@ -54,7 +54,7 @@
 	delete plug;
 }
 
-PathAlongPathPlugin::PathAlongPathPlugin() : ScActionPlugin(),
+PathAlongPathPlugin::PathAlongPathPlugin() :
 	patternItem(nullptr),
 	pathItem(nullptr),
 	originalRot(0.0),
@@ -144,10 +144,7 @@
 			if (currItem->isGroup())
 			{
 				currItem = doc->m_Selection->itemAt(1);
-				if (currItem->itemType() != PageItem::PolyLine)
-					ret = false;
-				else
-					ret = true;
+				ret = currItem->itemType() == PageItem::PolyLine;
 			}
 			else
 			{

Modified: trunk/Scribus/scribus/plugins/tools/2geomtools/pathalongpath/pathdialog.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22639&path=/trunk/Scribus/scribus/plugins/tools/2geomtools/pathalongpath/pathdialog.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/tools/2geomtools/pathalongpath/pathdialog.cpp	(original)
+++ trunk/Scribus/scribus/plugins/tools/2geomtools/pathalongpath/pathdialog.cpp	Tue Aug 21 20:01:01 2018
@@ -94,7 +94,7 @@
 	effectType = val;
 	if (previewCheck->isChecked())
 		emit updateValues(effectType, offset, offsetY, gap, rotate);
-	bool setter = (effectType < 2) ? false : true;
+	bool setter = effectType >= 2;
 	label_3->setEnabled(setter);
 	gapSpin->setEnabled(setter);
 }

Modified: trunk/Scribus/scribus/plugins/tools/flattenpath/flattenpath.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22639&path=/trunk/Scribus/scribus/plugins/tools/flattenpath/flattenpath.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/tools/flattenpath/flattenpath.cpp	(original)
+++ trunk/Scribus/scribus/plugins/tools/flattenpath/flattenpath.cpp	Tue Aug 21 20:01:01 2018
@@ -57,7 +57,7 @@
 	delete plug;
 }
 
-FlattenPathPlugin::FlattenPathPlugin() : ScActionPlugin()
+FlattenPathPlugin::FlattenPathPlugin()
 {
 	// Set action info in languageChange, so we only have to do
 	// it in one place.

Modified: trunk/Scribus/scribus/plugins/tools/hunspellcheck/hunspellplugin.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22639&path=/trunk/Scribus/scribus/plugins/tools/hunspellcheck/hunspellplugin.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/tools/hunspellcheck/hunspellplugin.cpp	(original)
+++ trunk/Scribus/scribus/plugins/tools/hunspellcheck/hunspellplugin.cpp	Tue Aug 21 20:01:01 2018
@@ -14,7 +14,7 @@
 // Please don't implement the functionality of your plugin here; do that
 // in mypluginimpl.h and mypluginimpl.cpp .
 
-HunspellPlugin::HunspellPlugin() : ScActionPlugin()
+HunspellPlugin::HunspellPlugin()
 {
 	// Set action info in languageChange, so we only have to do
 	// it in one place.

Modified: trunk/Scribus/scribus/plugins/tools/lenseffects/lenseffects.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22639&path=/trunk/Scribus/scribus/plugins/tools/lenseffects/lenseffects.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/tools/lenseffects/lenseffects.cpp	(original)
+++ trunk/Scribus/scribus/plugins/tools/lenseffects/lenseffects.cpp	Tue Aug 21 20:01:01 2018
@@ -49,7 +49,7 @@
 	delete plug;
 }
 
-LensEffectsPlugin::LensEffectsPlugin() : ScActionPlugin()
+LensEffectsPlugin::LensEffectsPlugin()
 {
 	// Set action info in languageChange, so we only have to do
 	// it in one place.

Modified: trunk/Scribus/scribus/plugins/tools/pathconnect/pathconnect.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22639&path=/trunk/Scribus/scribus/plugins/tools/pathconnect/pathconnect.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/tools/pathconnect/pathconnect.cpp	(original)
+++ trunk/Scribus/scribus/plugins/tools/pathconnect/pathconnect.cpp	Tue Aug 21 20:01:01 2018
@@ -50,7 +50,7 @@
 	delete plug;
 }
 
-PathConnectPlugin::PathConnectPlugin() : ScActionPlugin(),
+PathConnectPlugin::PathConnectPlugin() :
 	m_item1(nullptr),
 	m_item2(nullptr),
 	m_doc(nullptr),

Modified: trunk/Scribus/scribus/plugins/tools/pathcut/pathcut.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22639&path=/trunk/Scribus/scribus/plugins/tools/pathcut/pathcut.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/tools/pathcut/pathcut.cpp	(original)
+++ trunk/Scribus/scribus/plugins/tools/pathcut/pathcut.cpp	Tue Aug 21 20:01:01 2018
@@ -54,7 +54,7 @@
 	delete plug;
 }
 
-PathCutPlugin::PathCutPlugin() : ScActionPlugin()
+PathCutPlugin::PathCutPlugin()
 {
 	// Set action info in languageChange, so we only have to do
 	// it in one place.

Modified: trunk/Scribus/scribus/plugins/tools/pathfinder/pathfinder.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22639&path=/trunk/Scribus/scribus/plugins/tools/pathfinder/pathfinder.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/tools/pathfinder/pathfinder.cpp	(original)
+++ trunk/Scribus/scribus/plugins/tools/pathfinder/pathfinder.cpp	Tue Aug 21 20:01:01 2018
@@ -60,7 +60,7 @@
 	delete plug;
 }
 
-PathFinderPlugin::PathFinderPlugin() : ScActionPlugin()
+PathFinderPlugin::PathFinderPlugin()
 {
 	// Set action info in languageChange, so we only have to do
 	// it in one place.

Modified: trunk/Scribus/scribus/plugins/tools/pathstroker/pathstroker.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22639&path=/trunk/Scribus/scribus/plugins/tools/pathstroker/pathstroker.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/tools/pathstroker/pathstroker.cpp	(original)
+++ trunk/Scribus/scribus/plugins/tools/pathstroker/pathstroker.cpp	Tue Aug 21 20:01:01 2018
@@ -61,7 +61,7 @@
 	delete plug;
 }
 
-PathStrokerPlugin::PathStrokerPlugin() : ScActionPlugin()
+PathStrokerPlugin::PathStrokerPlugin()
 {
 	// Set action info in languageChange, so we only have to do
 	// it in one place.

Modified: trunk/Scribus/scribus/plugins/tools/smoothpath/smoothpath.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22639&path=/trunk/Scribus/scribus/plugins/tools/smoothpath/smoothpath.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/tools/smoothpath/smoothpath.cpp	(original)
+++ trunk/Scribus/scribus/plugins/tools/smoothpath/smoothpath.cpp	Tue Aug 21 20:01:01 2018
@@ -58,7 +58,7 @@
 	delete plug;
 }
 
-SmoothPathPlugin::SmoothPathPlugin() : ScActionPlugin()
+SmoothPathPlugin::SmoothPathPlugin()
 {
 	// Set action info in languageChange, so we only have to do
 	// it in one place.

Modified: trunk/Scribus/scribus/plugins/tools/subdivide/subdivide.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22639&path=/trunk/Scribus/scribus/plugins/tools/subdivide/subdivide.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/tools/subdivide/subdivide.cpp	(original)
+++ trunk/Scribus/scribus/plugins/tools/subdivide/subdivide.cpp	Tue Aug 21 20:01:01 2018
@@ -49,7 +49,7 @@
 	delete plug;
 }
 
-SubdividePlugin::SubdividePlugin() : ScActionPlugin()
+SubdividePlugin::SubdividePlugin()
 {
 	// Set action info in languageChange, so we only have to do
 	// it in one place.

Modified: trunk/Scribus/scribus/pslib.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22639&path=/trunk/Scribus/scribus/pslib.cpp
==============================================================================
--- trunk/Scribus/scribus/pslib.cpp	(original)
+++ trunk/Scribus/scribus/pslib.cpp	Tue Aug 21 20:01:01 2018
@@ -1814,7 +1814,7 @@
 			PS_closepath();
 			if (item->GrType == 14)
 				PS_HatchFill(item);
-			else if ((item->GrType != 0) && (master == false))
+			else if ((item->GrType != 0) && (!master))
 				HandleGradientFillStroke(item, false);
 			else
 				putColor(item->fillColor(), item->fillShade(), true);
@@ -1931,7 +1931,7 @@
 			PS_closepath();
 			if (item->GrType == 14)
 				PS_HatchFill(item);
-			else if ((item->GrType != 0) && (master == false))
+			else if ((item->GrType != 0) && (!master))
 				HandleGradientFillStroke(item, false);
 			else
 				putColor(item->fillColor(), item->fillShade(), true);
@@ -3285,7 +3285,6 @@
 			m_Doc->PageColors.remove(tmpAddedColors[cd]);
 		}
 	}
-	return;
 }
 
 void PSLib::HandlePatchMeshGradient(PageItem* item)
@@ -3466,7 +3465,6 @@
 		PutStream("gr\n");
 	}
 	PS_newpath();
-	return;
 }
 
 void PSLib::HandleDiamondGradient(PageItem* item)
@@ -3681,7 +3679,6 @@
 		PutStream("eofill\n");
 	else
 		PutStream("fill\n");
-	return;
 }
 
 void PSLib::HandleTensorGradient(PageItem* item)
@@ -3802,7 +3799,6 @@
 		PutStream("eofill\n");
 	else
 		PutStream("fill\n");
-	return;
 }
 
 void PSLib::HandleGradientFillStroke(PageItem *item, bool stroke, bool forArrow)

Modified: trunk/Scribus/scribus/sccolor.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22639&path=/trunk/Scribus/scribus/sccolor.cpp
==============================================================================
--- trunk/Scribus/scribus/sccolor.cpp	(original)
+++ trunk/Scribus/scribus/sccolor.cpp	Tue Aug 21 20:01:01 2018
@@ -426,7 +426,7 @@
 	m_Spot = s;
 }
 
-ColorList::ColorList(ScribusDoc* doc, bool retainDoc) : QMap<QString,ScColor>()
+ColorList::ColorList(ScribusDoc* doc, bool retainDoc)
 {
 	m_doc = doc;
 	m_retainDoc = retainDoc;

Modified: trunk/Scribus/scribus/scimage.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22639&path=/trunk/Scribus/scribus/scimage.cpp
==============================================================================
--- trunk/Scribus/scribus/scimage.cpp	(original)
+++ trunk/Scribus/scribus/scimage.cpp	Tue Aug 21 20:01:01 2018
@@ -775,7 +775,6 @@
 			d++;
 		}
 	}
-	return;
 }
 
 void ScImage::contrast(int contrastValue, bool cmyk)
@@ -1760,14 +1759,10 @@
 	}
 	if ( newrows != rows && tempxelrow )// Robust, tempxelrow might be 0 1 day
 		delete [] tempxelrow;
-	if ( as )				// Avoid purify complaint
-		delete [] as;
-	if ( rs )				// Robust, rs might be 0 one day
-		delete [] rs;
-	if ( gs )				// Robust, gs might be 0 one day
-		delete [] gs;
-	if ( bs )				// Robust, bs might be 0 one day
-		delete [] bs;
+	delete [] as;
+	delete [] rs;
+	delete [] gs;
+	delete [] bs;
 	QImage::operator=(QImage(nwidth, nheight, QImage::Format_ARGB32));
 	for( int yi=0; yi < dst.height(); ++yi )
 	{

Modified: trunk/Scribus/scribus/sclayer.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22639&path=/trunk/Scribus/scribus/sclayer.cpp
==============================================================================
--- trunk/Scribus/scribus/sclayer.cpp	(original)
+++ trunk/Scribus/scribus/sclayer.cpp	Tue Aug 21 20:01:01 2018
@@ -78,15 +78,11 @@
 bool ScLayer::operator== (const ScLayer& other) const
 {
 	// ignore markerColor?
-	if (Name == other.Name && ID == other.ID && Level == other.Level      &&
-		isPrintable  == other.isPrintable  && isViewable  == other.isViewable  &&
-		flowControl  == other.flowControl  && outlineMode == other.outlineMode && 
+	return Name == other.Name && ID == other.ID && Level == other.Level &&
+		isPrintable  == other.isPrintable  && isViewable  == other.isViewable &&
+		flowControl  == other.flowControl  && outlineMode == other.outlineMode &&
 		transparency == other.transparency && isEditable == other.isEditable &&
-		blendMode   == other.blendMode)
-	{
-		return true;
-	}
-	return false;
+		blendMode   == other.blendMode;
 }
 
 int ScLayers::getMaxID()

Modified: trunk/Scribus/scribus/scpage.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22639&path=/trunk/Scribus/scribus/scpage.cpp
==============================================================================
--- trunk/Scribus/scribus/scpage.cpp	(original)
+++ trunk/Scribus/scribus/scpage.cpp	Tue Aug 21 20:01:01 2018
@@ -43,7 +43,6 @@
 	initialMargins(40,40,40,40),
 	LeftPg(0),
 	MPageNam(""),
-	FromMaster(),
 	undoManager(UndoManager::instance()),
 	m_xOffset(x),
 	m_yOffset(y),

Modified: trunk/Scribus/scribus/scpainterex_ps2.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22639&path=/trunk/Scribus/scribus/scpainterex_ps2.cpp
==============================================================================
--- trunk/Scribus/scribus/scpainterex_ps2.cpp	(original)
+++ trunk/Scribus/scribus/scpainterex_ps2.cpp	Tue Aug 21 20:01:01 2018
@@ -60,7 +60,7 @@
 	cmykToOutputImageTransform = nullptr;
 }
 
-ScPainterEx_Ps2::ScPainterEx_Ps2(QIODevice* iodev, QRect& rect, ScPs2OutputParams& options ) : ScPainterExBase()
+ScPainterEx_Ps2::ScPainterEx_Ps2(QIODevice* iodev, QRect& rect, ScPs2OutputParams& options )
 {
 	m_stream.setDevice( iodev );
 	m_colorMode = options.colorMode;

Modified: trunk/Scribus/scribus/scribus.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22639&path=/trunk/Scribus/scribus/scribus.cpp
==============================================================================
--- trunk/Scribus/scribus/scribus.cpp	(original)
+++ trunk/Scribus/scribus/scribus.cpp	Tue Aug 21 20:01:01 2018
@@ -290,7 +290,7 @@
 QString DocDir;
 
 
-extern ScribusQApp* ScQApp;
+//extern ScribusQApp* ScQApp;
 extern bool emergencyActivated;
 
 
@@ -3888,9 +3888,7 @@
 bool ScribusMainWindow::postLoadDoc()
 {
 	//FIXME Just return for now, if we arent using the GUI
-	if (!ScCore->usingGUI())
-		return false;
-	return true;
+	return ScCore->usingGUI();
 }
 
 // This method was once named slotFileOpen(...) but it hasn't had anything to

Modified: trunk/Scribus/scribus/scribuscore.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22639&path=/trunk/Scribus/scribus/scribuscore.cpp
==============================================================================
--- trunk/Scribus/scribus/scribuscore.cpp	(original)
+++ trunk/Scribus/scribus/scribuscore.cpp	Tue Aug 21 20:01:01 2018
@@ -45,7 +45,7 @@
 #include "util_ghostscript.h"
 
 
-extern ScribusQApp* ScQApp;
+//extern ScribusQApp* ScQApp;
 
 ScribusCore::ScribusCore() : defaultEngine(colorMgmtEngineFactory.createDefaultEngine())
 {

Modified: trunk/Scribus/scribus/scribusdoc.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22639&path=/trunk/Scribus/scribus/scribusdoc.cpp
==============================================================================
--- trunk/Scribus/scribus/scribusdoc.cpp	(original)
+++ trunk/Scribus/scribus/scribusdoc.cpp	Tue Aug 21 20:01:01 2018
@@ -230,9 +230,8 @@
 	SnapElement(false), GuideLock(false),
 	minCanvasCoordinate(FPoint(0, 0)),
 	rulerXoffset(0.0), rulerYoffset(0.0),
-	Pages(nullptr), MasterPages(), DocPages(),
-	MasterNames(),
-	Items(nullptr), MasterItems(), DocItems(), FrameItems(),
+	Pages(nullptr),
+	Items(nullptr),
 	m_Selection(new Selection(this, true)),
 	PageSp(1), PageSpa(0),
 	FirstPnum(1),
@@ -242,45 +241,26 @@
 	ShapeValues(nullptr),
 	ValCount(0),
 	DocName( tr("Document")+"-"),
-	UsedFonts(),
 	AllFonts(&m_appPrefsData.fontPrefs.AvailFonts),
-	AObjects(),
 	CurrentSel(-1),
-	nodeEdit(),
 	LastAuto(nullptr), FirstAuto(nullptr),
 	DraggedElem(nullptr),
 	ElemToLink(nullptr),
-	DragElements(),
-	m_docParagraphStyles(),
-	m_docCharStyles(),
-	m_docTableStyles(),
-	m_docCellStyles(),
-	Layers(),
 	GroupCounter(1),
 	colorEngine(ScCore->defaultEngine),
-	JavaScripts(),
 	TotalItems(0),
 	RePos(false),
-	BookMarks(),
 	OldBM(false),
 	hasName(false),
 	isConverted(false),
 	autoSaveTimer(new QTimer(this)),
-	MLineStyles(),
 	WinHan(nullptr),
 	DoDrawing(true),
-	OpenNodes(),
 	CurTimer(nullptr),
-	pageErrors(),
-	docLayerErrors(),
-	docItemErrors(),
-	masterItemErrors(),
-	symReturn(), symNewLine(), symTab(), symNonBreak(), symNewCol(), symNewFrame(),
 	docHyphenator(nullptr),
 	m_itemCreationTransaction(nullptr),
 	m_alignTransaction(nullptr),
 	m_currentPage(nullptr),
-	m_updateManager(),
 	m_docUpdater(nullptr),
 	m_flag_notesChanged(false),
 	flag_restartMarksRenumbering(false),
@@ -347,9 +327,8 @@
 	GuideLock(false),
 	minCanvasCoordinate(FPoint(0, 0)),
 	rulerXoffset(0.0), rulerYoffset(0.0),
-	Pages(nullptr), MasterPages(), DocPages(),
-	MasterNames(),
-	Items(nullptr), MasterItems(), DocItems(), FrameItems(),
+	Pages(nullptr),
+	Items(nullptr),
 	m_Selection(new Selection(this, true)),
 	PageSp(pagesSetup.columnCount), PageSpa(pagesSetup.columnDistance),
 	FirstPnum(pagesSetup.firstPageNumber),
@@ -359,45 +338,26 @@
 	ShapeValues(nullptr),
 	ValCount(0),
 	DocName(docName),
-	UsedFonts(),
 	AllFonts(&m_appPrefsData.fontPrefs.AvailFonts),
-	AObjects(),
 	CurrentSel(-1),
-	nodeEdit(),
 	LastAuto(nullptr), FirstAuto(nullptr),
 	DraggedElem(nullptr),
 	ElemToLink(nullptr),
-	DragElements(),
-	m_docParagraphStyles(),
-	m_docCharStyles(),
-	m_docTableStyles(),
-	m_docCellStyles(),
-	Layers(),
 	GroupCounter(1),
 	colorEngine(ScCore->defaultEngine),
-	JavaScripts(),
 	TotalItems(0),
 	RePos(false),
-	BookMarks(),
 	OldBM(false),
 	hasName(false),
 	isConverted(false),
 	autoSaveTimer(new QTimer(this)),
-	MLineStyles(),
 	WinHan(nullptr),
 	DoDrawing(true),
-	OpenNodes(),
 	CurTimer(nullptr),
-	pageErrors(),
-	docLayerErrors(),
-	docItemErrors(),
-	masterItemErrors(),
-	symReturn(), symNewLine(), symTab(), symNonBreak(), symNewCol(), symNewFrame(),
 	docHyphenator(nullptr),
 	m_itemCreationTransaction(nullptr),
 	m_alignTransaction(nullptr),
 	m_currentPage(nullptr),
-	m_updateManager(),
 	m_docUpdater(nullptr),
 	m_flag_notesChanged(false),
 	flag_restartMarksRenumbering(false),
@@ -778,20 +738,17 @@
 
 bool ScribusDoc::inAnEditMode() const
 {
-	bool inEditMode = (appMode == modeDrawBezierLine ||
-					   appMode == modeEdit ||
-					   appMode == modeEditArc ||
-					   appMode == modeEditClip ||
-					   appMode == modeEditGradientVectors ||
-					   appMode == modeEditMeshGradient ||
-					   appMode == modeEditMeshPatch ||
-					   appMode == modeEditPolygon ||
-					   appMode == modeEditSpiral ||
-					   appMode == modeEditTable ||
-					   appMode == modeEditWeldPoint
-					   ) ? true : false;
-
-	return inEditMode;
+	return appMode == modeDrawBezierLine ||
+			appMode == modeEdit ||
+			appMode == modeEditArc ||
+			appMode == modeEditClip ||
+			appMode == modeEditGradientVectors ||
+			appMode == modeEditMeshGradient ||
+			appMode == modeEditMeshPatch ||
+			appMode == modeEditPolygon ||
+			appMode == modeEditSpiral ||
+			appMode == modeEditTable ||
+			appMode == modeEditWeldPoint;
 }
 
 bool ScribusDoc::inASpecialEditMode() const

Modified: trunk/Scribus/scribus/scribusview.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22639&path=/trunk/Scribus/scribus/scribusview.cpp
==============================================================================
--- trunk/Scribus/scribus/scribusview.cpp	(original)
+++ trunk/Scribus/scribus/scribusview.cpp	Tue Aug 21 20:01:01 2018
@@ -156,7 +156,6 @@
 	oldX(0), oldY(0),
 	m_groupTransactions(0),
 	m_oldCanvasHeight(0), m_oldCanvasWidth(0),
-	m_groupTransaction(),
 	_isGlobalMode(true),
 	linkAfterDraw(false),
 	ImageAfterDraw(false),

Modified: trunk/Scribus/scribus/serializer.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22639&path=/trunk/Scribus/scribus/serializer.cpp
==============================================================================
--- trunk/Scribus/scribus/serializer.cpp	(original)
+++ trunk/Scribus/scribus/serializer.cpp	Tue Aug 21 20:01:01 2018
@@ -138,7 +138,7 @@
 class MergeColors : public MakeAction<MergeColors_body>
 {};
 
-Serializer::Serializer(ScribusDoc& doc) : Digester(), m_Doc(doc)
+Serializer::Serializer(ScribusDoc& doc) : m_Doc(doc)
 {
 Q_UNUSED(m_Doc)
 	// register desaxe rules for styles, colors and elems

Modified: trunk/Scribus/scribus/styles/paragraphstyle.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22639&path=/trunk/Scribus/scribus/styles/paragraphstyle.cpp
==============================================================================
--- trunk/Scribus/scribus/styles/paragraphstyle.cpp	(original)
+++ trunk/Scribus/scribus/styles/paragraphstyle.cpp	Tue Aug 21 20:01:01 2018
@@ -27,7 +27,7 @@
 	return isequiv(tabPosition, other.tabPosition) && tabType==other.tabType && tabFillChar == other.tabFillChar;
 }
 
-ParagraphStyle::ParagraphStyle() : BaseStyle(), m_cstyleContext(nullptr), m_cstyleContextIsInh(true), m_cstyle()
+ParagraphStyle::ParagraphStyle() : m_cstyleContext(nullptr), m_cstyleContextIsInh(true)
 {
 	setParent("");
 	m_cstyleContext.setDefaultStyle( &m_cstyle );

Modified: trunk/Scribus/scribus/text/sctext_shared.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22639&path=/trunk/Scribus/scribus/text/sctext_shared.cpp
==============================================================================
--- trunk/Scribus/scribus/text/sctext_shared.cpp	(original)
+++ trunk/Scribus/scribus/text/sctext_shared.cpp	Tue Aug 21 20:01:01 2018
@@ -16,10 +16,9 @@
 #include "sctext_shared.h"
 #include "util.h"
 
-ScText_Shared::ScText_Shared(const StyleContext* pstyles) : QList<ScText*>(), 
-	defaultStyle(), 
+ScText_Shared::ScText_Shared(const StyleContext* pstyles) :
 	pstyleContext(nullptr),
-	refs(1), len(0), cursorPosition(0), trailingStyle()
+	refs(1), len(0), cursorPosition(0)
 {
 	pstyleContext.setDefaultStyle( & defaultStyle );
 	defaultStyle.setContext( pstyles );
@@ -29,7 +28,7 @@
 }
 		
 
-ScText_Shared::ScText_Shared(const ScText_Shared& other) : QList<ScText*>(), 
+ScText_Shared::ScText_Shared(const ScText_Shared& other) :
 	defaultStyle(other.defaultStyle), 
 	pstyleContext(other.pstyleContext),
 	refs(1), len(0), cursorPosition(other.cursorPosition),

Modified: trunk/Scribus/scribus/text/storytext.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22639&path=/trunk/Scribus/scribus/text/storytext.cpp
==============================================================================
--- trunk/Scribus/scribus/text/storytext.cpp	(original)
+++ trunk/Scribus/scribus/text/storytext.cpp	Tue Aug 21 20:01:01 2018
@@ -70,7 +70,7 @@
 	m_shapedTextCache = nullptr;
 }
 
-StoryText::StoryText(const StoryText & other) : QObject(), SaxIO(), m_doc(other.m_doc)
+StoryText::StoryText(const StoryText & other) : m_doc(other.m_doc)
 {
 	d = other.d;
 	d->refs++;
@@ -770,7 +770,7 @@
 	return lengthDiff;
 }
 
-void StoryText::hyphenateWord(int pos, uint len, char* hyphens)
+void StoryText::hyphenateWord(int pos, uint len, const char* hyphens)
 {
 	assert(pos >= 0);
 	assert(pos + signed(len) <= length());
@@ -2561,8 +2561,7 @@
 	
 	~Paragraph_body() 
 	{
-		if (lastStyle)
-			delete lastStyle;
+		delete lastStyle;
 	}
 
 	virtual void reset()
@@ -2585,8 +2584,7 @@
 				story->insertChars(-1, SpecialChars::PARSEP);
 				++lastPos;
 			}
-			if (lastStyle)
-				delete lastStyle;
+			delete lastStyle;
 			lastStyle = nullptr;
 		}
 	}
@@ -2619,7 +2617,7 @@
 
 struct Paragraph : public MakeAction<Paragraph_body>
 {
-	Paragraph() : MakeAction<Paragraph_body>() {}
+	Paragraph() {}
 };
 
 
@@ -2671,7 +2669,7 @@
 
 struct SpanAction : public MakeAction<SpanAction_body>
 {
-	SpanAction() : MakeAction<SpanAction_body>() {}
+	SpanAction() {}
 };
 
 

Modified: trunk/Scribus/scribus/text/storytext.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22639&path=/trunk/Scribus/scribus/text/storytext.h
==============================================================================
--- trunk/Scribus/scribus/text/storytext.h	(original)
+++ trunk/Scribus/scribus/text/storytext.h	Tue Aug 21 20:01:01 2018
@@ -132,7 +132,7 @@
 	int replaceWord(int pos, QString newWord);
 	void replaceObject(int pos, int obj);
 
-	void hyphenateWord(int pos, uint len, char* hyphens);
+	void hyphenateWord(int pos, uint len, const char* hyphens);
 	
  	// Retrieve length of story text
  	int length() const;

Modified: trunk/Scribus/scribus/ui/annot.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22639&path=/trunk/Scribus/scribus/ui/annot.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/annot.cpp	(original)
+++ trunk/Scribus/scribus/ui/annot.cpp	Tue Aug 21 20:01:01 2018
@@ -1392,7 +1392,7 @@
 			for (uint prop = 0; prop < array_act; ++prop)
 				ActionCombo->addItem(tmp_actcom[prop]);
 			ActionCombo->setCurrentIndex(qMin(tmpac,6));
-			setter = ((annotation.ActionType() != Annotation::Action_GoToR_FileRel) && (annotation.ActionType() != Annotation::Action_GoToR_FileAbs)) ? true : false;
+			setter = (annotation.ActionType() != Annotation::Action_GoToR_FileRel) && (annotation.ActionType() != Annotation::Action_GoToR_FileAbs);
 			Destfile->setEnabled(setter);
 			ChFile->setEnabled(setter);
 			SetActionType(tmpac);

Modified: trunk/Scribus/scribus/ui/bookmwin.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22639&path=/trunk/Scribus/scribus/ui/bookmwin.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/bookmwin.cpp	(original)
+++ trunk/Scribus/scribus/ui/bookmwin.cpp	Tue Aug 21 20:01:01 2018
@@ -146,7 +146,6 @@
 	text.clear();
 	title.clear();
 
-	const StoryText& itemText = item->itemText;
 	for (int i = 0; i < item->itemText.length(); ++i)
 	{
 		ch = item->itemText.text(i);

Modified: trunk/Scribus/scribus/ui/curvewidget.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22639&path=/trunk/Scribus/scribus/ui/curvewidget.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/curvewidget.cpp	(original)
+++ trunk/Scribus/scribus/ui/curvewidget.cpp	Tue Aug 21 20:01:01 2018
@@ -238,7 +238,7 @@
 	double x = e->pos().x() / (float)width();
 	double y = 1.0 - e->pos().y() / (float)height();
 
-	if (m_dragging == false)   // If no point is selected set the the cursor shape if on top
+	if (!m_dragging)   // If no point is selected set the the cursor shape if on top
 	{
 		double distance = 1000;
 		double ydistance = 1000;

Modified: trunk/Scribus/scribus/ui/customfdialog.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22639&path=/trunk/Scribus/scribus/ui/customfdialog.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/customfdialog.cpp	(original)
+++ trunk/Scribus/scribus/ui/customfdialog.cpp	Tue Aug 21 20:01:01 2018
@@ -63,7 +63,7 @@
 
 extern QString DocDir;
 
-ImIconProvider::ImIconProvider() : QFileIconProvider()
+ImIconProvider::ImIconProvider()
 {
 	fmts.clear();
 	QString tmp[] = {"eps", "epsi", "gif", "png", "jpg", "jpeg", "xpm", "tif", "tiff", "bmp", "pbm", "pgm", "ppm", "xbm", "xpm", "psd", "pat"};

Modified: trunk/Scribus/scribus/ui/gtfiledialog.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22639&path=/trunk/Scribus/scribus/ui/gtfiledialog.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/gtfiledialog.cpp	(original)
+++ trunk/Scribus/scribus/ui/gtfiledialog.cpp	Tue Aug 21 20:01:01 2018
@@ -14,7 +14,6 @@
 #include "prefsfile.h"
 
 gtFileDialog::gtFileDialog(const QString& filters, const QStringList& importers, const QString& wdir)
-	: QDialog()
 {
 	setupUi(this);
 

Modified: trunk/Scribus/scribus/ui/guidemanager.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22639&path=/trunk/Scribus/scribus/ui/guidemanager.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/guidemanager.cpp	(original)
+++ trunk/Scribus/scribus/ui/guidemanager.cpp	Tue Aug 21 20:01:01 2018
@@ -132,7 +132,7 @@
 	qobject_cast<GuidesVDelegate*>(verticalView->itemDelegateForColumn(0))->setDoc(doc);
 	if (!m_Doc)
 		currentPage = nullptr;
-	tabWidget->setEnabled(doc ? true : false);
+	tabWidget->setEnabled(doc != nullptr);
 }
 
 void GuideManager::setupPage(bool storeValues)
@@ -163,7 +163,7 @@
 	clearRestoreHorizontalList();
 	clearRestoreVerticalList();
 	// restore: brand "auto guides into GUI restore algorithm"
-	bool enable = currentPage->guides.horizontalAutoGap() > 0.0 ? true : false;
+	bool enable = currentPage->guides.horizontalAutoGap() > 0.0;
 	horizontalAutoGapCheck->setChecked(enable);
 	horizontalAutoGapSpin->setEnabled(enable);
 	horizontalAutoGapSpin->setValue(pts2value(currentPage->guides.horizontalAutoGap(), docUnitIndex));
@@ -178,7 +178,7 @@
 	horizontalSelectionAutoButton->setEnabled(!m_Doc->m_Selection->isEmpty());
 
 	// verticals
-	enable = currentPage->guides.verticalAutoGap() > 0.0 ? true : false;
+	enable = currentPage->guides.verticalAutoGap() > 0.0;
 	verticalAutoGapCheck->setChecked(enable);
 	verticalAutoGapSpin->setEnabled(enable);
 	verticalAutoGapSpin->setValue(pts2value(currentPage->guides.verticalAutoGap(), docUnitIndex));
@@ -368,7 +368,7 @@
 
 void GuideManager::horizontalAutoCountSpin_valueChanged(double val)
 {
-	bool enable = (val == 0) ? false : true;
+	bool enable = val != 0;
 	horizontalAutoGapCheck->setEnabled(enable);
 	if (enable && horizontalAutoGapCheck->isChecked())
 		horizontalAutoGapSpin->setEnabled(true);
@@ -399,7 +399,7 @@
 
 void GuideManager::verticalAutoCountSpin_valueChanged(double val)
 {
-	bool enable = (val == 0) ? false : true;
+	bool enable = val != 0;
 	verticalAutoGapCheck->setEnabled(enable);
 	if (enable && verticalAutoGapCheck->isChecked())
 		verticalAutoGapSpin->setEnabled(true);

Modified: trunk/Scribus/scribus/ui/latexeditor.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22639&path=/trunk/Scribus/scribus/ui/latexeditor.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/latexeditor.cpp	(original)
+++ trunk/Scribus/scribus/ui/latexeditor.cpp	Tue Aug 21 20:01:01 2018
@@ -646,7 +646,7 @@
 class SCRIBUS_API XmlFontComboBox : public XmlWidget, public QFontComboBox
 {
 	public:
-		XmlFontComboBox(I18nXmlStreamReader *xml) : XmlWidget(xml), QFontComboBox()
+		XmlFontComboBox(I18nXmlStreamReader *xml) : XmlWidget(xml)
 		{
 			fromString(m_defaultValue);
 		}

Modified: trunk/Scribus/scribus/ui/marginwidget.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22639&path=/trunk/Scribus/scribus/ui/marginwidget.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/marginwidget.cpp	(original)
+++ trunk/Scribus/scribus/ui/marginwidget.cpp	Tue Aug 21 20:01:01 2018
@@ -236,8 +236,8 @@
 {
 	facingPages = facing;
 	pageType = pagetype;
-	lText->setText(facing == true ? tr( "&Inside:" ) : tr( "&Left:" ));
-	rText->setText(facing == true ? tr( "O&utside:" ) : tr( "&Right:" ));
+	lText->setText(facing ? tr( "&Inside:" ) : tr( "&Left:" ));
+	rText->setText(facing ? tr( "O&utside:" ) : tr( "&Right:" ));
 	if (useBleeds)
 	{
 		if (facing)

Modified: trunk/Scribus/scribus/ui/newmarginwidget.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22639&path=/trunk/Scribus/scribus/ui/newmarginwidget.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/newmarginwidget.cpp	(original)
+++ trunk/Scribus/scribus/ui/newmarginwidget.cpp	Tue Aug 21 20:01:01 2018
@@ -336,8 +336,8 @@
 {
 	facingPages = facing;
 	pageType = pagetype;
-	leftMarginLabel->setText(facing == true ? tr( "&Inside:" ) : tr( "&Left:" ));
-	rightMarginLabel->setText(facing == true ? tr( "O&utside:" ) : tr( "&Right:" ));
+	leftMarginLabel->setText(facing ? tr( "&Inside:" ) : tr( "&Left:" ));
+	rightMarginLabel->setText(facing ? tr( "O&utside:" ) : tr( "&Right:" ));
 	setPreset();
 }
 

Modified: trunk/Scribus/scribus/ui/nodeeditpalette.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22639&path=/trunk/Scribus/scribus/ui/nodeeditpalette.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/nodeeditpalette.cpp	(original)
+++ trunk/Scribus/scribus/ui/nodeeditpalette.cpp	Tue Aug 21 20:01:01 2018
@@ -435,7 +435,7 @@
 			BezierClose->setEnabled(false);
 			break;
 		case PageItem::PolyLine:
-			setter = size > 7 ? true : false;
+			setter = size > 7;
 			BezierClose->setEnabled(setter);
 			PolySplit->setEnabled(setter);
 			break;
@@ -749,7 +749,7 @@
 {
 	if (m_doc==nullptr)
 		return;
-	bool setter = have ? true : false;
+	bool setter = have;
 	if (m_doc->nodeEdit.selNode().count() > 1)
 	{
 		XSpin->setEnabled(false);
@@ -760,7 +760,7 @@
 		XSpin->setEnabled(setter);
 		YSpin->setEnabled(setter);
 	}
-	if (setter == true)
+	if (setter)
 	{
 		if (m_doc->nodeEdit.edPoints())
 			ResNode->setEnabled(setter);

Modified: trunk/Scribus/scribus/ui/pagepalette_masterpages.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22639&path=/trunk/Scribus/scribus/ui/pagepalette_masterpages.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/pagepalette_masterpages.cpp	(original)
+++ trunk/Scribus/scribus/ui/pagepalette_masterpages.cpp	Tue Aug 21 20:01:01 2018
@@ -495,7 +495,7 @@
 		mpItem->setData(Qt::UserRole, it.key());
 		masterPageListBox->addItem(mpItem);
 	}
-	deleteButton->setEnabled(m_doc->MasterNames.count() == 1 ? false : true);
+	deleteButton->setEnabled(m_doc->MasterNames.count() != 1);
 	if (masterPageName == CommonStrings::masterPageNormal)
 	{
 		masterPageName = CommonStrings::trMasterPageNormal;

Modified: trunk/Scribus/scribus/ui/prefs_pdfexport.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22639&path=/trunk/Scribus/scribus/ui/prefs_pdfexport.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/prefs_pdfexport.cpp	(original)
+++ trunk/Scribus/scribus/ui/prefs_pdfexport.cpp	Tue Aug 21 20:01:01 2018
@@ -969,7 +969,7 @@
 {
 	bool setter=false;
 	if (useImageProfileCheckBox->isChecked())
-		setter = doNotUseEmbeddedImageProfileCheckBox->isChecked() ? true : false;
+		setter = doNotUseEmbeddedImageProfileCheckBox->isChecked();
 	imageProfileComboBox->setEnabled(setter);
 	imageRenderingIntentComboBox->setEnabled(setter);
 	doNotUseEmbeddedImageProfileCheckBox->setEnabled(useImageProfileCheckBox->isChecked());

Modified: trunk/Scribus/scribus/ui/printdialog.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22639&path=/trunk/Scribus/scribus/ui/printdialog.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/printdialog.cpp	(original)
+++ trunk/Scribus/scribus/ui/printdialog.cpp	Tue Aug 21 20:01:01 2018
@@ -263,8 +263,7 @@
 
 void PrintDialog::SelComm()
 {
-	/* PFJ - 29.02.04 - removed OthText, Command and PrintDest from switch */
-	bool test = OtherCom->isChecked() ? true : false;
+	bool test = OtherCom->isChecked();
 	OthText->setEnabled(test);
 	Command->setEnabled(test);
 	PrintDest->setEnabled(!test);

Modified: trunk/Scribus/scribus/ui/rulermover.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22639&path=/trunk/Scribus/scribus/ui/rulermover.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/rulermover.cpp	(original)
+++ trunk/Scribus/scribus/ui/rulermover.cpp	Tue Aug 21 20:01:01 2018
@@ -105,8 +105,7 @@
 		}
 		pmen->exec(QCursor::pos());
 		delete pmen;
-		if (pmen2)
-			delete pmen2;
+		delete pmen2;
 	}
 	if (currView->Doc->guidesPrefs().guidesShown)
 		currView->Doc->scMW()->guidePalette->setupPage();

Modified: trunk/Scribus/scribus/ui/selectobjects.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22639&path=/trunk/Scribus/scribus/ui/selectobjects.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/selectobjects.cpp	(original)
+++ trunk/Scribus/scribus/ui/selectobjects.cpp	Tue Aug 21 20:01:01 2018
@@ -107,24 +107,9 @@
 	if (useLineWidth->isChecked())
 		LWidth = lineWidthSpin->value();
 	if (usePrintState->isChecked())
-	{
-		if (printStateCombo->currentIndex() == 0)
-			Print = true;
-		else
-			Print = false;
-	}
+		Print = (printStateCombo->currentIndex() == 0);
 	if (useLockedState->isChecked())
-	{
-		if (lockStateCombo->currentIndex() == 0)
-			Locked = true;
-		else
-			Locked = false;
-	}
+		Locked = (lockStateCombo->currentIndex() == 0);
 	if (useResizeState->isChecked())
-	{
-		if (resizeStateCombo->currentIndex() == 0)
-			Resize = false;
-		else
-			Resize = true;
-	}
+		Resize = (resizeStateCombo->currentIndex() != 0);
 }

Modified: trunk/Scribus/scribus/ui/smcellstyle.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22639&path=/trunk/Scribus/scribus/ui/smcellstyle.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/smcellstyle.cpp	(original)
+++ trunk/Scribus/scribus/ui/smcellstyle.cpp	Tue Aug 21 20:01:01 2018
@@ -15,7 +15,7 @@
 #include "smcellstylewidget.h"
 #include "ui/scmessagebox.h"
 
-SMCellStyle::SMCellStyle() : StyleItem(),
+SMCellStyle::SMCellStyle() :
 	m_widget(nullptr),
 	m_page(nullptr),
 	m_doc(nullptr),

Modified: trunk/Scribus/scribus/ui/smcellstylewidget.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22639&path=/trunk/Scribus/scribus/ui/smcellstylewidget.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/smcellstylewidget.cpp	(original)
+++ trunk/Scribus/scribus/ui/smcellstylewidget.cpp	Tue Aug 21 20:01:01 2018
@@ -11,7 +11,7 @@
 #include "scribus.h"
 #include "smcellstylewidget.h"
 
-SMCellStyleWidget::SMCellStyleWidget(QWidget *parent) : QWidget(),
+SMCellStyleWidget::SMCellStyleWidget(QWidget *parent) :
 	m_Doc(nullptr)
 {
 	setupUi(this);

Modified: trunk/Scribus/scribus/ui/smcstylewidget.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22639&path=/trunk/Scribus/scribus/ui/smcstylewidget.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/smcstylewidget.cpp	(original)
+++ trunk/Scribus/scribus/ui/smcstylewidget.cpp	Tue Aug 21 20:01:01 2018
@@ -16,7 +16,7 @@
 #include "units.h"
 
 
-SMCStyleWidget::SMCStyleWidget(QWidget *parent) : QWidget(),
+SMCStyleWidget::SMCStyleWidget(QWidget *parent) :
 	m_Doc(nullptr)
 {
 	setupUi(this);

Modified: trunk/Scribus/scribus/ui/smlinestyle.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22639&path=/trunk/Scribus/scribus/ui/smlinestyle.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/smlinestyle.cpp	(original)
+++ trunk/Scribus/scribus/ui/smlinestyle.cpp	Tue Aug 21 20:01:01 2018
@@ -21,7 +21,7 @@
 #include "util.h"
 
 
-SMLineStyle::SMLineStyle() : StyleItem(), m_doc(nullptr), m_widget(nullptr), m_twidget(nullptr), m_selectionIsDirty(false), m_unitRatio(1.0)
+SMLineStyle::SMLineStyle() : m_doc(nullptr), m_widget(nullptr), m_twidget(nullptr), m_selectionIsDirty(false), m_unitRatio(1.0)
 {
 	
 }

Modified: trunk/Scribus/scribus/ui/smlinestylewidget.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22639&path=/trunk/Scribus/scribus/ui/smlinestylewidget.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/smlinestylewidget.cpp	(original)
+++ trunk/Scribus/scribus/ui/smlinestylewidget.cpp	Tue Aug 21 20:01:01 2018
@@ -18,7 +18,7 @@
 #include "util.h"
 
 
-SMLineStyleWidget::SMLineStyleWidget() : QWidget()
+SMLineStyleWidget::SMLineStyleWidget()
 {
 	setupUi(this);
 

Modified: trunk/Scribus/scribus/ui/smtablestyle.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22639&path=/trunk/Scribus/scribus/ui/smtablestyle.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/smtablestyle.cpp	(original)
+++ trunk/Scribus/scribus/ui/smtablestyle.cpp	Tue Aug 21 20:01:01 2018
@@ -15,7 +15,7 @@
 #include "smtablestylewidget.h"
 #include "ui/scmessagebox.h"
 
-SMTableStyle::SMTableStyle() : StyleItem(), m_widget(nullptr), m_page(nullptr), m_doc(nullptr)
+SMTableStyle::SMTableStyle() : m_widget(nullptr), m_page(nullptr), m_doc(nullptr)
 {
 	m_widget = new QTabWidget();
 	Q_CHECK_PTR(m_widget);

Modified: trunk/Scribus/scribus/ui/smtablestylewidget.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22639&path=/trunk/Scribus/scribus/ui/smtablestylewidget.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/smtablestylewidget.cpp	(original)
+++ trunk/Scribus/scribus/ui/smtablestylewidget.cpp	Tue Aug 21 20:01:01 2018
@@ -11,7 +11,7 @@
 #include "scribus.h"
 #include "smtablestylewidget.h"
 
-SMTableStyleWidget::SMTableStyleWidget(QWidget *parent) : QWidget(),
+SMTableStyleWidget::SMTableStyleWidget(QWidget *parent) :
 	m_Doc(nullptr)
 {
 	setupUi(this);

Modified: trunk/Scribus/scribus/ui/smtextstyles.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22639&path=/trunk/Scribus/scribus/ui/smtextstyles.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/smtextstyles.cpp	(original)
+++ trunk/Scribus/scribus/ui/smtextstyles.cpp	Tue Aug 21 20:01:01 2018
@@ -39,8 +39,8 @@
 #include "util.h"
 
 
-SMParagraphStyle::SMParagraphStyle(SMCharacterStyle* cstyleItem) : StyleItem(),
-m_pwidget(nullptr), m_cstyleItem(cstyleItem), m_doc(nullptr), m_selectionIsDirty(false), m_unitRatio(1.0)
+SMParagraphStyle::SMParagraphStyle(SMCharacterStyle* cstyleItem) :
+	m_pwidget(nullptr), m_cstyleItem(cstyleItem), m_doc(nullptr), m_selectionIsDirty(false), m_unitRatio(1.0)
 {
 	Q_ASSERT(m_cstyleItem);
 	m_cstyles = m_cstyleItem->tmpStyles();

Modified: trunk/Scribus/scribus/ui/storyeditor.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22639&path=/trunk/Scribus/scribus/ui/storyeditor.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/storyeditor.cpp	(original)
+++ trunk/Scribus/scribus/ui/storyeditor.cpp	Tue Aug 21 20:01:01 2018
@@ -1087,9 +1087,8 @@
 
 bool SEditor::canInsertFromMimeData( const QMimeData * source ) const
 {
-	if (source->hasText() || source->hasFormat("application/x-scribus-styledtext"))
-		return true;
-	return false;
+	return (source->hasText() || source->hasFormat("application/x-scribus-styledtext"));
+
 }
 
 QMimeData* SEditor::createMimeDataFromSelection () const
@@ -1588,7 +1587,7 @@
 	charSelect = new CharSelect(this);
 	charSelect->userTableModel()->setCharactersAndFonts(ScCore->primaryMainWindow()->charPalette->userTableModel()->characters(), ScCore->primaryMainWindow()->charPalette->userTableModel()->fonts());
 	connect(charSelect, SIGNAL(insertSpecialChar()), this, SLOT(slot_insertSpecialChar()));
-	connect(charSelect, SIGNAL(insertUserSpecialChar(QChar, QString)), this, SLOT(slot_insertUserSpecialChar(QChar, QString)));
+	connect(charSelect, SIGNAL(insertUserSpecialChar(QChar,QString)), this, SLOT(slot_insertUserSpecialChar(QChar,QString)));
 
 	m_smartSelection = prefsManager->appPrefs.storyEditorPrefs.smartTextSelection;
 	seActions["settingsSmartTextSelection"]->setChecked(m_smartSelection);




More information about the scribus-commit mailing list