r22510 by craig - More nullptr and other conversions

scribus-commit scribus-commit at lists.scribus.net
Tue May 1 20:41:00 UTC 2018


Author: craig
Date: Tue May  1 20:41:00 2018
New Revision: 22510

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=22510
Log:
More nullptr and other conversions

Modified:
    trunk/Scribus/scribus/pageitem.h
    trunk/Scribus/scribus/sccolorengine.h
    trunk/Scribus/scribus/scribusdoc.cpp
    trunk/Scribus/scribus/tocgenerator.h
    trunk/Scribus/scribus/ui/preferencesdialog.h
    trunk/Scribus/scribus/ui/prefs_colormanagement.h
    trunk/Scribus/scribus/ui/prefs_display.h
    trunk/Scribus/scribus/ui/prefs_documentinformation.h
    trunk/Scribus/scribus/ui/prefs_documentitemattributes.h
    trunk/Scribus/scribus/ui/prefs_documentsections.h
    trunk/Scribus/scribus/ui/prefs_documentsetup.h
    trunk/Scribus/scribus/ui/prefs_externaltools.h
    trunk/Scribus/scribus/ui/prefs_fonts.h
    trunk/Scribus/scribus/ui/prefs_guides.h
    trunk/Scribus/scribus/ui/prefs_hyphenator.h
    trunk/Scribus/scribus/ui/prefs_imagecache.h
    trunk/Scribus/scribus/ui/prefs_itemtools.h
    trunk/Scribus/scribus/ui/prefs_keyboardshortcuts.h
    trunk/Scribus/scribus/ui/prefs_miscellaneous.h
    trunk/Scribus/scribus/ui/prefs_operatortools.h
    trunk/Scribus/scribus/ui/prefs_pagesizes.h
    trunk/Scribus/scribus/ui/prefs_pane.h
    trunk/Scribus/scribus/ui/prefs_paths.h
    trunk/Scribus/scribus/ui/prefs_pdfexport.h
    trunk/Scribus/scribus/ui/prefs_plugins.h
    trunk/Scribus/scribus/ui/prefs_preflightverifier.h
    trunk/Scribus/scribus/ui/prefs_printer.h
    trunk/Scribus/scribus/ui/prefs_scrapbook.h
    trunk/Scribus/scribus/ui/prefs_spelling.h
    trunk/Scribus/scribus/ui/prefs_tableofcontents.h
    trunk/Scribus/scribus/ui/prefs_typography.h
    trunk/Scribus/scribus/ui/prefs_userinterface.h
    trunk/Scribus/scribus/util.h

Modified: trunk/Scribus/scribus/pageitem.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22510&path=/trunk/Scribus/scribus/pageitem.h
==============================================================================
--- trunk/Scribus/scribus/pageitem.h	(original)
+++ trunk/Scribus/scribus/pageitem.h	Tue May  1 20:41:00 2018
@@ -234,21 +234,21 @@
 	virtual ~PageItem();
 
 	/* these do essentially the same as a dynamic cast but might be more readable */
