Mercurial > ldforge / file diff

--- a/src/dialogs.cpp	Sun Apr 12 23:02:26 2015 +0300
+++ b/src/dialogs.cpp	Tue Jul 07 21:35:20 2015 +0300
@@ -92,7 +92,7 @@
 	LDGLOverlay& info = g_win->R()->getOverlay (newcam);
 	RadioDefault<int> (newcam, m_cameraArgs);
 
-	if (info.img != null)
+	if (info.img != nullptr)
 	{
 		ui->filename->setText (info.fname);
 		ui->originX->setValue (info.ox);
@@ -144,7 +144,7 @@
 
 void OverlayDialog::slot_fpath()
 {
-	ui->filename->setText (QFileDialog::getOpenFileName (null, "Overlay image"));
+	ui->filename->setText (QFileDialog::getOpenFileName (nullptr, "Overlay image"));
 }
 
 void OverlayDialog::slot_help()
@@ -326,7 +326,7 @@
 // =============================================================================
 void ExtProgPathPrompt::findPath()
 {
-	QString path = QFileDialog::getOpenFileName (null, "", "", g_extProgPathFilter);
+	QString path = QFileDialog::getOpenFileName (nullptr, "", "", g_extProgPathFilter);
 
 	if (not path.isEmpty())
 		ui->m_path->setText (path);