r20264 by jghali - fix incorrect use of QString::isNull()

scribus-commit scribus-commit at lists.scribus.net
Mon Jul 20 23:47:59 UTC 2015


Author: jghali
Date: Mon Jul 20 23:47:59 2015
New Revision: 20264

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=20264
Log:
fix incorrect use of QString::isNull()

Modified:
    trunk/Scribus/scribus/prefsmanager.cpp
    trunk/Scribus/scribus/scribuscore.cpp

Modified: trunk/Scribus/scribus/prefsmanager.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20264&path=/trunk/Scribus/scribus/prefsmanager.cpp
==============================================================================
--- trunk/Scribus/scribus/prefsmanager.cpp (original)
+++ trunk/Scribus/scribus/prefsmanager.cpp Mon Jul 20 23:47:59 2015
@@ -879,7 +879,7 @@
 void PrefsManager::ReadPrefs(const QString & fname)
 {
 	QString realFile;
-	if (fname.isNull())
+	if (fname.isEmpty())
 		realFile = prefsLocation + "/scribus150.rc";
 	else
 		realFile = fname;

Modified: trunk/Scribus/scribus/scribuscore.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20264&path=/trunk/Scribus/scribus/scribuscore.cpp
==============================================================================
--- trunk/Scribus/scribus/scribuscore.cpp (original)
+++ trunk/Scribus/scribus/scribuscore.cpp Mon Jul 20 23:47:59 2015
@@ -166,7 +166,7 @@
 	setSplashStatus( tr("Initializing Keyboard Shortcuts") );
 	prefsManager->initDefaultActionKeys();
 	setSplashStatus( tr("Reading Preferences") );
-	if (prefsUserFile.isNull())
+	if (prefsUserFile.isEmpty())
 		prefsManager->ReadPrefs();
 	else
 		prefsManager->ReadPrefs(prefsUserFile);




More information about the scribus-commit mailing list