r23089 by jghali - Fix unwanted use of c++11 keyword

scribus-commit scribus-commit at lists.scribus.net
Mon Jul 29 02:28:15 UTC 2019


Author: jghali
Date: Mon Jul 29 02:28:15 2019
New Revision: 23089

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=23089
Log:
Fix unwanted use of c++11 keyword

Modified:
    branches/Version14x/Scribus/scribus/scribusdoc.cpp

Modified: branches/Version14x/Scribus/scribus/scribusdoc.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23089&path=/branches/Version14x/Scribus/scribus/scribusdoc.cpp
==============================================================================
--- branches/Version14x/Scribus/scribus/scribusdoc.cpp	(original)
+++ branches/Version14x/Scribus/scribus/scribusdoc.cpp	Mon Jul 29 02:28:15 2019
@@ -5804,8 +5804,8 @@
 
 void ScribusDoc::itemSelection_SetFont(QString font, Selection* customSelection)
 {
-	Selection* itemSelection = (customSelection != nullptr) ? customSelection : m_Selection;
-	assert(itemSelection != nullptr);
+	Selection* itemSelection = (customSelection != NULL) ? customSelection : m_Selection;
+	assert(itemSelection != NULL);
 
 	uint selectedItemCount = itemSelection->count();
 	if (selectedItemCount == 0)




More information about the scribus-commit mailing list