r23049 by craig - Move away from QString::null due to deprecation, plus other code cleaning

scribus-commit scribus-commit at lists.scribus.net
Sat Jun 22 22:25:54 UTC 2019


Author: craig
Date: Sat Jun 22 22:25:53 2019
New Revision: 23049

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=23049
Log:
Move away from QString::null due to deprecation, plus other code cleaning

Modified:
    trunk/Scribus/scribus/actionmanager.cpp
    trunk/Scribus/scribus/actionmanager.h
    trunk/Scribus/scribus/appmodehelper.h
    trunk/Scribus/scribus/canvasmode_eyedropper.cpp
    trunk/Scribus/scribus/deferredtask.cpp
    trunk/Scribus/scribus/fileloader.cpp
    trunk/Scribus/scribus/fileloader.h
    trunk/Scribus/scribus/loadsaveplugin.h
    trunk/Scribus/scribus/menumanager.h
    trunk/Scribus/scribus/pageitem.cpp
    trunk/Scribus/scribus/pageitem.h
    trunk/Scribus/scribus/pagesize.cpp
    trunk/Scribus/scribus/pdfoptionsio.cpp
    trunk/Scribus/scribus/pdfoptionsio.h
    trunk/Scribus/scribus/plugins/barcodegenerator/barcode.h
    trunk/Scribus/scribus/plugins/colorwheel/colorwheel.h
    trunk/Scribus/scribus/plugins/export/pixmapexport/export.h
    trunk/Scribus/scribus/plugins/export/svgexplugin/svgexplugin.h
    trunk/Scribus/scribus/plugins/export/xpsexport/xpsexplugin.h
    trunk/Scribus/scribus/plugins/fileloader/scribus12format/scribus12format.cpp
    trunk/Scribus/scribus/plugins/fileloader/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/fontpreview/fontpreview.h
    trunk/Scribus/scribus/plugins/fontpreview/fontpreviewplugin.h
    trunk/Scribus/scribus/plugins/gettext/docim/docim.cpp
    trunk/Scribus/scribus/plugins/import/ai/importaiplugin.h
    trunk/Scribus/scribus/plugins/import/cdr/importcdrplugin.h
    trunk/Scribus/scribus/plugins/import/cgm/importcgmplugin.h
    trunk/Scribus/scribus/plugins/import/cvg/importcvgplugin.h
    trunk/Scribus/scribus/plugins/import/drw/importdrwplugin.h
    trunk/Scribus/scribus/plugins/import/emf/importemfplugin.h
    trunk/Scribus/scribus/plugins/import/fh/importfhplugin.h
    trunk/Scribus/scribus/plugins/import/idml/importidmlplugin.h
    trunk/Scribus/scribus/plugins/import/idml_old/importidml.h
    trunk/Scribus/scribus/plugins/import/odg/importodgplugin.h
    trunk/Scribus/scribus/plugins/import/oodraw/oodrawimp.h
    trunk/Scribus/scribus/plugins/import/oodraw/stylestack.cpp
    trunk/Scribus/scribus/plugins/import/pages/importpagesplugin.h
    trunk/Scribus/scribus/plugins/import/pct/importpctplugin.h
    trunk/Scribus/scribus/plugins/import/pdf/importpdfplugin.h
    trunk/Scribus/scribus/plugins/import/pm/importpmplugin.h
    trunk/Scribus/scribus/plugins/import/ps/importpsplugin.h
    trunk/Scribus/scribus/plugins/import/pub/importpubplugin.h
    trunk/Scribus/scribus/plugins/import/qxp/importqxpplugin.h
    trunk/Scribus/scribus/plugins/import/shape/importshapeplugin.h
    trunk/Scribus/scribus/plugins/import/sml/importsmlplugin.h
    trunk/Scribus/scribus/plugins/import/svg/svgplugin.h
    trunk/Scribus/scribus/plugins/import/svm/importsvmplugin.h
    trunk/Scribus/scribus/plugins/import/uniconvertor/uniconvplugin.h
    trunk/Scribus/scribus/plugins/import/viva/importvivaplugin.h
    trunk/Scribus/scribus/plugins/import/vsd/importvsdplugin.h
    trunk/Scribus/scribus/plugins/import/wmf/wmfimportplugin.h
    trunk/Scribus/scribus/plugins/import/wpg/importwpgplugin.h
    trunk/Scribus/scribus/plugins/import/xar/importxarplugin.h
    trunk/Scribus/scribus/plugins/import/xfig/importxfigplugin.h
    trunk/Scribus/scribus/plugins/import/xps/importxpsplugin.h
    trunk/Scribus/scribus/plugins/import/zmf/importzmfplugin.h
    trunk/Scribus/scribus/plugins/imposition/impositionplugin.h
    trunk/Scribus/scribus/plugins/myplugin/myplugin.h
    trunk/Scribus/scribus/plugins/newfromtemplateplugin/nftemplate.h
    trunk/Scribus/scribus/plugins/picbrowser/picturebrowserplugin.h
    trunk/Scribus/scribus/plugins/saveastemplateplugin/satemplate.h
    trunk/Scribus/scribus/plugins/scriptplugin/cmddialog.cpp
    trunk/Scribus/scribus/plugins/scriptplugin/pconsole.cpp
    trunk/Scribus/scribus/plugins/scriptplugin/scriptercore.cpp
    trunk/Scribus/scribus/plugins/short-words/shortwords.h
    trunk/Scribus/scribus/plugins/tools/2geomtools/meshdistortion/meshdistortion.h
    trunk/Scribus/scribus/plugins/tools/2geomtools/pathalongpath/pathalongpath.h
    trunk/Scribus/scribus/plugins/tools/flattenpath/flattenpath.h
    trunk/Scribus/scribus/plugins/tools/hunspellcheck/hunspellplugin.h
    trunk/Scribus/scribus/plugins/tools/lenseffects/lenseffects.h
    trunk/Scribus/scribus/plugins/tools/pathconnect/pathconnect.h
    trunk/Scribus/scribus/plugins/tools/pathcut/pathcut.h
    trunk/Scribus/scribus/plugins/tools/pathfinder/pathfinder.h
    trunk/Scribus/scribus/plugins/tools/pathfinder/pathfinderdialog.cpp
    trunk/Scribus/scribus/plugins/tools/pathstroker/pathstroker.h
    trunk/Scribus/scribus/plugins/tools/smoothpath/smoothpath.h
    trunk/Scribus/scribus/plugins/tools/subdivide/subdivide.h
    trunk/Scribus/scribus/scfonts.cpp
    trunk/Scribus/scribus/scgtplugin.h
    trunk/Scribus/scribus/scpaths.cpp
    trunk/Scribus/scribus/scplugin.h
    trunk/Scribus/scribus/scribus.cpp
    trunk/Scribus/scribus/styleitem.h
    trunk/Scribus/scribus/tocgenerator.cpp
    trunk/Scribus/scribus/ui/collectforoutput_ui.cpp
    trunk/Scribus/scribus/ui/collectforoutput_ui.h
    trunk/Scribus/scribus/ui/curvewidget.cpp
    trunk/Scribus/scribus/ui/insertaframe.cpp
    trunk/Scribus/scribus/ui/loremipsum.cpp
    trunk/Scribus/scribus/ui/marksmanager.cpp
    trunk/Scribus/scribus/ui/marksmanager.h
    trunk/Scribus/scribus/ui/newtemp.h
    trunk/Scribus/scribus/ui/nftwidget.cpp
    trunk/Scribus/scribus/ui/prefs_display.cpp
    trunk/Scribus/scribus/ui/prefs_guides.cpp
    trunk/Scribus/scribus/ui/prefs_keyboardshortcuts.cpp
    trunk/Scribus/scribus/ui/prefs_pdfexport.cpp
    trunk/Scribus/scribus/ui/printdialog.cpp
    trunk/Scribus/scribus/ui/scdockpalette.cpp
    trunk/Scribus/scribus/ui/scdockpalette.h
    trunk/Scribus/scribus/ui/scinputdialog.cpp
    trunk/Scribus/scribus/ui/scmenu.h
    trunk/Scribus/scribus/ui/scrpalettebase.cpp
    trunk/Scribus/scribus/ui/scrpalettebase.h
    trunk/Scribus/scribus/ui/shortcutwidget.cpp
    trunk/Scribus/scribus/ui/shortcutwidget.h
    trunk/Scribus/scribus/ui/smcellstyle.cpp
    trunk/Scribus/scribus/ui/smcolorcombo.cpp
    trunk/Scribus/scribus/ui/smcstylewidget.cpp
    trunk/Scribus/scribus/ui/smfontcomboh.cpp
    trunk/Scribus/scribus/ui/smlinestyle.cpp
    trunk/Scribus/scribus/ui/smscrspinbox.cpp
    trunk/Scribus/scribus/ui/smspinbox.cpp
    trunk/Scribus/scribus/ui/smtablestyle.cpp
    trunk/Scribus/scribus/ui/smtextstyles.cpp
    trunk/Scribus/scribus/ui/spalette.cpp
    trunk/Scribus/scribus/ui/stylemanager.cpp
    trunk/Scribus/scribus/ui/stylemanager.h
    trunk/Scribus/scribus/ui/styleview.cpp
    trunk/Scribus/scribus/ui/tabpdfoptions.cpp
    trunk/Scribus/scribus/urllauncher.cpp
    trunk/Scribus/scribus/util.cpp
    trunk/Scribus/scribus/util_formats.cpp
    trunk/Scribus/scribus/util_ghostscript.cpp

Modified: trunk/Scribus/scribus/actionmanager.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23049&path=/trunk/Scribus/scribus/actionmanager.cpp
==============================================================================
--- trunk/Scribus/scribus/actionmanager.cpp	(original)
+++ trunk/Scribus/scribus/actionmanager.cpp	Sat Jun 22 22:25:53 2019
@@ -38,15 +38,7 @@
 QVector< QPair<QString, QStringList> > ActionManager::defNonMenuActions;
 
 ActionManager::ActionManager ( QObject * parent ) :
-	QObject ( parent),
-	mainWindow(nullptr),
-	undoManager(nullptr),
-	im(nullptr),
-	scrActions(nullptr),
-	scrActionGroups(nullptr),
-	modeActionNames(nullptr),
-	nonEditActionNames(nullptr),
-	unicodeCharActionNames(nullptr)
+	QObject ( parent)
 {
 }
 
@@ -2536,7 +2528,7 @@
 {
 	//Here we mangle the URL based on the current GUI language, returning English if we don't get one of these hard coded options.
 	//CB TODO make more flexible one day.
-	QString language="EN";
+	QString language("EN");
 	QString langpref(ScCore->getGuiLanguage().left(2));
 	if (langpref=="de" || langpref=="fr" || langpref=="po" || langpref=="pt" || langpref=="ru")
 		language=langpref.toUpper();

Modified: trunk/Scribus/scribus/actionmanager.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23049&path=/trunk/Scribus/scribus/actionmanager.h
==============================================================================
--- trunk/Scribus/scribus/actionmanager.h	(original)
+++ trunk/Scribus/scribus/actionmanager.h	Sat Jun 22 22:25:53 2019
@@ -83,8 +83,8 @@
 		void connectNewSelectionActions(ScribusView *,ScribusDoc *);
 		void saveActionShortcutsPreEditMode();
 		void restoreActionShortcutsPostEditMode();
-		void enableActionStringList(QMap<QString, QPointer<ScrAction> > *actionMap, QStringList *list, bool enabled, bool checkingUnicode=false, const QString& fontName=QString::null);
-		void enableUnicodeActions(QMap<QString, QPointer<ScrAction> > *actionMap, bool enabled, const QString& fontName=QString::null);
+		void enableActionStringList(QMap<QString, QPointer<ScrAction> > *actionMap, QStringList *list, bool enabled, bool checkingUnicode=false, const QString& fontName=QString());
+		void enableUnicodeActions(QMap<QString, QPointer<ScrAction> > *actionMap, bool enabled, const QString& fontName=QString());
 		void setPDFActions(ScribusView *);
 		
 	public slots:
@@ -113,14 +113,14 @@
 		static QKeySequence defaultKey(const QString &actionName);
 	
 		QPixmap noIcon;
-		ScribusMainWindow *mainWindow;
-		UndoManager *undoManager;
-		IconManager* im;
-		QMap<QString, QPointer<ScrAction> > *scrActions;
-		QMultiHash<QString, QActionGroup*> *scrActionGroups;
-		QStringList *modeActionNames;
-		QStringList *nonEditActionNames;
-		QStringList *unicodeCharActionNames;
+		ScribusMainWindow *mainWindow {nullptr};
+		UndoManager *undoManager {nullptr};
+		IconManager* im {nullptr};
+		QMap<QString, QPointer<ScrAction> > *scrActions {nullptr};
+		QMultiHash<QString, QActionGroup*> *scrActionGroups {nullptr};
+		QStringList *modeActionNames {nullptr};
+		QStringList *nonEditActionNames {nullptr};
+		QStringList *unicodeCharActionNames {nullptr};
 		static QMap<QString, QKeySequence> defKeys;
 		static QVector< QPair<QString, QStringList> > defMenuNames;
 		static QVector< QPair<QString, QStringList> > defMenus;

Modified: trunk/Scribus/scribus/appmodehelper.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23049&path=/trunk/Scribus/scribus/appmodehelper.h
==============================================================================
--- trunk/Scribus/scribus/appmodehelper.h	(original)
+++ trunk/Scribus/scribus/appmodehelper.h	Sat Jun 22 22:25:53 2019
@@ -55,7 +55,7 @@
 		void mainWindowCloseLastDoc();
 		void setPreviewMode(bool b);
 		//! \brief enable or disable the unicode actions and their menus
-		void enableTextActions(bool enabled, const QString& fontName=QString::null);
+		void enableTextActions(bool enabled, const QString& fontName=QString());
 		void setStartupActionsEnabled(bool enabled);
 
 

Modified: trunk/Scribus/scribus/canvasmode_eyedropper.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23049&path=/trunk/Scribus/scribus/canvasmode_eyedropper.cpp
==============================================================================
--- trunk/Scribus/scribus/canvasmode_eyedropper.cpp	(original)
+++ trunk/Scribus/scribus/canvasmode_eyedropper.cpp	Sat Jun 22 22:25:53 2019
@@ -158,7 +158,7 @@
 			break;
 		}
 	}
-	QString colorName=QString::null;
+	QString colorName;
 	if (found)
 		colorName=it.key();
 	else
@@ -168,7 +168,7 @@
 		QString questionString="<qt>" + tr("The selected color does not exist in the document's color set. Please enter a name for this new color.") + "</qt>";
 		do
 		{
-			colorName = QInputDialog::getText(m_ScMW, tr("Color Not Found"), questionString, QLineEdit::Normal, QString::null, &ok);
+			colorName = QInputDialog::getText(m_ScMW, tr("Color Not Found"), questionString, QLineEdit::Normal, QString(), &ok);
 			if (ok)
 			{
 				if (m_doc->PageColors.contains(colorName))
@@ -185,7 +185,7 @@
 			m_ScMW->updateColorLists();
 		}
 		else
-			colorName=QString::null;
+			colorName.clear();
 	}
 	uint docSelectionCount=m_doc->m_Selection->count();
 	if (!colorName.isNull() && docSelectionCount > 0)

Modified: trunk/Scribus/scribus/deferredtask.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23049&path=/trunk/Scribus/scribus/deferredtask.cpp
==============================================================================
--- trunk/Scribus/scribus/deferredtask.cpp	(original)
+++ trunk/Scribus/scribus/deferredtask.cpp	Sat Jun 22 22:25:53 2019
@@ -30,7 +30,7 @@
 void DeferredTask::init()
 {
 	m_status = Status_NotStarted,
-	m_lastError = QString::null;
+	m_lastError.clear();
 	// Build the timer we'll use to access the event loop
 	m_timer = new QTimer(this);
 	Q_CHECK_PTR(m_timer);

Modified: trunk/Scribus/scribus/fileloader.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23049&path=/trunk/Scribus/scribus/fileloader.cpp
==============================================================================
--- trunk/Scribus/scribus/fileloader.cpp	(original)
+++ trunk/Scribus/scribus/fileloader.cpp	Sat Jun 22 22:25:53 2019
@@ -68,7 +68,7 @@
 	m_fileName(fileName),
 	m_fileType(-1)
 {
-	QString realPath = QFileInfo(fileName).canonicalFilePath();
+	QString realPath(QFileInfo(fileName).canonicalFilePath());
 	if (!realPath.isEmpty())
 		m_fileName = realPath;
 	m_newReplacement = false;
@@ -84,10 +84,10 @@
 	int ind = -1;
 	for (int i = 0; i < fmts.count()-1; i++)
 	{
-		QString fmt = fmts[i];
+		QString fmt(fmts[i]);
 		int s = fmt.indexOf("(");
 		int e = fmt.lastIndexOf(")");
-		QString f = fmt.mid(s+1, e-s-1);
+		QString f(fmt.mid(s+1, e-s-1));
 #ifndef HAVE_POPPLER
 		if (f.contains("pdf"))	// for removing PDF from the list
 		{
@@ -117,7 +117,7 @@
 	int ret = -1;
 	if (!fi.exists())
 		ret = -1;
-	QString lwrFileName = m_fileName.toLower();
+	QString lwrFileName(m_fileName.toLower());
 
 	bool found = false;
 	QList<FileFormat> fileFormats(LoadSavePlugin::supportedFormats());
@@ -144,7 +144,7 @@
 	if (!found)
 	{
 	// now try for the last suffix
-		QString ext = fi.suffix().toLower();
+		QString ext(fi.suffix().toLower());
 		it = fileFormats.constBegin();
 		itEnd = fileFormats.constEnd();
 		for ( ; (it != itEnd) && (!found); ++it)
@@ -152,9 +152,9 @@
 			if (!it->plug)
 				continue;
 			bool found = false;
-			for (int a = 0; a < it->fileExtensions.count(); a++)
+			for (int i = 0; i < it->fileExtensions.count(); i++)
 			{
-				QString exts = it->fileExtensions[a].toLower();
+				QString exts(it->fileExtensions[i].toLower());
 				if (ext == exts)
 				{
 					if (it->plug->fileSupported(nullptr, m_fileName))

Modified: trunk/Scribus/scribus/fileloader.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23049&path=/trunk/Scribus/scribus/fileloader.h
==============================================================================
--- trunk/Scribus/scribus/fileloader.h	(original)
+++ trunk/Scribus/scribus/fileloader.h	Sat Jun 22 22:25:53 2019
@@ -37,7 +37,7 @@
 	int fileType() const { return m_fileType; }
 	int testFile();
 
-	bool loadPage(ScribusDoc* currDoc, int PageToLoad, bool Mpage, const QString& renamedPageName=QString::null);
+	bool loadPage(ScribusDoc* currDoc, int PageToLoad, bool Mpage, const QString& renamedPageName=QString());
 	bool loadFile(ScribusDoc* currDoc);
 	bool saveFile(const QString& fileName, ScribusDoc *doc, QString *savedFile = nullptr);
 	bool readStyles(ScribusDoc* doc, StyleSet<ParagraphStyle> &docParagraphStyles);

Modified: trunk/Scribus/scribus/loadsaveplugin.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23049&path=/trunk/Scribus/scribus/loadsaveplugin.h
==============================================================================
--- trunk/Scribus/scribus/loadsaveplugin.h	(original)
+++ trunk/Scribus/scribus/loadsaveplugin.h	Sat Jun 22 22:25:53 2019
@@ -99,7 +99,7 @@
 		// It need not verify a file, just confirm that it looks like a supported
 		// file type (eg "XML doc with root element SCRIBUSXML and version 1.3.1").
 		// All plugins must implement this method.
-		virtual bool fileSupported(QIODevice* file, const QString & fileName=QString::null) const = 0;
+		virtual bool fileSupported(QIODevice* file, const QString & fileName=QString()) const = 0;
 
 		// Return a list of all formats supported by all currently loaded and
 		// active plugins. This list is sorted in a very specific order:
@@ -108,7 +108,7 @@
 
 		virtual void setupTargets(ScribusDoc *targetDoc, ScribusView* targetView, ScribusMainWindow* targetMW, QProgressBar* targetMWPRogressBar, SCFonts* targetAvailableFonts);
 		virtual void getReplacedFontData(bool & getNewReplacement, QMap<QString,QString> &getReplacedFonts, QList<ScFace> &getDummyScFaces);
-		virtual bool loadPage(const QString & fileName, int pageNumber, bool Mpage, const QString& renamedPageName=QString::null);
+		virtual bool loadPage(const QString & fileName, int pageNumber, bool Mpage, const QString& renamedPageName=QString());
 		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);
@@ -208,7 +208,7 @@
 
 		void setupTargets(ScribusDoc *targetDoc, ScribusView* targetView, ScribusMainWindow* targetMW, QProgressBar* targetMWPRogressBar, SCFonts* targetAvailableFonts) const;
 		void getReplacedFontData(bool & getNewReplacement, QMap<QString,QString> &getReplacedFonts, QList<ScFace> &getDummyScFaces) const;
-		bool loadPage(const QString & fileName, int pageNumber, bool Mpage, const QString& renamedPageName=QString::null) const;
+		bool loadPage(const QString & fileName, int pageNumber, bool Mpage, const QString& renamedPageName=QString()) const;
 		bool readStyles(const QString& fileName, ScribusDoc* doc, StyleSet<ParagraphStyle> &docParagraphStyles) const;
 		bool readCharStyles(const QString& fileName, ScribusDoc* doc, StyleSet<CharStyle> &docCharStyles) const;
 		bool readLineStyles(const QString& fileName, QHash<QString,multiLine> *Sty) const;

Modified: trunk/Scribus/scribus/menumanager.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23049&path=/trunk/Scribus/scribus/menumanager.h
==============================================================================
--- trunk/Scribus/scribus/menumanager.h	(original)
+++ trunk/Scribus/scribus/menumanager.h	Sat Jun 22 22:25:53 2019
@@ -49,7 +49,7 @@
 
 		enum MenuType {Normal, DLL};
 
-		bool createMenu(const QString &menuName, const QString &menuText = QString::null, const QString& parent = QString::null, bool checkable = false, bool rememberMenu = false);
+		bool createMenu(const QString &menuName, const QString &menuText = QString(), const QString& parent = QString(), bool checkable = false, bool rememberMenu = false);
 		void removeMenuItem(const QString& s, ScrAction *menuAction, const QString &parent);
 		bool removeMenuItem(ScrAction *menuAction, const QString &parent);
 		void runMenuAtPos(const QString &, const QPoint&);

Modified: trunk/Scribus/scribus/pageitem.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23049&path=/trunk/Scribus/scribus/pageitem.cpp
==============================================================================
--- trunk/Scribus/scribus/pageitem.cpp	(original)
+++ trunk/Scribus/scribus/pageitem.cpp	Sat Jun 22 22:25:53 2019
@@ -209,10 +209,10 @@
 	m_softShadowBlendMode(other.m_softShadowBlendMode),
 	m_softShadowErasedByObject(other.m_softShadowErasedByObject),
 	m_softShadowHasObjectTransparency(other.m_softShadowHasObjectTransparency),
-	LeftLink(other.LeftLink),
-	RightLink(other.RightLink),
-	TopLink(other.TopLink),
-	BottomLink(other.BottomLink),
+	m_leftLink(other.m_leftLink),
+	m_rightLink(other.m_rightLink),
+	m_topLink(other.m_topLink),
+	m_bottomLink(other.m_bottomLink),
 	LeftLinkID(other.LeftLinkID),
 	RightLinkID(other.RightLinkID),
 	TopLinkID(other.TopLinkID),
@@ -835,10 +835,10 @@
 	m_firstLineOffset = FLOPRealGlyphHeight;
 	m_columns = m_Doc->itemToolPrefs().textColumns;
 	m_columnGap = m_Doc->itemToolPrefs().textColumnGap;
-	LeftLink = nullptr;
-	RightLink = nullptr;
-	TopLink = nullptr;
-	BottomLink = nullptr;
+	m_leftLink = nullptr;
+	m_rightLink = nullptr;
+	m_topLink = nullptr;
+	m_bottomLink = nullptr;
 	LeftLinkID = 0;
 	RightLinkID = 0;
 	TopLinkID = 0;
@@ -1238,8 +1238,8 @@
 /// returns true if text is ending before that frame
 bool PageItem::frameUnderflows() const
 {
-	if (BackBox == nullptr)
-		return false;
+    if (BackBox == nullptr)
+        return false;
 	//FIX ME - I have found that condition if frame is empty
 	//and has been linked with previous frame
 	//if you will find any better solution - fix that function
@@ -7628,7 +7628,7 @@
 	if (countFound==1)
 		returnAttribute = (*foundIt);
 	else
-		returnAttribute.name = QString::null;
+		returnAttribute.name.clear();
 	return returnAttribute;
 }
 

Modified: trunk/Scribus/scribus/pageitem.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23049&path=/trunk/Scribus/scribus/pageitem.h
==============================================================================
--- trunk/Scribus/scribus/pageitem.h	(original)
+++ trunk/Scribus/scribus/pageitem.h	Sat Jun 22 22:25:53 2019
@@ -1364,10 +1364,10 @@
 
 	/* Additions for Table Support */
 	/* now deprecated with the new PageItem_Table */
-	PageItem* LeftLink;
-	PageItem* RightLink;
-	PageItem* TopLink;
-	PageItem* BottomLink;
+	PageItem* m_leftLink;
+	PageItem* m_rightLink;
+	PageItem* m_topLink;
+	PageItem* m_bottomLink;
 	int LeftLinkID;
 	int RightLinkID;
 	int TopLinkID;

Modified: trunk/Scribus/scribus/pagesize.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23049&path=/trunk/Scribus/scribus/pagesize.cpp
==============================================================================
--- trunk/Scribus/scribus/pagesize.cpp	(original)
+++ trunk/Scribus/scribus/pagesize.cpp	Sat Jun 22 22:25:53 2019
@@ -54,8 +54,8 @@
 {
 	m_width=m_height=0.0;
 	m_pageUnitIndex=-1;
-	m_pageSizeName=QString::null;
-	m_trPageSizeName=QString::null;
+	m_pageSizeName.clear();
+	m_trPageSizeName.clear();
 
 	bool valuesSet=false;
 	generateSizeList();

Modified: trunk/Scribus/scribus/pdfoptionsio.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23049&path=/trunk/Scribus/scribus/pdfoptionsio.cpp
==============================================================================
--- trunk/Scribus/scribus/pdfoptionsio.cpp	(original)
+++ trunk/Scribus/scribus/pdfoptionsio.cpp	Sat Jun 22 22:25:53 2019
@@ -43,7 +43,7 @@
 	ts.setCodec("UTF-8");
 	ts << xml;
 	m_includePasswords = false; // just to be paranoid
-	m_error = QString::null;
+	m_error.clear();
 	return true;
 }
 
@@ -62,7 +62,7 @@
 	ts.setCodec("UTF-8");
 	ts << xml;
 	m_includePasswords = false; // just to be paranoid
-	m_error = QString::null;
+	m_error.clear();
 	return true;
 }
 
@@ -76,7 +76,7 @@
 	if (vr != PDFOptions::Verify_NoError)
 	{
 		m_error = QObject::tr("Verification of settings failed: %1").arg(vrfyError);
-		return QString::null;
+		return QString();
 	}
 	// Build the document. Initial implementation uses QDom.
 	m_doc = QDomDocument();
@@ -320,7 +320,7 @@
 	if (!readSettings())
 		// m_error should already be set
 		return false;
-	m_error = QString::null;
+	m_error.clear();
 	return true;
 }
 

Modified: trunk/Scribus/scribus/pdfoptionsio.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23049&path=/trunk/Scribus/scribus/pdfoptionsio.h
==============================================================================
--- trunk/Scribus/scribus/pdfoptionsio.h	(original)
+++ trunk/Scribus/scribus/pdfoptionsio.h	Sat Jun 22 22:25:53 2019
@@ -87,7 +87,7 @@
 
 protected:
 	// Build and return an XML representation of the settings.
-	// QString::null is returned on failure, in which case
+	// QString() is returned on failure, in which case
 	// the error string is set.
 	QString buildXMLString();
 

Modified: trunk/Scribus/scribus/plugins/barcodegenerator/barcode.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23049&path=/trunk/Scribus/scribus/plugins/barcodegenerator/barcode.h
==============================================================================
--- trunk/Scribus/scribus/plugins/barcodegenerator/barcode.h	(original)
+++ trunk/Scribus/scribus/plugins/barcodegenerator/barcode.h	Sat Jun 22 22:25:53 2019
@@ -24,7 +24,7 @@
 		virtual ~Barcode();
 		/*! \brief run the plug
 		\param target none usage here */
-		virtual bool run(ScribusDoc* doc, const QString& target = QString::null);
+		virtual bool run(ScribusDoc* doc, const QString& target = QString());
 		virtual const QString fullTrName() const;
 		virtual const AboutData* getAboutData() const;
 		virtual void deleteAboutData(const AboutData* about) const;

Modified: trunk/Scribus/scribus/plugins/colorwheel/colorwheel.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23049&path=/trunk/Scribus/scribus/plugins/colorwheel/colorwheel.h
==============================================================================
--- trunk/Scribus/scribus/plugins/colorwheel/colorwheel.h	(original)
+++ trunk/Scribus/scribus/plugins/colorwheel/colorwheel.h	Sat Jun 22 22:25:53 2019
@@ -27,7 +27,7 @@
 		// Standard plugin implementation
 		ColorWheelPlugin();
 		virtual ~ColorWheelPlugin();
-		virtual bool run(ScribusDoc* doc, const QString& target = QString::null);
+		virtual bool run(ScribusDoc* doc, const QString& target = QString());
 		virtual const QString fullTrName() const;
 		virtual const AboutData* getAboutData() const;
 		virtual void deleteAboutData(const AboutData* about) const;

Modified: trunk/Scribus/scribus/plugins/export/pixmapexport/export.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23049&path=/trunk/Scribus/scribus/plugins/export/pixmapexport/export.h
==============================================================================
--- trunk/Scribus/scribus/plugins/export/pixmapexport/export.h	(original)
+++ trunk/Scribus/scribus/plugins/export/pixmapexport/export.h	Sat Jun 22 22:25:53 2019
@@ -23,7 +23,7 @@
 		// Standard plugin implementation
 		PixmapExportPlugin();
 		virtual ~PixmapExportPlugin();
-		virtual bool run(ScribusDoc* doc, const QString& target = QString::null);
+		virtual bool run(ScribusDoc* doc, const QString& target = QString());
 		virtual const QString fullTrName() const;
 		virtual const AboutData* getAboutData() const;
 		virtual void deleteAboutData(const AboutData* about) const;

Modified: trunk/Scribus/scribus/plugins/export/svgexplugin/svgexplugin.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23049&path=/trunk/Scribus/scribus/plugins/export/svgexplugin/svgexplugin.h
==============================================================================
--- trunk/Scribus/scribus/plugins/export/svgexplugin/svgexplugin.h	(original)
+++ trunk/Scribus/scribus/plugins/export/svgexplugin/svgexplugin.h	Sat Jun 22 22:25:53 2019
@@ -42,7 +42,7 @@
 	\param filename a file to export to
 	\retval bool true
 	*/
-	virtual bool run(ScribusDoc* doc=0, const QString& filename = QString::null);
+	virtual bool run(ScribusDoc* doc=0, const QString& filename = QString());
 	virtual const QString fullTrName() const;
 	virtual const AboutData* getAboutData() const;
 	virtual void deleteAboutData(const AboutData* about) const;

Modified: trunk/Scribus/scribus/plugins/export/xpsexport/xpsexplugin.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23049&path=/trunk/Scribus/scribus/plugins/export/xpsexport/xpsexplugin.h
==============================================================================
--- trunk/Scribus/scribus/plugins/export/xpsexport/xpsexplugin.h	(original)
+++ trunk/Scribus/scribus/plugins/export/xpsexport/xpsexplugin.h	Sat Jun 22 22:25:53 2019
@@ -44,7 +44,7 @@
 	\param filename a file to export to
 	\retval bool true
 	*/
-	virtual bool run(ScribusDoc* doc=0, const QString& filename = QString::null);
+	virtual bool run(ScribusDoc* doc=0, const QString& filename = QString());
 	virtual const QString fullTrName() const;
 	virtual const AboutData* getAboutData() const;
 	virtual void deleteAboutData(const AboutData* about) const;

Modified: trunk/Scribus/scribus/plugins/fileloader/scribus12format/scribus12format.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23049&path=/trunk/Scribus/scribus/plugins/fileloader/scribus12format/scribus12format.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/fileloader/scribus12format/scribus12format.cpp	(original)
+++ trunk/Scribus/scribus/plugins/fileloader/scribus12format/scribus12format.cpp	Sat Jun 22 22:25:53 2019
@@ -162,7 +162,7 @@
 		docBytes = compressor.readAll();
 		compressor.close();
 		if (docBytes.isEmpty())
-			return QString::null;
+			return QString();
 	}
 	else
 	{
@@ -176,13 +176,13 @@
 			docText = QString::fromUtf8(docBytes);
 		else if (docBytes.left(9) == "<SCRIBUS>") // Older non utf8 doc
 			docText = QString::fromLocal8Bit(docBytes);
-		else 
-			return QString::null;
+		else
+			return QString();
 	}
 	else
 	{
 		qDebug("scribus12format: SCRIBUSUTF8NEW");
-		return QString::null;
+		return QString();
 	}
 	if (docText.endsWith(QChar(10)) || docText.endsWith(QChar(13)))
 		docText.truncate(docText.length()-1);
@@ -1114,21 +1114,21 @@
 					{
 						PageItem* ta = TableItems.at(ttc);
 						if (ta->TopLinkID != -1)
-							ta->TopLink = m_Doc->Items->at(TableID[ta->TopLinkID]);
+							ta->m_topLink = m_Doc->Items->at(TableID[ta->TopLinkID]);
 						else
-							ta->TopLink = nullptr;
+							ta->m_topLink = nullptr;
 						if (ta->LeftLinkID != -1)
-							ta->LeftLink = m_Doc->Items->at(TableID[ta->LeftLinkID]);
+							ta->m_leftLink = m_Doc->Items->at(TableID[ta->LeftLinkID]);
 						else
-							ta->LeftLink = nullptr;
+							ta->m_leftLink = nullptr;
 						if (ta->RightLinkID != -1)
-							ta->RightLink = m_Doc->Items->at(TableID[ta->RightLinkID]);
+							ta->m_rightLink = m_Doc->Items->at(TableID[ta->RightLinkID]);
 						else
-							ta->RightLink = nullptr;
+							ta->m_rightLink = nullptr;
 						if (ta->BottomLinkID != -1)
-							ta->BottomLink = m_Doc->Items->at(TableID[ta->BottomLinkID]);
+							ta->m_bottomLink = m_Doc->Items->at(TableID[ta->BottomLinkID]);
 						else
-							ta->BottomLink = nullptr;
+							ta->m_bottomLink = nullptr;
 					}
 				}
 			}
@@ -2113,21 +2113,21 @@
 					{
 						PageItem* ta = TableItems.at(ttc);
 						if (ta->TopLinkID != -1)
-							ta->TopLink = m_Doc->Items->at(TableID[ta->TopLinkID]);
+							ta->m_topLink = m_Doc->Items->at(TableID[ta->TopLinkID]);
 						else
-							ta->TopLink = nullptr;
+							ta->m_topLink = nullptr;
 						if (ta->LeftLinkID != -1)
-							ta->LeftLink = m_Doc->Items->at(TableID[ta->LeftLinkID]);
+							ta->m_leftLink = m_Doc->Items->at(TableID[ta->LeftLinkID]);
 						else
-							ta->LeftLink = nullptr;
+							ta->m_leftLink = nullptr;
 						if (ta->RightLinkID != -1)
-							ta->RightLink = m_Doc->Items->at(TableID[ta->RightLinkID]);
+							ta->m_rightLink = m_Doc->Items->at(TableID[ta->RightLinkID]);
 						else
-							ta->RightLink = nullptr;
+							ta->m_rightLink = nullptr;
 						if (ta->BottomLinkID != -1)
-							ta->BottomLink = m_Doc->Items->at(TableID[ta->BottomLinkID]);
+							ta->m_bottomLink = m_Doc->Items->at(TableID[ta->BottomLinkID]);
 						else
-							ta->BottomLink = nullptr;
+							ta->m_bottomLink = nullptr;
 					}
 				}
 				// reestablish textframe links