-	virtual PageItem_Arc * asArc()					{ return NULL; } ///< Return self if Arc item, otherwise null
-	virtual PageItem_Group * asGroupFrame()			{ return NULL; } ///< Return self if Group item, otherwise null
-	virtual PageItem_ImageFrame * asImageFrame()	{ return NULL; } ///< Return self if Image item, otherwise null
-	virtual PageItem_LatexFrame * asLatexFrame()	{ return NULL; } ///< Return self if Render frame item, otherwise null
-	virtual PageItem_Line * asLine()				{ return NULL; } ///< Return self if Line item, otherwise null
-	virtual PageItem_NoteFrame * asNoteFrame()		{ return NULL; } ///< Return self if Note item, otherwise null
-	virtual PageItem_OSGFrame * asOSGFrame()		{ return NULL; } ///< Return self if OSG item, otherwise null
-	virtual PageItem_PathText * asPathText()		{ return NULL; } ///< Return self if Path Text item, otherwise null
-	virtual PageItem_PolyLine * asPolyLine()		{ return NULL; } ///< Return self if Poly Line item, otherwise null
-	virtual PageItem_Polygon * asPolygon()			{ return NULL; } ///< Return self if Polygon item, otherwise null
-	virtual PageItem_RegularPolygon * asRegularPolygon() { return NULL; } ///< Return self if Regular Polygon item, otherwise null
-	virtual PageItem_Spiral * asSpiral()			{ return NULL; } ///< Return self if Spiral item, otherwise null
-	virtual PageItem_Symbol * asSymbolFrame()		{ return NULL; } ///< Return self if Symbol item, otherwise null
-	virtual PageItem_Table * asTable()				{ return NULL; } ///< Return self if Table item, otherwise null
-	virtual PageItem_TextFrame * asTextFrame()		{ return NULL; } ///< Return self if Text item, otherwise null
+	virtual PageItem_Arc * asArc()							{ return nullptr; } ///< Return self if Arc item, otherwise null
+	virtual PageItem_Group * asGroupFrame()					{ return nullptr; } ///< Return self if Group item, otherwise null
+	virtual PageItem_ImageFrame * asImageFrame()			{ return nullptr; } ///< Return self if Image item, otherwise null
+	virtual PageItem_LatexFrame * asLatexFrame()			{ return nullptr; } ///< Return self if Render frame item, otherwise null
+	virtual PageItem_Line * asLine()						{ return nullptr; } ///< Return self if Line item, otherwise null
+	virtual PageItem_NoteFrame * asNoteFrame()				{ return nullptr; } ///< Return self if Note item, otherwise null
+	virtual PageItem_OSGFrame * asOSGFrame()				{ return nullptr; } ///< Return self if OSG item, otherwise null
+	virtual PageItem_PathText * asPathText()				{ return nullptr; } ///< Return self if Path Text item, otherwise null
+	virtual PageItem_PolyLine * asPolyLine()				{ return nullptr; } ///< Return self if Poly Line item, otherwise null
+	virtual PageItem_Polygon * asPolygon()					{ return nullptr; } ///< Return self if Polygon item, otherwise null
+	virtual PageItem_RegularPolygon * asRegularPolygon()	{ return nullptr; } ///< Return self if Regular Polygon item, otherwise null
+	virtual PageItem_Spiral * asSpiral()					{ return nullptr; } ///< Return self if Spiral item, otherwise null
+	virtual PageItem_Symbol * asSymbolFrame()				{ return nullptr; } ///< Return self if Symbol item, otherwise null
+	virtual PageItem_Table * asTable()						{ return nullptr; } ///< Return self if Table item, otherwise null
+	virtual PageItem_TextFrame * asTextFrame()				{ return nullptr; } ///< Return self if Text item, otherwise null
 
 	virtual bool isArc()			const { return false; } ///< Return true if Arc item, otherwise false
 	virtual bool isAutoNoteFrame()	const { return false; } ///< Return true if Auto Note item, otherwise false
@@ -270,8 +270,8 @@
 	virtual bool isGroupChild() const;
 	virtual bool isTableCell() const;
 
-	PageItem_Group* parentGroup() const { return (Parent ? Parent->asGroupFrame() : NULL); }
-	PageItem_Table* parentTable() const { return (Parent ? Parent->asTable() : NULL); }
+	PageItem_Group* parentGroup() const { return (Parent ? Parent->asGroupFrame() : nullptr); }
+	PageItem_Table* parentTable() const { return (Parent ? Parent->asTable() : nullptr); }
 
 	virtual void applicableActions(QStringList& actionList) = 0;
 	virtual QString infoDescription();
@@ -460,7 +460,7 @@
 	const PageItem* nextInChain() const { return NextBox; }
 	//simplify conditions checking if frame is in chain
 	//FIX: use it in other places
-	bool isInChain() { return ((prevInChain() != NULL) || (nextInChain() != NULL)); }
+	bool isInChain() { return ((prevInChain() != nullptr) || (nextInChain() != nullptr)); }
 
 	//you can change all code for search first or last item in chain
 	PageItem* firstInChain();
@@ -1226,11 +1226,11 @@
 	void updateConstants();
 	bool isWelded()  {return !weldList.isEmpty(); }  //true if to this item some other items are welded (weldList is list of these items)
 	void weldTo(PageItem* item);
-	QList<PageItem*> itemsWeldedTo(PageItem* except = NULL);
+	QList<PageItem*> itemsWeldedTo(PageItem* except = nullptr);
 	void unWeld();
 	void addWelded(PageItem* item);
 	void moveWelded(double dX, double dY, int weld);
-	void moveWelded(double dX, double dY, PageItem* except = NULL);
+	void moveWelded(double dX, double dY, PageItem* except = nullptr);
 	void rotateWelded(double dR, double oldRot);
 	void setWeldPoint(double dX, double dY, PageItem *pItem); 	///< added for autowelding feature of notes frames, setting welding point with given pItem to given coords
 	QString getItemTextSaxed(int selStart, int selLength); ///< used by notes frames to get content of notes from itemText

Modified: trunk/Scribus/scribus/sccolorengine.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22510&path=/trunk/Scribus/scribus/sccolorengine.h
==============================================================================
--- trunk/Scribus/scribus/sccolorengine.h	(original)
+++ trunk/Scribus/scribus/sccolorengine.h	Tue May  1 20:41:00 2018
@@ -71,7 +71,7 @@
 
 	/** \brief Return a color converted to monitor color space. No soft-proofing is done
 	* If gamut check is valid, the return value may be an gamut warning . */
