Replace 0 and NULL with nullptr where apropriate.

- fixed using clang-tidy's modernize-use-nullptr check.

glabels/AboutDialog.h

@@ -40,7 +40,7 @@ namespace glabels
 		// Life Cycle
 		/////////////////////////////////
 	public:
-		AboutDialog( QWidget *parent = 0 );
+		AboutDialog( QWidget *parent = nullptr );
 
 
 		/////////////////////////////////

glabels/BarcodeBackends.cpp

@@ -79,9 +79,9 @@ namespace glabels
 
 	void BarcodeBackends::init( void )
 	{
-		static BarcodeBackends* singletonInstance = NULL;
+		static BarcodeBackends* singletonInstance = nullptr;
                 
-		if ( singletonInstance == NULL )
+		if ( singletonInstance == nullptr )
 		{
 			singletonInstance = new BarcodeBackends();
 		}
@@ -132,7 +132,7 @@ namespace glabels
 			return i.value();
 		}
 		
-		return 0;
+		return nullptr;
 	}
 
 
@@ -144,7 +144,7 @@ namespace glabels
 			return i.value();
 		}
 		
-		return 0;
+		return nullptr;
 	}
 
 

glabels/BarcodeMenuButton.h

@@ -42,7 +42,7 @@ namespace glabels
 		// Life Cycle
 		/////////////////////////////////
 	public:
-		BarcodeMenuButton( QWidget* parent = 0 );
+		BarcodeMenuButton( QWidget* parent = nullptr );
 
 
 		/////////////////////////////////

glabels/BarcodeMenuItem.h

@@ -41,7 +41,7 @@ namespace glabels
 		// Life Cycle
 		/////////////////////////////////
 	public:
-		BarcodeMenuItem( const BarcodeStyle* bcStyle, QObject* parent = 0 );
+		BarcodeMenuItem( const BarcodeStyle* bcStyle, QObject* parent = nullptr );
 
 
 		/////////////////////////////////

glabels/ColorButton.h

@@ -43,7 +43,7 @@ namespace glabels
 		// Life Cycle
 		/////////////////////////////////
 	public:
-		ColorButton( QWidget* parent = 0 );
+		ColorButton( QWidget* parent = nullptr );
 
 
 		/////////////////////////////////

glabels/ColorHistory.cpp

@@ -36,9 +36,9 @@ namespace glabels
 
 	ColorHistory* ColorHistory::instance()
 	{
-		static ColorHistory* singletonInstance = 0;
+		static ColorHistory* singletonInstance = nullptr;
 
-		if ( singletonInstance == 0 )
+		if ( singletonInstance == nullptr )
 		{
 			singletonInstance = new ColorHistory();
 		}

glabels/ColorNode.cpp

@@ -178,7 +178,7 @@ namespace glabels
 	{
 		if ( mIsField )
 		{
-			if ( record == 0 )
+			if ( record == nullptr )
 			{
 				return mColor;
 			}

glabels/ColorPaletteButtonItem.h

@@ -40,7 +40,7 @@ namespace glabels
 		// Life Cycle
 		/////////////////////////////////
 	public:
-		ColorPaletteButtonItem( const QString& text, QWidget* parent = 0 );
+		ColorPaletteButtonItem( const QString& text, QWidget* parent = nullptr );
 
 
 		/////////////////////////////////

glabels/ColorPaletteDialog.h

@@ -49,7 +49,7 @@ namespace glabels
 		ColorPaletteDialog( const QString& defaultLabel,
 		                    const QColor&  defaultColor,
 		                    const QColor&  color,
-		                    QWidget*       parent = 0 );
+		                    QWidget*       parent = nullptr );
 
 
 		/////////////////////////////////

glabels/ColorPaletteItem.h

@@ -43,7 +43,7 @@ namespace glabels
 		ColorPaletteItem( int            id,
 		                  const QColor&  color,
 		                  const QString& tip,
-		                  QWidget*       parent = 0 );
+		                  QWidget*       parent = nullptr );
 
 
 		/////////////////////////////////

glabels/Db.cpp

@@ -175,7 +175,7 @@ namespace glabels
 		}
 
 		qWarning() << "Unknown paper name: " << name;
-		return NULL;
+		return nullptr;
 	}
 
 
@@ -196,7 +196,7 @@ namespace glabels
 		}
 
 		qWarning() << "Unknown paper ID: " << id;