Modified: trunk/Scribus/scribus/plugins/fileloader/scribus12format/scribus12format.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23049&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	Sat Jun 22 22:25:53 2019
@@ -34,14 +34,14 @@
 		virtual void deleteAboutData(const AboutData* about) const;
 		virtual void languageChange();
 		//Not the same as readSLA. This one only reads max 4k of the file for speed.
-		virtual bool fileSupported(QIODevice* file, const QString & fileName=QString::null) const;
+		virtual bool fileSupported(QIODevice* file, const QString & fileName=QString()) const;
 
 		virtual bool loadFile(const QString & fileName, const FileFormat & fmt, int flags, int index = 0);
 		virtual bool saveFile(const QString & fileName, const FileFormat & fmt);
 		virtual void addToMainWindowMenu(ScribusMainWindow *) {};
 
 		// Special features - .sla page extraction support
-		virtual bool loadPage(const QString & fileName, int pageNumber, bool Mpage, const QString& renamedPageName=QString::null);
+		virtual bool loadPage(const QString & fileName, int pageNumber, bool Mpage, const QString& renamedPageName=QString());
 		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=23049&path=/trunk/Scribus/scribus/plugins/fileloader/scribus134format/scribus134format.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/fileloader/scribus134format/scribus134format.cpp	(original)
+++ trunk/Scribus/scribus/plugins/fileloader/scribus134format/scribus134format.cpp	Sat Jun 22 22:25:53 2019
@@ -502,21 +502,21 @@
 		{
 			PageItem* ta = TableItemsF.at(ttc);
 			if (ta->TopLinkID != -1)
-				ta->TopLink = TableIDF[ta->TopLinkID];
+				ta->m_topLink = TableIDF[ta->TopLinkID];
 			else
-				ta->TopLink = nullptr;
+				ta->m_topLink = nullptr;
 			if (ta->LeftLinkID != -1)
-				ta->LeftLink = TableIDF[ta->LeftLinkID];
+				ta->m_leftLink = TableIDF[ta->LeftLinkID];
 			else
-				ta->LeftLink = nullptr;
+				ta->m_leftLink = nullptr;
 			if (ta->RightLinkID != -1)
-				ta->RightLink = TableIDF[ta->RightLinkID];
+				ta->m_rightLink = TableIDF[ta->RightLinkID];
 			else
-				ta->RightLink = nullptr;
+				ta->m_rightLink = nullptr;
 			if (ta->BottomLinkID != -1)
-				ta->BottomLink = TableIDF[ta->BottomLinkID];
+				ta->m_bottomLink = TableIDF[ta->BottomLinkID];
 			else
-				ta->BottomLink = nullptr;
+				ta->m_bottomLink = nullptr;
 		}
 	}
 	if (TableItemsM.count() != 0)
@@ -525,21 +525,21 @@
 		{
 			PageItem* ta = TableItemsM.at(ttc);
 			if (ta->TopLinkID != -1)
-				ta->TopLink = TableIDM[ta->TopLinkID];
+				ta->m_topLink = TableIDM[ta->TopLinkID];
 			else
-				ta->TopLink = nullptr;
+				ta->m_topLink = nullptr;
 			if (ta->LeftLinkID != -1)
-				ta->LeftLink = TableIDM[ta->LeftLinkID];
+				ta->m_leftLink = TableIDM[ta->LeftLinkID];
 			else
-				ta->LeftLink = nullptr;
+				ta->m_leftLink = nullptr;
 			if (ta->RightLinkID != -1)
-				ta->RightLink = TableIDM[ta->RightLinkID];
+				ta->m_rightLink = TableIDM[ta->RightLinkID];
 			else
-				ta->RightLink = nullptr;
+				ta->m_rightLink = nullptr;
 			if (ta->BottomLinkID != -1)
-				ta->BottomLink = TableIDM[ta->BottomLinkID];
+				ta->m_bottomLink = TableIDM[ta->BottomLinkID];
 			else
-				ta->BottomLink = nullptr;
+				ta->m_bottomLink = nullptr;
 		}
 	}
 	if (TableItems.count() != 0)
@@ -548,21 +548,21 @@
 		{
 			PageItem* ta = TableItems.at(ttc);
 			if (ta->TopLinkID != -1)
-				ta->TopLink = TableID[ta->TopLinkID];
+				ta->m_topLink = TableID[ta->TopLinkID];
 			else
-				ta->TopLink = nullptr;
+				ta->m_topLink = nullptr;
 			if (ta->LeftLinkID != -1)
-				ta->LeftLink = TableID[ta->LeftLinkID];
+				ta->m_leftLink = TableID[ta->LeftLinkID];
 			else
-				ta->LeftLink = nullptr;
+				ta->m_leftLink = nullptr;
 			if (ta->RightLinkID != -1)
-				ta->RightLink = TableID[ta->RightLinkID];
+				ta->m_rightLink = TableID[ta->RightLinkID];
 			else
-				ta->RightLink = nullptr;
+				ta->m_rightLink = nullptr;
 			if (ta->BottomLinkID != -1)
-				ta->BottomLink = TableID[ta->BottomLinkID];
+				ta->m_bottomLink = TableID[ta->BottomLinkID];
 			else
-				ta->BottomLink = nullptr;
+				ta->m_bottomLink = nullptr;
 		}
 	}
 	//CB Add this in to set this in the file in memory. Its saved, why not load it.
@@ -2208,21 +2208,21 @@
 		{
 			PageItem* ta = TableItems2.at(ttc);
 			if (ta->TopLinkID != -1)
-				ta->TopLink = TableID2[ta->TopLinkID];
+				ta->m_topLink = TableID2[ta->TopLinkID];
 			else
-				ta->TopLink = nullptr;
+				ta->m_topLink = nullptr;
 			if (ta->LeftLinkID != -1)
-				ta->LeftLink = TableID2[ta->LeftLinkID];
+				ta->m_leftLink = TableID2[ta->LeftLinkID];
 			else
-				ta->LeftLink = nullptr;
+				ta->m_leftLink = nullptr;
 			if (ta->RightLinkID != -1)
-				ta->RightLink = TableID2[ta->RightLinkID];
+				ta->m_rightLink = TableID2[ta->RightLinkID];
 			else
-				ta->RightLink = nullptr;
+				ta->m_rightLink = nullptr;
 			if (ta->BottomLinkID != -1)
-				ta->BottomLink = TableID2[ta->BottomLinkID];
+				ta->m_bottomLink = TableID2[ta->BottomLinkID];
 			else
-				ta->BottomLink = nullptr;
+				ta->m_bottomLink = nullptr;
 		}
 	}
 	if (groupStackP.count() > 0)
@@ -3416,21 +3416,21 @@
 		{
 			PageItem* ta = TableItems.at(ttc);
 			if (ta->TopLinkID != -1)
-				ta->TopLink = TableID[ta->TopLinkID];
+				ta->m_topLink = TableID[ta->TopLinkID];
 			else
-				ta->TopLink = nullptr;
+				ta->m_topLink = nullptr;
 			if (ta->LeftLinkID != -1)
-				ta->LeftLink = TableID[ta->LeftLinkID];
+				ta->m_leftLink = TableID[ta->LeftLinkID];
 			else
-				ta->LeftLink = nullptr;
+				ta->m_leftLink = nullptr;
 			if (ta->RightLinkID != -1)
-				ta->RightLink = TableID[ta->RightLinkID];
+				ta->m_rightLink = TableID[ta->RightLinkID];
 			else
-				ta->RightLink = nullptr;
+				ta->m_rightLink = nullptr;
 			if (ta->BottomLinkID != -1)
-				ta->BottomLink = TableID[ta->BottomLinkID];
+				ta->m_bottomLink = TableID[ta->BottomLinkID];
 			else
-				ta->BottomLink = nullptr;
+				ta->m_bottomLink = nullptr;
 		}
 	}
 

Modified: trunk/Scribus/scribus/plugins/fileloader/scribus134format/scribus134format.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23049&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	Sat Jun 22 22:25:53 2019
@@ -43,14 +43,14 @@
 		virtual void deleteAboutData(const AboutData* about) const;
 		virtual void languageChange();
 		//Not the same as readSLA. This one only reads max 4k of the file for speed.
-		virtual bool fileSupported(QIODevice* file, const QString & fileName=QString::null) const;
+		virtual bool fileSupported(QIODevice* file, const QString & fileName=QString()) const;
 
 		virtual bool loadFile(const QString & fileName, const FileFormat & fmt, int flags, int index = 0);
 		virtual bool saveFile(const QString & fileName, const FileFormat & fmt) { return false; };
 		virtual void addToMainWindowMenu(ScribusMainWindow *) {};
 
 		// Special features - .sla page extraction support
-		virtual bool loadPage(const QString & fileName, int pageNumber, bool Mpage, const QString& renamedPageName=QString::null);
+		virtual bool loadPage(const QString & fileName, int pageNumber, bool Mpage, const QString& renamedPageName=QString());
 		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=23049&path=/trunk/Scribus/scribus/plugins/fileloader/scribus13format/scribus13format.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/fileloader/scribus13format/scribus13format.cpp	(original)
+++ trunk/Scribus/scribus/plugins/fileloader/scribus13format/scribus13format.cpp	Sat Jun 22 22:25:53 2019
@@ -141,7 +141,7 @@
 		docBytes = compressor.readAll();
 		compressor.close();
 		if (docBytes.isEmpty())
-			return QString::null;
+			return QString();
 	}
 	else
 	{
@@ -152,7 +152,7 @@
 	if (docBytes.left(16) == "<SCRIBUSUTF8NEW " && !docBytes.left(35).contains("Version=\"1.3.4"))
 		docText = QString::fromUtf8(docBytes);
 	else
-		return QString::null;
+		return QString();
 	if (docText.endsWith(QChar(10)) || docText.endsWith(QChar(13)))
 		docText.truncate(docText.length()-1);
 	return docText;
@@ -1004,21 +1004,21 @@
 		{
 			PageItem* ta = TableItemsF.at(ttc);
 			if (ta->TopLinkID != -1)
-				ta->TopLink = FrameItems.at(TableIDF[ta->TopLinkID]);
+				ta->m_topLink = FrameItems.at(TableIDF[ta->TopLinkID]);
 			else
-				ta->TopLink = nullptr;
+				ta->m_topLink = nullptr;
 			if (ta->LeftLinkID != -1)
-				ta->LeftLink = FrameItems.at(TableIDF[ta->LeftLinkID]);
+				ta->m_leftLink = FrameItems.at(TableIDF[ta->LeftLinkID]);
 			else
-				ta->LeftLink = nullptr;
+				ta->m_leftLink = nullptr;
 			if (ta->RightLinkID != -1)
-				ta->RightLink = FrameItems.at(TableIDF[ta->RightLinkID]);
+				ta->m_rightLink = FrameItems.at(TableIDF[ta->RightLinkID]);
 			else
-				ta->RightLink = nullptr;
+				ta->m_rightLink = nullptr;
 			if (ta->BottomLinkID != -1)
-				ta->BottomLink = FrameItems.at(TableIDF[ta->BottomLinkID]);
+				ta->m_bottomLink = FrameItems.at(TableIDF[ta->BottomLinkID]);
 			else
-				ta->BottomLink = nullptr;
+				ta->m_bottomLink = nullptr;
 		}
 	}
 	if (TableItemsM.count() != 0)
@@ -1027,21 +1027,21 @@
 		{
 			PageItem* ta = TableItemsM.at(ttc);
 			if (ta->TopLinkID != -1)
-				ta->TopLink = m_Doc->MasterItems.at(TableIDM[ta->TopLinkID]);
+				ta->m_topLink = m_Doc->MasterItems.at(TableIDM[ta->TopLinkID]);
 			else
-				ta->TopLink = nullptr;
+				ta->m_topLink = nullptr;
 			if (ta->LeftLinkID != -1)
-				ta->LeftLink = m_Doc->MasterItems.at(TableIDM[ta->LeftLinkID]);
+				ta->m_leftLink = m_Doc->MasterItems.at(TableIDM[ta->LeftLinkID]);
 			else
-				ta->LeftLink = nullptr;
+				ta->m_leftLink = nullptr;
 			if (ta->RightLinkID != -1)
-				ta->RightLink = m_Doc->MasterItems.at(TableIDM[ta->RightLinkID]);
+				ta->m_rightLink = m_Doc->MasterItems.at(TableIDM[ta->RightLinkID]);
 			else
-				ta->RightLink = nullptr;
+				ta->m_rightLink = nullptr;
 			if (ta->BottomLinkID != -1)
-				ta->BottomLink = m_Doc->MasterItems.at(TableIDM[ta->BottomLinkID]);
+				ta->m_bottomLink = m_Doc->MasterItems.at(TableIDM[ta->BottomLinkID]);
 			else
-				ta->BottomLink = nullptr;
+				ta->m_bottomLink = nullptr;
 		}
 	}
 	if (TableItems.count() != 0)
@@ -1050,21 +1050,21 @@
 		{
 			PageItem* ta = TableItems.at(ttc);
 			if (ta->TopLinkID != -1)
-				ta->TopLink = m_Doc->Items->at(TableID[ta->TopLinkID]);
+				ta->m_topLink = m_Doc->Items->at(TableID[ta->TopLinkID]);
 			else
-				ta->TopLink = nullptr;
+				ta->m_topLink = nullptr;
 			if (ta->LeftLinkID != -1)
-				ta->LeftLink = m_Doc->Items->at(TableID[ta->LeftLinkID]);
+				ta->m_leftLink = m_Doc->Items->at(TableID[ta->LeftLinkID]);
 			else
-				ta->LeftLink = nullptr;
+				ta->m_leftLink = nullptr;
 			if (ta->RightLinkID != -1)
-				ta->RightLink = m_Doc->Items->at(TableID[ta->RightLinkID]);
+				ta->m_rightLink = m_Doc->Items->at(TableID[ta->RightLinkID]);
 			else
-				ta->RightLink = nullptr;
+				ta->m_rightLink = nullptr;
 			if (ta->BottomLinkID != -1)
-				ta->BottomLink = m_Doc->Items->at(TableID[ta->BottomLinkID]);
+				ta->m_bottomLink = m_Doc->Items->at(TableID[ta->BottomLinkID]);
 			else
-				ta->BottomLink = nullptr;
+				ta->m_bottomLink = nullptr;
 		}
 	}
 	m_Doc->setMasterPageMode(false);
@@ -2399,21 +2399,21 @@
 		{
 			PageItem* ta = TableItems.at(ttc);
 			if (ta->TopLinkID != -1)
-				ta->TopLink = m_Doc->Items->at(TableID[ta->TopLinkID]);
+				ta->m_topLink = m_Doc->Items->at(TableID[ta->TopLinkID]);
 			else
-				ta->TopLink = nullptr;
+				ta->m_topLink = nullptr;
 			if (ta->LeftLinkID != -1)
-				ta->LeftLink = m_Doc->Items->at(TableID[ta->LeftLinkID]);
+				ta->m_leftLink = m_Doc->Items->at(TableID[ta->LeftLinkID]);
 			else
-				ta->LeftLink = nullptr;
+				ta->m_leftLink = nullptr;
 			if (ta->RightLinkID != -1)
-				ta->RightLink = m_Doc->Items->at(TableID[ta->RightLinkID]);
+				ta->m_rightLink = m_Doc->Items->at(TableID[ta->RightLinkID]);
 			else
-				ta->RightLink = nullptr;
+				ta->m_rightLink = nullptr;
 			if (ta->BottomLinkID != -1)
-				ta->BottomLink = m_Doc->Items->at(TableID[ta->BottomLinkID]);
+				ta->m_bottomLink = m_Doc->Items->at(TableID[ta->BottomLinkID]);
 			else
-				ta->BottomLink = nullptr;
+				ta->m_bottomLink = nullptr;
 		}
 	}
 	// reestablish textframe links

Modified: trunk/Scribus/scribus/plugins/fileloader/scribus13format/scribus13format.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23049&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	Sat Jun 22 22:25:53 2019
@@ -32,14 +32,14 @@
 		virtual void deleteAboutData(const AboutData* about) const;
 		virtual void languageChange();
 		//Not the same as readSLA. This one only reads max 4k of the file for speed.
-		virtual bool fileSupported(QIODevice* file, const QString & fileName=QString::null) const;
+		virtual bool fileSupported(QIODevice* file, const QString & fileName=QString()) const;
 
 		virtual bool loadFile(const QString & fileName, const FileFormat & fmt, int flags, int index = 0);
 		virtual bool saveFile(const QString & fileName, const FileFormat & fmt) { return false; };
 		virtual void addToMainWindowMenu(ScribusMainWindow *) {};
 
 		// Special features - .sla page extraction support
-		virtual bool loadPage(const QString & fileName, int pageNumber, bool Mpage, const QString& renamedPageName=QString::null);
+		virtual bool loadPage(const QString & fileName, int pageNumber, bool Mpage, const QString& renamedPageName=QString());
 		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=23049&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	Sat Jun 22 22:25:53 2019
@@ -419,21 +419,21 @@
 			{
 				PageItem* ta = TableItems.at(ttc);
 				if (ta->TopLinkID != -1)
-					ta->TopLink = LinkID[ta->TopLinkID];
-				else
-					ta->TopLink = nullptr;
+					ta->m_topLink = LinkID[ta->TopLinkID];
+				else
+					ta->m_topLink = nullptr;
 				if (ta->LeftLinkID != -1)
-					ta->LeftLink = LinkID[ta->LeftLinkID];
-				else
-					ta->LeftLink = nullptr;
+					ta->m_leftLink = LinkID[ta->LeftLinkID];
+				else
+					ta->m_leftLink = nullptr;
 				if (ta->RightLinkID != -1)
-					ta->RightLink = LinkID[ta->RightLinkID];
-				else
-					ta->RightLink = nullptr;
+					ta->m_rightLink = LinkID[ta->RightLinkID];
+				else
+					ta->m_rightLink = nullptr;
 				if (ta->BottomLinkID != -1)
-					ta->BottomLink = LinkID[ta->BottomLinkID];
-				else
-					ta->BottomLink = nullptr;
+					ta->m_bottomLink = LinkID[ta->BottomLinkID];
+				else
+					ta->m_bottomLink = nullptr;
 			}
 		}
 		if (WeldItems.count() != 0)
@@ -477,21 +477,21 @@
 			{
 				PageItem* ta = TableItemsF.at(ttc);
 				if (ta->TopLinkID != -1)
-					ta->TopLink = TableIDF[ta->TopLinkID];
-				else
-					ta->TopLink = nullptr;
+					ta->m_topLink = TableIDF[ta->TopLinkID];
+				else
+					ta->m_topLink = nullptr;
 				if (ta->LeftLinkID != -1)
-					ta->LeftLink = TableIDF[ta->LeftLinkID];
-				else
-					ta->LeftLink = nullptr;
+					ta->m_leftLink = TableIDF[ta->LeftLinkID];
+				else
+					ta->m_leftLink = nullptr;
 				if (ta->RightLinkID != -1)
-					ta->RightLink = TableIDF[ta->RightLinkID];
-				else
-					ta->RightLink = nullptr;
+					ta->m_rightLink = TableIDF[ta->RightLinkID];
+				else
+					ta->m_rightLink = nullptr;
 				if (ta->BottomLinkID != -1)
-					ta->BottomLink = TableIDF[ta->BottomLinkID];
-				else
-					ta->BottomLink = nullptr;
+					ta->m_bottomLink = TableIDF[ta->BottomLinkID];
+				else
+					ta->m_bottomLink = nullptr;
 			}
 		}
 		if (TableItemsM.count() != 0)
