Mercurial > ldforge / file diff

--- a/src/documentmanager.cpp	Sat Feb 13 04:14:43 2016 +0200
+++ b/src/documentmanager.cpp	Sun Feb 14 03:19:28 2016 +0200
@@ -139,7 +139,7 @@
 		unknowns << static_cast<LDError*> (obj)->fileReferenced();
 	}
 
-	if (Config->tryDownloadMissingFiles() and not unknowns.isEmpty())
+	if (m_config->tryDownloadMissingFiles() and not unknowns.isEmpty())
 	{
 		PartDownloader dl (m_window);
 		dl.setSourceType (PartDownloader::PartsTracker);
@@ -225,7 +225,7 @@
 		return relativePath;
 
 	// Try with just the LDraw path first
-	QString fullPath = format ("%1" DIRSLASH "%2", Config->lDrawPath(), relativePath);
+	QString fullPath = format ("%1" DIRSLASH "%2", m_config->lDrawPath(), relativePath);
 
 	if (QFileInfo::exists (fullPath))
 		return fullPath;
@@ -234,7 +234,7 @@
 	{
 		// Look in sub-directories: parts and p. Also look in the download path, since that's where we download parts
 		// from the PT to.
-		QStringList dirs = { Config->lDrawPath(), Config->downloadFilePath() };
+		QStringList dirs = { m_config->lDrawPath(), m_config->downloadFilePath() };
 		for (const QString& topdir : dirs)
 		{
 			for (const QString& subdir : QStringList ({ "parts", "p" }))
@@ -363,7 +363,7 @@
 
 void DocumentManager::addRecentFile (QString path)
 {
-	QStringList recentFiles = Config->recentFiles();
+	QStringList recentFiles = m_config->recentFiles();
 	int idx = recentFiles.indexOf (path);
 
 	// If this file already is in the list, pop it out.
@@ -381,7 +381,7 @@
 
 	// Add the file
 	recentFiles << path;
-	Config->setRecentFiles (recentFiles);
+	m_config->setRecentFiles (recentFiles);
 	m_window->syncSettings();
 	m_window->updateRecentFilesMenu();
 }
@@ -416,7 +416,7 @@
 	// Possibly substitute with logoed studs:
 	// stud.dat -> stud-logo.dat
 	// stud2.dat -> stud-logo2.dat
-	if (Config->useLogoStuds() and renderinline)
+	if (m_config->useLogoStuds() and renderinline)
 	{
 		// Ensure logoed studs are loaded first
 		loadLogoedStuds();