-		return NULL;
+		return nullptr;
 	}
 
 
@@ -205,7 +205,7 @@ namespace glabels
 		if ( !name.isNull() && !name.isEmpty() )
 		{
 			const Paper *paper = lookupPaperFromName( name );
-			if ( paper != NULL )
+			if ( paper != nullptr )
 			{
 				return paper->id();
 			}
@@ -226,7 +226,7 @@ namespace glabels
 			}
 
 			const Paper *paper = lookupPaperFromId( id );
-			if ( paper != NULL )
+			if ( paper != nullptr )
 			{
 				return paper->name();
 			}
@@ -289,7 +289,7 @@ namespace glabels
 		}
 
 		qWarning() << "Unknown category name: \"%s\"." << name;
-		return NULL;
+		return nullptr;
 	}
 
 
@@ -310,7 +310,7 @@ namespace glabels
 		}
 
 		qWarning() << "Unknown category ID: " << id;
-		return NULL;
+		return nullptr;
 	}
 
 
@@ -319,7 +319,7 @@ namespace glabels
 		if ( !name.isNull() && !name.isEmpty() )
 		{
 			const Category *category = lookupCategoryFromName( name );
-			if ( category != NULL )
+			if ( category != nullptr )
 			{
 				return category->id();
 			}
@@ -335,7 +335,7 @@ namespace glabels
 		if ( !id.isNull() && !id.isEmpty() )
 		{
 			const Category *category = lookupCategoryFromId( id );
-			if ( category != NULL )
+			if ( category != nullptr )
 			{
 				return category->name();
 			}
@@ -391,7 +391,7 @@ namespace glabels
 		}
 
 		qWarning() << "Unknown vendor name: " << name;
-		return NULL;
+		return nullptr;
 	}
 
 
@@ -400,7 +400,7 @@ namespace glabels
 		if ( !name.isNull() && !name.isEmpty() )
 		{
 			const Vendor *vendor = lookupVendorFromName( name );
-			if ( vendor != NULL )
+			if ( vendor != nullptr )
 			{
 				return vendor->url();
 			}
@@ -456,7 +456,7 @@ namespace glabels
 		}
 
 		qWarning() << "Unknown template name: " << name;
-		return NULL;
+		return nullptr;
 	}
 
 
@@ -477,7 +477,7 @@ namespace glabels
 		}
 
 		qWarning() << "Unknown template brand, part: " << brand << ", " << part;
-		return NULL;
+		return nullptr;
 	}
 
 
@@ -500,7 +500,7 @@ namespace glabels
 		QStringList list;
 
 		const Template *tmplate1 = lookupTemplateFromName( name );
