r15478 by craig - Fix return false for QString return type

scribus-commit scribus-commit at lists.scribus.net
Mon Sep 20 22:19:48 CEST 2010


Author: craig
Date: Mon Sep 20 20:19:48 2010
New Revision: 15478

URL: http://scribus.info/websvn/listing.php?repname=Scribus&sc=1&rev=15478
Log:
Fix return false for QString return type

Modified:
    branches/Version135/Scribus/scribus/plugins/fileloader/scribus12format/scribus12format.cpp
    branches/Version135/Scribus/scribus/plugins/fileloader/scribus134format/scribus134format.cpp
    branches/Version135/Scribus/scribus/plugins/fileloader/scribus13format/scribus13format.cpp

Modified: branches/Version135/Scribus/scribus/plugins/fileloader/scribus12format/scribus12format.cpp
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15478&path=/branches/Version135/Scribus/scribus/plugins/fileloader/scribus12format/scribus12format.cpp
==============================================================================
--- branches/Version135/Scribus/scribus/plugins/fileloader/scribus12format/scribus12format.cpp (original)
+++ branches/Version135/Scribus/scribus/plugins/fileloader/scribus12format/scribus12format.cpp Mon Sep 20 20:19:48 2010
@@ -147,7 +147,7 @@
 		if (!ScGzFile::readFromFile(fileName, docBytes))
 		{
 			// FIXME: Needs better error return
-			return false;
+			return QString::null;
 		}
 	}
 	else
@@ -172,7 +172,7 @@
 	}
 	if (docText.endsWith(QChar(10)) || docText.endsWith(QChar(13)))
 		docText.truncate(docText.length()-1);
-	return docText;	return docText;
+	return docText;	
 }
 
 

Modified: branches/Version135/Scribus/scribus/plugins/fileloader/scribus134format/scribus134format.cpp
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15478&path=/branches/Version135/Scribus/scribus/plugins/fileloader/scribus134format/scribus134format.cpp
==============================================================================
--- branches/Version135/Scribus/scribus/plugins/fileloader/scribus134format/scribus134format.cpp (original)
+++ branches/Version135/Scribus/scribus/plugins/fileloader/scribus134format/scribus134format.cpp Mon Sep 20 20:19:48 2010
@@ -112,7 +112,7 @@
 		if (!ScGzFile::readFromFile(fileName, docBytes, 4096))
 		{
 			// FIXME: Needs better error return
-			return false;
+			return QString::null;
 		}
 	}
 	else

Modified: branches/Version135/Scribus/scribus/plugins/fileloader/scribus13format/scribus13format.cpp
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15478&path=/branches/Version135/Scribus/scribus/plugins/fileloader/scribus13format/scribus13format.cpp
==============================================================================
--- branches/Version135/Scribus/scribus/plugins/fileloader/scribus13format/scribus13format.cpp (original)
+++ branches/Version135/Scribus/scribus/plugins/fileloader/scribus13format/scribus13format.cpp Mon Sep 20 20:19:48 2010
@@ -110,7 +110,7 @@
 		if (!ScGzFile::readFromFile(fileName, docBytes, 4096))
 		{
 			// FIXME: Needs better error return
-			return false;
+			return QString::null;
 		}
 	}
 	else




More information about the scribus-commit mailing list