New FileUtil::makeRelativeIfInDir func; label parser_3 barcode map; unit tests

glabels/MainWindow.cpp

@@ -217,7 +217,7 @@ namespace glabels
 		if ( mModel )
 		{
 			delete mModel->merge(); // Ownership of final Merge instance is ours
-			delete mModel->variables(); // Ownership of final Variables instance is ours
+			delete mModel->variables(); // Ownership of Variables instance is ours
 			delete mModel;
 		}
 	}

glabels/MergeView.cpp

@@ -22,6 +22,8 @@
 
 #include "merge/Factory.h"
 
+#include "model/FileUtil.h"
+
 #include <QFileDialog>
 #include <QFileInfo>
 #include <QtDebug>
@@ -93,7 +95,7 @@ namespace glabels
 
 		case merge::Factory::FILE:
 			locationLabel->setEnabled( true );
-			fn = mModel->dir().relativeFilePath( mModel->merge()->source() );
+			fn = model::FileUtil::makeRelativeIfInDir( mModel->dir(), mModel->merge()->source() );
 			locationLineEdit->setText( fn );
 			locationBrowseButton->setVisible( true );
 			break;
@@ -124,7 +126,7 @@ namespace glabels
 	///
 	void MergeView::onMergeSourceChanged()
 	{
-		QString fn = mModel->dir().relativeFilePath( mModel->merge()->source() );
+		QString fn = model::FileUtil::makeRelativeIfInDir( mModel->dir(), mModel->merge()->source() );
 		locationLineEdit->setText( fn );
 
 		recordsTable->clear();

glabels/ObjectEditor.cpp

@@ -30,6 +30,7 @@
 #include "model/ModelImageObject.h"
 #include "model/ModelLineObject.h"
 #include "model/ModelTextObject.h"
+#include "model/FileUtil.h"
 #include "model/Settings.h"
 #include "model/Size.h"
 
@@ -130,7 +131,7 @@ namespace glabels
 			}
 			else
 			{
-				QString fn = mModel->dir().relativeFilePath( filenameNode.data() );
+				QString fn = model::FileUtil::makeRelativeIfInDir( mModel->dir(), filenameNode.data() );
 				imageFilenameLineEdit->setText( fn );
 			}