-	static QColor getDisplayColorGC(const ScColor& color, const ScribusDoc* doc, bool *outOfG = NULL);
+	static QColor getDisplayColorGC(const ScColor& color, const ScribusDoc* doc, bool *outOfG = nullptr);
 
 	/** \brief Return a proofed QColor with 100% shade and optional gamut check.
 	* If color management is enabled, returned value use the monitor color space. */

Modified: trunk/Scribus/scribus/scribusdoc.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22510&path=/trunk/Scribus/scribus/scribusdoc.cpp
==============================================================================
--- trunk/Scribus/scribus/scribusdoc.cpp	(original)
+++ trunk/Scribus/scribus/scribusdoc.cpp	Tue May  1 20:41:00 2018
@@ -2055,7 +2055,7 @@
 		if (is)
 		{
 			Mark* mrk = getMark(is->get("label"), (MarkType) is->getInt("type"));
-			if (mrk == NULL && is->contains("labelOLD"))
+			if (mrk == nullptr && is->contains("labelOLD"))
 				mrk = getMark(is->get("labelOLD"), (MarkType) is->getInt("type"));
 			int pos = is->getInt("at");
 			bool isAutoNoteFrame = false;
@@ -2102,7 +2102,7 @@
 				}
 				else if (is->get("MARK") == "edit")
 				{
-					Q_ASSERT(mrk != NULL);
+					Q_ASSERT(mrk != nullptr);
 					if (is->contains("labelOLD"))
 						mrk->label = is->get("labelOLD");
 					if (is->contains("strtxtOLD"))
@@ -2112,7 +2112,7 @@
 					}
 					if (is->contains("dNameOLD"))
 						mrk->setMark(is->get("dNameOLD"), (MarkType) is->getInt("dTypeOLD"));
-					if (is->getItem("itemPtrOLD") != NULL)
+					if (is->getItem("itemPtrOLD") != nullptr)
 						mrk->setItemPtr((PageItem*) is->getItem("itemPtrOLD"));
 				}
 				else if (is->get("MARK") == "insert_existing")
@@ -2291,7 +2291,7 @@
 				}
 			}
 			scMW()->emitUpdateRequest(reqMarksUpdate);