@@ -500,21 +500,21 @@
 			{
 				PageItem* ta = TableItemsM.at(ttc);
 				if (ta->TopLinkID != -1)
-					ta->TopLink = TableIDM[ta->TopLinkID];
-				else
-					ta->TopLink = nullptr;
+					ta->m_topLink = TableIDM[ta->TopLinkID];
+				else
+					ta->m_topLink = nullptr;
 				if (ta->LeftLinkID != -1)
-					ta->LeftLink = TableIDM[ta->LeftLinkID];
-				else
-					ta->LeftLink = nullptr;
+					ta->m_leftLink = TableIDM[ta->LeftLinkID];
+				else
+					ta->m_leftLink = nullptr;
 				if (ta->RightLinkID != -1)
-					ta->RightLink = TableIDM[ta->RightLinkID];
-				else
-					ta->RightLink = nullptr;
+					ta->m_rightLink = TableIDM[ta->RightLinkID];
+				else
+					ta->m_rightLink = nullptr;
 				if (ta->BottomLinkID != -1)
-					ta->BottomLink = TableIDM[ta->BottomLinkID];
-				else
-					ta->BottomLink = nullptr;
+					ta->m_bottomLink = TableIDM[ta->BottomLinkID];
+				else
+					ta->m_bottomLink = nullptr;
 			}
 		}
 		if (TableItems.count() != 0)
@@ -523,21 +523,21 @@
 			{
 				PageItem* ta = TableItems.at(ttc);
 				if (ta->TopLinkID != -1)
-					ta->TopLink = TableID[ta->TopLinkID];
-				else
-					ta->TopLink = nullptr;
+					ta->m_topLink = TableID[ta->TopLinkID];
+				else
+					ta->m_topLink = nullptr;
 				if (ta->LeftLinkID != -1)
-					ta->LeftLink = TableID[ta->LeftLinkID];
-				else
-					ta->LeftLink = nullptr;
+					ta->m_leftLink = TableID[ta->LeftLinkID];
+				else
+					ta->m_leftLink = nullptr;
 				if (ta->RightLinkID != -1)
-					ta->RightLink = TableID[ta->RightLinkID];
-				else
-					ta->RightLink = nullptr;
+					ta->m_rightLink = TableID[ta->RightLinkID];
+				else
+					ta->m_rightLink = nullptr;
 				if (ta->BottomLinkID != -1)
-					ta->BottomLink = TableID[ta->BottomLinkID];
-				else
-					ta->BottomLink = nullptr;
+					ta->m_bottomLink = TableID[ta->BottomLinkID];
+				else
+					ta->m_bottomLink = nullptr;
 			}
 		}
 		if (WeldItems.count() != 0)
@@ -921,21 +921,21 @@
 			{
 				PageItem* ta = TableItems.at(ttc);
 				if (ta->TopLinkID != -1)
-					ta->TopLink = LinkID[ta->TopLinkID];
-				else
-					ta->TopLink = nullptr;
+					ta->m_topLink = LinkID[ta->TopLinkID];
+				else
+					ta->m_topLink = nullptr;
 				if (ta->LeftLinkID != -1)
-					ta->LeftLink = LinkID[ta->LeftLinkID];
-				else
-					ta->LeftLink = nullptr;
+					ta->m_leftLink = LinkID[ta->LeftLinkID];
+				else
+					ta->m_leftLink = nullptr;
 				if (ta->RightLinkID != -1)
-					ta->RightLink = LinkID[ta->RightLinkID];
-				else
-					ta->RightLink = nullptr;
+					ta->m_rightLink = LinkID[ta->RightLinkID];
+				else
+					ta->m_rightLink = nullptr;
 				if (ta->BottomLinkID != -1)
-					ta->BottomLink = LinkID[ta->BottomLinkID];
-				else
-					ta->BottomLink = nullptr;
+					ta->m_bottomLink = LinkID[ta->BottomLinkID];
+				else
+					ta->m_bottomLink = nullptr;
 			}
 		}
 		if (WeldItems.count() != 0)
@@ -979,21 +979,21 @@
 			{
 				PageItem* ta = TableItemsF.at(ttc);
 				if (ta->TopLinkID != -1)
-					ta->TopLink = TableIDF[ta->TopLinkID];
-				else
-					ta->TopLink = nullptr;
+					ta->m_topLink = TableIDF[ta->TopLinkID];
+				else
+					ta->m_topLink = nullptr;
 				if (ta->LeftLinkID != -1)
-					ta->LeftLink = TableIDF[ta->LeftLinkID];
-				else
-					ta->LeftLink = nullptr;
+					ta->m_leftLink = TableIDF[ta->LeftLinkID];
+				else
+					ta->m_leftLink = nullptr;
 				if (ta->RightLinkID != -1)
-					ta->RightLink = TableIDF[ta->RightLinkID];
-				else
-					ta->RightLink = nullptr;
+					ta->m_rightLink = TableIDF[ta->RightLinkID];
+				else
+					ta->m_rightLink = nullptr;
 				if (ta->BottomLinkID != -1)
-					ta->BottomLink = TableIDF[ta->BottomLinkID];
-				else
-					ta->BottomLink = nullptr;
+					ta->m_bottomLink = TableIDF[ta->BottomLinkID];
+				else
+					ta->m_bottomLink = nullptr;
 			}
 		}
 		if (TableItemsM.count() != 0)
@@ -1002,21 +1002,21 @@
 			{
 				PageItem* ta = TableItemsM.at(ttc);
 				if (ta->TopLinkID != -1)
-					ta->TopLink = TableIDM[ta->TopLinkID];
-				else
-					ta->TopLink = nullptr;
+					ta->m_topLink = TableIDM[ta->TopLinkID];
+				else
+					ta->m_topLink = nullptr;
 				if (ta->LeftLinkID != -1)
-					ta->LeftLink = TableIDM[ta->LeftLinkID];
-				else
-					ta->LeftLink = nullptr;
+					ta->m_leftLink = TableIDM[ta->LeftLinkID];
+				else
+					ta->m_leftLink = nullptr;
 				if (ta->RightLinkID != -1)
-					ta->RightLink = TableIDM[ta->RightLinkID];
-				else
-					ta->RightLink = nullptr;
+					ta->m_rightLink = TableIDM[ta->RightLinkID];
+				else
+					ta->m_rightLink = nullptr;
 				if (ta->BottomLinkID != -1)
-					ta->BottomLink = TableIDM[ta->BottomLinkID];
-				else
-					ta->BottomLink = nullptr;
+					ta->m_bottomLink = TableIDM[ta->BottomLinkID];
+				else
+					ta->m_bottomLink = nullptr;
 			}
 		}
 		if (TableItems.count() != 0)
@@ -1025,21 +1025,21 @@
 			{
 				PageItem* ta = TableItems.at(ttc);
 				if (ta->TopLinkID != -1)
-					ta->TopLink = TableID[ta->TopLinkID];
-				else
-					ta->TopLink = nullptr;
+					ta->m_topLink = TableID[ta->TopLinkID];
+				else
+					ta->m_topLink = nullptr;
 				if (ta->LeftLinkID != -1)
-					ta->LeftLink = TableID[ta->LeftLinkID];
-				else
-					ta->LeftLink = nullptr;
+					ta->m_leftLink = TableID[ta->LeftLinkID];
+				else
+					ta->m_leftLink = nullptr;
 				if (ta->RightLinkID != -1)
-					ta->RightLink = TableID[ta->RightLinkID];
-				else
-					ta->RightLink = nullptr;
+					ta->m_rightLink = TableID[ta->RightLinkID];
+				else
+					ta->m_rightLink = nullptr;
 				if (ta->BottomLinkID != -1)
-					ta->BottomLink = TableID[ta->BottomLinkID];
-				else
-					ta->BottomLink = nullptr;
+					ta->m_bottomLink = TableID[ta->BottomLinkID];
+				else
+					ta->m_bottomLink = nullptr;
 			}
 		}
 		if (WeldItems.count() != 0)
@@ -1607,21 +1607,21 @@
 			{
 				PageItem* ta = TableItems.at(ttc);
 				if (ta->TopLinkID != -1)
-					ta->TopLink = LinkID[ta->TopLinkID];
-				else
-					ta->TopLink = nullptr;
+					ta->m_topLink = LinkID[ta->TopLinkID];
+				else
+					ta->m_topLink = nullptr;
 				if (ta->LeftLinkID != -1)
-					ta->LeftLink = LinkID[ta->LeftLinkID];
-				else
-					ta->LeftLink = nullptr;
+					ta->m_leftLink = LinkID[ta->LeftLinkID];
+				else
+					ta->m_leftLink = nullptr;
 				if (ta->RightLinkID != -1)
-					ta->RightLink = LinkID[ta->RightLinkID];
-				else
-					ta->RightLink = nullptr;
+					ta->m_rightLink = LinkID[ta->RightLinkID];
+				else
+					ta->m_rightLink = nullptr;
 				if (ta->BottomLinkID != -1)
-					ta->BottomLink = LinkID[ta->BottomLinkID];
-				else
-					ta->BottomLink = nullptr;
+					ta->m_bottomLink = LinkID[ta->BottomLinkID];
+				else
+					ta->m_bottomLink = nullptr;
 			}
 		}
 		if (WeldItems.count() != 0)
@@ -1665,21 +1665,21 @@
 			{
 				PageItem* ta = TableItemsF.at(ttc);
 				if (ta->TopLinkID != -1)
-					ta->TopLink = TableIDF[ta->TopLinkID];
-				else
-					ta->TopLink = nullptr;
+					ta->m_topLink = TableIDF[ta->TopLinkID];
+				else
+					ta->m_topLink = nullptr;
 				if (ta->LeftLinkID != -1)
-					ta->LeftLink = TableIDF[ta->LeftLinkID];
-				else
-					ta->LeftLink = nullptr;
+					ta->m_leftLink = TableIDF[ta->LeftLinkID];
+				else
+					ta->m_leftLink = nullptr;
 				if (ta->RightLinkID != -1)
-					ta->RightLink = TableIDF[ta->RightLinkID];
-				else
-					ta->RightLink = nullptr;
+					ta->m_rightLink = TableIDF[ta->RightLinkID];
+				else
+					ta->m_rightLink = nullptr;
 				if (ta->BottomLinkID != -1)
-					ta->BottomLink = TableIDF[ta->BottomLinkID];
-				else
-					ta->BottomLink = nullptr;
+					ta->m_bottomLink = TableIDF[ta->BottomLinkID];
+				else
+					ta->m_bottomLink = nullptr;
 			}
 		}
 		if (TableItemsM.count() != 0)
@@ -1688,21 +1688,21 @@
 			{
 				PageItem* ta = TableItemsM.at(ttc);
 				if (ta->TopLinkID != -1)
-					ta->TopLink = TableIDM[ta->TopLinkID];
-				else
-					ta->TopLink = nullptr;
+					ta->m_topLink = TableIDM[ta->TopLinkID];
+				else
+					ta->m_topLink = nullptr;
 				if (ta->LeftLinkID != -1)
-					ta->LeftLink = TableIDM[ta->LeftLinkID];
-				else
-					ta->LeftLink = nullptr;
+					ta->m_leftLink = TableIDM[ta->LeftLinkID];
+				else
+					ta->m_leftLink = nullptr;
 				if (ta->RightLinkID != -1)
-					ta->RightLink = TableIDM[ta->RightLinkID];
-				else
-					ta->RightLink = nullptr;
+					ta->m_rightLink = TableIDM[ta->RightLinkID];
+				else
+					ta->m_rightLink = nullptr;
 				if (ta->BottomLinkID != -1)
-					ta->BottomLink = TableIDM[ta->BottomLinkID];
-				else
-					ta->BottomLink = nullptr;
+					ta->m_bottomLink = TableIDM[ta->BottomLinkID];
+				else
+					ta->m_bottomLink = nullptr;
 			}
 		}
 		if (TableItems.count() != 0)
@@ -1711,21 +1711,21 @@
 			{
 				PageItem* ta = TableItems.at(ttc);
 				if (ta->TopLinkID != -1)
-					ta->TopLink = TableID[ta->TopLinkID];
-				else
-					ta->TopLink = nullptr;
+					ta->m_topLink = TableID[ta->TopLinkID];
+				else
+					ta->m_topLink = nullptr;
 				if (ta->LeftLinkID != -1)
-					ta->LeftLink = TableID[ta->LeftLinkID];
-				else
-					ta->LeftLink = nullptr;
+					ta->m_leftLink = TableID[ta->LeftLinkID];
+				else
+					ta->m_leftLink = nullptr;
 				if (ta->RightLinkID != -1)
-					ta->RightLink = TableID[ta->RightLinkID];
-				else
-					ta->RightLink = nullptr;
+					ta->m_rightLink = TableID[ta->RightLinkID];
+				else
+					ta->m_rightLink = nullptr;
 				if (ta->BottomLinkID != -1)
-					ta->BottomLink = TableID[ta->BottomLinkID];
-				else
-					ta->BottomLink = nullptr;
+					ta->m_bottomLink = TableID[ta->BottomLinkID];
+				else
+					ta->m_bottomLink = nullptr;
 			}
 		}
 		if (WeldItems.count() != 0)
@@ -4351,21 +4351,21 @@
 			{
 				PageItem* ta = TableItems2.at(ttc);
 				if (ta->TopLinkID != -1)
-					ta->TopLink = LinkID[ta->TopLinkID];
-				else
-					ta->TopLink = nullptr;
+					ta->m_topLink = LinkID[ta->TopLinkID];
+				else
+					ta->m_topLink = nullptr;
 				if (ta->LeftLinkID != -1)
-					ta->LeftLink = LinkID[ta->LeftLinkID];
-				else
-					ta->LeftLink = nullptr;
+					ta->m_leftLink = LinkID[ta->LeftLinkID];
+				else
+					ta->m_leftLink = nullptr;
 				if (ta->RightLinkID != -1)
-					ta->RightLink = LinkID[ta->RightLinkID];
-				else
-					ta->RightLink = nullptr;
+					ta->m_rightLink = LinkID[ta->RightLinkID];
+				else
+					ta->m_rightLink = nullptr;
 				if (ta->BottomLinkID != -1)
-					ta->BottomLink = LinkID[ta->BottomLinkID];
-				else
-					ta->BottomLink = nullptr;
+					ta->m_bottomLink = LinkID[ta->BottomLinkID];
+				else
+					ta->m_bottomLink = nullptr;
 			}
 		}
 		if (WeldItems.count() != 0)
@@ -4391,21 +4391,21 @@
 			{
 				PageItem* ta = TableItems2.at(ttc);
 				if (ta->TopLinkID != -1)
-					ta->TopLink = TableID2[ta->TopLinkID];
-				else
-					ta->TopLink = nullptr;
+					ta->m_topLink = TableID2[ta->TopLinkID];
+				else
+					ta->m_topLink = nullptr;
 				if (ta->LeftLinkID != -1)
-					ta->LeftLink = TableID2[ta->LeftLinkID];
-				else
-					ta->LeftLink = nullptr;
+					ta->m_leftLink = TableID2[ta->LeftLinkID];
+				else
+					ta->m_leftLink = nullptr;
 				if (ta->RightLinkID != -1)
-					ta->RightLink = TableID2[ta->RightLinkID];
-				else
-					ta->RightLink = nullptr;
+					ta->m_rightLink = TableID2[ta->RightLinkID];
+				else
+					ta->m_rightLink = nullptr;
 				if (ta->BottomLinkID != -1)
-					ta->BottomLink = TableID2[ta->BottomLinkID];
-				else
-					ta->BottomLink = nullptr;
+					ta->m_bottomLink = TableID2[ta->BottomLinkID];
+				else
+					ta->m_bottomLink = nullptr;
 			}
 		}
 		if (WeldItems.count() != 0)
@@ -6385,21 +6385,21 @@
 			{
 				PageItem* ta = TableItems.at(ttc);
 				if (ta->TopLinkID != -1)
-					ta->TopLink = LinkID[ta->TopLinkID];
-				else
-					ta->TopLink = nullptr;
+					ta->m_topLink = LinkID[ta->TopLinkID];
+				else
+					ta->m_topLink = nullptr;
 				if (ta->LeftLinkID != -1)
-					ta->LeftLink = LinkID[ta->LeftLinkID];
-				else
-					ta->LeftLink = nullptr;
+					ta->m_leftLink = LinkID[ta->LeftLinkID];
+				else
+					ta->m_leftLink = nullptr;
 				if (ta->RightLinkID != -1)
-					ta->RightLink = LinkID[ta->RightLinkID];
-				else
-					ta->RightLink = nullptr;
+					ta->m_rightLink = LinkID[ta->RightLinkID];
+				else
+					ta->m_rightLink = nullptr;
 				if (ta->BottomLinkID != -1)
-					ta->BottomLink = LinkID[ta->BottomLinkID];
-				else
-					ta->BottomLink = nullptr;
+					ta->m_bottomLink = LinkID[ta->BottomLinkID];
+				else
+					ta->m_bottomLink = nullptr;
 			}
 		}
 		if (WeldItems.count() != 0)
@@ -6443,21 +6443,21 @@
 			{
 				PageItem* ta = TableItems.at(ttc);
 				if (ta->TopLinkID != -1)
-					ta->TopLink = TableID[ta->TopLinkID];
-				else
-					ta->TopLink = nullptr;
+					ta->m_topLink = TableID[ta->TopLinkID];
+				else
+					ta->m_topLink = nullptr;
 				if (ta->LeftLinkID != -1)
-					ta->LeftLink = TableID[ta->LeftLinkID];
-				else
-					ta->LeftLink = nullptr;
+					ta->m_leftLink = TableID[ta->LeftLinkID];
+				else
+					ta->m_leftLink = nullptr;
 				if (ta->RightLinkID != -1)
-					ta->RightLink = TableID[ta->RightLinkID];
-				else
-					ta->RightLink = nullptr;
+					ta->m_rightLink = TableID[ta->RightLinkID];
+				else
+					ta->m_rightLink = nullptr;
 				if (ta->BottomLinkID != -1)
-					ta->BottomLink = TableID[ta->BottomLinkID];
-				else
-					ta->BottomLink = nullptr;
+					ta->m_bottomLink = TableID[ta->BottomLinkID];
+				else
+					ta->m_bottomLink = nullptr;
 			}
 		}
 		if (WeldItems.count() != 0)

Modified: trunk/Scribus/scribus/plugins/fileloader/scribus150format/scribus150format.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23049&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	Sat Jun 22 22:25:53 2019
@@ -45,7 +45,7 @@
 		virtual void deleteAboutData(const AboutData* about) const;
 		virtual void languageChange();
 		//Not the same as readSLA. This one only reads max 4k of the file for speed.
-		virtual bool fileSupported(QIODevice* file, const QString & fileName=QString::null) const;
+		virtual bool fileSupported(QIODevice* file, const QString & fileName=QString()) const;
 
 		virtual bool loadFile(const QString & fileName, const FileFormat & fmt, int flags, int index = 0);
 		virtual bool saveFile(const QString & fileName, const FileFormat & fmt);
@@ -56,7 +56,7 @@
 		virtual void addToMainWindowMenu(ScribusMainWindow *) {};
 
 		// Special features - .sla page extraction support
-		virtual bool loadPage(const QString & fileName, int pageNumber, bool Mpage, const QString& renamedPageName=QString::null);
+		virtual bool loadPage(const QString & fileName, int pageNumber, bool Mpage, const QString& renamedPageName=QString());
 		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/fontpreview/fontpreview.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23049&path=/trunk/Scribus/scribus/plugins/fontpreview/fontpreview.h
==============================================================================
--- trunk/Scribus/scribus/plugins/fontpreview/fontpreview.h	(original)
+++ trunk/Scribus/scribus/plugins/fontpreview/fontpreview.h	Sat Jun 22 22:25:53 2019
@@ -30,7 +30,7 @@
 	/*! \brief Create Font Preview window,
 	\param fontName Optional name of the font to init/select on start.
 	*/
-	FontPreview(const QString& fontName = QString::null, QWidget* parent = 0, ScribusDoc* doc=0);
+	FontPreview(const QString& fontName = QString(), QWidget* parent = 0, ScribusDoc* doc=0);
 	~FontPreview();
 
 	/*! \brief Get the current selected font name.

Modified: trunk/Scribus/scribus/plugins/fontpreview/fontpreviewplugin.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23049&path=/trunk/Scribus/scribus/plugins/fontpreview/fontpreviewplugin.h
==============================================================================
--- trunk/Scribus/scribus/plugins/fontpreview/fontpreviewplugin.h	(original)
+++ trunk/Scribus/scribus/plugins/fontpreview/fontpreviewplugin.h	Sat Jun 22 22:25:53 2019
@@ -20,8 +20,8 @@
 		// Standard plugin implementation
 		FontPreviewPlugin();
 		virtual ~FontPreviewPlugin();
-		virtual bool run(ScribusDoc* doc, const QString& target = QString::null);
-		virtual bool run(QWidget *parent, ScribusDoc* doc, const QString& target = QString::null);
+		virtual bool run(ScribusDoc* doc, const QString& target = QString());
+		virtual bool run(QWidget *parent, ScribusDoc* doc, const QString& target = QString());
 		virtual const QString fullTrName() const;
 		virtual const AboutData* getAboutData() const;
 		virtual void deleteAboutData(const AboutData* about) const;

Modified: trunk/Scribus/scribus/plugins/gettext/docim/docim.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23049&path=/trunk/Scribus/scribus/plugins/gettext/docim/docim.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/gettext/docim/docim.cpp	(original)
+++ trunk/Scribus/scribus/plugins/gettext/docim/docim.cpp	Sat Jun 22 22:25:53 2019
@@ -39,7 +39,7 @@
 		found = true;
 		test->terminate();
 		std::this_thread::sleep_for(std::chrono::milliseconds(5));
-		test->kill();	
+		test->kill();
 	}
 	delete test;
 	searched = true;
@@ -50,7 +50,7 @@
 {
 	if (hasAntiword())
 		return QObject::tr("Word Documents");
-	return QString::null;
+	return QString();
 }
 
 QStringList FileExtensions()

Modified: trunk/Scribus/scribus/plugins/import/ai/importaiplugin.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23049&path=/trunk/Scribus/scribus/plugins/import/ai/importaiplugin.h
==============================================================================
--- trunk/Scribus/scribus/plugins/import/ai/importaiplugin.h	(original)
+++ trunk/Scribus/scribus/plugins/import/ai/importaiplugin.h	Sat Jun 22 22:25:53 2019
@@ -31,7 +31,7 @@
 		virtual const AboutData* getAboutData() const;
 		virtual void deleteAboutData(const AboutData* about) const;
 		virtual void languageChange();
-		virtual bool fileSupported(QIODevice* file, const QString & fileName=QString::null) const;
+		virtual bool fileSupported(QIODevice* file, const QString & fileName=QString()) const;
 		virtual bool loadFile(const QString & fileName, const FileFormat & fmt, int flags, int index = 0);
 		virtual QImage readThumbnail(const QString& fileName);
 		virtual bool readColors(const QString& fileName, ColorList & colors);
@@ -45,7 +45,7 @@
 		\param fileName input filename, or QString::null to prompt.
 		\retval bool always true
 		 */
-		virtual bool import(QString fileName = QString::null, int flags = lfUseCurrentPage|lfInteractive);
+	virtual bool import(QString fileName = QString(), int flags = lfUseCurrentPage|lfInteractive);
 
 	private:
 		void registerFormats();

Modified: trunk/Scribus/scribus/plugins/import/cdr/importcdrplugin.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23049&path=/trunk/Scribus/scribus/plugins/import/cdr/importcdrplugin.h
==============================================================================
--- trunk/Scribus/scribus/plugins/import/cdr/importcdrplugin.h	(original)
+++ trunk/Scribus/scribus/plugins/import/cdr/importcdrplugin.h	Sat Jun 22 22:25:53 2019
@@ -31,7 +31,7 @@
 		virtual const AboutData* getAboutData() const;
 		virtual void deleteAboutData(const AboutData* about) const;
 		virtual void languageChange();
-		virtual bool fileSupported(QIODevice* file, const QString & fileName=QString::null) const;
+		virtual bool fileSupported(QIODevice* file, const QString & fileName=QString()) const;
 		virtual bool loadFile(const QString & fileName, const FileFormat & fmt, int flags, int index = 0);
 		virtual QImage readThumbnail(const QString& fileName);
 		virtual void addToMainWindowMenu(ScribusMainWindow *) {};
@@ -41,10 +41,10 @@
 		\author Franz Schmid
 		\date
 		\brief Run the EPS import
-		\param fileName input filename, or QString::null to prompt.
+		\param fileName input filename, or QString() to prompt.
 		\retval bool always true
 		 */
-		virtual bool import(QString fileName = QString::null, int flags = lfUseCurrentPage|lfInteractive);
+	virtual bool import(QString fileName = QString(), int flags = lfUseCurrentPage|lfInteractive);
 
 	private:
 		void registerFormats();

Modified: trunk/Scribus/scribus/plugins/import/cgm/importcgmplugin.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23049&path=/trunk/Scribus/scribus/plugins/import/cgm/importcgmplugin.h
==============================================================================
--- trunk/Scribus/scribus/plugins/import/cgm/importcgmplugin.h	(original)
+++ trunk/Scribus/scribus/plugins/import/cgm/importcgmplugin.h	Sat Jun 22 22:25:53 2019
@@ -38,7 +38,7 @@
 		virtual const AboutData* getAboutData() const;
 		virtual void deleteAboutData(const AboutData* about) const;
 		virtual void languageChange();
-		virtual bool fileSupported(QIODevice* file, const QString & fileName=QString::null) const;
+		virtual bool fileSupported(QIODevice* file, const QString & fileName=QString()) const;
 		virtual bool loadFile(const QString & fileName, const FileFormat & fmt, int flags, int index = 0);
 		virtual QImage readThumbnail(const QString& fileName);
 		virtual void addToMainWindowMenu(ScribusMainWindow *) {};
@@ -48,10 +48,10 @@
 		\author Franz Schmid
 		\date
 		\brief Run the EPS import
-		\param fileName input filename, or QString::null to prompt.
+		\param fileName input filename, or QString() to prompt.
 		\retval bool always true
 		 */
-		virtual bool import(QString fileName = QString::null, int flags = lfUseCurrentPage|lfInteractive);
+		virtual bool import(QString fileName = QString(), int flags = lfUseCurrentPage|lfInteractive);
 
 	private:
 		void registerFormats();

Modified: trunk/Scribus/scribus/plugins/import/cvg/importcvgplugin.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23049&path=/trunk/Scribus/scribus/plugins/import/cvg/importcvgplugin.h
==============================================================================
--- trunk/Scribus/scribus/plugins/import/cvg/importcvgplugin.h	(original)
+++ trunk/Scribus/scribus/plugins/import/cvg/importcvgplugin.h	Sat Jun 22 22:25:53 2019
@@ -31,7 +31,7 @@
 		virtual const AboutData* getAboutData() const;
 		virtual void deleteAboutData(const AboutData* about) const;
 		virtual void languageChange();
-		virtual bool fileSupported(QIODevice* file, const QString & fileName=QString::null) const;
+		virtual bool fileSupported(QIODevice* file, const QString & fileName=QString()) const;
 		virtual bool loadFile(const QString & fileName, const FileFormat & fmt, int flags, int index = 0);
 		virtual QImage readThumbnail(const QString& fileName);
 		virtual void addToMainWindowMenu(ScribusMainWindow *) {};
@@ -41,10 +41,10 @@
 		\author Franz Schmid
 		\date
 		\brief Run the EPS import
-		\param fileName input filename, or QString::null to prompt.
+		\param fileName input filename, or QString() to prompt.
 		\retval bool always true
 		 */
-		virtual bool import(QString fileName = QString::null, int flags = lfUseCurrentPage|lfInteractive);
+		virtual bool import(QString fileName = QString(), int flags = lfUseCurrentPage|lfInteractive);
 
 	private:
 		void registerFormats();