-		if ( tmplate1 == NULL )
+		if ( tmplate1 == nullptr )
 		{
 			qWarning() << "Unknown template name: " << name;
 			return list;

glabels/FieldButton.h

@@ -40,7 +40,7 @@ namespace glabels
 		// Life Cycle
 		/////////////////////////////////
 	public:
-		FieldButton( QWidget* parent = 0 );
+		FieldButton( QWidget* parent = nullptr );
 
 
 		/////////////////////////////////

glabels/File.cpp

@@ -184,7 +184,7 @@ namespace glabels
 			                              tr("gLabels - Save Project As"),
 			                              cwd,
 			                              tr("glabels files (*.glabels);;All files (*)"),
-			                              0,
+			                              nullptr,
 			                              QFileDialog::DontConfirmOverwrite	);
 		if ( !rawFileName.isEmpty() )
 		{

glabels/File.h

@@ -42,7 +42,7 @@ namespace glabels
 		Q_OBJECT
 
 	public:
-		static bool newLabel( MainWindow *window = 0 );
+		static bool newLabel( MainWindow *window = nullptr );
 		static void open( MainWindow *window );
 		static bool save( MainWindow *window );
 		static bool saveAs( MainWindow *window );

glabels/LabelEditor.cpp

@@ -85,8 +85,8 @@ namespace glabels
 	{
 		mState = IdleState;
 
-		mModel              = 0;
+		mModel              = nullptr;
-		mUndoRedoModel      = 0;
+		mUndoRedoModel      = nullptr;
 		mMarkupVisible      = true;
 		mGridVisible        = true;
 		mGridSpacing        = 18;
@@ -433,10 +433,10 @@ namespace glabels
 
 				case IdleState:
 				{
-					LabelModelObject* object = 0;
+					LabelModelObject* object = nullptr;
-					Handle* handle = 0;
+					Handle* handle = nullptr;
 					if ( mModel->isSelectionAtomic() &&
-					     (handle = mModel->handleAt( mScale, xWorld, yWorld )) != 0 )
+					     (handle = mModel->handleAt( mScale, xWorld, yWorld )) != nullptr )
 					{
 						//
 						// Start an object resize
@@ -447,7 +447,7 @@ namespace glabels
 
 						mState = ArrowResize;
 					}
-					else if ( (object = mModel->objectAt( mScale, xWorld, yWorld )) != 0 )
+					else if ( (object = mModel->objectAt( mScale, xWorld, yWorld )) != nullptr )
 					{
 						//
 						// Start a Move Selection (adjusting selection if necessary)

glabels/LabelEditor.h

@@ -50,7 +50,7 @@ namespace glabels
 		// Lifecycle
 		/////////////////////////////////////
 	public:
-		LabelEditor( QScrollArea* scrollArea, QWidget* parent = 0 );
+		LabelEditor( QScrollArea* scrollArea, QWidget* parent = nullptr );
 
 
 		/////////////////////////////////////

glabels/LabelModel.cpp

@@ -53,7 +53,7 @@ namespace glabels
 	///
 	/// Default constructor.
 	///
-	LabelModel::LabelModel() : mUntitledInstance(0), mModified(true), mTmplate(0), mRotate(false)
+	LabelModel::LabelModel() : mUntitledInstance(0), mModified(true), mTmplate(nullptr), mRotate(false)
 	{
 		mMerge = new merge::None();
 	}
@@ -360,7 +360,7 @@ namespace glabels
 		object->unselect();
 		mObjectList.removeOne( object );
 
-		disconnect( object, 0, this, 0 );
+		disconnect( object, nullptr, this, nullptr );
 
 		setModified();
 
@@ -389,7 +389,7 @@ namespace glabels
 			}
 		}
 
-		return 0;
+		return nullptr;
 	}
 
 
@@ -409,7 +409,7 @@ namespace glabels
 			}
 		}
 
-		return 0;
+		return nullptr;
 	}
 
 
@@ -603,7 +603,7 @@ namespace glabels
 			}
 		}
 
-		return 0;
+		return nullptr;
 	}
 
 

glabels/LabelModel.h

@@ -203,7 +203,7 @@ namespace glabels
 		// Drawing operations
 		/////////////////////////////////
 	public:
-		void draw( QPainter* painter, bool inEditor = true, merge::Record* record = 0 ) const;
+		void draw( QPainter* painter, bool inEditor = true, merge::Record* record = nullptr ) const;
 
 		
 		/////////////////////////////////

glabels/LabelModelImageObject.cpp

@@ -36,13 +36,13 @@ namespace glabels
 	///
 	/// Static data
 	///
-	QImage* LabelModelImageObject::smDefaultImage = 0;
+	QImage* LabelModelImageObject::smDefaultImage = nullptr;
 
 
 	///
 	/// Constructor
 	///
-	LabelModelImageObject::LabelModelImageObject() : mImage(0), mSvgRenderer(0)
+	LabelModelImageObject::LabelModelImageObject() : mImage(nullptr), mSvgRenderer(nullptr)
 	{
 		mOutline = new Outline( this );
 
@@ -55,7 +55,7 @@ namespace glabels
 		mHandles << new HandleSouthWest( this );
 		mHandles << new HandleWest( this );
 
-		if ( smDefaultImage == 0 )
+		if ( smDefaultImage == nullptr )
 		{
 			smDefaultImage = new QImage( ":images/checkerboard.png" );
 		}
@@ -74,7 +74,7 @@ namespace glabels
 		}
 		else
 		{
-			mImage = 0;
+			mImage = nullptr;
 		}
 		if ( object->mSvgRenderer )
 		{
@@ -82,7 +82,7 @@ namespace glabels
 		}
 		else
 		{
-			mSvgRenderer = 0;
+			mSvgRenderer = nullptr;
 		}
 		mSvg = object->mSvg;
 	}
@@ -164,12 +164,12 @@ namespace glabels
 			if ( mImage )
 			{
 				delete mImage;
-				mImage = 0;
+				mImage = nullptr;
 			}
 			if ( mSvgRenderer )
 			{
 				delete mSvgRenderer;
-				mSvgRenderer = 0;
+				mSvgRenderer = nullptr;
 			}
 
 			mImage = new QImage(value);
