[patch] Compare to character, not to string

scribus-ambiguous-overload.patch (text/plain), 2.38 KB, created by Alexander B. Ustinov on 2024-06-19 14:15:56 UTC

--- a/scribus/scribusapp.cpp	2024-06-19 12:59:56.220667947 +0300
+++ b/scribus/scribusapp.cpp	2024-06-19 12:46:53.663544352 +0300
@@ -282,7 +282,7 @@
 		}
 		else
 		{ //argument is not a known option, but either positional parameter or invalid.
-			if (arg.at(0) == "-")
+			if (arg.at(0) == '-')
 			{
 				std::cout << tr("Invalid argument: %1").arg(arg).toLocal8Bit().data() << std::endl;
 				std::exit(EXIT_FAILURE);

--- a/scribus/plugins/gettext/htmlim/htmlreader.cpp	2024-06-19 13:41:35.942344450 +0300
+++ b/scribus/plugins/gettext/htmlim/htmlreader.cpp 	2024-06-19 13:41:19.989001104 +0300
@@ -248,7 +248,7 @@
 		bool lcis = (chr.length() > 0 && chr[0].isSpace());
 		if (inPre)
 		{
+			if (tmp.at(0) == "\n")
-			if (tmp.at(0) == '\n')
 				tmp = tmp.right(tmp.length() - 2);
 		}
 		else

--- a/scribus/plugins/gettext/sxwim/stylereader.cpp	2024-06-19 13:47:23.485743302 +0300
+++ b/scribus/plugins/gettext/sxwim/stylereader.cpp	2024-06-19 13:48:06.025753906 +0300
@@ -274,11 +274,11 @@
 			currentStyle->getFont()->setHscale(static_cast<int>(getSize(attrValue, -1.0)));
 		else if ((attrName == "style:text-position") &&
 				 ((attrValue.indexOf("sub") != -1) ||
-				  ((attrValue.at(0) == "-") && (attrValue.at(0) != "0"))))
+				  ((attrValue.at(0) == '-') && (attrValue.at(0) != '0'))))
 			currentStyle->getFont()->toggleEffect(SUBSCRIPT);
 		else if ((attrName == "style:text-position") &&
 				 ((attrValue.indexOf("super") != -1) ||
-				  ((attrValue.at(0) != "-") && (attrValue.at(0) != "0"))))
+				  ((attrValue.at(0) != '-') && (attrValue.at(0) != '0'))))
 			currentStyle->getFont()->toggleEffect(SUPERSCRIPT);
 		else if ((attrName == "fo:margin-top") && (pstyle != nullptr))
 			pstyle->setSpaceAbove(getSize(attrValue));
@@ -652,11 +652,11 @@
 		style->getFont()->setHscale(static_cast<int>(getSize(value, -1.0)));
 	else if ((key == "style:text-position") &&
 			 ((value.indexOf("sub") != -1) ||
-			  ((value.at(0) == "-") && (value.at(0) != "0"))))
+			  ((value.at(0) == '-') && (value.at(0) != '0'))))
 		style->getFont()->toggleEffect(SUBSCRIPT);
 	else if ((key == "style:text-position") &&
 			 ((value.indexOf("super") != -1) ||
-			  ((value.at(0) != "-") && (value.at(0) != "0"))))
+			  ((value.at(0) != '-') && (value.at(0) != '0'))))
 		style->getFont()->toggleEffect(SUPERSCRIPT);
 	else if ((key == "fo:margin-top") && (pstyle != nullptr))
 		pstyle->setSpaceAbove(getSize(value));