Modified: trunk/Scribus/scribus/plugins/import/drw/importdrwplugin.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23049&path=/trunk/Scribus/scribus/plugins/import/drw/importdrwplugin.h
==============================================================================
--- trunk/Scribus/scribus/plugins/import/drw/importdrwplugin.h	(original)
+++ trunk/Scribus/scribus/plugins/import/drw/importdrwplugin.h	Sat Jun 22 22:25:53 2019
@@ -38,7 +38,7 @@
 		virtual const AboutData* getAboutData() const;
 		virtual void deleteAboutData(const AboutData* about) const;
 		virtual void languageChange();
-		virtual bool fileSupported(QIODevice* file, const QString & fileName=QString::null) const;
+		virtual bool fileSupported(QIODevice* file, const QString & fileName=QString()) const;
 		virtual bool loadFile(const QString & fileName, const FileFormat & fmt, int flags, int index = 0);
 		virtual QImage readThumbnail(const QString& fileName);
 		virtual void addToMainWindowMenu(ScribusMainWindow *) {};
@@ -48,10 +48,10 @@
 		\author Franz Schmid
 		\date
 		\brief Run the import
-		\param fileName input filename, or QString::null to prompt.
+		\param fileName input filename, or QString() to prompt.
 		\retval bool always true
 		 */
-		virtual bool import(QString fileName = QString::null, int flags = lfUseCurrentPage|lfInteractive);
+		virtual bool import(QString fileName = QString(), int flags = lfUseCurrentPage|lfInteractive);
 
 	private:
 		void registerFormats();

Modified: trunk/Scribus/scribus/plugins/import/emf/importemfplugin.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23049&path=/trunk/Scribus/scribus/plugins/import/emf/importemfplugin.h
==============================================================================
--- trunk/Scribus/scribus/plugins/import/emf/importemfplugin.h	(original)
+++ trunk/Scribus/scribus/plugins/import/emf/importemfplugin.h	Sat Jun 22 22:25:53 2019
@@ -36,7 +36,7 @@
 		virtual const AboutData* getAboutData() const;
 		virtual void deleteAboutData(const AboutData* about) const;
 		virtual void languageChange();
-		virtual bool fileSupported(QIODevice* file, const QString & fileName=QString::null) const;
+		virtual bool fileSupported(QIODevice* file, const QString & fileName=QString()) const;
 		virtual bool loadFile(const QString & fileName, const FileFormat & fmt, int flags, int index = 0);
 		virtual QImage readThumbnail(const QString& fileName);
 		virtual void addToMainWindowMenu(ScribusMainWindow *) {};
@@ -46,10 +46,10 @@
 		\author Franz Schmid
 		\date
 		\brief Run the EPS import
-		\param fileName input filename, or QString::null to prompt.
+		\param fileName input filename, or QString() to prompt.
 		\retval bool always true
 		 */
-		virtual bool import(QString fileName = QString::null, int flags = lfUseCurrentPage|lfInteractive);
+		virtual bool import(QString fileName = QString(), int flags = lfUseCurrentPage|lfInteractive);
 
 	private:
 		void registerFormats();

Modified: trunk/Scribus/scribus/plugins/import/fh/importfhplugin.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23049&path=/trunk/Scribus/scribus/plugins/import/fh/importfhplugin.h
==============================================================================
--- trunk/Scribus/scribus/plugins/import/fh/importfhplugin.h	(original)
+++ trunk/Scribus/scribus/plugins/import/fh/importfhplugin.h	Sat Jun 22 22:25:53 2019
@@ -31,7 +31,7 @@
 		virtual const AboutData* getAboutData() const;
 		virtual void deleteAboutData(const AboutData* about) const;
 		virtual void languageChange();
-		virtual bool fileSupported(QIODevice* file, const QString & fileName=QString::null) const;
+		virtual bool fileSupported(QIODevice* file, const QString & fileName=QString()) const;
 		virtual bool loadFile(const QString & fileName, const FileFormat & fmt, int flags, int index = 0);
 		virtual QImage readThumbnail(const QString& fileName);
 		virtual void addToMainWindowMenu(ScribusMainWindow *) {};
@@ -41,10 +41,10 @@
 		\author Franz Schmid
 		\date
 		\brief Run the EPS import
-		\param fileName input filename, or QString::null to prompt.
+		\param fileName input filename, or QString() to prompt.
 		\retval bool always true
 		 */
-		virtual bool import(QString fileName = QString::null, int flags = lfUseCurrentPage|lfInteractive);
+		virtual bool import(QString fileName = QString(), int flags = lfUseCurrentPage|lfInteractive);
 
 	private:
 		void registerFormats();

Modified: trunk/Scribus/scribus/plugins/import/idml/importidmlplugin.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23049&path=/trunk/Scribus/scribus/plugins/import/idml/importidmlplugin.h
==============================================================================
--- trunk/Scribus/scribus/plugins/import/idml/importidmlplugin.h	(original)
+++ trunk/Scribus/scribus/plugins/import/idml/importidmlplugin.h	Sat Jun 22 22:25:53 2019
@@ -44,7 +44,7 @@
 		virtual const AboutData* getAboutData() const;
 		virtual void deleteAboutData(const AboutData* about) const;
 		virtual void languageChange();
-		virtual bool fileSupported(QIODevice* file, const QString & fileName=QString::null) const;
+		virtual bool fileSupported(QIODevice* file, const QString & fileName=QString()) const;
 		virtual bool loadFile(const QString & fileName, const FileFormat & fmt, int flags, int index = 0);
 		virtual QImage readThumbnail(const QString& fileName);
 		virtual bool readColors(const QString& fileName, ColorList & colors);
@@ -55,10 +55,10 @@
 		\author Franz Schmid
 		\date
 		\brief Run the IDML import
-		\param fileName input filename, or QString::null to prompt.
+		\param fileName input filename, or QString() to prompt.
 		\retval bool always true
 		 */
-		virtual bool import(QString fileName = QString::null, int flags = lfUseCurrentPage|lfInteractive);
+		virtual bool import(QString fileName = QString(), int flags = lfUseCurrentPage|lfInteractive);
 
 	private:
 		void registerFormats();

Modified: trunk/Scribus/scribus/plugins/import/idml_old/importidml.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23049&path=/trunk/Scribus/scribus/plugins/import/idml_old/importidml.h
==============================================================================
--- trunk/Scribus/scribus/plugins/import/idml_old/importidml.h	(original)
+++ trunk/Scribus/scribus/plugins/import/idml_old/importidml.h	Sat Jun 22 22:25:53 2019
@@ -28,15 +28,15 @@
 		ImportIdml();
 		virtual ~ImportIdml();
 		//! \brief main method to run the plug
-		virtual bool run(ScribusDoc* doc, QString target = QString::null);
+		virtual bool run(ScribusDoc* doc, QString target = QString());
 		virtual const QString fullTrName() const;
 		virtual const AboutData* getAboutData() const;
 		virtual void deleteAboutData(const AboutData* about) const;
 		virtual void languageChange();
-		virtual bool fileSupported(QIODevice* file, const QString & fileName=QString::null) const;
+		virtual bool fileSupported(QIODevice* file, const QString & fileName=QString()) const;
 		virtual bool loadFile(const QString & fileName, const FileFormat & fmt, int flags, int index = 0);
 		virtual void addToMainWindowMenu(ScribusMainWindow *) {};
-//		virtual bool import(QString fileName = QString::null, int flags = lfUseCurrentPage|lfInteractive);
+//		virtual bool import(QString fileName = QString(), int flags = lfUseCurrentPage|lfInteractive);
 		void registerFormats();
 };
 

Modified: trunk/Scribus/scribus/plugins/import/odg/importodgplugin.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23049&path=/trunk/Scribus/scribus/plugins/import/odg/importodgplugin.h
==============================================================================
--- trunk/Scribus/scribus/plugins/import/odg/importodgplugin.h	(original)
+++ trunk/Scribus/scribus/plugins/import/odg/importodgplugin.h	Sat Jun 22 22:25:53 2019
@@ -44,7 +44,7 @@
 		virtual const AboutData* getAboutData() const;
 		virtual void deleteAboutData(const AboutData* about) const;
 		virtual void languageChange();
-		virtual bool fileSupported(QIODevice* file, const QString & fileName=QString::null) const;
+		virtual bool fileSupported(QIODevice* file, const QString & fileName=QString()) const;
 		virtual bool loadFile(const QString & fileName, const FileFormat & fmt, int flags, int index = 0);
 		virtual QImage readThumbnail(const QString& fileName);
 		virtual void addToMainWindowMenu(ScribusMainWindow *) {};
@@ -54,10 +54,10 @@
 		\author Franz Schmid
 		\date
 		\brief Run the ODG import
-		\param fileName input filename, or QString::null to prompt.
+		\param fileName input filename, or QString() to prompt.
 		\retval bool always true
 		 */
-		virtual bool import(QString fileName = QString::null, int flags = lfUseCurrentPage|lfInteractive);
+		virtual bool import(QString fileName = QString(), int flags = lfUseCurrentPage|lfInteractive);
 
 	private:
 		void registerFormats();

Modified: trunk/Scribus/scribus/plugins/import/oodraw/oodrawimp.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23049&path=/trunk/Scribus/scribus/plugins/import/oodraw/oodrawimp.h
==============================================================================
--- trunk/Scribus/scribus/plugins/import/oodraw/oodrawimp.h	(original)
+++ trunk/Scribus/scribus/plugins/import/oodraw/oodrawimp.h	Sat Jun 22 22:25:53 2019
@@ -31,14 +31,14 @@
 		virtual const AboutData* getAboutData() const;
 		virtual void deleteAboutData(const AboutData* about) const;
 		virtual void languageChange();
-		virtual bool fileSupported(QIODevice* file, const QString & fileName=QString::null) const;
+		virtual bool fileSupported(QIODevice* file, const QString & fileName=QString()) const;
 		virtual bool loadFile(const QString & fileName, const FileFormat & fmt, int flags, int index = 0);
 		virtual QImage readThumbnail(const QString& fileName);
 		virtual void addToMainWindowMenu(ScribusMainWindow *) {};
 
 		// Special features - File->Import slot
 	public slots:
-		virtual bool import(QString target = QString::null, int flags = lfUseCurrentPage|lfInteractive);
+		virtual bool import(QString target = QString(), int flags = lfUseCurrentPage|lfInteractive);
 
 	private:
 		void registerFormats();

Modified: trunk/Scribus/scribus/plugins/import/oodraw/stylestack.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23049&path=/trunk/Scribus/scribus/plugins/import/oodraw/stylestack.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/oodraw/stylestack.cpp	(original)
+++ trunk/Scribus/scribus/plugins/import/oodraw/stylestack.cpp	Sat Jun 22 22:25:53 2019
@@ -31,7 +31,7 @@
 
 StyleStack::StyleStack()
 {
-    clear();
+	clear();
 	fillNodeNameList(m_nodeNames, StyleStack::OODraw1x);
 }
 
@@ -47,98 +47,98 @@
 
 void StyleStack::clear()
 {
-    m_stack.clear();
+	m_stack.clear();
 }
 
 void StyleStack::save()
 {
-    m_marks.push( m_stack.count() );
+	m_marks.push( m_stack.count() );
 }
 
 void StyleStack::restore()
 {
-    Q_ASSERT( !m_marks.isEmpty() );
-    int toIndex = m_marks.pop();
-    Q_ASSERT( toIndex > -1 );
-    Q_ASSERT( toIndex <= (int)m_stack.count() ); // If equal, nothing to remove. If greater, bug.
-    for ( int index = (int)m_stack.count() - 1; index >= toIndex; --index )
-        m_stack.pop_back();
+	Q_ASSERT( !m_marks.isEmpty() );
+	int toIndex = m_marks.pop();
+	Q_ASSERT( toIndex > -1 );
+	Q_ASSERT( toIndex <= (int)m_stack.count() ); // If equal, nothing to remove. If greater, bug.
+	for ( int index = (int)m_stack.count() - 1; index >= toIndex; --index )
+		m_stack.pop_back();
 }
 
 void StyleStack::pop()
 {
-    m_stack.pop_back();
+	m_stack.pop_back();
 }
 
 void StyleStack::push( const QDomElement& style )
 {
-    m_stack.append( style );
+	m_stack.append( style );
 }
 
 bool StyleStack::hasAttribute( const QString& name ) const
 {
-    // TODO: has to be fixed for complex styles like list-styles
-    QList<QDomElement>::ConstIterator it = m_stack.end();
-    while ( it != m_stack.begin() )
-    {
-        --it;
-		QDomElement properties = searchAttribute( *it, m_nodeNames, name );
-        if ( properties.hasAttribute( name ) )
-            return true;
-    }
-
-    return false;
+	// TODO: has to be fixed for complex styles like list-styles
+	QList<QDomElement>::ConstIterator it = m_stack.end();
+	while ( it != m_stack.begin() )
+	{
+		--it;
+		QDomElement properties = searchAttribute( *it, m_nodeNames, name );
+		if ( properties.hasAttribute( name ) )
+			return true;
+	}
+
+	return false;
 }
 
 QString StyleStack::attribute( const QString& name ) const
 {
-    // TODO: has to be fixed for complex styles like list-styles
-    QList<QDomElement>::ConstIterator it = m_stack.end();
-    while ( it != m_stack.begin() )
-    {
-        --it;
-        QDomElement properties = searchAttribute( *it, m_nodeNames, name );
-        if ( properties.hasAttribute( name ) )
-            return properties.attribute( name );
-    }
-
-    return QString::null;
+	// TODO: has to be fixed for complex styles like list-styles
+	QList<QDomElement>::ConstIterator it = m_stack.end();
+	while ( it != m_stack.begin() )
+	{
+		--it;
+		QDomElement properties = searchAttribute( *it, m_nodeNames, name );
+		if ( properties.hasAttribute( name ) )
+			return properties.attribute( name );
+	}
+
+	return QString();
 }
 
 bool StyleStack::hasAttribute( const QString& name, const QString& detail ) const
 {
-    QString fullName( name );
-    fullName += '-';
-    fullName += detail;
-    QList<QDomElement>::ConstIterator it = m_stack.end();
-    while ( it != m_stack.begin() )
-    {
-        --it;
+	QString fullName( name );
+	fullName += '-';
+	fullName += detail;
+	QList<QDomElement>::ConstIterator it = m_stack.end();
+	while ( it != m_stack.begin() )
+	{
+		--it;
 		QDomElement properties = searchAttribute( *it, m_nodeNames, name, fullName );
-        if ( properties.hasAttribute( name ) || properties.hasAttribute( fullName ) )
-            return true;
-    }
-
-    return false;
+		if ( properties.hasAttribute( name ) || properties.hasAttribute( fullName ) )
+			return true;
+	}
+
+	return false;
 }
 
 QString StyleStack::attribute( const QString& name, const QString& detail ) const
 {
-    QString fullName( name );
-    fullName += '-';
-    fullName += detail;
-    QList<QDomElement>::ConstIterator it = m_stack.end();
-    while ( it != m_stack.begin() )
-    {
-        --it;
-        QDomElement properties = searchAttribute( *it, m_nodeNames, name, fullName );
-        if ( properties.hasAttribute( fullName ) )
-            return properties.attribute( fullName );
-        if ( properties.hasAttribute( name ) )
-            return properties.attribute( name );
-    }
-
-    return QString::null;
+	QString fullName( name );
+	fullName += '-';
+	fullName += detail;
+	QList<QDomElement>::ConstIterator it = m_stack.end();
+	while ( it != m_stack.begin() )
+	{
+		--it;
+		QDomElement properties = searchAttribute( *it, m_nodeNames, name, fullName );
+		if ( properties.hasAttribute( fullName ) )
+			return properties.attribute( fullName );
+		if ( properties.hasAttribute( name ) )
+			return properties.attribute( name );
+	}
+
+	return QString();
 }
 
 // Font size is a bit special. "115%" applies to "the fontsize of the parent style".
@@ -146,69 +146,69 @@
 // Although, if we also add support for fo:font-size-rel here then it's not general anymore.
 double StyleStack::fontSize() const
 {
-    QString name = "fo:font-size";
-    double percent = 1;
-    QList<QDomElement>::ConstIterator it = m_stack.end();
-    while ( it != m_stack.begin() )
-    {
-        --it;
-        QDomElement properties = searchAttribute( *it, m_nodeNames, name );
-        if ( properties.hasAttribute( name ) ) {
-            QString value = properties.attribute( name );
-            if ( value.endsWith( "%" ) )
+	QString name = "fo:font-size";
+	double percent = 1;
+	QList<QDomElement>::ConstIterator it = m_stack.end();
+	while ( it != m_stack.begin() )
+	{
+		--it;
+		QDomElement properties = searchAttribute( *it, m_nodeNames, name );
+		if ( properties.hasAttribute( name ) ) {
+			QString value = properties.attribute( name );
+			if ( value.endsWith( "%" ) )
 				percent *= ScCLocale::toDoubleC(value) / 100.0;
-            else
-                return percent * OODPlug::parseUnit( value ); // e.g. 12pt
-        }
-    }
-    return 0;
+			else
+				return percent * OODPlug::parseUnit( value ); // e.g. 12pt
+		}
+	}
+	return 0;
 }
 
 bool StyleStack::hasChildNode(const QString & name) const
 {
-    QList<QDomElement>::ConstIterator it = m_stack.end();
-    while ( it != m_stack.begin() )
-    {
-        --it;
-        QDomElement properties = searchAttribute( *it, m_nodeNames, name );
-        if ( !properties.namedItem( name ).isNull() )
-            return true;
-    }
-
-    return false;
+	QList<QDomElement>::ConstIterator it = m_stack.end();
+	while ( it != m_stack.begin() )
+	{
+		--it;
+		QDomElement properties = searchAttribute( *it, m_nodeNames, name );
+		if ( !properties.namedItem( name ).isNull() )
+			return true;
+	}
+
+	return false;
 }
 
 QDomNode StyleStack::childNode(const QString & name) const
 {
-    QList<QDomElement>::ConstIterator it = m_stack.end();
-    while ( it != m_stack.begin() )
-    {
-        --it;
-        QDomElement properties = searchAttribute( *it, m_nodeNames, name );
-        if ( !properties.namedItem( name ).isNull() )
-            return properties.namedItem( name );
-    }
-
-    return QDomNode();          // a null node
+	QList<QDomElement>::ConstIterator it = m_stack.end();
+	while ( it != m_stack.begin() )
+	{
+		--it;
+		QDomElement properties = searchAttribute( *it, m_nodeNames, name );
+		if ( !properties.namedItem( name ).isNull() )
+			return properties.namedItem( name );
+	}
+
+	return QDomNode();          // a null node
 }
 
 static bool isUserStyle( const QDomElement& e )
 {
-    QDomElement parent = e.parentNode().toElement();
-    return parent.tagName() == "office:styles";
+	QDomElement parent = e.parentNode().toElement();
+	return parent.tagName() == "office:styles";
 }
 
 QString StyleStack::userStyleName() const
 {
-    QList<QDomElement>::ConstIterator it = m_stack.end();
-    while ( it != m_stack.begin() )
-    {
-        --it;
-        if ( isUserStyle( *it ) )
-            return (*it).attribute("style:name");
-    }
-    // Can this ever happen?
-    return "Standard";
+	QList<QDomElement>::ConstIterator it = m_stack.end();
+	while ( it != m_stack.begin() )
+	{
+		--it;
+		if ( isUserStyle( *it ) )
+			return (*it).attribute("style:name");
+	}
+	// Can this ever happen?
+	return "Standard";
 }
 
 void StyleStack::fillNodeNameList( QStringList& names, const StyleStack::Mode mode )

Modified: trunk/Scribus/scribus/plugins/import/pages/importpagesplugin.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23049&path=/trunk/Scribus/scribus/plugins/import/pages/importpagesplugin.h
==============================================================================
--- trunk/Scribus/scribus/plugins/import/pages/importpagesplugin.h	(original)
+++ trunk/Scribus/scribus/plugins/import/pages/importpagesplugin.h	Sat Jun 22 22:25:53 2019
@@ -44,7 +44,7 @@
 		virtual const AboutData* getAboutData() const;
 		virtual void deleteAboutData(const AboutData* about) const;
 		virtual void languageChange();
-		virtual bool fileSupported(QIODevice* file, const QString & fileName=QString::null) const;
+		virtual bool fileSupported(QIODevice* file, const QString & fileName=QString()) const;
 		virtual bool loadFile(const QString & fileName, const FileFormat & fmt, int flags, int index = 0);
 		virtual QImage readThumbnail(const QString& fileName);
 		virtual void addToMainWindowMenu(ScribusMainWindow *) {};
@@ -54,10 +54,10 @@
 		\author Franz Schmid
 		\date
 		\brief Run the Pages import
-		\param fileName input filename, or QString::null to prompt.
+		\param fileName input filename, or QString() to prompt.
 		\retval bool always true
 		 */
-		virtual bool import(QString fileName = QString::null, int flags = lfUseCurrentPage|lfInteractive);
+		virtual bool import(QString fileName = QString(), int flags = lfUseCurrentPage|lfInteractive);
 
 	private:
 		void registerFormats();

Modified: trunk/Scribus/scribus/plugins/import/pct/importpctplugin.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23049&path=/trunk/Scribus/scribus/plugins/import/pct/importpctplugin.h
==============================================================================
--- trunk/Scribus/scribus/plugins/import/pct/importpctplugin.h	(original)
+++ trunk/Scribus/scribus/plugins/import/pct/importpctplugin.h	Sat Jun 22 22:25:53 2019
@@ -31,7 +31,7 @@
 		virtual const AboutData* getAboutData() const;
 		virtual void deleteAboutData(const AboutData* about) const;
 		virtual void languageChange();
-		virtual bool fileSupported(QIODevice* file, const QString & fileName=QString::null) const;
+		virtual bool fileSupported(QIODevice* file, const QString & fileName=QString()) const;
 		virtual bool loadFile(const QString & fileName, const FileFormat & fmt, int flags, int index = 0);
 		virtual QImage readThumbnail(const QString& fileName);
 		virtual void addToMainWindowMenu(ScribusMainWindow *) {};
@@ -41,10 +41,10 @@
 		\author Franz Schmid
 		\date
 		\brief Run the EPS import
-		\param fileName input filename, or QString::null to prompt.
+		\param fileName input filename, or QString() to prompt.
 		\retval bool always true
 		 */
-		virtual bool import(QString fileName = QString::null, int flags = lfUseCurrentPage|lfInteractive);
+		virtual bool import(QString fileName = QString(), int flags = lfUseCurrentPage|lfInteractive);
 
 	private:
 		void registerFormats();

Modified: trunk/Scribus/scribus/plugins/import/pdf/importpdfplugin.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23049&path=/trunk/Scribus/scribus/plugins/import/pdf/importpdfplugin.h
==============================================================================
--- trunk/Scribus/scribus/plugins/import/pdf/importpdfplugin.h	(original)
+++ trunk/Scribus/scribus/plugins/import/pdf/importpdfplugin.h	Sat Jun 22 22:25:53 2019
@@ -31,7 +31,7 @@
 		virtual const AboutData* getAboutData() const;
 		virtual void deleteAboutData(const AboutData* about) const;
 		virtual void languageChange();
-		virtual bool fileSupported(QIODevice* file, const QString & fileName=QString::null) const;
+		virtual bool fileSupported(QIODevice* file, const QString & fileName=QString()) const;
 		virtual bool loadFile(const QString & fileName, const FileFormat & fmt, int flags, int index = 0);
 		virtual QImage readThumbnail(const QString& fileName);
 		virtual void addToMainWindowMenu(ScribusMainWindow *) {};
@@ -41,10 +41,10 @@
 		\author Franz Schmid
 		\date
 		\brief Run the EPS import
-		\param fileName input filename, or QString::null to prompt.
+		\param fileName input filename, or QString() to prompt.
 		\retval bool always true
 		 */
-		virtual bool import(QString fileName = QString::null, int flags = lfUseCurrentPage|lfInteractive);
+		virtual bool import(QString fileName = QString(), int flags = lfUseCurrentPage|lfInteractive);
 
 	private:
 		void registerFormats();

Modified: trunk/Scribus/scribus/plugins/import/pm/importpmplugin.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23049&path=/trunk/Scribus/scribus/plugins/import/pm/importpmplugin.h
==============================================================================
--- trunk/Scribus/scribus/plugins/import/pm/importpmplugin.h	(original)
+++ trunk/Scribus/scribus/plugins/import/pm/importpmplugin.h	Sat Jun 22 22:25:53 2019
@@ -31,7 +31,7 @@
 		virtual const AboutData* getAboutData() const;
 		virtual void deleteAboutData(const AboutData* about) const;
 		virtual void languageChange();
-		virtual bool fileSupported(QIODevice* file, const QString & fileName=QString::null) const;
+		virtual bool fileSupported(QIODevice* file, const QString & fileName=QString()) const;
 		virtual bool loadFile(const QString & fileName, const FileFormat & fmt, int flags, int index = 0);
 		virtual QImage readThumbnail(const QString& fileName);
 		virtual void addToMainWindowMenu(ScribusMainWindow *) {};
@@ -41,10 +41,10 @@
 		\author Franz Schmid
 		\date
 		\brief Run the EPS import
-		\param fileName input filename, or QString::null to prompt.
+		\param fileName input filename, or QString() to prompt.
 		\retval bool always true
 		 */
-		virtual bool import(QString fileName = QString::null, int flags = lfUseCurrentPage|lfInteractive);
+		virtual bool import(QString fileName = QString(), int flags = lfUseCurrentPage|lfInteractive);
 
 	private:
 		void registerFormats();

Modified: trunk/Scribus/scribus/plugins/import/ps/importpsplugin.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23049&path=/trunk/Scribus/scribus/plugins/import/ps/importpsplugin.h
==============================================================================
--- trunk/Scribus/scribus/plugins/import/ps/importpsplugin.h	(original)
+++ trunk/Scribus/scribus/plugins/import/ps/importpsplugin.h	Sat Jun 22 22:25:53 2019
@@ -31,7 +31,7 @@
 		virtual const AboutData* getAboutData() const;
 		virtual void deleteAboutData(const AboutData* about) const;
 		virtual void languageChange();
-		virtual bool fileSupported(QIODevice* file, const QString & fileName=QString::null) const;
+		virtual bool fileSupported(QIODevice* file, const QString & fileName=QString()) const;
 		virtual bool loadFile(const QString & fileName, const FileFormat & fmt, int flags, int index = 0);
 		virtual void addToMainWindowMenu(ScribusMainWindow *) {};
 
@@ -40,10 +40,10 @@
 		\author Franz Schmid
 		\date
 		\brief Run the EPS import
-		\param fileName input filename, or QString::null to prompt.
+		\param fileName input filename, or QString() to prompt.
 		\retval bool always true
 		 */
-		virtual bool import(QString fileName = QString::null, int flags = lfUseCurrentPage|lfInteractive);
+		virtual bool import(QString fileName = QString(), int flags = lfUseCurrentPage|lfInteractive);
 
 	private:
 		void registerFormats();

Modified: trunk/Scribus/scribus/plugins/import/pub/importpubplugin.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23049&path=/trunk/Scribus/scribus/plugins/import/pub/importpubplugin.h
==============================================================================
--- trunk/Scribus/scribus/plugins/import/pub/importpubplugin.h	(original)
+++ trunk/Scribus/scribus/plugins/import/pub/importpubplugin.h	Sat Jun 22 22:25:53 2019
@@ -31,7 +31,7 @@
 		virtual const AboutData* getAboutData() const;
 		virtual void deleteAboutData(const AboutData* about) const;
 		virtual void languageChange();
-		virtual bool fileSupported(QIODevice* file, const QString & fileName=QString::null) const;
+		virtual bool fileSupported(QIODevice* file, const QString & fileName=QString()) const;
 		virtual bool loadFile(const QString & fileName, const FileFormat & fmt, int flags, int index = 0);
 		virtual QImage readThumbnail(const QString& fileName);
 		virtual void addToMainWindowMenu(ScribusMainWindow *) {};
@@ -41,10 +41,10 @@
 		\author Franz Schmid
 		\date
 		\brief Run the EPS import
-		\param fileName input filename, or QString::null to prompt.
+		\param fileName input filename, or QString() to prompt.
 		\retval bool always true
 		 */