@@ -191,12 +191,12 @@ namespace glabels
 			if ( mImage )
 			{
 				delete mImage;
-				mImage = 0;
+				mImage = nullptr;
 			}
 			if ( mSvgRenderer )
 			{
 				delete mSvgRenderer;
-				mSvgRenderer = 0;
+				mSvgRenderer = nullptr;
 			}
 
 			mImage = new QImage(value);
@@ -226,12 +226,12 @@ namespace glabels
 			if ( mImage )
 			{
 				delete mImage;
-				mImage = 0;
+				mImage = nullptr;
 			}
 			if ( mSvgRenderer )
 			{
 				delete mSvgRenderer;
-				mSvgRenderer = 0;
+				mSvgRenderer = nullptr;
 			}
 
 			mSvg = value;
@@ -345,12 +345,12 @@ namespace glabels
 		if ( mImage )
 		{
 			delete mImage;
-			mImage = 0;
+			mImage = nullptr;
 		}
 		if ( mSvgRenderer )
 		{
 			delete mSvgRenderer;
-			mSvgRenderer = 0;
+			mSvgRenderer = nullptr;
 		}
 
 		if ( !mFilenameNode.isField() )
@@ -370,7 +370,7 @@ namespace glabels
 						mSvgRenderer = new QSvgRenderer( mSvg );
 						if ( !mSvgRenderer->isValid() )
 						{
-							mSvgRenderer = 0;
+							mSvgRenderer = nullptr;
 						}
 						else
 						{
@@ -393,7 +393,7 @@ namespace glabels
 					mImage = new QImage( filename );
 					if ( mImage->isNull() )
 					{
-						mImage = 0;
+						mImage = nullptr;
 					}
 					else
 					{

glabels/LabelModelLineObject.cpp

@@ -42,7 +42,7 @@ namespace glabels
 	///
 	LabelModelLineObject::LabelModelLineObject()
 	{
-		mOutline = 0;
+		mOutline = nullptr;
 
 		mHandles << new HandleP1( this );
 		mHandles << new HandleP2( this );

glabels/LabelModelObject.cpp

@@ -43,7 +43,7 @@ namespace glabels
 	///
 	/// Constructor
 	///
-	LabelModelObject::LabelModelObject() : QObject(0)
+	LabelModelObject::LabelModelObject() : QObject(nullptr)
 	{
 		mId = msNextId++;
 
@@ -61,7 +61,7 @@ namespace glabels
 
 		mSelectedFlag = false;
 
-		mOutline = 0;
+		mOutline = nullptr;
 	}
 
 
@@ -96,7 +96,7 @@ namespace glabels
 		}
 		else
 		{
-			mOutline = 0;
+			mOutline = nullptr;
 		}
 
 		mMatrix          = object->mMatrix;
@@ -606,7 +606,7 @@ namespace glabels
 	///
 	const QImage* LabelModelObject::image() const
 	{
-		return 0;
+		return nullptr;
 	}
 
 
@@ -1119,7 +1119,7 @@ namespace glabels
 			}
 		}
 
-		return 0;
+		return nullptr;
 	}
 
 

glabels/MainWindow.cpp

@@ -59,7 +59,7 @@ namespace glabels
 	/// Constructor
 	///
 	MainWindow::MainWindow()