-			if (currItem != NULL && !isAutoNoteFrame)
+			if (currItem != nullptr && !isAutoNoteFrame)
 			{
 				currItem->invalidateLayout();
 				currItem->updateLayout();
@@ -9482,9 +9482,9 @@
 					if (UndoManager::undoEnabled())
 					{
 						UndoState* state = m_undoManager->getLastUndo();
-						ScItemState<QPair<CharStyle,CharStyle> > *is = NULL;
-						SimpleState *ss = NULL;
-						TransactionState *ts = NULL;
+						ScItemState<QPair<CharStyle,CharStyle> > *is = nullptr;
+						SimpleState *ss = nullptr;
+						TransactionState *ts = nullptr;
 						while (state && state->isTransaction())
 						{
 							ts = dynamic_cast<TransactionState*>(state);

Modified: trunk/Scribus/scribus/tocgenerator.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22510&path=/trunk/Scribus/scribus/tocgenerator.h
==============================================================================
--- trunk/Scribus/scribus/tocgenerator.h	(original)
+++ trunk/Scribus/scribus/tocgenerator.h	Tue May  1 20:41:00 2018
@@ -35,9 +35,8 @@
 {
 	Q_OBJECT
 	public:
-		TOCGenerator(QObject *parent = NULL, ScribusDoc *doc = NULL);
-		
-		void setDoc(ScribusDoc *doc = NULL);
+		TOCGenerator(QObject *parent = nullptr, ScribusDoc *doc = nullptr);
+		void setDoc(ScribusDoc *doc = nullptr);
 		
 	public slots:
 		void generateDefault();

Modified: trunk/Scribus/scribus/ui/preferencesdialog.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22510&path=/trunk/Scribus/scribus/ui/preferencesdialog.h
==============================================================================
--- trunk/Scribus/scribus/ui/preferencesdialog.h	(original)
+++ trunk/Scribus/scribus/ui/preferencesdialog.h	Tue May  1 20:41:00 2018
@@ -56,7 +56,7 @@
 	Q_OBJECT
 
 	public:
-		PreferencesDialog(QWidget* parent, ApplicationPrefs& prefsData, ScribusDoc *doc=NULL);
+		PreferencesDialog(QWidget* parent, ApplicationPrefs& prefsData, ScribusDoc *doc=nullptr);
 		~PreferencesDialog();
 
 		virtual void changeEvent(QEvent *e);

Modified: trunk/Scribus/scribus/ui/prefs_colormanagement.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22510&path=/trunk/Scribus/scribus/ui/prefs_colormanagement.h
==============================================================================
--- trunk/Scribus/scribus/ui/prefs_colormanagement.h	(original)
+++ trunk/Scribus/scribus/ui/prefs_colormanagement.h	Tue May  1 20:41:00 2018
@@ -21,7 +21,7 @@
 	Q_OBJECT
 
 	public:
-		Prefs_ColorManagement(QWidget* parent, ScribusDoc* doc=NULL);
+		Prefs_ColorManagement(QWidget* parent, ScribusDoc* doc=nullptr);
 		~Prefs_ColorManagement();
 		virtual void restoreDefaults(struct ApplicationPrefs *prefsData);
 		void setProfiles(struct ApplicationPrefs *prefsData, ProfilesL *inputProfiles, ProfilesL *inputProfilesCMYK, ProfilesL *printerProfiles, ProfilesL *monitorProfiles);

Modified: trunk/Scribus/scribus/ui/prefs_display.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22510&path=/trunk/Scribus/scribus/ui/prefs_display.h
==============================================================================
--- trunk/Scribus/scribus/ui/prefs_display.h	(original)
+++ trunk/Scribus/scribus/ui/prefs_display.h	Tue May  1 20:41:00 2018
@@ -19,7 +19,7 @@
 	Q_OBJECT
 
 	public:
-		Prefs_Display(QWidget* parent, ScribusDoc* doc=NULL);
+		Prefs_Display(QWidget* parent, ScribusDoc* doc=nullptr);
 		~Prefs_Display();
 		virtual void restoreDefaults(struct ApplicationPrefs *prefsData);
 		virtual void saveGuiToPrefs(struct ApplicationPrefs *prefsData) const;

Modified: trunk/Scribus/scribus/ui/prefs_documentinformation.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22510&path=/trunk/Scribus/scribus/ui/prefs_documentinformation.h
==============================================================================
--- trunk/Scribus/scribus/ui/prefs_documentinformation.h	(original)
+++ trunk/Scribus/scribus/ui/prefs_documentinformation.h	Tue May  1 20:41:00 2018
@@ -19,7 +19,7 @@
 	Q_OBJECT
 
 	public:
-		Prefs_DocumentInformation(QWidget* parent, ScribusDoc* doc=NULL);
+		Prefs_DocumentInformation(QWidget* parent, ScribusDoc* doc=nullptr);
 		~Prefs_DocumentInformation();
 		virtual void restoreDefaults(struct ApplicationPrefs *prefsData);
 		virtual void saveGuiToPrefs(struct ApplicationPrefs *prefsData) const;

Modified: trunk/Scribus/scribus/ui/prefs_documentitemattributes.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22510&path=/trunk/Scribus/scribus/ui/prefs_documentitemattributes.h
==============================================================================
--- trunk/Scribus/scribus/ui/prefs_documentitemattributes.h	(original)
+++ trunk/Scribus/scribus/ui/prefs_documentitemattributes.h	Tue May  1 20:41:00 2018
@@ -18,7 +18,7 @@
 	Q_OBJECT
 
 	public:
-		Prefs_DocumentItemAttributes(QWidget* parent, ScribusDoc* doc=NULL);
+		Prefs_DocumentItemAttributes(QWidget* parent, ScribusDoc* doc=nullptr);
 		~Prefs_DocumentItemAttributes();
 		virtual void restoreDefaults(struct ApplicationPrefs *prefsData);
 		virtual void saveGuiToPrefs(struct ApplicationPrefs *prefsData) const;

Modified: trunk/Scribus/scribus/ui/prefs_documentsections.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22510&path=/trunk/Scribus/scribus/ui/prefs_documentsections.h
==============================================================================
--- trunk/Scribus/scribus/ui/prefs_documentsections.h	(original)
+++ trunk/Scribus/scribus/ui/prefs_documentsections.h	Tue May  1 20:41:00 2018
@@ -20,7 +20,7 @@
 	Q_OBJECT
 
 	public:
-		Prefs_DocumentSections(QWidget* parent, ScribusDoc* doc=NULL);
+		Prefs_DocumentSections(QWidget* parent, ScribusDoc* doc=nullptr);
 		~Prefs_DocumentSections();
 		virtual void restoreDefaults(struct ApplicationPrefs *prefsData);
 		virtual void saveGuiToPrefs(struct ApplicationPrefs *prefsData) const;

Modified: trunk/Scribus/scribus/ui/prefs_documentsetup.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22510&path=/trunk/Scribus/scribus/ui/prefs_documentsetup.h
==============================================================================
--- trunk/Scribus/scribus/ui/prefs_documentsetup.h	(original)
+++ trunk/Scribus/scribus/ui/prefs_documentsetup.h	Tue May  1 20:41:00 2018
@@ -20,7 +20,7 @@
 	Q_OBJECT
 
 	public:
-		Prefs_DocumentSetup(QWidget* parent, ScribusDoc* doc=NULL);
+		Prefs_DocumentSetup(QWidget* parent, ScribusDoc* doc=nullptr);
 		~Prefs_DocumentSetup();
 		virtual void restoreDefaults(struct ApplicationPrefs *prefsData);
 		virtual void saveGuiToPrefs(struct ApplicationPrefs *prefsData) const;

Modified: trunk/Scribus/scribus/ui/prefs_externaltools.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22510&path=/trunk/Scribus/scribus/ui/prefs_externaltools.h
==============================================================================
--- trunk/Scribus/scribus/ui/prefs_externaltools.h	(original)
+++ trunk/Scribus/scribus/ui/prefs_externaltools.h	Tue May  1 20:41:00 2018
@@ -18,7 +18,7 @@
 	Q_OBJECT
 
 	public:
-		Prefs_ExternalTools(QWidget* parent, ScribusDoc* doc=NULL);
+		Prefs_ExternalTools(QWidget* parent, ScribusDoc* doc=nullptr);
 		~Prefs_ExternalTools();
 		virtual void restoreDefaults(struct ApplicationPrefs *prefsData);
 		virtual void saveGuiToPrefs(struct ApplicationPrefs *prefsData) const;

Modified: trunk/Scribus/scribus/ui/prefs_fonts.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22510&path=/trunk/Scribus/scribus/ui/prefs_fonts.h
==============================================================================
--- trunk/Scribus/scribus/ui/prefs_fonts.h	(original)
+++ trunk/Scribus/scribus/ui/prefs_fonts.h	Tue May  1 20:41:00 2018
@@ -23,7 +23,7 @@
 	Q_OBJECT
 
 	public:
-		Prefs_Fonts(QWidget* parent, ScribusDoc* doc=NULL);
+		Prefs_Fonts(QWidget* parent, ScribusDoc* doc=nullptr);
 		~Prefs_Fonts();
 		virtual void restoreDefaults(struct ApplicationPrefs *prefsData);
 		virtual void saveGuiToPrefs(struct ApplicationPrefs *prefsData) const;

Modified: trunk/Scribus/scribus/ui/prefs_guides.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22510&path=/trunk/Scribus/scribus/ui/prefs_guides.h
==============================================================================
--- trunk/Scribus/scribus/ui/prefs_guides.h	(original)
+++ trunk/Scribus/scribus/ui/prefs_guides.h	Tue May  1 20:41:00 2018
@@ -19,7 +19,7 @@
 	Q_OBJECT
 
 	public:
-		Prefs_Guides(QWidget* parent, ScribusDoc* doc=NULL);
+		Prefs_Guides(QWidget* parent, ScribusDoc* doc=nullptr);
 		~Prefs_Guides();
 		virtual void restoreDefaults(struct ApplicationPrefs *prefsData);
 		virtual void saveGuiToPrefs(struct ApplicationPrefs *prefsData) const;

Modified: trunk/Scribus/scribus/ui/prefs_hyphenator.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22510&path=/trunk/Scribus/scribus/ui/prefs_hyphenator.h
==============================================================================
--- trunk/Scribus/scribus/ui/prefs_hyphenator.h	(original)
+++ trunk/Scribus/scribus/ui/prefs_hyphenator.h	Tue May  1 20:41:00 2018
@@ -20,7 +20,7 @@
 	Q_OBJECT
 
 	public:
-		Prefs_Hyphenator(QWidget* parent, ScribusDoc* doc=NULL);
+		Prefs_Hyphenator(QWidget* parent, ScribusDoc* doc=nullptr);
 		~Prefs_Hyphenator();
 		virtual void restoreDefaults(struct ApplicationPrefs *prefsData);
 		virtual void saveGuiToPrefs(struct ApplicationPrefs *prefsData) const;

Modified: trunk/Scribus/scribus/ui/prefs_imagecache.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22510&path=/trunk/Scribus/scribus/ui/prefs_imagecache.h
==============================================================================
--- trunk/Scribus/scribus/ui/prefs_imagecache.h	(original)
+++ trunk/Scribus/scribus/ui/prefs_imagecache.h	Tue May  1 20:41:00 2018
@@ -19,7 +19,7 @@
 	Q_OBJECT
 
 	public:
-		Prefs_ImageCache(QWidget* parent, ScribusDoc* doc=NULL);
+		Prefs_ImageCache(QWidget* parent, ScribusDoc* doc=nullptr);
 		~Prefs_ImageCache();
 		virtual void restoreDefaults(struct ApplicationPrefs *prefsData);
 		virtual void saveGuiToPrefs(struct ApplicationPrefs *prefsData) const;

Modified: trunk/Scribus/scribus/ui/prefs_itemtools.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22510&path=/trunk/Scribus/scribus/ui/prefs_itemtools.h
==============================================================================
--- trunk/Scribus/scribus/ui/prefs_itemtools.h	(original)
+++ trunk/Scribus/scribus/ui/prefs_itemtools.h	Tue May  1 20:41:00 2018
@@ -19,7 +19,7 @@
 	Q_OBJECT
 
 	public:
-		Prefs_ItemTools(QWidget* parent, ScribusDoc* doc=NULL);
+		Prefs_ItemTools(QWidget* parent, ScribusDoc* doc=nullptr);
 		~Prefs_ItemTools();
 		virtual void restoreDefaults(struct ApplicationPrefs *prefsData);
 		virtual void saveGuiToPrefs(struct ApplicationPrefs *prefsData) const;

Modified: trunk/Scribus/scribus/ui/prefs_keyboardshortcuts.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22510&path=/trunk/Scribus/scribus/ui/prefs_keyboardshortcuts.h
==============================================================================
--- trunk/Scribus/scribus/ui/prefs_keyboardshortcuts.h	(original)
+++ trunk/Scribus/scribus/ui/prefs_keyboardshortcuts.h	Tue May  1 20:41:00 2018
@@ -26,7 +26,7 @@
 	Q_OBJECT
 
 	public:
-		Prefs_KeyboardShortcuts(QWidget* parent, ScribusDoc* doc=NULL);
+		Prefs_KeyboardShortcuts(QWidget* parent, ScribusDoc* doc=nullptr);
 		~Prefs_KeyboardShortcuts();
 		virtual void restoreDefaults(struct ApplicationPrefs *prefsData);
 		virtual void saveGuiToPrefs(struct ApplicationPrefs *prefsData) const;

Modified: trunk/Scribus/scribus/ui/prefs_miscellaneous.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22510&path=/trunk/Scribus/scribus/ui/prefs_miscellaneous.h
==============================================================================
--- trunk/Scribus/scribus/ui/prefs_miscellaneous.h	(original)
+++ trunk/Scribus/scribus/ui/prefs_miscellaneous.h	Tue May  1 20:41:00 2018
@@ -19,7 +19,7 @@
 	Q_OBJECT
 
 	public:
-		Prefs_Miscellaneous(QWidget* parent, ScribusDoc* doc=NULL);
+		Prefs_Miscellaneous(QWidget* parent, ScribusDoc* doc=nullptr);
 		~Prefs_Miscellaneous();
 		virtual void restoreDefaults(struct ApplicationPrefs *prefsData);
 		virtual void saveGuiToPrefs(struct ApplicationPrefs *prefsData) const;

Modified: trunk/Scribus/scribus/ui/prefs_operatortools.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22510&path=/trunk/Scribus/scribus/ui/prefs_operatortools.h
==============================================================================
--- trunk/Scribus/scribus/ui/prefs_operatortools.h	(original)
+++ trunk/Scribus/scribus/ui/prefs_operatortools.h	Tue May  1 20:41:00 2018
@@ -19,7 +19,7 @@
 	Q_OBJECT
 
 	public:
-		Prefs_OperatorTools(QWidget* parent, ScribusDoc* doc=NULL);
+		Prefs_OperatorTools(QWidget* parent, ScribusDoc* doc=nullptr);
 		~Prefs_OperatorTools();
 		virtual void restoreDefaults(struct ApplicationPrefs *prefsData);
 		virtual void saveGuiToPrefs(struct ApplicationPrefs *prefsData) const;

Modified: trunk/Scribus/scribus/ui/prefs_pagesizes.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22510&path=/trunk/Scribus/scribus/ui/prefs_pagesizes.h
==============================================================================
--- trunk/Scribus/scribus/ui/prefs_pagesizes.h	(original)
+++ trunk/Scribus/scribus/ui/prefs_pagesizes.h	Tue May  1 20:41:00 2018
@@ -19,7 +19,7 @@
 	Q_OBJECT
 
 	public:
-		Prefs_PageSizes(QWidget* parent, ScribusDoc* doc=NULL);
+		Prefs_PageSizes(QWidget* parent, ScribusDoc* doc=nullptr);
 		~Prefs_PageSizes();
 		virtual void restoreDefaults(struct ApplicationPrefs *prefsData);
 		virtual void saveGuiToPrefs(struct ApplicationPrefs *prefsData) const;

Modified: trunk/Scribus/scribus/ui/prefs_pane.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22510&path=/trunk/Scribus/scribus/ui/prefs_pane.h
==============================================================================
--- trunk/Scribus/scribus/ui/prefs_pane.h	(original)
+++ trunk/Scribus/scribus/ui/prefs_pane.h	Tue May  1 20:41:00 2018
@@ -16,8 +16,8 @@
 	Q_OBJECT
 
 	public:
-		Prefs_Pane(QWidget* parent) : QWidget(parent) {};
-		~Prefs_Pane() {} ;
+		Prefs_Pane(QWidget* parent) : QWidget(parent) {}
+		~Prefs_Pane() {}
 		virtual void restoreDefaults(struct ApplicationPrefs *prefsData) = 0;
 		virtual void saveGuiToPrefs(struct ApplicationPrefs *prefsData) const = 0;
 };

Modified: trunk/Scribus/scribus/ui/prefs_paths.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22510&path=/trunk/Scribus/scribus/ui/prefs_paths.h
==============================================================================
--- trunk/Scribus/scribus/ui/prefs_paths.h	(original)
+++ trunk/Scribus/scribus/ui/prefs_paths.h	Tue May  1 20:41:00 2018
@@ -19,7 +19,7 @@
 	Q_OBJECT
 
 	public:
-		Prefs_Paths(QWidget* parent, ScribusDoc* doc=NULL);
+		Prefs_Paths(QWidget* parent, ScribusDoc* doc=nullptr);
 		~Prefs_Paths();
 		virtual void restoreDefaults(struct ApplicationPrefs *prefsData);
 		virtual void saveGuiToPrefs(struct ApplicationPrefs *prefsData) const;

Modified: trunk/Scribus/scribus/ui/prefs_pdfexport.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22510&path=/trunk/Scribus/scribus/ui/prefs_pdfexport.h
==============================================================================
--- trunk/Scribus/scribus/ui/prefs_pdfexport.h	(original)
+++ trunk/Scribus/scribus/ui/prefs_pdfexport.h	Tue May  1 20:41:00 2018
@@ -21,7 +21,7 @@
 	Q_OBJECT
 
 	public:
-		Prefs_PDFExport(QWidget* parent, ScribusDoc* doc=NULL);
+		Prefs_PDFExport(QWidget* parent, ScribusDoc* doc=nullptr);
 		~Prefs_PDFExport();
 
 		virtual void restoreDefaults(struct ApplicationPrefs *prefsData);

Modified: trunk/Scribus/scribus/ui/prefs_plugins.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22510&path=/trunk/Scribus/scribus/ui/prefs_plugins.h
==============================================================================
--- trunk/Scribus/scribus/ui/prefs_plugins.h	(original)
+++ trunk/Scribus/scribus/ui/prefs_plugins.h	Tue May  1 20:41:00 2018
@@ -19,7 +19,7 @@
 	Q_OBJECT
 
 	public:
-		Prefs_Plugins(QWidget* parent, ScribusDoc* doc=NULL);
+		Prefs_Plugins(QWidget* parent, ScribusDoc* doc=nullptr);
 		~Prefs_Plugins();
 		virtual void restoreDefaults(struct ApplicationPrefs *prefsData);
 		virtual void saveGuiToPrefs(struct ApplicationPrefs *prefsData) const;

Modified: trunk/Scribus/scribus/ui/prefs_preflightverifier.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22510&path=/trunk/Scribus/scribus/ui/prefs_preflightverifier.h
==============================================================================
--- trunk/Scribus/scribus/ui/prefs_preflightverifier.h	(original)
+++ trunk/Scribus/scribus/ui/prefs_preflightverifier.h	Tue May  1 20:41:00 2018
@@ -21,7 +21,7 @@
 	Q_OBJECT
 
 	public:
-		Prefs_PreflightVerifier(QWidget* parent, ScribusDoc* doc=NULL);
+		Prefs_PreflightVerifier(QWidget* parent, ScribusDoc* doc=nullptr);
 		~Prefs_PreflightVerifier();
 		virtual void restoreDefaults(struct ApplicationPrefs *prefsData);
 		virtual void saveGuiToPrefs(struct ApplicationPrefs *prefsData) const;

Modified: trunk/Scribus/scribus/ui/prefs_printer.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22510&path=/trunk/Scribus/scribus/ui/prefs_printer.h
==============================================================================
--- trunk/Scribus/scribus/ui/prefs_printer.h	(original)
+++ trunk/Scribus/scribus/ui/prefs_printer.h	Tue May  1 20:41:00 2018
@@ -17,7 +17,7 @@
 	Q_OBJECT
 
 	public:
-		Prefs_Printer(QWidget* parent, ScribusDoc* doc=NULL);
+		Prefs_Printer(QWidget* parent, ScribusDoc* doc=nullptr);
 		~Prefs_Printer();
 		virtual void restoreDefaults(struct ApplicationPrefs *prefsData);
 		virtual void saveGuiToPrefs(struct ApplicationPrefs *prefsData) const;

Modified: trunk/Scribus/scribus/ui/prefs_scrapbook.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22510&path=/trunk/Scribus/scribus/ui/prefs_scrapbook.h
==============================================================================
--- trunk/Scribus/scribus/ui/prefs_scrapbook.h	(original)
+++ trunk/Scribus/scribus/ui/prefs_scrapbook.h	Tue May  1 20:41:00 2018
@@ -19,7 +19,7 @@
 	Q_OBJECT
 
 	public:
-		Prefs_Scrapbook(QWidget* parent, ScribusDoc* doc=NULL);
+		Prefs_Scrapbook(QWidget* parent, ScribusDoc* doc=nullptr);
 		~Prefs_Scrapbook();
 		virtual void restoreDefaults(struct ApplicationPrefs *prefsData);
 		virtual void saveGuiToPrefs(struct ApplicationPrefs *prefsData) const;

Modified: trunk/Scribus/scribus/ui/prefs_spelling.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22510&path=/trunk/Scribus/scribus/ui/prefs_spelling.h
==============================================================================
--- trunk/Scribus/scribus/ui/prefs_spelling.h	(original)
+++ trunk/Scribus/scribus/ui/prefs_spelling.h	Tue May  1 20:41:00 2018
@@ -22,7 +22,7 @@
 	Q_OBJECT
 
 	public:
-		Prefs_Spelling(QWidget* parent, ScribusDoc* doc=NULL);
+		Prefs_Spelling(QWidget* parent, ScribusDoc* doc=nullptr);
 		~Prefs_Spelling();
 		virtual void restoreDefaults(struct ApplicationPrefs *prefsData);
 		virtual void saveGuiToPrefs(struct ApplicationPrefs *prefsData) const;

Modified: trunk/Scribus/scribus/ui/prefs_tableofcontents.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22510&path=/trunk/Scribus/scribus/ui/prefs_tableofcontents.h
==============================================================================
--- trunk/Scribus/scribus/ui/prefs_tableofcontents.h	(original)
+++ trunk/Scribus/scribus/ui/prefs_tableofcontents.h	Tue May  1 20:41:00 2018
@@ -24,7 +24,7 @@
 	Q_OBJECT
 
 	public:
-		Prefs_TableOfContents(QWidget* parent, ScribusDoc* doc=NULL);
+		Prefs_TableOfContents(QWidget* parent, ScribusDoc* doc=nullptr);
 		~Prefs_TableOfContents();
 		virtual void restoreDefaults(struct ApplicationPrefs *prefsData);
 		virtual void saveGuiToPrefs(struct ApplicationPrefs *prefsData) const;

Modified: trunk/Scribus/scribus/ui/prefs_typography.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22510&path=/trunk/Scribus/scribus/ui/prefs_typography.h
==============================================================================
--- trunk/Scribus/scribus/ui/prefs_typography.h	(original)
+++ trunk/Scribus/scribus/ui/prefs_typography.h	Tue May  1 20:41:00 2018
@@ -19,7 +19,7 @@
 	Q_OBJECT
 
 	public:
-		Prefs_Typography(QWidget* parent, ScribusDoc* doc=NULL);
+		Prefs_Typography(QWidget* parent, ScribusDoc* doc=nullptr);
 		~Prefs_Typography();
 		virtual void restoreDefaults(struct ApplicationPrefs *prefsData);
 		virtual void saveGuiToPrefs(struct ApplicationPrefs *prefsData) const;

Modified: trunk/Scribus/scribus/ui/prefs_userinterface.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22510&path=/trunk/Scribus/scribus/ui/prefs_userinterface.h
==============================================================================
--- trunk/Scribus/scribus/ui/prefs_userinterface.h	(original)
+++ trunk/Scribus/scribus/ui/prefs_userinterface.h	Tue May  1 20:41:00 2018
@@ -23,7 +23,7 @@
 	Q_OBJECT
 
 	public:
-		Prefs_UserInterface(QWidget* parent, ScribusDoc* doc=NULL);
+		Prefs_UserInterface(QWidget* parent, ScribusDoc* doc=nullptr);
 		~Prefs_UserInterface();
 		virtual void restoreDefaults(struct ApplicationPrefs *prefsData);
 		virtual void saveGuiToPrefs(struct ApplicationPrefs *prefsData) const;

Modified: trunk/Scribus/scribus/util.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22510&path=/trunk/Scribus/scribus/util.h
==============================================================================
--- trunk/Scribus/scribus/util.h	(original)
+++ trunk/Scribus/scribus/util.h	Tue May  1 20:41:00 2018
@@ -150,7 +150,7 @@
  *\brief Convert pre-1.5.x tables to table as implemented in 1.5.x
  *\retval true on success, false it items have to be converted to a group
 */
-bool SCRIBUS_API convertOldTable(ScribusDoc *m_Doc, PageItem* gItem, QList<PageItem*> &gpL, QStack< QList<PageItem*> > *groupStackT = NULL, QList<PageItem *> *target = NULL);
+bool SCRIBUS_API convertOldTable(ScribusDoc *m_Doc, PageItem* gItem, QList<PageItem*> &gpL, QStack< QList<PageItem*> > *groupStackT = nullptr, QList<PageItem *> *target = nullptr);
 
 void SCRIBUS_API setWidgetBoldFont(QWidget* w, bool wantBold);
 /*!




More information about the scribus-commit mailing list