-		virtual bool import(QString fileName = QString::null, int flags = lfUseCurrentPage|lfInteractive);
+		virtual bool import(QString fileName = QString(), int flags = lfUseCurrentPage|lfInteractive);
 
 	private:
 		void registerFormats();

Modified: trunk/Scribus/scribus/plugins/import/qxp/importqxpplugin.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23049&path=/trunk/Scribus/scribus/plugins/import/qxp/importqxpplugin.h
==============================================================================
--- trunk/Scribus/scribus/plugins/import/qxp/importqxpplugin.h	(original)
+++ trunk/Scribus/scribus/plugins/import/qxp/importqxpplugin.h	Sat Jun 22 22:25:53 2019
@@ -31,7 +31,7 @@
 		virtual const AboutData* getAboutData() const;
 		virtual void deleteAboutData(const AboutData* about) const;
 		virtual void languageChange();
-		virtual bool fileSupported(QIODevice* file, const QString & fileName=QString::null) const;
+		virtual bool fileSupported(QIODevice* file, const QString & fileName=QString()) const;
 		virtual bool loadFile(const QString & fileName, const FileFormat & fmt, int flags, int index = 0);
 		virtual QImage readThumbnail(const QString& fileName);
 		virtual void addToMainWindowMenu(ScribusMainWindow *) {};
@@ -41,10 +41,10 @@
 		\author Franz Schmid
 		\date
 		\brief Run the EPS import
-		\param fileName input filename, or QString::null to prompt.
+		\param fileName input filename, or QString() to prompt.
 		\retval bool always true
 		 */
-		virtual bool import(QString fileName = QString::null, int flags = lfUseCurrentPage|lfInteractive);
+		virtual bool import(QString fileName = QString(), int flags = lfUseCurrentPage|lfInteractive);
 
 	private:
 		void registerFormats();

Modified: trunk/Scribus/scribus/plugins/import/shape/importshapeplugin.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23049&path=/trunk/Scribus/scribus/plugins/import/shape/importshapeplugin.h
==============================================================================
--- trunk/Scribus/scribus/plugins/import/shape/importshapeplugin.h	(original)
+++ trunk/Scribus/scribus/plugins/import/shape/importshapeplugin.h	Sat Jun 22 22:25:53 2019
@@ -31,7 +31,7 @@
 		virtual const AboutData* getAboutData() const;
 		virtual void deleteAboutData(const AboutData* about) const;
 		virtual void languageChange();
-		virtual bool fileSupported(QIODevice* file, const QString & fileName=QString::null) const;
+		virtual bool fileSupported(QIODevice* file, const QString & fileName=QString()) const;
 		virtual bool loadFile(const QString & fileName, const FileFormat & fmt, int flags, int index = 0);
 		virtual QImage readThumbnail(const QString& fileName);
 		virtual void addToMainWindowMenu(ScribusMainWindow *) {};
@@ -41,10 +41,10 @@
 		\author Franz Schmid
 		\date
 		\brief Run the SML import
-		\param fileName input filename, or QString::null to prompt.
+		\param fileName input filename, or QString() to prompt.
 		\retval bool always true
 		 */
-		virtual bool import(QString fileName = QString::null, int flags = lfUseCurrentPage|lfInteractive);
+		virtual bool import(QString fileName = QString(), int flags = lfUseCurrentPage|lfInteractive);
 
 	private:
 		void registerFormats();

Modified: trunk/Scribus/scribus/plugins/import/sml/importsmlplugin.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23049&path=/trunk/Scribus/scribus/plugins/import/sml/importsmlplugin.h
==============================================================================
--- trunk/Scribus/scribus/plugins/import/sml/importsmlplugin.h	(original)
+++ trunk/Scribus/scribus/plugins/import/sml/importsmlplugin.h	Sat Jun 22 22:25:53 2019
@@ -31,7 +31,7 @@
 		virtual const AboutData* getAboutData() const;
 		virtual void deleteAboutData(const AboutData* about) const;
 		virtual void languageChange();
-		virtual bool fileSupported(QIODevice* file, const QString & fileName=QString::null) const;
+		virtual bool fileSupported(QIODevice* file, const QString & fileName=QString()) const;
 		virtual bool loadFile(const QString & fileName, const FileFormat & fmt, int flags, int index = 0);
 		virtual QImage readThumbnail(const QString& fileName);
 		virtual void addToMainWindowMenu(ScribusMainWindow *) {};
@@ -41,10 +41,10 @@
 		\author Franz Schmid
 		\date
 		\brief Run the SML import
-		\param fileName input filename, or QString::null to prompt.
+		\param fileName input filename, or QString() to prompt.
 		\retval bool always true
 		 */
-		virtual bool import(QString fileName = QString::null, int flags = lfUseCurrentPage|lfInteractive);
+		virtual bool import(QString fileName = QString(), int flags = lfUseCurrentPage|lfInteractive);
 
 	private:
 		void registerFormats();

Modified: trunk/Scribus/scribus/plugins/import/svg/svgplugin.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23049&path=/trunk/Scribus/scribus/plugins/import/svg/svgplugin.h
==============================================================================
--- trunk/Scribus/scribus/plugins/import/svg/svgplugin.h	(original)
+++ trunk/Scribus/scribus/plugins/import/svg/svgplugin.h	Sat Jun 22 22:25:53 2019
@@ -37,7 +37,7 @@
 		virtual const AboutData* getAboutData() const;
 		virtual void deleteAboutData(const AboutData* about) const;
 		virtual void languageChange();
-		virtual bool fileSupported(QIODevice* file, const QString & fileName=QString::null) const;
+		virtual bool fileSupported(QIODevice* file, const QString & fileName=QString()) const;
 		virtual bool loadFile(const QString & fileName, const FileFormat & fmt, int flags, int index = 0);
 		virtual QImage readThumbnail(const QString& fileName);
 		virtual void addToMainWindowMenu(ScribusMainWindow *) {};
@@ -49,7 +49,7 @@
 		\param filename a file name to import
 		\retval true for success
 		 */
-		virtual bool import(QString filename = QString::null, int flags = lfUseCurrentPage|lfInteractive);
+		virtual bool import(QString filename = QString(), int flags = lfUseCurrentPage|lfInteractive);
 
 	private:
 		void registerFormats();

Modified: trunk/Scribus/scribus/plugins/import/svm/importsvmplugin.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23049&path=/trunk/Scribus/scribus/plugins/import/svm/importsvmplugin.h
==============================================================================
--- trunk/Scribus/scribus/plugins/import/svm/importsvmplugin.h	(original)
+++ trunk/Scribus/scribus/plugins/import/svm/importsvmplugin.h	Sat Jun 22 22:25:53 2019
@@ -36,7 +36,7 @@
 		virtual const AboutData* getAboutData() const;
 		virtual void deleteAboutData(const AboutData* about) const;
 		virtual void languageChange();
-		virtual bool fileSupported(QIODevice* file, const QString & fileName=QString::null) const;
+		virtual bool fileSupported(QIODevice* file, const QString & fileName=QString()) const;
 		virtual bool loadFile(const QString & fileName, const FileFormat & fmt, int flags, int index = 0);
 		virtual QImage readThumbnail(const QString& fileName);
 		virtual void addToMainWindowMenu(ScribusMainWindow *) {};
@@ -46,10 +46,10 @@
 		\author Franz Schmid
 		\date
 		\brief Run the EPS import
-		\param fileName input filename, or QString::null to prompt.
+		\param fileName input filename, or QString() to prompt.
 		\retval bool always true
 		 */
-		virtual bool import(QString fileName = QString::null, int flags = lfUseCurrentPage|lfInteractive);
+		virtual bool import(QString fileName = QString(), int flags = lfUseCurrentPage|lfInteractive);
 
 	private:
 		void registerFormats();

Modified: trunk/Scribus/scribus/plugins/import/uniconvertor/uniconvplugin.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23049&path=/trunk/Scribus/scribus/plugins/import/uniconvertor/uniconvplugin.h
==============================================================================
--- trunk/Scribus/scribus/plugins/import/uniconvertor/uniconvplugin.h	(original)
+++ trunk/Scribus/scribus/plugins/import/uniconvertor/uniconvplugin.h	Sat Jun 22 22:25:53 2019
@@ -30,7 +30,7 @@
 		virtual const AboutData* getAboutData() const;
 		virtual void deleteAboutData(const AboutData* about) const;
 		virtual void languageChange();
-		virtual bool fileSupported(QIODevice* file, const QString & fileName=QString::null) const;
+		virtual bool fileSupported(QIODevice* file, const QString & fileName=QString()) const;
 		virtual bool loadFile(const QString & fileName, const FileFormat & fmt, int flags, int index = 0);
 		virtual void addToMainWindowMenu(ScribusMainWindow *) {};
 
@@ -40,7 +40,7 @@
 		\param filename a file name to import
 		\retval true for success
 		*/
-		virtual bool import(const QString& fileName = QString::null, int flags = lfUseCurrentPage|lfInteractive);
+		virtual bool import(const QString& fileName = QString(), int flags = lfUseCurrentPage|lfInteractive);
 
 	private:
 		void registerFormats();

Modified: trunk/Scribus/scribus/plugins/import/viva/importvivaplugin.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23049&path=/trunk/Scribus/scribus/plugins/import/viva/importvivaplugin.h
==============================================================================
--- trunk/Scribus/scribus/plugins/import/viva/importvivaplugin.h	(original)
+++ trunk/Scribus/scribus/plugins/import/viva/importvivaplugin.h	Sat Jun 22 22:25:53 2019
@@ -44,7 +44,7 @@
 		virtual const AboutData* getAboutData() const;
 		virtual void deleteAboutData(const AboutData* about) const;
 		virtual void languageChange();
-		virtual bool fileSupported(QIODevice* file, const QString & fileName=QString::null) const;
+		virtual bool fileSupported(QIODevice* file, const QString & fileName=QString()) const;
 		virtual bool loadFile(const QString & fileName, const FileFormat & fmt, int flags, int index = 0);
 		virtual QImage readThumbnail(const QString& fileName);
 		virtual bool readColors(const QString& fileName, ColorList & colors);
@@ -55,10 +55,10 @@
 		\author Franz Schmid
 		\date
 		\brief Run the Viva import
-		\param fileName input filename, or QString::null to prompt.
+		\param fileName input filename, or QString() to prompt.
 		\retval bool always true
 		 */
-		virtual bool import(QString fileName = QString::null, int flags = lfUseCurrentPage|lfInteractive);
+		virtual bool import(QString fileName = QString(), int flags = lfUseCurrentPage|lfInteractive);
 
 	private:
 		void registerFormats();

Modified: trunk/Scribus/scribus/plugins/import/vsd/importvsdplugin.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23049&path=/trunk/Scribus/scribus/plugins/import/vsd/importvsdplugin.h
==============================================================================
--- trunk/Scribus/scribus/plugins/import/vsd/importvsdplugin.h	(original)
+++ trunk/Scribus/scribus/plugins/import/vsd/importvsdplugin.h	Sat Jun 22 22:25:53 2019
@@ -31,7 +31,7 @@
 		virtual const AboutData* getAboutData() const;
 		virtual void deleteAboutData(const AboutData* about) const;
 		virtual void languageChange();
-		virtual bool fileSupported(QIODevice* file, const QString & fileName=QString::null) const;
+		virtual bool fileSupported(QIODevice* file, const QString & fileName=QString()) const;
 		virtual bool loadFile(const QString & fileName, const FileFormat & fmt, int flags, int index = 0);
 		virtual QImage readThumbnail(const QString& fileName);
 		virtual void addToMainWindowMenu(ScribusMainWindow *) {};
@@ -41,10 +41,10 @@
 		\author Franz Schmid
 		\date
 		\brief Run the EPS import
-		\param fileName input filename, or QString::null to prompt.
+		\param fileName input filename, or QString() to prompt.
 		\retval bool always true
 		 */
-		virtual bool import(QString fileName = QString::null, int flags = lfUseCurrentPage|lfInteractive);
+		virtual bool import(QString fileName = QString(), int flags = lfUseCurrentPage|lfInteractive);
 
 	private:
 		void registerFormats();

Modified: trunk/Scribus/scribus/plugins/import/wmf/wmfimportplugin.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23049&path=/trunk/Scribus/scribus/plugins/import/wmf/wmfimportplugin.h
==============================================================================
--- trunk/Scribus/scribus/plugins/import/wmf/wmfimportplugin.h	(original)
+++ trunk/Scribus/scribus/plugins/import/wmf/wmfimportplugin.h	Sat Jun 22 22:25:53 2019
@@ -29,7 +29,7 @@
 		virtual const AboutData* getAboutData() const;
 		virtual void deleteAboutData(const AboutData* about) const;
 		virtual void languageChange();
-		virtual bool fileSupported(QIODevice* file, const QString & fileName=QString::null) const;
+		virtual bool fileSupported(QIODevice* file, const QString & fileName=QString()) const;
 		virtual bool loadFile(const QString & fileName, const FileFormat & fmt, int flags, int index = 0);
 		virtual QImage readThumbnail(const QString& fileName);
 		virtual void addToMainWindowMenu(ScribusMainWindow *) {};
@@ -41,7 +41,7 @@
 		\param filename a file name to import
 		\retval true for success
 		 */
-		virtual bool import(QString filename = QString::null, int flags = lfUseCurrentPage|lfInteractive);
+		virtual bool import(QString filename = QString(), int flags = lfUseCurrentPage|lfInteractive);
 
 	private:
 		void registerFormats();

Modified: trunk/Scribus/scribus/plugins/import/wpg/importwpgplugin.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23049&path=/trunk/Scribus/scribus/plugins/import/wpg/importwpgplugin.h
==============================================================================
--- trunk/Scribus/scribus/plugins/import/wpg/importwpgplugin.h	(original)
+++ trunk/Scribus/scribus/plugins/import/wpg/importwpgplugin.h	Sat Jun 22 22:25:53 2019
@@ -31,7 +31,7 @@
 		virtual const AboutData* getAboutData() const;
 		virtual void deleteAboutData(const AboutData* about) const;
 		virtual void languageChange();
-		virtual bool fileSupported(QIODevice* file, const QString & fileName=QString::null) const;
+		virtual bool fileSupported(QIODevice* file, const QString & fileName=QString()) const;
 		virtual bool loadFile(const QString & fileName, const FileFormat & fmt, int flags, int index = 0);
 		virtual QImage readThumbnail(const QString& fileName);
 		virtual void addToMainWindowMenu(ScribusMainWindow *) {};
@@ -41,10 +41,10 @@
 		\author Franz Schmid
 		\date
 		\brief Run the EPS import
-		\param fileName input filename, or QString::null to prompt.
+		\param fileName input filename, or QString() to prompt.
 		\retval bool always true
 		 */
-		virtual bool import(QString fileName = QString::null, int flags = lfUseCurrentPage|lfInteractive);
+		virtual bool import(QString fileName = QString(), int flags = lfUseCurrentPage|lfInteractive);
 
 	private:
 		void registerFormats();

Modified: trunk/Scribus/scribus/plugins/import/xar/importxarplugin.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23049&path=/trunk/Scribus/scribus/plugins/import/xar/importxarplugin.h
==============================================================================
--- trunk/Scribus/scribus/plugins/import/xar/importxarplugin.h	(original)
+++ trunk/Scribus/scribus/plugins/import/xar/importxarplugin.h	Sat Jun 22 22:25:53 2019
@@ -31,7 +31,7 @@
 		virtual const AboutData* getAboutData() const;
 		virtual void deleteAboutData(const AboutData* about) const;
 		virtual void languageChange();
-		virtual bool fileSupported(QIODevice* file, const QString & fileName=QString::null) const;
+		virtual bool fileSupported(QIODevice* file, const QString & fileName=QString()) const;
 		virtual bool loadFile(const QString & fileName, const FileFormat & fmt, int flags, int index = 0);
 		virtual QImage readThumbnail(const QString& fileName);
 		virtual bool readColors(const QString& fileName, ColorList & colors);
@@ -42,10 +42,10 @@
 		\author Franz Schmid
 		\date
 		\brief Run the EPS import
-		\param fileName input filename, or QString::null to prompt.
+		\param fileName input filename, or QString() to prompt.
 		\retval bool always true
 		 */
-		virtual bool import(QString fileName = QString::null, int flags = lfUseCurrentPage|lfInteractive);
+		virtual bool import(QString fileName = QString(), int flags = lfUseCurrentPage|lfInteractive);
 
 	private:
 		void registerFormats();

Modified: trunk/Scribus/scribus/plugins/import/xfig/importxfigplugin.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23049&path=/trunk/Scribus/scribus/plugins/import/xfig/importxfigplugin.h
==============================================================================
--- trunk/Scribus/scribus/plugins/import/xfig/importxfigplugin.h	(original)
+++ trunk/Scribus/scribus/plugins/import/xfig/importxfigplugin.h	Sat Jun 22 22:25:53 2019
@@ -31,7 +31,7 @@
 		virtual const AboutData* getAboutData() const;
 		virtual void deleteAboutData(const AboutData* about) const;
 		virtual void languageChange();
-		virtual bool fileSupported(QIODevice* file, const QString & fileName=QString::null) const;
+		virtual bool fileSupported(QIODevice* file, const QString & fileName=QString()) const;
 		virtual bool loadFile(const QString & fileName, const FileFormat & fmt, int flags, int index = 0);
 		virtual QImage readThumbnail(const QString& fileName);
 		virtual void addToMainWindowMenu(ScribusMainWindow *) {};
@@ -41,10 +41,10 @@
 		\author Franz Schmid
 		\date
 		\brief Run the EPS import
-		\param fileName input filename, or QString::null to prompt.
+		\param fileName input filename, or QString() to prompt.
 		\retval bool always true
 		 */
-		virtual bool import(QString fileName = QString::null, int flags = lfUseCurrentPage|lfInteractive);
+		virtual bool import(QString fileName = QString(), int flags = lfUseCurrentPage|lfInteractive);
 
 	private:
 		void registerFormats();

Modified: trunk/Scribus/scribus/plugins/import/xps/importxpsplugin.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23049&path=/trunk/Scribus/scribus/plugins/import/xps/importxpsplugin.h
==============================================================================
--- trunk/Scribus/scribus/plugins/import/xps/importxpsplugin.h	(original)
+++ trunk/Scribus/scribus/plugins/import/xps/importxpsplugin.h	Sat Jun 22 22:25:53 2019
@@ -44,7 +44,7 @@
 		virtual const AboutData* getAboutData() const;
 		virtual void deleteAboutData(const AboutData* about) const;
 		virtual void languageChange();
-		virtual bool fileSupported(QIODevice* file, const QString & fileName=QString::null) const;
+		virtual bool fileSupported(QIODevice* file, const QString & fileName=QString()) const;
 		virtual bool loadFile(const QString & fileName, const FileFormat & fmt, int flags, int index = 0);
 		virtual QImage readThumbnail(const QString& fileName);
 		virtual void addToMainWindowMenu(ScribusMainWindow *) {};
@@ -54,10 +54,10 @@
 		\author Franz Schmid
 		\date
 		\brief Run the XPS import
-		\param fileName input filename, or QString::null to prompt.
+		\param fileName input filename, or QString() to prompt.
 		\retval bool always true
 		 */
-		virtual bool import(QString fileName = QString::null, int flags = lfUseCurrentPage|lfInteractive);
+		virtual bool import(QString fileName = QString(), int flags = lfUseCurrentPage|lfInteractive);
 
 	private:
 		void registerFormats();

Modified: trunk/Scribus/scribus/plugins/import/zmf/importzmfplugin.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23049&path=/trunk/Scribus/scribus/plugins/import/zmf/importzmfplugin.h
==============================================================================
--- trunk/Scribus/scribus/plugins/import/zmf/importzmfplugin.h	(original)
+++ trunk/Scribus/scribus/plugins/import/zmf/importzmfplugin.h	Sat Jun 22 22:25:53 2019
@@ -31,7 +31,7 @@
 		virtual const AboutData* getAboutData() const;
 		virtual void deleteAboutData(const AboutData* about) const;
 		virtual void languageChange();
-		virtual bool fileSupported(QIODevice* file, const QString & fileName=QString::null) const;
+		virtual bool fileSupported(QIODevice* file, const QString & fileName=QString()) const;
 		virtual bool loadFile(const QString & fileName, const FileFormat & fmt, int flags, int index = 0);
 		virtual QImage readThumbnail(const QString& fileName);
 		virtual void addToMainWindowMenu(ScribusMainWindow *) {};
@@ -41,10 +41,10 @@
 		\author Franz Schmid
 		\date
 		\brief Run the EPS import
-		\param fileName input filename, or QString::null to prompt.
+		\param fileName input filename, or QString() to prompt.
 		\retval bool always true
 		 */
-		virtual bool import(QString fileName = QString::null, int flags = lfUseCurrentPage|lfInteractive);
+		virtual bool import(QString fileName = QString(), int flags = lfUseCurrentPage|lfInteractive);
 
 	private:
 		void registerFormats();

Modified: trunk/Scribus/scribus/plugins/imposition/impositionplugin.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23049&path=/trunk/Scribus/scribus/plugins/imposition/impositionplugin.h
==============================================================================
--- trunk/Scribus/scribus/plugins/imposition/impositionplugin.h	(original)
+++ trunk/Scribus/scribus/plugins/imposition/impositionplugin.h	Sat Jun 22 22:25:53 2019
@@ -34,8 +34,8 @@
     ImpositionPlugin();
     virtual ~ImpositionPlugin();
     
-    virtual bool run(QWidget* parent, ScribusDoc* doc, QString target = QString::null);
-    virtual bool run(ScribusDoc* doc, QString target = QString::null);
+	virtual bool run(QWidget* parent, ScribusDoc* doc, QString target = QString());
+	virtual bool run(ScribusDoc* doc, QString target = QString());
     virtual void languageChange();
     virtual const QString fullTrName() const;
     virtual const AboutData* getAboutData() const;

Modified: trunk/Scribus/scribus/plugins/myplugin/myplugin.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23049&path=/trunk/Scribus/scribus/plugins/myplugin/myplugin.h
==============================================================================
--- trunk/Scribus/scribus/plugins/myplugin/myplugin.h	(original)
+++ trunk/Scribus/scribus/plugins/myplugin/myplugin.h	Sat Jun 22 22:25:53 2019
@@ -23,7 +23,7 @@
 		MyPlugin();
 		virtual ~MyPlugin();
 		//! \brief main method to run the plug
-		virtual bool run(ScribusDoc* doc, QString target = QString::null);
+		virtual bool run(ScribusDoc* doc, QString target = QString());
 		virtual const QString fullTrName() const;
 		virtual const AboutData* getAboutData() const;
 		virtual void deleteAboutData(const AboutData* about) const;

Modified: trunk/Scribus/scribus/plugins/newfromtemplateplugin/nftemplate.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23049&path=/trunk/Scribus/scribus/plugins/newfromtemplateplugin/nftemplate.h
==============================================================================
--- trunk/Scribus/scribus/plugins/newfromtemplateplugin/nftemplate.h	(original)
+++ trunk/Scribus/scribus/plugins/newfromtemplateplugin/nftemplate.h	Sat Jun 22 22:25:53 2019
@@ -22,7 +22,7 @@
 		NewFromTemplatePlugin();
 		virtual ~NewFromTemplatePlugin();
 		//! \brief main method
-		virtual bool run(ScribusDoc* doc, QString target = QString::null);
+		virtual bool run(ScribusDoc* doc, QString target = QString());
 		virtual const QString fullTrName() const;
 		virtual const AboutData* getAboutData() const;
 		virtual void deleteAboutData(const AboutData* about) const;

Modified: trunk/Scribus/scribus/plugins/picbrowser/picturebrowserplugin.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23049&path=/trunk/Scribus/scribus/plugins/picbrowser/picturebrowserplugin.h
==============================================================================
--- trunk/Scribus/scribus/plugins/picbrowser/picturebrowserplugin.h	(original)
+++ trunk/Scribus/scribus/plugins/picbrowser/picturebrowserplugin.h	Sat Jun 22 22:25:53 2019
@@ -25,7 +25,7 @@
 		virtual ~PictureBrowserPlugin();
 		virtual bool cleanupPlugin();
 		//! \brief main method to run the plug
-		virtual bool run ( ScribusDoc* doc, const QString& target = QString::null );
+		virtual bool run ( ScribusDoc* doc, const QString& target = QString() );
 		virtual const QString fullTrName() const;
 		virtual const AboutData* getAboutData() const;
 		virtual void deleteAboutData ( const AboutData* about ) const;

Modified: trunk/Scribus/scribus/plugins/saveastemplateplugin/satemplate.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23049&path=/trunk/Scribus/scribus/plugins/saveastemplateplugin/satemplate.h
==============================================================================
--- trunk/Scribus/scribus/plugins/saveastemplateplugin/satemplate.h	(original)
+++ trunk/Scribus/scribus/plugins/saveastemplateplugin/satemplate.h	Sat Jun 22 22:25:53 2019
@@ -20,7 +20,7 @@
 		// Standard plugin implementation
 		SaveAsTemplatePlugin();
 		virtual ~SaveAsTemplatePlugin();
-		virtual bool run(ScribusDoc* doc, const QString& target = QString::null);
+		virtual bool run(ScribusDoc* doc, const QString& target = QString());
 		virtual const QString fullTrName() const;
 		virtual const AboutData* getAboutData() const;
 		virtual void deleteAboutData(const AboutData* about) const;

Modified: trunk/Scribus/scribus/plugins/scriptplugin/cmddialog.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23049&path=/trunk/Scribus/scribus/plugins/scriptplugin/cmddialog.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/scriptplugin/cmddialog.cpp	(original)
+++ trunk/Scribus/scribus/plugins/scriptplugin/cmddialog.cpp	Sat Jun 22 22:25:53 2019
@@ -132,7 +132,7 @@
 	bool ok;
 	QString s = QInputDialog::getText(ScCore->primaryMainWindow(), "New Paragraph Style",
 			"Enter name of the new paragraph style:", QLineEdit::Normal,
-			QString::null, &ok);
+			QString(), &ok);
 
 	if (ok && !s.isEmpty())
 	{

Modified: trunk/Scribus/scribus/plugins/scriptplugin/pconsole.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23049&path=/trunk/Scribus/scribus/plugins/scriptplugin/pconsole.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/scriptplugin/pconsole.cpp	(original)
+++ trunk/Scribus/scribus/plugins/scriptplugin/pconsole.cpp	Sat Jun 22 22:25:53 2019
@@ -165,7 +165,7 @@
 	parsePythonString();
 	commandEdit->clear();
 	// content is destroyed. This is to prevent overwriting
-	filename = QString::null;
+	filename.clear();
 	outputEdit->append("\n>>> " + m_command);
 	emit runCommand();
 }

Modified: trunk/Scribus/scribus/plugins/scriptplugin/scriptercore.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23049&path=/trunk/Scribus/scribus/plugins/scriptplugin/scriptercore.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/scriptplugin/scriptercore.cpp	(original)
+++ trunk/Scribus/scribus/plugins/scriptplugin/scriptercore.cpp	Sat Jun 22 22:25:53 2019
@@ -504,7 +504,7 @@
 	// then get more general preferences
 	m_enableExtPython = prefs->getBool("extensionscripts",false);
 	m_importAllNames = prefs->getBool("importall",true);
-	m_startupScript = prefs->get("startupscript", QString::null);
+	m_startupScript = prefs->get("startupscript", QString());
 	// and have the console window set up its position
 }
 
