r23063 by craig - Reimplement PrefsManager with better singleton approach part 3

[scribus-commit]

Author: craig
Date: Mon Jul  1 19:34:52 2019
New Revision: 23063

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=23063
Log:
Reimplement PrefsManager with better singleton approach part 3

Modified:
    trunk/Scribus/scribus/plugins/import/zmf/importzmf.cpp
    trunk/Scribus/scribus/plugins/import/zmf/importzmfplugin.cpp

Modified: trunk/Scribus/scribus/plugins/import/zmf/importzmf.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23063&path=/trunk/Scribus/scribus/plugins/import/zmf/importzmf.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/zmf/importzmf.cpp	(original)
+++ trunk/Scribus/scribus/plugins/import/zmf/importzmf.cpp	Mon Jul  1 19:34:52 2019
@@ -70,8 +70,8 @@
 {
 	QFileInfo fi = QFileInfo(fName);
 	double b, h;
-	b = PrefsManager::instance()->appPrefs.docSetupPrefs.pageWidth;
-	h = PrefsManager::instance()->appPrefs.docSetupPrefs.pageHeight;
+	b = PrefsManager::instance().appPrefs.docSetupPrefs.pageWidth;
+	h = PrefsManager::instance().appPrefs.docSetupPrefs.pageHeight;
 	docWidth = b;
 	docHeight = h;
 	progressDialog = nullptr;
@@ -169,9 +169,9 @@
 		qApp->processEvents();
 	}
 	if (b == 0.0)
-		b = PrefsManager::instance()->appPrefs.docSetupPrefs.pageWidth;
+		b = PrefsManager::instance().appPrefs.docSetupPrefs.pageWidth;
 	if (h == 0.0)
-		h = PrefsManager::instance()->appPrefs.docSetupPrefs.pageHeight;
+		h = PrefsManager::instance().appPrefs.docSetupPrefs.pageHeight;
 	docWidth = b;
 	docHeight = h;
 	baseX = 0;

Modified: trunk/Scribus/scribus/plugins/import/zmf/importzmfplugin.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23063&path=/trunk/Scribus/scribus/plugins/import/zmf/importzmfplugin.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/zmf/importzmfplugin.cpp	(original)
+++ trunk/Scribus/scribus/plugins/import/zmf/importzmfplugin.cpp	Mon Jul  1 19:34:52 2019
@@ -118,7 +118,7 @@
 	if (fileName.isEmpty())
 	{
 		flags |= lfInteractive;
-		PrefsContext* prefs = PrefsManager::instance()->prefsFile->getPluginContext("importzmf");
+		PrefsContext* prefs = PrefsManager::instance().prefsFile->getPluginContext("importzmf");
 		QString wdir = prefs->get("wdir", ".");
 		CustomFDialog diaf(ScCore->primaryMainWindow(), wdir, QObject::tr("Open"), tr("All Supported Formats")+" (*.zmf *.ZMF);;All Files (*)");
 		if (diaf.exec())