r23765 by jghali - Code style fixes

scribus-commit scribus-commit at lists.scribus.net
Mon May 11 14:09:13 UTC 2020


Author: jghali
Date: Mon May 11 14:09:13 2020
New Revision: 23765

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=23765
Log:
Code style fixes

Modified:
    trunk/Scribus/scribus/fileloader.cpp
    trunk/Scribus/scribus/fileloader.h
    trunk/Scribus/scribus/ui/about.cpp

Modified: trunk/Scribus/scribus/fileloader.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23765&path=/trunk/Scribus/scribus/fileloader.cpp
==============================================================================
--- trunk/Scribus/scribus/fileloader.cpp	(original)
+++ trunk/Scribus/scribus/fileloader.cpp	Mon May 11 14:09:13 2020
@@ -440,7 +440,7 @@
 	if (!dia.exec())
 		return false;
 
-	QMap<QString,QString>::Iterator itfsu;
+	QMap<QString, QString>::Iterator itfsu;
 	for (itfsu = m_ReplacedFonts.begin(); itfsu != m_ReplacedFonts.end(); ++itfsu)
 	{
 		if (dia.stickyReplacements->isChecked())
@@ -460,7 +460,7 @@
 	{
 		qApp->changeOverrideCursor(QCursor(Qt::ArrowCursor));
 		QString mess = tr("Some fonts used by this document have been substituted:")+"\n\n";
-		QMap<QString,QString>::Iterator it;
+		QMap<QString, QString>::Iterator it;
 		for (it = m_ReplacedFonts.begin(); it != m_ReplacedFonts.end(); ++it)
 		{
 			mess += it.key() + tr(" was replaced by: ")+ it.value() +"\n";

Modified: trunk/Scribus/scribus/fileloader.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23765&path=/trunk/Scribus/scribus/fileloader.h
==============================================================================
--- trunk/Scribus/scribus/fileloader.h	(original)
+++ trunk/Scribus/scribus/fileloader.h	Mon May 11 14:09:13 2020
@@ -55,6 +55,7 @@
 	const FileFormat * const formatSLA150;
 
 	static const QString getLoadFilterString();
+
 private:
 	QMap<QString, QString> m_ReplacedFonts;
 	bool m_newReplacement;

Modified: trunk/Scribus/scribus/ui/about.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23765&path=/trunk/Scribus/scribus/ui/about.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/about.cpp	(original)
+++ trunk/Scribus/scribus/ui/about.cpp	Mon May 11 14:09:13 2020
@@ -393,17 +393,16 @@
 				if (isTitle)
 				{
 					startTitle = false;
-					result += "<tr><td><b>"+About::trAuthorTitle(lineTS)+"</b></td><td></td></tr>";
-
-				} // if is title
+					result += "<tr><td><b>" + About::trAuthorTitle(lineTS) + "</b></td><td></td></tr>";
+				}
 				else
 				{
 					startText = false;
 					fieldTS = lineTS.split(" ");
-					contact = (fieldTS.isEmpty() ? "" : fieldTS.takeLast());
-					name = (fieldTS.isEmpty() ? "" : fieldTS.join(" "));
-					result += "<tr><td>"+name+"</td><td>"+(contact == "@" ? "" : contact)+"</td></tr>";
-				} // else is title
+					contact = fieldTS.isEmpty() ? QString() : fieldTS.takeLast();
+					name = fieldTS.isEmpty() ? QString() : fieldTS.join(" ");
+					result += "<tr><td>" +name + "</td><td>" + (contact == "@" ? "" : contact) + "</td></tr>";
+				}
 			} // if is empty line
 			else
 			{




More information about the scribus-commit mailing list