@@ -535,7 +535,7 @@
 void ScripterCore::aboutScript()
 {
 	QString fname = ScCore->primaryMainWindow()->CFileDialog(".", tr("Examine Script"), tr("Python Scripts (*.py *.PY);;All Files (*)"), "", fdNone);
-	if (fname == QString::null)
+	if (fname.isNull())
 		return;
 	QString html("<html><body>");
 	QFileInfo fi = QFileInfo(fname);

Modified: trunk/Scribus/scribus/plugins/short-words/shortwords.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23049&path=/trunk/Scribus/scribus/plugins/short-words/shortwords.h
==============================================================================
--- trunk/Scribus/scribus/plugins/short-words/shortwords.h	(original)
+++ trunk/Scribus/scribus/plugins/short-words/shortwords.h	Sat Jun 22 22:25:53 2019
@@ -27,7 +27,7 @@
 		// Standard plugin implementation
 		ShortWordsPlugin();
 		virtual ~ShortWordsPlugin();
-		virtual bool run(ScribusDoc* doc, const QString& target = QString::null);
+		virtual bool run(ScribusDoc* doc, const QString& target = QString());
 		virtual const QString fullTrName() const;
 		virtual const AboutData* getAboutData() const;
 		virtual void deleteAboutData(const AboutData* about) const;

Modified: trunk/Scribus/scribus/plugins/tools/2geomtools/meshdistortion/meshdistortion.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23049&path=/trunk/Scribus/scribus/plugins/tools/2geomtools/meshdistortion/meshdistortion.h
==============================================================================
--- trunk/Scribus/scribus/plugins/tools/2geomtools/meshdistortion/meshdistortion.h	(original)
+++ trunk/Scribus/scribus/plugins/tools/2geomtools/meshdistortion/meshdistortion.h	Sat Jun 22 22:25:53 2019
@@ -43,7 +43,7 @@
 		// Standard plugin implementation
 		MeshDistortionPlugin();
 		virtual ~MeshDistortionPlugin();
-		virtual bool run(ScribusDoc* doc, const QString& target = QString::null);
+		virtual bool run(ScribusDoc* doc, const QString& target = QString());
 		virtual const QString fullTrName() const;
 		virtual const AboutData* getAboutData() const;
 		virtual void deleteAboutData(const AboutData* about) const;

Modified: trunk/Scribus/scribus/plugins/tools/2geomtools/pathalongpath/pathalongpath.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23049&path=/trunk/Scribus/scribus/plugins/tools/2geomtools/pathalongpath/pathalongpath.h
==============================================================================
--- trunk/Scribus/scribus/plugins/tools/2geomtools/pathalongpath/pathalongpath.h	(original)
+++ trunk/Scribus/scribus/plugins/tools/2geomtools/pathalongpath/pathalongpath.h	Sat Jun 22 22:25:53 2019
@@ -60,7 +60,7 @@
 		// Standard plugin implementation
 		PathAlongPathPlugin();
 		virtual ~PathAlongPathPlugin();
-		virtual bool run(ScribusDoc* doc, const QString& target = QString::null);
+		virtual bool run(ScribusDoc* doc, const QString& target = QString());
 		virtual const QString fullTrName() const;
 		virtual const AboutData* getAboutData() const;
 		virtual void deleteAboutData(const AboutData* about) const;

Modified: trunk/Scribus/scribus/plugins/tools/flattenpath/flattenpath.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23049&path=/trunk/Scribus/scribus/plugins/tools/flattenpath/flattenpath.h
==============================================================================
--- trunk/Scribus/scribus/plugins/tools/flattenpath/flattenpath.h	(original)
+++ trunk/Scribus/scribus/plugins/tools/flattenpath/flattenpath.h	Sat Jun 22 22:25:53 2019
@@ -38,7 +38,7 @@
 		// Standard plugin implementation
 		FlattenPathPlugin();
 		virtual ~FlattenPathPlugin();
-		virtual bool run(ScribusDoc* doc, const QString& target = QString::null);
+		virtual bool run(ScribusDoc* doc, const QString& target = QString());
 		virtual const QString fullTrName() const;
 		virtual const AboutData* getAboutData() const;
 		virtual void deleteAboutData(const AboutData* about) const;

Modified: trunk/Scribus/scribus/plugins/tools/hunspellcheck/hunspellplugin.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23049&path=/trunk/Scribus/scribus/plugins/tools/hunspellcheck/hunspellplugin.h
==============================================================================
--- trunk/Scribus/scribus/plugins/tools/hunspellcheck/hunspellplugin.h	(original)
+++ trunk/Scribus/scribus/plugins/tools/hunspellcheck/hunspellplugin.h	Sat Jun 22 22:25:53 2019
@@ -23,8 +23,8 @@
 		HunspellPlugin();
 		virtual ~HunspellPlugin();
 		//! \brief main method to run the plug
-		virtual bool run(ScribusDoc* doc, const QString& target = QString::null);
-		virtual bool run(QWidget* p, ScribusDoc* doc, const QString& target = QString::null);
+		virtual bool run(ScribusDoc* doc, const QString& target = QString());
+		virtual bool run(QWidget* p, ScribusDoc* doc, const QString& target = QString());
 		virtual const QString fullTrName() const;
 		virtual const AboutData* getAboutData() const;
 		virtual void deleteAboutData(const AboutData* about) const;

Modified: trunk/Scribus/scribus/plugins/tools/lenseffects/lenseffects.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23049&path=/trunk/Scribus/scribus/plugins/tools/lenseffects/lenseffects.h
==============================================================================
--- trunk/Scribus/scribus/plugins/tools/lenseffects/lenseffects.h	(original)
+++ trunk/Scribus/scribus/plugins/tools/lenseffects/lenseffects.h	Sat Jun 22 22:25:53 2019
@@ -42,7 +42,7 @@
 		// Standard plugin implementation
 		LensEffectsPlugin();
 		virtual ~LensEffectsPlugin();
-		virtual bool run(ScribusDoc* doc, const QString& target = QString::null);
+		virtual bool run(ScribusDoc* doc, const QString& target = QString());
 		virtual const QString fullTrName() const;
 		virtual const AboutData* getAboutData() const;
 		virtual void deleteAboutData(const AboutData* about) const;

Modified: trunk/Scribus/scribus/plugins/tools/pathconnect/pathconnect.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23049&path=/trunk/Scribus/scribus/plugins/tools/pathconnect/pathconnect.h
==============================================================================
--- trunk/Scribus/scribus/plugins/tools/pathconnect/pathconnect.h	(original)
+++ trunk/Scribus/scribus/plugins/tools/pathconnect/pathconnect.h	Sat Jun 22 22:25:53 2019
@@ -46,7 +46,7 @@
 		// Standard plugin implementation
 		PathConnectPlugin();
 		virtual ~PathConnectPlugin();
-		virtual bool run(ScribusDoc* doc, const QString& target = QString::null);
+		virtual bool run(ScribusDoc* doc, const QString& target = QString());
 		virtual const QString fullTrName() const;
 		virtual const AboutData* getAboutData() const;
 		virtual void deleteAboutData(const AboutData* about) const;

Modified: trunk/Scribus/scribus/plugins/tools/pathcut/pathcut.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23049&path=/trunk/Scribus/scribus/plugins/tools/pathcut/pathcut.h
==============================================================================
--- trunk/Scribus/scribus/plugins/tools/pathcut/pathcut.h	(original)
+++ trunk/Scribus/scribus/plugins/tools/pathcut/pathcut.h	Sat Jun 22 22:25:53 2019
@@ -42,7 +42,7 @@
 		// Standard plugin implementation
 		PathCutPlugin();
 		virtual ~PathCutPlugin();
-		virtual bool run(ScribusDoc* doc, const QString& target = QString::null);
+		virtual bool run(ScribusDoc* doc, const QString& target = QString());
 		virtual const QString fullTrName() const;
 		virtual const AboutData* getAboutData() const;
 		virtual void deleteAboutData(const AboutData* about) const;

Modified: trunk/Scribus/scribus/plugins/tools/pathfinder/pathfinder.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23049&path=/trunk/Scribus/scribus/plugins/tools/pathfinder/pathfinder.h
==============================================================================
--- trunk/Scribus/scribus/plugins/tools/pathfinder/pathfinder.h	(original)
+++ trunk/Scribus/scribus/plugins/tools/pathfinder/pathfinder.h	Sat Jun 22 22:25:53 2019
@@ -43,7 +43,7 @@
 		// Standard plugin implementation
 		PathFinderPlugin();
 		virtual ~PathFinderPlugin();
-		virtual bool run(ScribusDoc* doc, const QString& target = QString::null);
+		virtual bool run(ScribusDoc* doc, const QString& target = QString());
 		virtual const QString fullTrName() const;
 		virtual const AboutData* getAboutData() const;
 		virtual void deleteAboutData(const AboutData* about) const;

Modified: trunk/Scribus/scribus/plugins/tools/pathfinder/pathfinderdialog.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23049&path=/trunk/Scribus/scribus/plugins/tools/pathfinder/pathfinderdialog.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/tools/pathfinder/pathfinderdialog.cpp	(original)
+++ trunk/Scribus/scribus/plugins/tools/pathfinder/pathfinderdialog.cpp	Sat Jun 22 22:25:53 2019
@@ -39,11 +39,11 @@
 	setupUi(this);
 	setModal(true);
 	setWindowIcon(QIcon(IconManager::instance()->loadIcon("AppIcon.png")));
-	opCombine->setText( QString::null );
-	opSubtraction->setText( QString::null );
-	opIntersection->setText( QString::null );
-	opExclusion->setText( QString::null );
-	opParts->setText( QString::null );
+	opCombine->setText( QString() );
+	opSubtraction->setText( QString() );
+	opIntersection->setText( QString() );
+	opExclusion->setText( QString() );
+	opParts->setText( QString() );
 	opExclusion->setIcon(QIcon(IconManager::instance()->loadIcon("pathexclusion.png")));
 	opIntersection->setIcon(QIcon(IconManager::instance()->loadIcon("pathintersection.png")));
 	opParts->setIcon(QIcon(IconManager::instance()->loadIcon("pathparts.png")));

Modified: trunk/Scribus/scribus/plugins/tools/pathstroker/pathstroker.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23049&path=/trunk/Scribus/scribus/plugins/tools/pathstroker/pathstroker.h
==============================================================================
--- trunk/Scribus/scribus/plugins/tools/pathstroker/pathstroker.h	(original)
+++ trunk/Scribus/scribus/plugins/tools/pathstroker/pathstroker.h	Sat Jun 22 22:25:53 2019
@@ -42,7 +42,7 @@
 		// Standard plugin implementation
 		PathStrokerPlugin();
 		virtual ~PathStrokerPlugin();
-		virtual bool run(ScribusDoc* doc, const QString& target = QString::null);
+		virtual bool run(ScribusDoc* doc, const QString& target = QString());
 		virtual const QString fullTrName() const;
 		virtual const AboutData* getAboutData() const;
 		virtual void deleteAboutData(const AboutData* about) const;

Modified: trunk/Scribus/scribus/plugins/tools/smoothpath/smoothpath.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23049&path=/trunk/Scribus/scribus/plugins/tools/smoothpath/smoothpath.h
==============================================================================
--- trunk/Scribus/scribus/plugins/tools/smoothpath/smoothpath.h	(original)
+++ trunk/Scribus/scribus/plugins/tools/smoothpath/smoothpath.h	Sat Jun 22 22:25:53 2019
@@ -38,7 +38,7 @@
 		// Standard plugin implementation
 		SmoothPathPlugin();
 		virtual ~SmoothPathPlugin();
-		virtual bool run(ScribusDoc* doc, const QString& target = QString::null);
+		virtual bool run(ScribusDoc* doc, const QString& target = QString());
 		virtual const QString fullTrName() const;
 		virtual const AboutData* getAboutData() const;
 		virtual void deleteAboutData(const AboutData* about) const;

Modified: trunk/Scribus/scribus/plugins/tools/subdivide/subdivide.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23049&path=/trunk/Scribus/scribus/plugins/tools/subdivide/subdivide.h
==============================================================================
--- trunk/Scribus/scribus/plugins/tools/subdivide/subdivide.h	(original)
+++ trunk/Scribus/scribus/plugins/tools/subdivide/subdivide.h	Sat Jun 22 22:25:53 2019
@@ -42,7 +42,7 @@
 		// Standard plugin implementation
 		SubdividePlugin();
 		virtual ~SubdividePlugin();
-		virtual bool run(ScribusDoc* doc, const QString& target = QString::null);
+		virtual bool run(ScribusDoc* doc, const QString& target = QString());
 		virtual const QString fullTrName() const;
 		virtual const AboutData* getAboutData() const;
 		virtual void deleteAboutData(const AboutData* about) const;

Modified: trunk/Scribus/scribus/scfonts.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23049&path=/trunk/Scribus/scribus/scfonts.cpp
==============================================================================
--- trunk/Scribus/scribus/scfonts.cpp	(original)
+++ trunk/Scribus/scribus/scfonts.cpp	Sat Jun 22 22:25:53 2019
@@ -126,7 +126,7 @@
 void SCFonts::AddScalableFonts(const QString &path, const QString& DocName)
 {
 	//Make sure this is not empty or we will scan the whole drive on *nix
-	//QString::null+/ is / of course.
+	//QString()+/ is / of course.
 	if (path.isEmpty())
 		return;
 	FT_Library library = nullptr;
@@ -624,7 +624,7 @@
 
 	if (ftErrors.contains(code))
 		return ftErrors.value(code);
-	return QString::null;
+	return QString();
 }
 
 // Load a single font into the library from the passed filename. Returns true on error.

Modified: trunk/Scribus/scribus/scgtplugin.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23049&path=/trunk/Scribus/scribus/scgtplugin.h
==============================================================================
--- trunk/Scribus/scribus/scgtplugin.h	(original)
+++ trunk/Scribus/scribus/scgtplugin.h	Sat Jun 22 22:25:53 2019
@@ -33,9 +33,9 @@
 	~ScGTPlugin() {};
 
 	/**
-	  @brief Returns the file format's name that this plugin can import or QString::null
+	  @brief Returns the file format's name that this plugin can import or QString()
 	  @brief if this plugin doesn't handle files.
-	  @return file format's name or QString::null if this plugin doesn't handle files
+	  @return file format's name or QString() if this plugin doesn't handle files
 	 */
 	virtual QString fileFormatName() const = 0;
 
@@ -57,7 +57,7 @@
 	  @param filename name of the file that is wanted to be imported
 	  @param encoding encoding as selected by a user in the import file dialog
 	 */
-	virtual void run(const QString &filename, const QString &encoding = QString::null) {};
+	virtual void run(const QString &filename, const QString &encoding = QString()) {};
 
 	/**
 	  @brief Run the plugin and do the magic with the <code>text</code> and

Modified: trunk/Scribus/scribus/scpaths.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23049&path=/trunk/Scribus/scribus/scpaths.cpp
==============================================================================
--- trunk/Scribus/scribus/scpaths.cpp	(original)
+++ trunk/Scribus/scribus/scpaths.cpp	Sat Jun 22 22:25:53 2019
@@ -192,7 +192,7 @@
 	CFRelease(macPath);
 	return q_pathPtr;
 #endif
-	return QString::null;
+	return QString();
 }
 
 QString ScPaths::defaultImageEditorApp()

Modified: trunk/Scribus/scribus/scplugin.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23049&path=/trunk/Scribus/scribus/scplugin.h
==============================================================================
--- trunk/Scribus/scribus/scplugin.h	(original)
+++ trunk/Scribus/scribus/scplugin.h	Sat Jun 22 22:25:53 2019
@@ -340,7 +340,7 @@
 		 * @returns bool True for success.
 		 *
 		 */
-		virtual bool run(ScribusDoc* doc, const QString& target = QString::null) = 0;
+		virtual bool run(ScribusDoc* doc, const QString& target = QString()) = 0;
 
 		/**
 		 * @brief Run the plug-in's main action.
@@ -349,7 +349,7 @@
 		 * a parent widget reference. It's useful e.g. when you need to
 		 * open a dialog on a specific parent one.
 		 */
-		virtual bool run(QWidget* parent, ScribusDoc* doc, const QString& target = QString::null);
+		virtual bool run(QWidget* parent, ScribusDoc* doc, const QString& target = QString());
 
 		/**
 		 * @brief Run the plugin on a QIODevice
@@ -408,7 +408,7 @@
 		 * If this method is used, the plugin must not be unloaded until all
 		 * DeferredTask instances have been deleted.
 		 */
-		virtual DeferredTask* runAsync(const QString& target = QString::null);
+		virtual DeferredTask* runAsync(const QString& target = QString());
 
 		/**
 		 * @brief Run the plugin asynchronously

Modified: trunk/Scribus/scribus/scribus.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23049&path=/trunk/Scribus/scribus/scribus.cpp
==============================================================================
--- trunk/Scribus/scribus/scribus.cpp	(original)
+++ trunk/Scribus/scribus/scribus.cpp	Sat Jun 22 22:25:53 2019
@@ -5442,8 +5442,8 @@
 	ScPage* currentPage = doc->currentPage();
 	for (int i = 0; i < numPages; ++i)
 	{
-		slotNewPage(wot, base[(wot + pageSet.FirstPage) % pageSet.Columns], mov); //Avoid the master page application with QString::null
-//		slotNewPage(wot, QString::null, mov); //Avoid the master page application with QString::null
+		slotNewPage(wot, base[(wot + pageSet.FirstPage) % pageSet.Columns], mov); //Avoid the master page application with QString()
+//		slotNewPage(wot, QString(), mov); //Avoid the master page application with QString()
 		//CB: #8212: added overrideMasterPageSizing, but keeping default to true for other calls for now, off for calls from InsPage
 		if (overrideMasterPageSizing)
 		{	
@@ -7324,7 +7324,7 @@
 		QString pdfViewer(PrefsManager::instance()->appPrefs.extToolPrefs.pdfViewerExecutable);
 		if (pdfViewer.isEmpty())
 		{
-			pdfViewer = QFileDialog::getOpenFileName(this, tr("Locate your PDF viewer"), QString::null, QString::null);
+			pdfViewer = QFileDialog::getOpenFileName(this, tr("Locate your PDF viewer"), QString(), QString());
 			if (!QFileInfo::exists(pdfViewer))
 				pdfViewer="";
 			PrefsManager::instance()->appPrefs.extToolPrefs.pdfViewerExecutable=pdfViewer;
@@ -8379,7 +8379,7 @@
 {
 	if ((doc->hasName) && doc->documentFileName().endsWith(".gz"))
 		compress=true;
-	CollectForOutput_UI c(this, doc, QString::null, withFonts, withProfiles, compress);
+	CollectForOutput_UI c(this, doc, QString(), withFonts, withProfiles, compress);
 	QString newFileName;
 	QString errorMsg=c.collect(newFileName);
 	qDebug()<<errorMsg;

Modified: trunk/Scribus/scribus/styleitem.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23049&path=/trunk/Scribus/scribus/styleitem.h
==============================================================================
--- trunk/Scribus/scribus/styleitem.h	(original)
+++ trunk/Scribus/scribus/styleitem.h	Sat Jun 22 22:25:53 2019
@@ -22,7 +22,7 @@
 typedef QPair<QString, QString> RemoveItem;
 
 /** StyleName.first is the name of the style and StyleName.second is the
- *  name of the parent style or QString::null if there's no parent for this style */
+ *  name of the parent style or QString() if there's no parent for this style */
 typedef QPair<QString, QString> StyleName;
 
 /**
@@ -71,7 +71,7 @@
 	 * should function return currently cached and possibly changed styles
 	 * @return Name of the styles and their parent as a QValueList.
 	 * StyleName::first is the style name and StyleName::second it's parent's name.
-	 * If the StyleItem has no parent StyleName::second should be set to QString::null.
+	 * If the StyleItem has no parent StyleName::second should be set to QString().
 	 */
 	virtual QList<StyleName> styles(bool reloadFromDoc = true) = 0;
 
@@ -100,12 +100,12 @@
 
 	/**
 	 * @brief Return the name of the style in this category applied to the
-	 * @brief selected object(s) in the current document or QString::null
+	 * @brief selected object(s) in the current document or QString()
 	 * @brief if there is no selection in the document.
 	 *
 	 * If there are multiple objects selected only return a style name if the same style
 	 * is applied on all selected objects. If they doesn't share the same style then
-	 * return QString::null.
+	 * return QString().
 	 */
 	virtual QString fromSelection() const = 0;
 
@@ -164,7 +164,7 @@
 	 * @param removeList list of styles to be deleted. RemoveItem::first is
 	 * the style to be deleted and RemoveItem::second is the style to replace
 	 * the deleted style with. If no replacement was requested RemoveItem::second
-	 * has been set to QString::null.
+	 * has been set to QString().
 	 */
 	virtual void deleteStyles(const QList<RemoveItem> &removeList) = 0;
 

Modified: trunk/Scribus/scribus/tocgenerator.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23049&path=/trunk/Scribus/scribus/tocgenerator.cpp
==============================================================================
--- trunk/Scribus/scribus/tocgenerator.cpp	(original)
+++ trunk/Scribus/scribus/tocgenerator.cpp	Sat Jun 22 22:25:53 2019
@@ -131,7 +131,7 @@
 		pstyle->setName(tocSetupIt->textStyle);
 		writer.setParagraphStyle(pstyle);
 		
-		QString oldTocPage = QString::null;
+		QString oldTocPage;
 		for (QMap<QString, QString>::Iterator tocIt=tocMap.begin(); tocIt != tocMap.end();++tocIt)
 		{
 			QString tocPage(tocIt.key().section( ',', 2, 2 ).trimmed());

Modified: trunk/Scribus/scribus/ui/collectforoutput_ui.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23049&path=/trunk/Scribus/scribus/ui/collectforoutput_ui.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/collectforoutput_ui.cpp	(original)
+++ trunk/Scribus/scribus/ui/collectforoutput_ui.cpp	Sat Jun 22 22:25:53 2019
@@ -131,7 +131,7 @@
 	delete progressDialog;
 	progressDialog = nullptr;
 
-	return QString::null;
+	return QString();
 }
 
 void CollectForOutput_UI::collectedFonts(int c)

Modified: trunk/Scribus/scribus/ui/collectforoutput_ui.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23049&path=/trunk/Scribus/scribus/ui/collectforoutput_ui.h
==============================================================================
--- trunk/Scribus/scribus/ui/collectforoutput_ui.h	(original)
+++ trunk/Scribus/scribus/ui/collectforoutput_ui.h	Sat Jun 22 22:25:53 2019
@@ -15,18 +15,19 @@
 {
 	Q_OBJECT
 	public:
-		CollectForOutput_UI(QWidget *parent, ScribusDoc* doc, const QString& outputDirectory=QString::null, bool withFonts=false, bool withProfiles=false, bool compressDoc=false);
-		virtual QString collect(QString &newFileName);
+	CollectForOutput_UI(QWidget *parent, ScribusDoc* doc, const QString& outputDirectory=QString(), bool withFonts=false, bool withProfiles=false, bool compressDoc=false);
+	virtual QString collect(QString &newFileName);
+
 	signals:
 
 	protected slots:
-		void collectedFonts(int);
-		void collectedItems(int);
-		void collectedPatterns(int);
-		void collectedProfiles(int);
+	void collectedFonts(int);
+	void collectedItems(int);
+	void collectedPatterns(int);
+	void collectedProfiles(int);
 
 	protected:
-		MultiProgressDialog* progressDialog;
+	MultiProgressDialog* progressDialog;
 };
 
 #endif // COLLECTFOROUTPUT_UI_H

Modified: trunk/Scribus/scribus/ui/curvewidget.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23049&path=/trunk/Scribus/scribus/ui/curvewidget.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/curvewidget.cpp	(original)
+++ trunk/Scribus/scribus/ui/curvewidget.cpp	Sat Jun 22 22:25:53 2019
@@ -497,10 +497,10 @@
 
 void CurveWidget::languageChange()
 {
-	invertButton->setText( QString::null );
-	resetButton->setText( QString::null );
-	loadButton->setText( QString::null );
-	saveButton->setText( QString::null );
+	invertButton->setText( QString() );
+	resetButton->setText( QString() );
+	loadButton->setText( QString() );
+	saveButton->setText( QString() );
 	invertButton->setToolTip("");
 	resetButton->setToolTip("");
 	linearButton->setToolTip("");

Modified: trunk/Scribus/scribus/ui/insertaframe.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23049&path=/trunk/Scribus/scribus/ui/insertaframe.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/insertaframe.cpp	(original)
+++ trunk/Scribus/scribus/ui/insertaframe.cpp	Sat Jun 22 22:25:53 2019
@@ -261,7 +261,7 @@
 			return;
 		}
 	}
-	placementPagesLineEdit->setText(QString::null);
+	placementPagesLineEdit->setText(QString());
 }
 
 void InsertAFrame::slotLinkToExistingFrame(int state)