-		: mModel(0)
+		: mModel(nullptr)
 	{
 		setWindowIcon( Icons::Glabels() );
 
@@ -204,7 +204,7 @@ namespace glabels
 	///
 	bool MainWindow::isEmpty() const
 	{
-		return mModel == 0;
+		return mModel == nullptr;
 	}
 
 
@@ -867,7 +867,7 @@ namespace glabels
 	///
 	void MainWindow::setTitle()
 	{
-		if ( mModel == 0 )
+		if ( mModel == nullptr )
 		{
 			setWindowTitle( "gLabels" );
 		}

glabels/Merge/Factory.cpp

@@ -102,7 +102,7 @@ namespace glabels
 		///
 		void Factory::init()
 		{
-			static Factory* singletonInstance = 0;
+			static Factory* singletonInstance = nullptr;
 			if ( !singletonInstance )
 			{
 				singletonInstance = new Factory();

glabels/Merge/Merge.cpp

@@ -95,7 +95,7 @@ namespace glabels
 			mRecordList.clear();
 
 			open();
-			for ( Record* record = readNextRecord(); record != 0; record = readNextRecord() )
+			for ( Record* record = readNextRecord(); record != nullptr; record = readNextRecord() )
 			{
 				mRecordList.append( record );
 			}

glabels/Merge/None.cpp

@@ -119,7 +119,7 @@ namespace glabels
 		///
 		Record* None::readNextRecord()
 		{
-			return 0;
+			return nullptr;
 		}
 
 	}

glabels/Merge/Text.cpp

@@ -139,7 +139,7 @@ namespace glabels
 
 				return record;
 			}
-			return 0;
+			return nullptr;
 		}
 
 

glabels/MergeView.cpp

@@ -37,7 +37,7 @@ namespace glabels
 	/// Constructor
 	///
 	MergeView::MergeView( QWidget *parent )
-		: QWidget(parent), mModel(0), mBlock(false)
+		: QWidget(parent), mModel(nullptr), mBlock(false)
 	{
 		setupUi( this );
 

glabels/MergeView.h

@@ -47,7 +47,7 @@ namespace glabels
 		// Life Cycle
 		/////////////////////////////////
 	public:
-		MergeView( QWidget *parent = 0 );
+		MergeView( QWidget *parent = nullptr );
 		~MergeView() override;
 
 

glabels/ObjectEditor.cpp

@@ -46,7 +46,7 @@ namespace glabels
 	/// Constructor
 	///
 	ObjectEditor::ObjectEditor( QWidget *parent )
-		: mModel(0), mObject(0), mImageCwd("."), mBlocked(false)
+		: mModel(nullptr), mObject(nullptr), mImageCwd("."), mBlocked(false)
 	{
 		setupUi( this );
 
@@ -302,7 +302,7 @@ namespace glabels
 		{
 			if ( mObject )
 			{
-				disconnect( mObject, 0, this, 0 );
+				disconnect( mObject, nullptr, this, nullptr );
 			}
 
 			hidePages();
@@ -424,7 +424,7 @@ namespace glabels
 			}
 			else
 			{
-				mObject = 0;
+				mObject = nullptr;
 
 				titleImageLabel->setPixmap( QPixmap(":icons/24x24/actions/glabels-object-properties.svg") );
 				titleLabel->setText( "Object properties" );
@@ -472,8 +472,8 @@ namespace glabels
 
 	void ObjectEditor::onObjectDestroyed()
 	{
-		disconnect( mObject, 0, this, 0 );
+		disconnect( mObject, nullptr, this, nullptr );
-		mObject = 0;
+		mObject = nullptr;
 	}
 	
 	

glabels/ObjectEditor.h

@@ -50,7 +50,7 @@ namespace glabels
 		// Life Cycle
 		/////////////////////////////////
 	public:
-		ObjectEditor( QWidget *parent = 0 );
+		ObjectEditor( QWidget *parent = nullptr );
 
 
 		/////////////////////////////////

glabels/PageRenderer.cpp

@@ -46,7 +46,7 @@ namespace glabels
 
 
 	PageRenderer::PageRenderer()
-		: mModel(0), mNCopies(0), mStartLabel(0),
+		: mModel(nullptr), mNCopies(0), mStartLabel(0),
 		  mPrintOutlines(false), mPrintCropMarks(false), mPrintReverse(false),
 		  mIsMerge(false), mIPage(0), mNPages(0)
 	{
@@ -75,7 +75,7 @@ namespace glabels
 		mMerge = mModel->merge();
 		mOrigins = mModel->frame()->getOrigins();
 		mNLabelsPerPage = mModel->frame()->nLabels();
-		mIsMerge = ( dynamic_cast<const merge::None*>(mMerge) == 0 );
+		mIsMerge = ( dynamic_cast<const merge::None*>(mMerge) == nullptr );
 		updateNPages();
 
 		emit changed();
@@ -237,7 +237,7 @@ namespace glabels
 			painter->save();
 
 			clipLabel( painter );
-			printLabel( painter, 0 );
+			printLabel( painter, nullptr );
 
 			painter->restore();  // From before clip
 

glabels/PreferencesDialog.h

@@ -39,7 +39,7 @@ namespace glabels
 		// Life Cycle
 		/////////////////////////////////
 	public:
-		PreferencesDialog( QWidget *parent = 0 );
+		PreferencesDialog( QWidget *parent = nullptr );
 
 
 		/////////////////////////////////

glabels/Preview.cpp

@@ -55,7 +55,7 @@ namespace glabels
 	/// Constructor
 	///
 	Preview::Preview( QWidget *parent )
-		: mModel(0), mRenderer(0), QGraphicsView(parent)
+		: mModel(nullptr), mRenderer(nullptr), QGraphicsView(parent)
 	{
 		mScene = new QGraphicsScene();
 		setScene( mScene );
@@ -89,7 +89,7 @@ namespace glabels
 
 		clearScene();
 
-		if ( mModel != NULL )
+		if ( mModel != nullptr )
 		{
 			// Set scene up with a 5% margin around paper
 			Distance x = -0.05 * mModel->tmplate()->pageWidth();

glabels/Preview.h

@@ -47,7 +47,7 @@ namespace glabels
 		// Life Cycle
 		/////////////////////////////////
 	public:
-		Preview( QWidget *parent = 0 );
+		Preview( QWidget *parent = nullptr );
 
 
 		/////////////////////////////////

glabels/PreviewOverlayItem.h

@@ -42,7 +42,7 @@ namespace glabels
 		// Life Cycle
 		/////////////////////////////////
 	public:
-		PreviewOverlayItem( const PageRenderer* renderer, QGraphicsItem* parent = 0 );
+		PreviewOverlayItem( const PageRenderer* renderer, QGraphicsItem* parent = nullptr );
 
 
 		/////////////////////////////////////

glabels/PrintView.cpp

@@ -34,7 +34,7 @@ namespace glabels
 	/// Constructor
 	///
 	PrintView::PrintView( QWidget *parent )
-		: QWidget(parent), mModel(0), mBlocked(false)
+		: QWidget(parent), mModel(nullptr), mBlocked(false)
 	{
 		setupUi( this );
 

glabels/PrintView.h

@@ -47,7 +47,7 @@ namespace glabels
 		// Life Cycle
 		/////////////////////////////////
 	public:
-		PrintView( QWidget *parent = 0 );
+		PrintView( QWidget *parent = nullptr );
 		~PrintView() override;
 
 

glabels/PropertiesView.cpp

@@ -38,7 +38,7 @@ namespace glabels
 	/// Constructor
 	///
 	PropertiesView::PropertiesView( QWidget *parent )
-		: QWidget(parent), mModel(0)
+		: QWidget(parent), mModel(nullptr)
 	{
 		setupUi( this );
 
@@ -108,7 +108,7 @@ namespace glabels
 		preview->setRotate( isRotated );
 
 		const Vendor *vendor = Db::lookupVendorFromName( tmplate->brand() );
-		if ( (vendor != NULL) && (vendor->url() != NULL) )
+		if ( (vendor != nullptr) && (vendor->url() != nullptr) )
 		{
 			QString markup = QString( "<a href='%1'>%2</a>" )
 				.arg( vendor->url() ).arg( vendor->name() );
@@ -119,7 +119,7 @@ namespace glabels
 			vendorLabel->setText( tmplate->brand() );
 		}
 
-		if ( tmplate->productUrl() != NULL )
+		if ( tmplate->productUrl() != nullptr )
 		{
 			QString markup = QString( "<a href='%1'>%2</a>" )
 				.arg( tmplate->productUrl() ).arg( tmplate->part() );

glabels/PropertiesView.h

@@ -47,7 +47,7 @@ namespace glabels
 		// Life Cycle
 		/////////////////////////////////
 	public:
-		PropertiesView( QWidget *parent = 0 );
+		PropertiesView( QWidget *parent = nullptr );
 		~PropertiesView() override;
 
 

glabels/SelectProductDialog.cpp

@@ -84,7 +84,7 @@ namespace glabels
 		}
 		else
 		{
-			return 0;
+			return nullptr;
 		}
 	}
 

glabels/SelectProductDialog.h

@@ -42,7 +42,7 @@ namespace glabels
 		// Life Cycle
 		/////////////////////////////////
 	public:
-		SelectProductDialog( QWidget *parent = 0 );
+		SelectProductDialog( QWidget *parent = nullptr );
 
 
 		/////////////////////////////////

glabels/Settings.cpp

@@ -32,7 +32,7 @@ namespace glabels
 	//
 	// Static data
 	//
-	Settings* Settings::mInstance = 0;
+	Settings* Settings::mInstance = nullptr;
 
 
 	Settings::Settings()
@@ -43,7 +43,7 @@ namespace glabels
 
 	void Settings::init()
 	{
-		if ( mInstance == 0 )
+		if ( mInstance == nullptr )
 		{
 			mInstance = new Settings();
 		}

glabels/SimplePreview.cpp

@@ -59,7 +59,7 @@ namespace glabels
 	/// Constructor
 	///
 	SimplePreview::SimplePreview( QWidget *parent )
-		: mTmplate(NULL), mRotateFlag(false), QGraphicsView(parent)
+		: mTmplate(nullptr), mRotateFlag(false), QGraphicsView(parent)
 	{
 		mScene = new QGraphicsScene();
 		setScene( mScene );
@@ -108,7 +108,7 @@ namespace glabels
 	{
 		clearScene();
 
-		if ( mTmplate != NULL )
+		if ( mTmplate != nullptr )
 		{
 			// Set scene up with a 5% margin around paper
 			Distance x = -0.05 * mTmplate->pageWidth();

glabels/SimplePreview.h

@@ -44,7 +44,7 @@ namespace glabels
 		// Life Cycle
 		/////////////////////////////////
 	public:
-		SimplePreview( QWidget *parent = 0 );
+		SimplePreview( QWidget *parent = nullptr );
 
 
 		/////////////////////////////////

glabels/StrUtil.cpp

@@ -34,7 +34,7 @@ namespace glabels
 	{
 		const double FRAC_EPSILON = 0.00005;
 		const double denom[]        = {  1.0,  2.0, 3.0,  4.0,  8.0,  16.0,  32.0,  0.0 };
-		const char*  denom_string[] = { "1", "₂", "₃", "₄", "₈", "₁₆", "₃₂", NULL };
+		const char*  denom_string[] = { "1", "₂", "₃", "₄", "₈", "₁₆", "₃₂", nullptr };
 		const char*  num_string[]   = {  "⁰",  "¹",  "²",  "³",  "⁴",  "⁵",  "⁶",  "⁷",  "⁸",  "⁹",
 		                                 "¹⁰", "¹¹", "¹²", "¹³", "¹⁴", "¹⁵", "¹⁶", "¹⁷", "¹⁸", "¹⁹",
 		                                 "²⁰", "²¹", "²²", "²³", "²⁴", "²⁵", "²⁶", "²⁷", "²⁸", "²⁹",

glabels/Template.cpp

@@ -92,7 +92,7 @@ namespace glabels
 	Template* Template::fullPage( const QString& paperId )
 	{
 		// TODO
-		return NULL;
+		return nullptr;
 	}
 
 
@@ -102,7 +102,7 @@ namespace glabels
 				       const QString& equivPart )
 	{
 		const Template* other = Db::lookupTemplateFromBrandPart( brand, equivPart );
-		if ( other != NULL )
+		if ( other != nullptr )
 		{
 			Template* tmplate = other->dup();
 
@@ -119,7 +119,7 @@ namespace glabels
 			qWarning() << "Error: cannot create equivalent template for "
 				   << brand << ", " << equivPart
 				   << ". Forward references not supported.";
-			return NULL;
+			return nullptr;
 		}
 	}
 

glabels/TemplatePicker.cpp

@@ -141,7 +141,7 @@ namespace glabels
 		QList<QListWidgetItem *> items = selectedItems();
 		if ( items.isEmpty() )
 		{
-			return NULL;
+			return nullptr;
 		}
 		else
 		{

glabels/TemplatePicker.h

@@ -43,7 +43,7 @@ namespace glabels
 		// Life Cycle
 		/////////////////////////////////
 	public:
-		TemplatePicker( QWidget *parent = 0 );
+		TemplatePicker( QWidget *parent = nullptr );
 
 
 		/////////////////////////////////

glabels/TemplatePickerItem.h

@@ -41,7 +41,7 @@ namespace glabels
 		// Life Cycle
 		/////////////////////////////////
 	public:
-		TemplatePickerItem( Template *tmplate, QListWidget *parent = 0 );
+		TemplatePickerItem( Template *tmplate, QListWidget *parent = nullptr );
 
 
 		/////////////////////////////////

glabels/XmlCategoryParser.cpp

@@ -95,7 +95,7 @@ namespace glabels
 		QString name = XmlUtil::getI18nAttr( node, "name", "" );
 
 		Category *category = new Category( id, name );
-		if ( category != NULL )
+		if ( category != nullptr )
 		{
 			Db::registerCategory( category );
 		}

glabels/XmlLabelParser.cpp

@@ -57,7 +57,7 @@ namespace glabels
 		{
 			qWarning() << "Error: Cannot read file " << qPrintable(fileName)
 			           << ": " << file.errorString();
-			return 0;
+			return nullptr;
 		}
 
 		QDomDocument doc;
@@ -85,7 +85,7 @@ namespace glabels
 			qWarning() << "Error: Parse error at line " << errorLine
 			           << "column " << errorColumn
 			           << ": " << errorString;
-			return 0;
+			return nullptr;
 		}
 	
 
@@ -93,7 +93,7 @@ namespace glabels
 		if ( root.tagName() != "Glabels-document" )
 		{
 			qWarning() << "Error: Not a Glabels-document file";
-			return 0;
+			return nullptr;
 		}
 
 		return parseRootNode( root );
@@ -113,14 +113,14 @@ namespace glabels
 			qWarning() << "Error: Parse error at line " << errorLine
 			           << "column " << errorColumn
 			           << ": " << errorString;
-			return 0;
+			return nullptr;
 		}
 
 		QDomElement root = doc.documentElement();
 		if ( root.tagName() != "Glabels-document" )
 		{
 			qWarning() << "Error: Not a Glabels-document file";
-			return 0;
+			return nullptr;
 		}
 
 		return parseRootNode( root );
@@ -253,11 +253,11 @@ namespace glabels
 			if ( tagName == "Template" )
 			{
 				Template* tmplate = XmlTemplateParser().parseTemplateNode( child.toElement() );
-				if ( tmplate == 0 )
+				if ( tmplate == nullptr )
 				{
 					qWarning() << "Unable to parse template";
 					delete label;
-					return 0;
+					return nullptr;
 				}
 				label->setTmplate( tmplate );
 			}
@@ -466,7 +466,7 @@ namespace glabels
 	LabelModelBarcodeObject*
 	XmlLabelParser::parseObjectBarcodeNode( const QDomElement &node )
 	{
-		return 0;
+		return nullptr;
 	}
 
 

glabels/XmlPaperParser.cpp

@@ -100,7 +100,7 @@ namespace glabels
 		QString pwgSize = XmlUtil::getStringAttr( node, "pwg_size", "" );
 
 		Paper *paper = new Paper( id, name, width, height, pwgSize );
-		if ( paper != NULL )
+		if ( paper != nullptr )
 		{
 			Db::registerPaper( paper );
 		}

glabels/XmlTemplateParser.cpp

@@ -84,7 +84,7 @@ namespace glabels
 			if ( child.toElement().tagName() == "Template" )
 			{
 				Template *tmplate = parseTemplateNode( child.toElement() );
-				if ( tmplate != NULL )
+				if ( tmplate != nullptr )
 				{
 					Db::registerTemplate( tmplate );
 				}
@@ -121,15 +121,15 @@ namespace glabels
 			else
 			{
 				qWarning() << "Error: missing name or brand/part attributes.";
-				return NULL;
+				return nullptr;
 			}
 		}
 
 
-		Template *tmplate = NULL;
+		Template *tmplate = nullptr;
 
 		QString equivPart = XmlUtil::getStringAttr( node, "equiv", "" );
-		if ( equivPart != NULL )
+		if ( equivPart != nullptr )
 		{
 			tmplate = Template::fromEquiv( brand, part, equivPart );
 
@@ -155,10 +155,10 @@ namespace glabels
 			if ( !Db::isPaperIdOther( paperId ) )
 			{
 				const Paper *paper = Db::lookupPaperFromId( paperId );
-				if ( paper == NULL )
+				if ( paper == nullptr )
 				{
 					qWarning() << "Error: unknown paper ID: " << paperId;
-					return NULL;
+					return nullptr;
 				}
 
 				tmplate = new Template( brand, part, description,

glabels/XmlVendorParser.cpp

@@ -95,7 +95,7 @@ namespace glabels
 		QString url  = XmlUtil::getStringAttr( node, "url", "" );
 
 		Vendor *vendor = new Vendor( name, url );
-		if ( vendor != NULL )
+		if ( vendor != nullptr )
 		{
 			Db::registerVendor( vendor );
 		}