Modified: trunk/Scribus/scribus/ui/loremipsum.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23049&path=/trunk/Scribus/scribus/ui/loremipsum.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/loremipsum.cpp	(original)
+++ trunk/Scribus/scribus/ui/loremipsum.cpp	Sat Jun 22 22:25:53 2019
@@ -97,7 +97,7 @@
 QString LoremParser::createLorem(uint parCount, bool random)
 {
 	if (parCount < 1)
-		return QString::null;
+		return QString();
 	// first paragraph is always the same
 	QString lorem = "";
 	if (!loremIpsum.isEmpty())
@@ -198,7 +198,7 @@
 	languageChange();
 
 	// reading lorems
-	QDir d(getLoremLocation(QString::null), "*.xml");
+	QDir d(getLoremLocation(QString()), "*.xml");
 
 	QFileInfoList list = d.entryInfoList();
 	QListIterator<QFileInfo> it(list);

Modified: trunk/Scribus/scribus/ui/marksmanager.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23049&path=/trunk/Scribus/scribus/ui/marksmanager.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/marksmanager.cpp	(original)
+++ trunk/Scribus/scribus/ui/marksmanager.cpp	Sat Jun 22 22:25:53 2019
@@ -63,24 +63,24 @@
 
 void MarksManager::storeColaption()
 {
-	expandedItems.clear();
+	m_expandedItems.clear();
 	for (int i=0; i < listView->topLevelItemCount(); ++i)
 	{
 		QTreeWidgetItem *item = listView->topLevelItem(i);
 		if (item->isExpanded())
-			expandedItems.append(item->text(0));
+			m_expandedItems.append(item->text(0));
 	}
 }
 
 void MarksManager::restoreColaption()
 {
 	listView->collapseAll();
-	if (!expandedItems.isEmpty())
+	if (!m_expandedItems.isEmpty())
 	{
 		for (int i=0; i < listView->topLevelItemCount(); ++i)
 		{
 			QTreeWidgetItem *item = listView->topLevelItem(i);
-			if (expandedItems.contains(item->text(0)))
+			if (m_expandedItems.contains(item->text(0)))
 				listView->topLevelItem(i)->setExpanded(true);
 		}
 	}

Modified: trunk/Scribus/scribus/ui/marksmanager.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23049&path=/trunk/Scribus/scribus/ui/marksmanager.h
==============================================================================
--- trunk/Scribus/scribus/ui/marksmanager.h	(original)
+++ trunk/Scribus/scribus/ui/marksmanager.h	Sat Jun 22 22:25:53 2019
@@ -21,11 +21,11 @@
 	void updateListView();
 
 private:
-	ScribusDoc         *m_Doc;
-	PrefsContext       *m_prefs;
+	ScribusDoc* m_Doc;
+	PrefsContext* m_prefs;
 	Mark* getMarkFromListView();
 	void addListItem(MarkType typeMrk, const QString& typeStr, const QList<Mark *> &marks, int &index);
-	QStringList expandedItems;
+	QStringList m_expandedItems;
 	void storeColaption();
 	void restoreColaption();
 

Modified: trunk/Scribus/scribus/ui/newtemp.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23049&path=/trunk/Scribus/scribus/ui/newtemp.h
==============================================================================
--- trunk/Scribus/scribus/ui/newtemp.h	(original)
+++ trunk/Scribus/scribus/ui/newtemp.h	Sat Jun 22 22:25:53 2019
@@ -23,7 +23,7 @@
 	Q_OBJECT
 
 public:
-	NewTm(QWidget* parent, const QString& text, const QString& titel, ScribusDoc *doc, const QString& answerText=QString::null );
+	NewTm(QWidget* parent, const QString& text, const QString& titel, ScribusDoc *doc, const QString& answerText=QString() );
 	~NewTm() {};
 
 	QPushButton* PushButton1;

Modified: trunk/Scribus/scribus/ui/nftwidget.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23049&path=/trunk/Scribus/scribus/ui/nftwidget.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/nftwidget.cpp	(original)
+++ trunk/Scribus/scribus/ui/nftwidget.cpp	Sat Jun 22 22:25:53 2019
@@ -105,7 +105,7 @@
 	}
 	
 	QString curtype(categoryList->currentItem()->text());
-	if (curtype != QString::null)
+	if (!curtype.isNull())
 	{
 		tnailGrid->clear();
 		for (uint i = 0; i < iconItems.size(); ++i)

Modified: trunk/Scribus/scribus/ui/prefs_display.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23049&path=/trunk/Scribus/scribus/ui/prefs_display.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/prefs_display.cpp	(original)
+++ trunk/Scribus/scribus/ui/prefs_display.cpp	Sat Jun 22 22:25:53 2019
@@ -131,52 +131,52 @@
 	QPixmap pm(100, 30);
 	pm.fill(prefsData->displayPrefs.paperColor);
 	colorPaper = prefsData->displayPrefs.paperColor;
-	pageFillColorButton->setText( QString::null );
+	pageFillColorButton->setText( QString() );
 	pageFillColorButton->setIcon(pm);
 
 	pm.fill(prefsData->displayPrefs.scratchColor);
 	colorScratch = prefsData->displayPrefs.scratchColor;
-	scratchSpaceColorButton->setText( QString::null );
+	scratchSpaceColorButton->setText( QString() );
 	scratchSpaceColorButton->setIcon(pm);
 
 	pm.fill(prefsData->displayPrefs.frameColor);
 	colorFrame = prefsData->displayPrefs.frameColor;
-	frameSelectedColorButton->setText( QString::null );
+	frameSelectedColorButton->setText( QString() );
 	frameSelectedColorButton->setIcon(pm);
 
 	pm.fill(prefsData->displayPrefs.frameNormColor);
 	colorFrameNorm = prefsData->displayPrefs.frameNormColor;
-	frameColorButton->setText( QString::null );
+	frameColorButton->setText( QString() );
 	frameColorButton->setIcon(pm);
 
 	pm.fill(prefsData->displayPrefs.frameGroupColor);
 	colorFrameGroup = prefsData->displayPrefs.frameGroupColor;
-	frameGroupedColorButton->setText( QString::null );
+	frameGroupedColorButton->setText( QString() );
 	frameGroupedColorButton->setIcon(pm);
 
 	pm.fill(prefsData->displayPrefs.frameLinkColor);
 	colorFrameLinked = prefsData->displayPrefs.frameLinkColor;
-	frameLinkedColorButton->setText( QString::null );
+	frameLinkedColorButton->setText( QString() );
 	frameLinkedColorButton->setIcon(pm);
 
 	pm.fill(prefsData->displayPrefs.frameLockColor);
 	colorFrameLocked = prefsData->displayPrefs.frameLockColor;
-	frameLockedColorButton->setText( QString::null );
+	frameLockedColorButton->setText( QString() );
 	frameLockedColorButton->setIcon(pm);
 
 	pm.fill(prefsData->displayPrefs.frameAnnotationColor);
 	colorFrameAnnotation = prefsData->displayPrefs.frameAnnotationColor;
-	frameAnnotationColorButton->setText( QString::null );
+	frameAnnotationColorButton->setText( QString() );
 	frameAnnotationColorButton->setIcon(pm);
 
 	pm.fill(prefsData->displayPrefs.pageBorderColor);
 	colorPageBorder = prefsData->displayPrefs.pageBorderColor;
-	selectedPageBorderButton->setText( QString::null );
+	selectedPageBorderButton->setText( QString() );
 	selectedPageBorderButton->setIcon(pm);
 
 	pm.fill(prefsData->displayPrefs.controlCharColor);
 	colorControlChars = prefsData->displayPrefs.controlCharColor;
-	textControlCharsButton->setText( QString::null );
+	textControlCharsButton->setText( QString() );
 	textControlCharsButton->setIcon(pm);
 
 	displayScale=prefsData->displayPrefs.displayScale;

Modified: trunk/Scribus/scribus/ui/prefs_guides.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23049&path=/trunk/Scribus/scribus/ui/prefs_guides.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/prefs_guides.cpp	(original)
+++ trunk/Scribus/scribus/ui/prefs_guides.cpp	Sat Jun 22 22:25:53 2019
@@ -155,28 +155,28 @@
 	QPixmap pm(100, 30);
 	pm.fill(prefsData->guidesPrefs.guideColor);
 	colorGuides = prefsData->guidesPrefs.guideColor;
-	guideColorPushButton->setText( QString::null );
+	guideColorPushButton->setText( QString() );
 	guideColorPushButton->setIcon(pm);
 
 
 	pm.fill(prefsData->guidesPrefs.marginColor);
 	colorMargin = prefsData->guidesPrefs.marginColor;
-	marginColorPushButton->setText( QString::null );
+	marginColorPushButton->setText( QString() );
 	marginColorPushButton->setIcon(pm);
 
 	pm.fill(prefsData->guidesPrefs.majorGridColor);
 	colorMajorGrid = prefsData->guidesPrefs.majorGridColor;
-	majorGridColorPushButton->setText( QString::null );
+	majorGridColorPushButton->setText( QString() );
 	majorGridColorPushButton->setIcon(pm);
 
 	pm.fill(prefsData->guidesPrefs.minorGridColor);
 	colorMinorGrid = prefsData->guidesPrefs.minorGridColor;
-	minorGridColorPushButton->setText( QString::null );
+	minorGridColorPushButton->setText( QString() );
 	minorGridColorPushButton->setIcon(pm);
 
 	pm.fill(prefsData->guidesPrefs.baselineGridColor);
 	colorBaselineGrid = prefsData->guidesPrefs.baselineGridColor;
-	baselineGridColorPushButton->setText( QString::null );
+	baselineGridColorPushButton->setText( QString() );
 	baselineGridColorPushButton->setIcon(pm);
 	gridTypeCombo->setEnabled(visibilityGridCheckBox->isChecked());
 }

Modified: trunk/Scribus/scribus/ui/prefs_keyboardshortcuts.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23049&path=/trunk/Scribus/scribus/ui/prefs_keyboardshortcuts.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/prefs_keyboardshortcuts.cpp	(original)
+++ trunk/Scribus/scribus/ui/prefs_keyboardshortcuts.cpp	Sat Jun 22 22:25:53 2019
@@ -204,7 +204,7 @@
 	if (overwrite(this, exportFileName))
 	{
 		bool ok;
-		QString setName = QInputDialog::getText(this, tr("Export Keyboard Shortcuts to File"), tr("Enter the name of the shortcut set:"), QLineEdit::Normal, QString::null, &ok);
+		QString setName = QInputDialog::getText(this, tr("Export Keyboard Shortcuts to File"), tr("Enter the name of the shortcut set:"), QLineEdit::Normal, QString(), &ok);
 		if (!( ok && !setName.isEmpty()) )
 			return false;
 

Modified: trunk/Scribus/scribus/ui/prefs_pdfexport.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23049&path=/trunk/Scribus/scribus/ui/prefs_pdfexport.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/prefs_pdfexport.cpp	(original)
+++ trunk/Scribus/scribus/ui/prefs_pdfexport.cpp	Sat Jun 22 22:25:53 2019
@@ -808,7 +808,7 @@
 			return;
 		}
 	}
-	exportPageListLineEdit->setText(QString::null);
+	exportPageListLineEdit->setText(QString());
 }
 
 void Prefs_PDFExport::setMaximumResolution()

Modified: trunk/Scribus/scribus/ui/printdialog.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23049&path=/trunk/Scribus/scribus/ui/printdialog.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/printdialog.cpp	(original)
+++ trunk/Scribus/scribus/ui/printdialog.cpp	Sat Jun 22 22:25:53 2019
@@ -711,7 +711,7 @@
 			return;
 		}
 	}
-	pageNr->setText(QString::null);
+	pageNr->setText(QString());
 }
 
 void PrintDialog::refreshPrintEngineBox()

Modified: trunk/Scribus/scribus/ui/scdockpalette.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23049&path=/trunk/Scribus/scribus/ui/scdockpalette.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/scdockpalette.cpp	(original)
+++ trunk/Scribus/scribus/ui/scdockpalette.cpp	Sat Jun 22 22:25:53 2019
@@ -44,9 +44,8 @@
 #else
 	: QDockWidget ( parent, f | Qt::Tool  | Qt::CustomizeWindowHint ),
 #endif
-	palettePrefs(nullptr),
-	prefsContextName(QString::null),
-	visibleOnStartup(false)
+	m_palettePrefs(nullptr),
+	m_visibleOnStartup(false)
 {
 	if (PrefsManager::instance()->appPrefs.uiPrefs.useSmallWidgets)
 	{
@@ -63,8 +62,8 @@
 						QToolBox::tab { font-size: 10px; padding: 0px; margin: 0px; } \
 			  		");
 	}
-	originalParent=parent;
-	tempParent=nullptr;
+	m_originalParent=parent;
+	m_tempParent=nullptr;
 	setAllowedAreas(Qt::LeftDockWidgetArea | Qt::RightDockWidgetArea);
 	setWindowIcon(IconManager::instance()->loadPixmap("AppIcon.png"));
 	setPrefsContext(prefsContext);
@@ -74,24 +73,24 @@
 
 void ScDockPalette::setPrefsContext(const QString& context)
 {
-	if (prefsContextName.isEmpty())
-	{
-		prefsContextName=context;
-		if (!prefsContextName.isEmpty())
+	if (m_prefsContextName.isEmpty())
+	{
+		m_prefsContextName=context;
+		if (!m_prefsContextName.isEmpty())
 		{
-			palettePrefs = PrefsManager::instance()->prefsFile->getContext(prefsContextName);
-			if (palettePrefs)
-				visibleOnStartup = palettePrefs->getBool("visible");
+			m_palettePrefs = PrefsManager::instance()->prefsFile->getContext(m_prefsContextName);
+			if (m_palettePrefs)
+				m_visibleOnStartup = m_palettePrefs->getBool("visible");
 		}
 		else
-			palettePrefs = nullptr;
+			m_palettePrefs = nullptr;
 	}
 }
 
 void ScDockPalette::startup()
 {
 	setFontSize();
-	if (visibleOnStartup)
+	if (m_visibleOnStartup)
 	{
 #if QT_VERSION < 0x050600
 		QMainWindow* mainWindow = dynamic_cast<QMainWindow*>(parent());
@@ -111,7 +110,7 @@
 	}
 	else
 		hide();
-	emit paletteShown(visibleOnStartup);
+	emit paletteShown(m_visibleOnStartup);
 }
 
 void ScDockPalette::setPaletteShown(bool visible)
@@ -155,25 +154,25 @@
 	// According to Qt doc, non-spontaneous show events are sent to widgets
 	// immediately before they are shown. We want to restore geometry for those
 	// events as spontaneous events are delivered after dialog has been shown
-	if (palettePrefs && !showEvent->spontaneous() && isFloating())
+	if (m_palettePrefs && !showEvent->spontaneous() && isFloating())
 	{
 		QDesktopWidget *d = QApplication::desktop();
 		QSize gStrut = QApplication::globalStrut();
-		if (palettePrefs->contains("left"))
+		if (m_palettePrefs->contains("left"))
 		{
 			QRect scr = QApplication::desktop()->availableGeometry(this);
 			// all palettes should have enough room for 3x3 min widgets
-			int vwidth  = qMin(qMax(3*gStrut.width(), palettePrefs->getInt("width")),
+			int vwidth  = qMin(qMax(3*gStrut.width(), m_palettePrefs->getInt("width")),
 			                   d->width());
-			int vheight = qMin(qMax(3*gStrut.height(), palettePrefs->getInt("height")),
+			int vheight = qMin(qMax(3*gStrut.height(), m_palettePrefs->getInt("height")),
 			                   d->height());
 			// palettes should not use too much screen space
 			if (vwidth > d->width()/3 && vheight > d->height()/3)
 				vwidth = d->width()/3;
 			// and should be partly visible
-			int vleft   = qMin(qMax(scr.left() - vwidth + gStrut.width(), palettePrefs->getInt("left")),
+			int vleft   = qMin(qMax(scr.left() - vwidth + gStrut.width(), m_palettePrefs->getInt("left")),
 			                   scr.right() - gStrut.width());
-			int vtop = qMin(palettePrefs->getInt("top"), d->height() - gStrut.height());
+			int vtop = qMin(m_palettePrefs->getInt("top"), d->height() - gStrut.height());
 #if defined(Q_OS_MAC) || defined(_WIN32)
 			// on Mac and Windows you're dead if the titlebar is not on screen
 			vtop    = qMax(64, vtop);
@@ -219,48 +218,48 @@
 
 void ScDockPalette::storePosition()
 {
-	if (palettePrefs)
+	if (m_palettePrefs)
 	{
 		QPoint geo = pos();
-		palettePrefs->set("left", geo.x());
-		palettePrefs->set("top", geo.y());
+		m_palettePrefs->set("left", geo.x());
+		m_palettePrefs->set("top", geo.y());
 	}
 }
 
 void ScDockPalette::storePosition(int newX, int newY)
 {
-	if (palettePrefs)
-	{
-		palettePrefs->set("left", newX);
-		palettePrefs->set("top", newY);
+	if (m_palettePrefs)
+	{
+		m_palettePrefs->set("left", newX);
+		m_palettePrefs->set("top", newY);
 	}
 }
 
 void ScDockPalette::storeSize()
 {
-	if (palettePrefs)
-	{
-		palettePrefs->set("width", width());
-		palettePrefs->set("height", height());
+	if (m_palettePrefs)
+	{
+		m_palettePrefs->set("width", width());
+		m_palettePrefs->set("height", height());
 	}
 }
 
 void ScDockPalette::storeVisibility(bool vis)
 {
-	if (palettePrefs)
-		palettePrefs->set("visible", vis);
+	if (m_palettePrefs)
+		m_palettePrefs->set("visible", vis);
 }
 
 void ScDockPalette::storeDockState()
 {
-	if (palettePrefs)
-	{
-		palettePrefs->set("floating", isFloating());
+	if (m_palettePrefs)
+	{
+		m_palettePrefs->set("floating", isFloating());
 		Qt::DockWidgetArea area = Qt::NoDockWidgetArea;
 		QMainWindow* mainWindow = dynamic_cast<QMainWindow*>(parent());
 		if (mainWindow)
 			area = mainWindow->dockWidgetArea(this);
-		palettePrefs->set("area", (int) area);
-	}
-}
-
+		m_palettePrefs->set("area", (int) area);
+	}
+}
+

Modified: trunk/Scribus/scribus/ui/scdockpalette.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23049&path=/trunk/Scribus/scribus/ui/scdockpalette.h
==============================================================================
--- trunk/Scribus/scribus/ui/scdockpalette.h	(original)
+++ trunk/Scribus/scribus/ui/scdockpalette.h	Sat Jun 22 22:25:53 2019
@@ -37,44 +37,44 @@
 
 class SCRIBUS_API ScDockPalette : public QDockWidget
 {
-	Q_OBJECT
+Q_OBJECT
 
-	public:
-		ScDockPalette( QWidget * parent = nullptr, const QString& prefsContext = QString::null, Qt::WindowFlags f = 0 );
-		~ScDockPalette() {}
-		/** @brief Sample way to grab keystrokes, simply calls superclass at this point */
-		//virtual void keyPressEvent(QKeyEvent *keyEvent);
-		virtual void hide();
-		void startup();
-		
-	public slots:
-		virtual void setPaletteShown(bool);
-		virtual void setFontSize();
-		
-	signals:
-		/** @brief Let the action for this palette know when something changes and it hasn't caused it */
-		void paletteShown(bool);
-		
-	protected:
-		/** @brief Set the Preferences context to be used for storage of startup visibility and position and size */
-		virtual void setPrefsContext(const QString& context);
-		void storePosition();
-		void storePosition(int newX, int newY);
-		void storeSize();
-		void storeVisibility(bool);
-		void storeDockState();
+public:
+	ScDockPalette( QWidget * parent = nullptr, const QString& prefsContext = QString(), Qt::WindowFlags f = 0 );
+	~ScDockPalette() {}
+	/** @brief Sample way to grab keystrokes, simply calls superclass at this point */
+	//virtual void keyPressEvent(QKeyEvent *keyEvent);
+	virtual void hide();
+	void startup();
 
-		/** @brief Restore the geometry of the window when showing it. */
-		virtual void showEvent(QShowEvent *showEvent);
-		/** @brief Captures the close event and changes it to hide */
-		virtual void closeEvent(QCloseEvent *closeEvent);
-		/** @brief Stores the geometry of the window when hiding. */
-		virtual void hideEvent(QHideEvent* hideEvent);
-		
-		PrefsContext* palettePrefs;
-		QString prefsContextName;
-		bool visibleOnStartup;
-		QWidget* originalParent;
-		QWidget* tempParent;
+public slots:
+	virtual void setPaletteShown(bool);
+	virtual void setFontSize();
+
+signals:
+	/** @brief Let the action for this palette know when something changes and it hasn't caused it */
+	void paletteShown(bool);
+
+protected:
+	/** @brief Set the Preferences context to be used for storage of startup visibility and position and size */
+	virtual void setPrefsContext(const QString& context);
+	void storePosition();
+	void storePosition(int newX, int newY);
+	void storeSize();
+	void storeVisibility(bool);
+	void storeDockState();
+
+	/** @brief Restore the geometry of the window when showing it. */
+	virtual void showEvent(QShowEvent *showEvent);
+	/** @brief Captures the close event and changes it to hide */
+	virtual void closeEvent(QCloseEvent *closeEvent);
+	/** @brief Stores the geometry of the window when hiding. */
+	virtual void hideEvent(QHideEvent* hideEvent);
+
+	PrefsContext* m_palettePrefs;
+	QString m_prefsContextName;
+	bool m_visibleOnStartup;
+	QWidget* m_originalParent;
+	QWidget* m_tempParent;
 };
 #endif

Modified: trunk/Scribus/scribus/ui/scinputdialog.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23049&path=/trunk/Scribus/scribus/ui/scinputdialog.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/scinputdialog.cpp	(original)
+++ trunk/Scribus/scribus/ui/scinputdialog.cpp	Sat Jun 22 22:25:53 2019
@@ -79,9 +79,9 @@
 	setWindowTitle( tr( "Input Dialog" ) );
 	entryLabel->setText( tr( "InputDialog" ) );
 	buttonOk->setText( tr( "&OK" ) );
-	buttonOk->setShortcut( QKeySequence( QString::null ) );
+	buttonOk->setShortcut( QKeySequence( QString() ) );
 	buttonCancel->setText( tr( "&Cancel" ) );
-	buttonCancel->setShortcut( QKeySequence( QString::null ) );
+	buttonCancel->setShortcut( QKeySequence( QString() ) );
 }
 
 double ScInputDialog::getDouble( const QString &caption, const QString &label, double num,

Modified: trunk/Scribus/scribus/ui/scmenu.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23049&path=/trunk/Scribus/scribus/ui/scmenu.h
==============================================================================
--- trunk/Scribus/scribus/ui/scmenu.h	(original)
+++ trunk/Scribus/scribus/ui/scmenu.h	Sat Jun 22 22:25:53 2019
@@ -36,7 +36,7 @@
 {
 	Q_OBJECT
 	public:
-		ScrPopupMenu ( QWidget * parent = nullptr, const QString& pMenuName = QString::null, const QString& pMenuText = QString::null, const QString& parentName = QString::null, bool checkable = false);
+		ScrPopupMenu ( QWidget * parent = nullptr, const QString& pMenuName = QString(), const QString& pMenuText = QString(), const QString& parentName = QString(), bool checkable = false);
 		~ScrPopupMenu ();
 		
 		const QString getMenuName();

Modified: trunk/Scribus/scribus/ui/scrpalettebase.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23049&path=/trunk/Scribus/scribus/ui/scrpalettebase.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/scrpalettebase.cpp	(original)
+++ trunk/Scribus/scribus/ui/scrpalettebase.cpp	Sat Jun 22 22:25:53 2019
@@ -41,9 +41,8 @@
 	: QDialog ( parent, f | Qt::Tool | Qt::CustomizeWindowHint
 			| Qt::WindowTitleHint | Qt::WindowMinMaxButtonsHint
 			| Qt::WindowSystemMenuHint | Qt::WindowCloseButtonHint ),
-	palettePrefs(nullptr),
-	prefsContextName(QString::null),
-	visibleOnStartup(false)
+	m_palettePrefs(nullptr),
+	m_visibleOnStartup(false)
 {
 	if (PrefsManager::instance()->appPrefs.uiPrefs.useSmallWidgets)
 	{
@@ -60,8 +59,8 @@
 						QToolBox::tab { font-size: 10px; padding: 0px; margin: 0px; } \
 			  		");
 	}
-	originalParent=parent;
-	tempParent=nullptr;
+	m_originalParent=parent;
+	m_tempParent=nullptr;
 	setWindowIcon(IconManager::instance()->loadIcon("AppIcon.png"));
 	setPrefsContext(prefsContext);
 	setModal(modal);
@@ -70,28 +69,28 @@
 
 void ScrPaletteBase::setPrefsContext(const QString& context)
 {
-	if (prefsContextName.isEmpty())
-	{
-		prefsContextName=context;
-		if (!prefsContextName.isEmpty())
+	if (m_prefsContextName.isEmpty())
+	{
+		m_prefsContextName=context;
+		if (!m_prefsContextName.isEmpty())
 		{
-			palettePrefs = PrefsManager::instance()->prefsFile->getContext(prefsContextName);
-			if (palettePrefs)
-				visibleOnStartup = palettePrefs->getBool("visible");
+			m_palettePrefs = PrefsManager::instance()->prefsFile->getContext(m_prefsContextName);
+			if (m_palettePrefs)
+				m_visibleOnStartup = m_palettePrefs->getBool("visible");
 		}
 		else
-			palettePrefs = nullptr;
+			m_palettePrefs = nullptr;
 	}
 }
 
 void ScrPaletteBase::startup()
 {
 	setFontSize();
-	if (visibleOnStartup)
+	if (m_visibleOnStartup)
 		show();
 	else
 		hide();
-	emit paletteShown(visibleOnStartup);
+	emit paletteShown(m_visibleOnStartup);
 }
 
 void ScrPaletteBase::setPaletteShown(bool visible)
@@ -158,25 +157,25 @@
 	// According to Qt doc, non-spontaneous show events are sent to widgets
 	// immediately before they are shown. We want to restore geometry for those
 	// events as spontaneous events are delivered after dialog has been shown
-	if (palettePrefs && !showEvent->spontaneous())
+	if (m_palettePrefs && !showEvent->spontaneous())
 	{
 		QDesktopWidget *d = QApplication::desktop();
 		QSize gStrut = QApplication::globalStrut();
-		if (palettePrefs->contains("left"))
+		if (m_palettePrefs->contains("left"))
 		{
 			QRect scr = QApplication::desktop()->availableGeometry(this);
 			// all palettes should have enough room for 3x3 min widgets
-			int vwidth  = qMin(qMax(3*gStrut.width(), palettePrefs->getInt("width")),
+			int vwidth  = qMin(qMax(3*gStrut.width(), m_palettePrefs->getInt("width")),
 			                   d->width());
-			int vheight = qMin(qMax(3*gStrut.height(), palettePrefs->getInt("height")),
+			int vheight = qMin(qMax(3*gStrut.height(), m_palettePrefs->getInt("height")),
 			                   d->height());
 			// palettes should not use too much screen space
 			if (vwidth > d->width()/3 && vheight > d->height()/3)
 				vwidth = d->width()/3;
 			// and should be partly visible
-			int vleft   = qMin(qMax(scr.left() - vwidth + gStrut.width(), palettePrefs->getInt("left")),
+			int vleft   = qMin(qMax(scr.left() - vwidth + gStrut.width(), m_palettePrefs->getInt("left")),
 			                   scr.right() - gStrut.width());
-			int vtop = qMin(palettePrefs->getInt("top"), d->height() - gStrut.height());
+			int vtop = qMin(m_palettePrefs->getInt("top"), d->height() - gStrut.height());
 #if defined(Q_OS_MAC) || defined(_WIN32)
 			// on Mac and Windows you're dead if the titlebar is not on screen
 			vtop    = qMax(64, vtop);
@@ -225,46 +224,46 @@
 
 void ScrPaletteBase::storePosition()
 {
-	if (palettePrefs)
+	if (m_palettePrefs)
 	{
 		QPoint geo = pos();
-		palettePrefs->set("left", geo.x());
-		palettePrefs->set("top", geo.y());
+		m_palettePrefs->set("left", geo.x());
+		m_palettePrefs->set("top", geo.y());
 	}
 }
 
 void ScrPaletteBase::storePosition(int newX, int newY)
 {
-	if (palettePrefs)
-	{
-		palettePrefs->set("left", newX);
-		palettePrefs->set("top", newY);
+	if (m_palettePrefs)
+	{
+		m_palettePrefs->set("left", newX);
+		m_palettePrefs->set("top", newY);
 	}
 }
 
 void ScrPaletteBase::storeSize()
 {
-	if (palettePrefs)
-	{
-		palettePrefs->set("width", width());
-		palettePrefs->set("height", height());
+	if (m_palettePrefs)
+	{
+		m_palettePrefs->set("width", width());
+		m_palettePrefs->set("height", height());
 	}
 }
 
 void ScrPaletteBase::storeVisibility(bool vis)
 {
-	if (palettePrefs)
-		palettePrefs->set("visible", vis);
+	if (m_palettePrefs)
+		m_palettePrefs->set("visible", vis);
 }
 
 int ScrPaletteBase::exec(QWidget* newParent)
 {
-	Q_ASSERT(tempParent==nullptr && newParent!=nullptr);
-	tempParent=newParent;
+	Q_ASSERT(m_tempParent==nullptr && newParent!=nullptr);
+	m_tempParent=newParent;
 	Qt::WindowFlags wflags = windowFlags();
 	setParent(newParent, wflags);
 	int i=QDialog::exec();
-	setParent(originalParent, wflags);
-	tempParent=nullptr;
+	setParent(m_originalParent, wflags);
+	m_tempParent=nullptr;
 	return i;
 }

Modified: trunk/Scribus/scribus/ui/scrpalettebase.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23049&path=/trunk/Scribus/scribus/ui/scrpalettebase.h
==============================================================================
--- trunk/Scribus/scribus/ui/scrpalettebase.h	(original)
+++ trunk/Scribus/scribus/ui/scrpalettebase.h	Sat Jun 22 22:25:53 2019
@@ -37,48 +37,48 @@
 
 class SCRIBUS_API ScrPaletteBase : public QDialog
 {
-	Q_OBJECT
+Q_OBJECT
 
-	public:
-		ScrPaletteBase( QWidget * parent = nullptr, const QString& prefsContext = QString::null, bool modal = false, Qt::WindowFlags f = nullptr);
-		~ScrPaletteBase() {}
-		/** @brief Sample way to grab keystrokes, simply calls superclass at this point */
-		//virtual void keyPressEvent(QKeyEvent *keyEvent);
-		virtual void hide();
-		void startup();
-		
-	public slots:
-		virtual void setPaletteShown(bool);
-		virtual void setFontSize();
-		virtual int exec() { return QDialog::exec();}
-		int exec(QWidget* newParent);
-		
-	signals:
-		/** @brief Let the action for this palette know when something changes and it hasn't caused it */
-		void paletteShown(bool);
-		
-	protected:
-		/** @brief Set the Preferences context to be used for storage of startup visibility and position and size */
-		virtual void setPrefsContext(const QString& context);
-		void storePosition();
-		void storePosition(int newX, int newY);
-		void storeSize();
-		void storeVisibility(bool);
+public:
+	ScrPaletteBase( QWidget * parent = nullptr, const QString& prefsContext = QString(), bool modal = false, Qt::WindowFlags f = nullptr);
+	~ScrPaletteBase() {}
+	/** @brief Sample way to grab keystrokes, simply calls superclass at this point */
+	//virtual void keyPressEvent(QKeyEvent *keyEvent);
+	virtual void hide();
+	void startup();
 
-		/** @brief Restore the geometry of the window when showing it. */
-		virtual void showEvent(QShowEvent *showEvent);
-		/** @brief Captures the close event and changes it to hide */
-		virtual void closeEvent(QCloseEvent *closeEvent);
-		/** @brief Stores the geometry of the window when hiding. */
-		virtual void hideEvent(QHideEvent*);
-		
-		PrefsContext* palettePrefs;
-		QString prefsContextName;
-		bool visibleOnStartup;
-		QWidget* originalParent;
-		QWidget* tempParent;
-		
+public slots:
+	virtual void setPaletteShown(bool);
+	virtual void setFontSize();
+	virtual int exec() { return QDialog::exec();}
+	int exec(QWidget* newParent);
+
+signals:
+	/** @brief Let the action for this palette know when something changes and it hasn't caused it */
+	void paletteShown(bool);
+
+protected:
+	/** @brief Set the Preferences context to be used for storage of startup visibility and position and size */
+	virtual void setPrefsContext(const QString& context);
+	void storePosition();
+	void storePosition(int newX, int newY);
+	void storeSize();
+	void storeVisibility(bool);
+
+	/** @brief Restore the geometry of the window when showing it. */
+	virtual void showEvent(QShowEvent *showEvent);
+	/** @brief Captures the close event and changes it to hide */
+	virtual void closeEvent(QCloseEvent *closeEvent);
+	/** @brief Stores the geometry of the window when hiding. */
+	virtual void hideEvent(QHideEvent*);
+
+	PrefsContext* m_palettePrefs;
+	QString m_prefsContextName;
+	bool m_visibleOnStartup;
+	QWidget* m_originalParent;
+	QWidget* m_tempParent;
+
 	protected slots:
-		virtual void reject();
+	virtual void reject();
 };
 #endif

Modified: trunk/Scribus/scribus/ui/shortcutwidget.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23049&path=/trunk/Scribus/scribus/ui/shortcutwidget.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/shortcutwidget.cpp	(original)
+++ trunk/Scribus/scribus/ui/shortcutwidget.cpp	Sat Jun 22 22:25:53 2019
@@ -223,7 +223,7 @@
 	if (noKey->isChecked())
 	{
 		keyDisplay->setText("");
-		emit newKey(QString::null);
+		emit newKey(QString());
 	}
 }
 

Modified: trunk/Scribus/scribus/ui/shortcutwidget.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23049&path=/trunk/Scribus/scribus/ui/shortcutwidget.h
==============================================================================
--- trunk/Scribus/scribus/ui/shortcutwidget.h	(original)
+++ trunk/Scribus/scribus/ui/shortcutwidget.h	Sat Jun 22 22:25:53 2019
@@ -45,7 +45,7 @@
 	/**
 	 * @brief emitted when a shrotcut is changed.
 	 *
-	 * Parameter will be QString::null when No key is used
+	 * Parameter will be QString() when No key is used
 	 */
 	void newKey(const QString&);
 

Modified: trunk/Scribus/scribus/ui/smcellstyle.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23049&path=/trunk/Scribus/scribus/ui/smcellstyle.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/smcellstyle.cpp	(original)
+++ trunk/Scribus/scribus/ui/smcellstyle.cpp	Sat Jun 22 22:25:53 2019
@@ -85,7 +85,7 @@
 		if (m_cachedStyles[i].hasName())
 		{
 			QString styleName(m_cachedStyles[i].displayName());
-			QString parentName(QString::null);
+			QString parentName;
 
 			if (m_cachedStyles[i].hasParent())
 			{
@@ -134,7 +134,7 @@
 QString SMCellStyle::fromSelection() const
 {
 	// TODO: Implement this once we have cell items.
-	return QString::null;
+	return QString();
 }
 
 void SMCellStyle::toSelection(const QString &styleName) const
@@ -164,14 +164,14 @@
 
 	Q_ASSERT(m_cachedStyles.resolve(fromStyleName));
 	if (!m_cachedStyles.resolve(fromStyleName))
-		return QString::null;
+		return QString();
 
 	// Copy the style with name constructed from the original name.
 	QString styleName(getUniqueName(tr("Clone of %1").arg(fromStyle)));
 	CellStyle cellStyle(m_cachedStyles.get(fromStyleName));
 	cellStyle.setDefaultStyle(false);
 	cellStyle.setName(styleName);
-	cellStyle.setShortcut(QString::null);
+	cellStyle.setShortcut(QString());
 	m_cachedStyles.create(cellStyle);
 
 	return styleName;
@@ -243,7 +243,7 @@
 
 QString SMCellStyle::shortcut(const QString &styleName) const
 {
-	QString result(QString::null);
+	QString result;
 	int index = m_cachedStyles.find(styleName);
 	if (index > -1)
 		result = m_cachedStyles[index].shortcut();

Modified: trunk/Scribus/scribus/ui/smcolorcombo.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23049&path=/trunk/Scribus/scribus/ui/smcolorcombo.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/smcolorcombo.cpp	(original)
+++ trunk/Scribus/scribus/ui/smcolorcombo.cpp	Sat Jun 22 22:25:53 2019
@@ -22,8 +22,7 @@
 : ColorCombo(rw, parent),
   m_hasParent(false),
   m_useParentValue(false),
-  m_pItem(0),
-  m_pText(QString::null)
+  m_pItem(0)
 {
 	
 }
@@ -34,7 +33,7 @@
 	setFont(false);
 	m_hasParent = false;
 	m_pItem = 0;
-	m_pText = QString::null;
+	m_pText.clear();
 	ColorCombo::setCurrentIndex(i);
 }
 
@@ -43,7 +42,7 @@
 	disconnect(this, SIGNAL(highlighted(int)), this, SLOT(currentChanged()));
 	m_hasParent = true;
 	m_pItem = i;
-	m_pText = QString::null;
+	m_pText.clear();
 	ColorCombo::setCurrentIndex(i);
 	setFont(!isParentValue);
 	connect(this, SIGNAL(highlighted(int)), this, SLOT(currentChanged()));
@@ -75,7 +74,7 @@
 {
 	m_hasParent = true;
 	m_pItem = i;
-	m_pText = QString::null;
+	m_pText.clear();
 }
 
 void SMColorCombo::setParentText(const QString &s)

Modified: trunk/Scribus/scribus/ui/smcstylewidget.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23049&path=/trunk/Scribus/scribus/ui/smcstylewidget.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/smcstylewidget.cpp	(original)
+++ trunk/Scribus/scribus/ui/smcstylewidget.cpp	Sat Jun 22 22:25:53 2019
@@ -311,7 +311,7 @@
 
 	QString defaultLang(defLang.isEmpty() ? "en_GB" : defLang);
 	QString clang(cstyle->language().isEmpty() ? defaultLang : cstyle->language());
-	QString plang(QString::null);
+	QString plang;
 	if (hasParent)
 		plang = parent->language().isEmpty() ? defaultLang : parent->language();
 

Modified: trunk/Scribus/scribus/ui/smfontcomboh.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23049&path=/trunk/Scribus/scribus/ui/smfontcomboh.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/smfontcomboh.cpp	(original)
+++ trunk/Scribus/scribus/ui/smfontcomboh.cpp	Sat Jun 22 22:25:53 2019
@@ -11,7 +11,6 @@
 : FontComboH(parent, true),
   m_hasParent(false),
   m_useParentValue(false),
-  m_parentFont(QString::null),
   m_useParentFont( tr("Use Parent Font"))
 {
 	

Modified: trunk/Scribus/scribus/ui/smlinestyle.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23049&path=/trunk/Scribus/scribus/ui/smlinestyle.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/smlinestyle.cpp	(original)
+++ trunk/Scribus/scribus/ui/smlinestyle.cpp	Sat Jun 22 22:25:53 2019
@@ -80,7 +80,7 @@
 	QHash<QString,multiLine>::Iterator it;
 
 	for (it = m_tmpLines.begin(); it != m_tmpLines.end(); ++it)
-		tmp << StyleName(it.key(), QString::null);
+		tmp << StyleName(it.key(), QString());
 
 	return tmp;
 }
@@ -139,7 +139,7 @@
 
 QString SMLineStyle::fromSelection() const
 {
-	QString lsName(QString::null);
+	QString lsName;
 	if (!m_doc)
 		return lsName;
 
@@ -153,7 +153,7 @@
 		}
 		else if (!lsName.isNull() && !tmpName.isEmpty() && tmpName != "" && lsName != tmpName)
 		{
-			lsName = QString::null;
+			lsName.clear();
 			break;
 		}
 	}
@@ -179,7 +179,7 @@
 QString SMLineStyle::newStyle()
 {
 	if (!m_doc)
-		return QString::null;
+		return QString();
 	struct SingleLine sl;
 	sl.Color = m_doc->itemToolPrefs().lineColor;
 	sl.Shade = m_doc->itemToolPrefs().lineColorShade;

Modified: trunk/Scribus/scribus/ui/smscrspinbox.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23049&path=/trunk/Scribus/scribus/ui/smscrspinbox.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/smscrspinbox.cpp	(original)
+++ trunk/Scribus/scribus/ui/smscrspinbox.cpp	Sat Jun 22 22:25:53 2019
@@ -77,8 +77,6 @@
 
 void SMScrSpinBox::interpretText()
 {
-// 	QString t = text();
-// 	if (m_hasParent && (t == "" || t.isEmpty() || t == QString::null))
 	if (m_hasParent && text().isEmpty())
 	{
 		m_useParentValue = true;

Modified: trunk/Scribus/scribus/ui/smspinbox.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23049&path=/trunk/Scribus/scribus/ui/smspinbox.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/smspinbox.cpp	(original)
+++ trunk/Scribus/scribus/ui/smspinbox.cpp	Sat Jun 22 22:25:53 2019
@@ -59,8 +59,6 @@
 
 void SMSpinBox::interpretText()
 {
-// 	QString t = text();
-// 	if (m_hasParent && (t == "" || t.isEmpty() || t == QString::null))
 	if (m_hasParent && text().isEmpty())
 	{
 		m_useParentValue = true;

Modified: trunk/Scribus/scribus/ui/smtablestyle.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23049&path=/trunk/Scribus/scribus/ui/smtablestyle.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/smtablestyle.cpp	(original)
+++ trunk/Scribus/scribus/ui/smtablestyle.cpp	Sat Jun 22 22:25:53 2019
@@ -81,7 +81,7 @@
 		if (m_cachedStyles[i].hasName())
 		{
 			QString styleName(m_cachedStyles[i].displayName());
-			QString parentName(QString::null);
+			QString parentName;
 
 			if (m_cachedStyles[i].hasParent())
 			{
@@ -130,7 +130,7 @@
 QString SMTableStyle::fromSelection() const
 {
 	// TODO: Implement this once we have table items.
-	return QString::null;
+	return QString();
 }
 
 void SMTableStyle::toSelection(const QString &styleName) const
@@ -160,14 +160,14 @@
 
 	Q_ASSERT(m_cachedStyles.resolve(fromStyleName));
 	if (!m_cachedStyles.resolve(fromStyleName))
-		return QString::null;
+		return QString();
 
 	// Copy the style with name constructed from the original name.
 	QString styleName(getUniqueName(tr("Clone of %1").arg(fromStyle)));
 	TableStyle tableStyle(m_cachedStyles.get(fromStyleName));
 	tableStyle.setDefaultStyle(false);
 	tableStyle.setName(styleName);
-	tableStyle.setShortcut(QString::null);
+	tableStyle.setShortcut(QString());
 	m_cachedStyles.create(tableStyle);
 
 	return styleName;
@@ -239,7 +239,7 @@
 
 QString SMTableStyle::shortcut(const QString &styleName) const
 {
-	QString result(QString::null);
+	QString result;
 	int index = m_cachedStyles.find(styleName);
 	if (index > -1)
 		result = m_cachedStyles[index].shortcut();

Modified: trunk/Scribus/scribus/ui/smtextstyles.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23049&path=/trunk/Scribus/scribus/ui/smtextstyles.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/smtextstyles.cpp	(original)
+++ trunk/Scribus/scribus/ui/smtextstyles.cpp	Sat Jun 22 22:25:53 2019
@@ -109,7 +109,7 @@
 		if (m_tmpStyles[i].hasName())
 		{
 			QString styleName(m_tmpStyles[i].displayName());
-			QString parentName(QString::null);
+			QString parentName;
 
 			if (m_tmpStyles[i].hasParent())
 			{
@@ -179,7 +179,7 @@
 
 QString SMParagraphStyle::fromSelection() const
 {
-	QString lsName(QString::null);
+	QString lsName;
 	if (!m_doc)
 		return lsName; // no doc available
 
@@ -196,7 +196,7 @@
 		}
 		else if (!lsName.isNull() && !tmpName.isEmpty() && tmpName != "" && lsName != tmpName)
 		{
-			lsName = QString::null;
+			lsName.clear();
 			break;
 		}
 	}
@@ -225,7 +225,7 @@
 QString SMParagraphStyle::newStyle()
 {
 	if (!m_doc)
-		return QString::null;
+		return QString();
 
 	QString s(getUniqueName( tr("New Style")));
 	ParagraphStyle p;
@@ -246,14 +246,14 @@
 
 	Q_ASSERT(m_tmpStyles.resolve(copiedStyleName));
 	if (!m_tmpStyles.resolve(copiedStyleName))
-		return QString::null;
+		return QString();
 
 	//Copy the style with the original name
 	QString s(getUniqueName( tr("Clone of %1").arg(fromStyle)));
 	ParagraphStyle p(m_tmpStyles.get(copiedStyleName));
 	p.setDefaultStyle(false);
 	p.setName(s);
-	p.setShortcut(QString::null); // do not clone the sc
+	p.setShortcut(QString()); // do not clone the sc
 	m_tmpStyles.create(p);
 
 	return s;
@@ -351,7 +351,7 @@
 
 QString SMParagraphStyle::shortcut(const QString &stylename) const
 {
-	QString s(QString::null);
+	QString s;
 
 	int index = m_tmpStyles.find(stylename);
 	if (index > -1)
@@ -1997,14 +1997,14 @@
 
 void SMParagraphStyle::slotCharParentChanged(const QString &parent)
 {
-	Q_ASSERT(parent != QString::null);
+	Q_ASSERT(!parent.isNull());
 
 	QStringList sel;
 
 	for (int i = 0; i < m_selection.count(); ++i)
 	{
 		m_selection[i]->charStyle().erase();
-		if (parent != QString::null)
+		if (!parent.isNull())
 			m_selection[i]->charStyle().setParent(parent);
 
 		sel << m_selection[i]->name();
@@ -2148,7 +2148,7 @@
 		if (m_tmpStyles[i].hasName())
 		{
 			QString styleName(m_tmpStyles[i].displayName());
-			QString parentName(QString::null);
+			QString parentName;
 
 			if (m_tmpStyles[i].hasParent())
 			{
@@ -2197,7 +2197,7 @@
 
 QString SMCharacterStyle::fromSelection() const
 {
-	QString lsName(QString::null);
+	QString lsName;
 	if (!m_doc)
 		return lsName; // no doc available
 
@@ -2214,7 +2214,7 @@
 		}
 		else if (!lsName.isNull() && !tmpName.isEmpty() && tmpName != "" && lsName != tmpName)
 		{
-			lsName = QString::null;
+			lsName.clear();
 			break;
 		}
 	}
@@ -2264,13 +2264,13 @@
 
 	Q_ASSERT(m_tmpStyles.resolve(copiedStyleName));
 	if (!m_tmpStyles.resolve(copiedStyleName))
-		return QString::null;
+		return QString();
 	//Copy the style with the original name
 	QString s(getUniqueName( tr("Clone of %1").arg(fromStyle)));
 	CharStyle c(m_tmpStyles.get(copiedStyleName));
 	c.setDefaultStyle(false);
 	c.setName(s);
-	c.setShortcut(QString::null);
+	c.setShortcut(QString());
 	m_tmpStyles.create(c);
 
 	return s;
@@ -2368,7 +2368,7 @@
 
 QString SMCharacterStyle::shortcut(const QString &stylename) const
 {
-	QString s(QString::null);
+	QString s;
 	int index = m_tmpStyles.find(stylename);
 	if (index > -1)
 		s = m_tmpStyles[index].shortcut();

Modified: trunk/Scribus/scribus/ui/spalette.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23049&path=/trunk/Scribus/scribus/ui/spalette.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/spalette.cpp	(original)
+++ trunk/Scribus/scribus/ui/spalette.cpp	Sat Jun 22 22:25:53 2019
@@ -88,7 +88,7 @@
 void ParaStyleComboBox::selFormat(int e)
 {
 	if (e == 0)
-		emit newStyle(QString::null);
+		emit newStyle(QString());
 	else
 		emit newStyle(currentText());
 }
@@ -153,7 +153,7 @@
 void CharStyleComboBox::selFormat(int e)
 {
 	if (e == 0)
-		emit newStyle(QString::null);
+		emit newStyle(QString());
 	else
 		emit newStyle(currentText());
 }
@@ -216,7 +216,7 @@
 {
 	if (e == 0)
 	{
-		emit newStyle(QString::null);
+		emit newStyle(QString());
 	}
 	else
 	{
@@ -282,10 +282,10 @@
 {
 	if (e == 0)
 	{
-		emit newStyle(QString::null);
-	}
-	else
-	{
-		emit newStyle(currentText());
-	}
-}
+		emit newStyle(QString());
+	}
+	else
+	{
+		emit newStyle(currentText());
+	}
+}

Modified: trunk/Scribus/scribus/ui/stylemanager.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23049&path=/trunk/Scribus/scribus/ui/stylemanager.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/stylemanager.cpp	(original)
+++ trunk/Scribus/scribus/ui/stylemanager.cpp	Sat Jun 22 22:25:53 2019
@@ -37,7 +37,7 @@
 
 StyleManager::StyleManager(QWidget *parent, const char *name)
 	: ScrPaletteBase(parent, name), m_item(nullptr), m_widget(nullptr),
-	m_shortcutWidget(nullptr), m_currentType(QString::null), m_isEditMode(true), m_doc(nullptr)
+	m_shortcutWidget(nullptr), m_isEditMode(true), m_doc(nullptr)
 {
 	setupUi(this);
 	styleView->hideColumn(SHORTCUT_COL);
@@ -533,8 +533,8 @@
 			}
 			++it;
 		}
-		m_rcStyle = QString::null;
-		m_rcType = QString::null;
+		m_rcStyle.clear();
+		m_rcType.clear();
 	}
 }
 
@@ -562,8 +562,8 @@
 			}
 			++it;
 		}
-		m_rcStyle = QString::null;
-		m_rcType = QString::null;
+		m_rcStyle.clear();
+		m_rcType.clear();
 	}
 
 	QTreeWidgetItemIterator it(styleView, QTreeWidgetItemIterator::Selected);
@@ -611,8 +611,8 @@
 	else if (actionType.isEmpty())
 		return;
 
-	m_rcType = QString::null;
-	m_rcStyle = QString::null;
+	m_rcStyle.clear();
+	m_rcType.clear();
 
 	createNewStyle(typeName);
 }
@@ -625,8 +625,8 @@
 void StyleManager::slotRightClick(/*StyleViewItem *item, */const QPoint &point/*, int col*/)
 {
 	StyleViewItem *item = static_cast<StyleViewItem*>(styleView->currentItem());
-	m_rcStyle = QString::null;
-	m_rcType = QString::null;
+	m_rcStyle.clear();
+	m_rcType.clear();
 
 	if (m_isEditMode && item) // make item the only selection if in edit mode
 	{                        // default behaviour for right clicking is not to select the item
@@ -709,8 +709,8 @@
 
 void StyleManager::slotDoubleClick(QTreeWidgetItem *item, /*const QPoint &point, */int col)
 {
-	m_rcStyle = QString::null;
-	m_rcType = QString::null;
+	m_rcStyle.clear();
+	m_rcType.clear();
 
 	if (m_isEditMode && item) // make item the only selection if in edit mode
 	{
@@ -735,8 +735,8 @@
 			slotOk(); 
 		createNewStyle(itext);
 	}
-	m_rcStyle = QString::null;
-	m_rcType = QString::null;
+	m_rcStyle.clear();
+	m_rcType.clear();
 }
 
 void StyleManager::createNewStyle(const QString &typeName, const QString &fromParent)
@@ -1159,8 +1159,8 @@
 	m_item->toSelection(slist[1]);
 	slotDocSelectionChanged();
 
-	m_rcStyle = QString::null;
-	m_rcType  = QString::null;
+	m_rcStyle.clear();
+	m_rcType.clear();
 }
 
 bool StyleManager::nameIsUnique(const QString &name)
@@ -1199,7 +1199,7 @@
 			if (m_shortcutWidget)
 			{
 				m_shortcutWidget->setEnabled(false);
-				m_shortcutWidget->setShortcut(QString::null);
+				m_shortcutWidget->setShortcut(QString());
 			}
 		}
 		else
@@ -1243,8 +1243,8 @@
 
 	slotDocSelectionChanged();
 
-	m_rcStyle = QString::null;
-	m_rcType  = QString::null;
+	m_rcStyle.clear();
+	m_rcType.clear();
 }
 
 void StyleManager::slotApplyStyle(QTreeWidgetItem *newitem, QTreeWidgetItem *)
@@ -1304,14 +1304,14 @@
 	qDebug() << "slotDocStylesChanged()";
 }
 
-// QPair.first == QString::null if nothing is selected or if
+// QPair.first == QString() if nothing is selected or if
 // there are items from more than one type in the selection
 // if selection is valid (only from single type) QPair.first will
 // include the type name and QPair.second will have all the selected
 // stylenames in it
 QPair<QString, QStringList> StyleManager::namesFromSelection()
 {
-	QString typeName(QString::null);
+	QString typeName;
 	QStringList styleNames;
 	if (m_rcStyle.isNull())
 	{
@@ -1324,7 +1324,7 @@
 				typeName = item->rootName();
 			else if (!typeName.isNull() && typeName != item->rootName())
 			{
-				typeName = QString::null;
+				typeName.clear();
 				break; // two different types selected returning null
 			}
 	

Modified: trunk/Scribus/scribus/ui/stylemanager.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23049&path=/trunk/Scribus/scribus/ui/stylemanager.h
==============================================================================
--- trunk/Scribus/scribus/ui/stylemanager.h	(original)
+++ trunk/Scribus/scribus/ui/stylemanager.h	Sat Jun 22 22:25:53 2019
@@ -98,7 +98,7 @@
 	QPair<QString, QStringList> namesFromSelection();
 	void loadType(const QString &name);
 	void addNewType(StyleItem *item, bool loadFromDoc = true);
-	void createNewStyle(const QString &typeName, const QString &fromParent = QString::null);
+	void createNewStyle(const QString &typeName, const QString &fromParent = QString());
 	void reloadStyleView(bool loadFromDoc = true); // are the styles loaded from doc or from tmp cache
 	bool shortcutExists(const QString &keys);
 	void updateActionName(const QString &oldName, const QString &newName);

Modified: trunk/Scribus/scribus/ui/styleview.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23049&path=/trunk/Scribus/scribus/ui/styleview.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/styleview.cpp	(original)
+++ trunk/Scribus/scribus/ui/styleview.cpp	Sat Jun 22 22:25:53 2019
@@ -52,8 +52,7 @@
 
 StyleViewItem::StyleViewItem(QTreeWidget *parent, const QString &text)
 	: QTreeWidgetItem(parent),
-	m_isRoot(true), m_isDirty(false),
-	m_parentName(QString::null), m_rootName(QString::null)
+	m_isRoot(true), m_isDirty(false)
 {
 	setFlags(flags() & ~Qt::ItemIsSelectable);
 	setText(0, text);

Modified: trunk/Scribus/scribus/ui/tabpdfoptions.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23049&path=/trunk/Scribus/scribus/ui/tabpdfoptions.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/tabpdfoptions.cpp	(original)
+++ trunk/Scribus/scribus/ui/tabpdfoptions.cpp	Sat Jun 22 22:25:53 2019
@@ -1453,5 +1453,5 @@
 		return;
 	}
 
-	PageNr->setText(QString::null);
-}
+	PageNr->setText(QString());
+}

Modified: trunk/Scribus/scribus/urllauncher.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23049&path=/trunk/Scribus/scribus/urllauncher.cpp
==============================================================================
--- trunk/Scribus/scribus/urllauncher.cpp	(original)
+++ trunk/Scribus/scribus/urllauncher.cpp	Sat Jun 22 22:25:53 2019
@@ -59,7 +59,7 @@
 		{
 			if (!QDesktopServices::openUrl(link))
 			{
-				extBrowser = QFileDialog::getOpenFileName(p, tr("Locate your web browser"), QString::null, QString::null);
+				extBrowser = QFileDialog::getOpenFileName(p, tr("Locate your web browser"), QString(), QString());
 				if (!QFileInfo::exists(extBrowser))
 					extBrowser="";
 				PrefsManager::instance()->setExtBrowserExecutable(extBrowser);

Modified: trunk/Scribus/scribus/util.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23049&path=/trunk/Scribus/scribus/util.cpp
==============================================================================
--- trunk/Scribus/scribus/util.cpp	(original)
+++ trunk/Scribus/scribus/util.cpp	Sat Jun 22 22:25:53 2019
@@ -1017,7 +1017,7 @@
 		it->isTableItem = false;
 		if (it->nextInChain() || it->prevInChain())
 			hasTextLinks = true;
-		if (it->LeftLink || it->RightLink || it->BottomLink || it->TopLink)
+		if (it->m_leftLink || it->m_rightLink || it->m_bottomLink || it->m_topLink)
 			hasTableLinks = true;
 	}
 
@@ -1028,20 +1028,20 @@
 	for (int i = 0; i < gpL.count(); i++)
 	{
 		PageItem* it = gpL[i];
-		if ((it->TopLink == nullptr) && (it->LeftLink == nullptr))	// we got the topleft item
+		if ((it->m_topLink == nullptr) && (it->m_leftLink == nullptr))	// we got the topleft item
 		{
 			topLeft = it;
 			PageItem *tl = it;
-			while (tl->RightLink != nullptr)
+			while (tl->m_rightLink != nullptr)
 			{
 				colWidths.append(tl->width());
-				tl = tl->RightLink;
+				tl = tl->m_rightLink;
 			}
 			colWidths.append(tl->width());
-			while (tl->BottomLink != nullptr)
+			while (tl->m_bottomLink != nullptr)
 			{
 				rowHeights.append(tl->height());
-				tl = tl->BottomLink;
+				tl = tl->m_bottomLink;
 			}
 			rowHeights.append(tl->height());
 			break;
@@ -1109,13 +1109,13 @@
 			if (colCount == colWidths.count()-1)
 				break;
 			colCount++;
-			tl = tl->RightLink;
+			tl = tl->m_rightLink;
 		}
 		if (rowCount == rowHeights.count()-1)
 			break;
 		colCount = 0;
 		rowCount++;
-		tr = tr->BottomLink;
+		tr = tr->m_bottomLink;
 	}
 	m_Doc->dontResize = true;
 	currItem->setLayer(gItem->m_layerID);

Modified: trunk/Scribus/scribus/util_formats.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23049&path=/trunk/Scribus/scribus/util_formats.cpp
==============================================================================
--- trunk/Scribus/scribus/util_formats.cpp	(original)
+++ trunk/Scribus/scribus/util_formats.cpp	Sat Jun 22 22:25:53 2019
@@ -204,7 +204,7 @@
 		if (type & it.key())
 			return it.value();
 	}
-	return QString::null;
+	return QString();
 }
 
 QStringList FormatsManager::mimetypeOfFormat(int type)

Modified: trunk/Scribus/scribus/util_ghostscript.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23049&path=/trunk/Scribus/scribus/util_ghostscript.cpp
==============================================================================
--- trunk/Scribus/scribus/util_ghostscript.cpp	(original)
+++ trunk/Scribus/scribus/util_ghostscript.cpp	Sat Jun 22 22:25:53 2019
@@ -228,7 +228,7 @@
 	return (proc.exitCode()==0);
 }
 
-// Return the GhostScript version string, or QString::null if it couldn't be retrived.
+// Return the GhostScript version string, or QString() if it couldn't be retrived.
 QString getGSVersion()
 {
 	QStringList args;




More information about the scribus-commit mailing list