[patch] Patch to fix compilation warnings with the new QT

puNES-0.105-fixed-compilation-warnings-with-QT-514.patch (text/plain), 4.79 KB, created by Fabio Cavallo on 2020-03-18 11:25:01 UTC

diff --git a/src/gui/cgp.cpp b/src/gui/cgp.cpp
index e4d1b6a..799af10 100644
--- a/src/gui/cgp.cpp
+++ b/src/gui/cgp.cpp
@@ -74,9 +74,8 @@
 
 		// shader
-		key.sprintf("shader%u", i);
+		key = QString("shader%1").arg(i);
 		if (cgp_value(set, key, value) == FALSE) {
 			value.replace('\\', '/');
-			ustrncpy(sp->path,uQStringCD(QFileInfo(fi.absolutePath() + '/' + value).absoluteFilePath()),
-				usizeof(sp->path) - 1);
+			ustrncpy(sp->path, uQStringCD(QFileInfo(fi.absolutePath() + '/' + value).absoluteFilePath()), usizeof(sp->path) - 1);
 		} else {
 			delete(set);
@@ -85,5 +84,5 @@
 
 		// alias
-		key.sprintf("alias%u", i);
+		key = QString("alias%1").arg(i);
 		if (cgp_value(set, key, value) == FALSE) {
 			::strncpy(sp->alias, qPrintable(value), sizeof(sp->alias) - 1);
@@ -91,5 +90,5 @@
 
 		// mipmap_input
-		key.sprintf("mipmap_input%u", i);
+		key = QString("mipmap_input%1").arg(i);
 		if (cgp_value(set, key, value) == FALSE) {
 			if (QString::compare(value, "true", Qt::CaseInsensitive) == 0) {
@@ -99,5 +98,5 @@
 
 		// filter_linear
-		key.sprintf("filter_linear%u", i);
+		key = QString("filter_linear%1").arg(i);
 		if (cgp_value(set, key, value) == FALSE) {
 			if (QString::compare(value, "false", Qt::CaseInsensitive) == 0) {
@@ -109,5 +108,5 @@
 
 		// float_framebuffer
-		key.sprintf("float_framebuffer%u", i);
+		key = QString("float_framebuffer%1").arg(i);
 		if (cgp_value(set, key, value) == FALSE) {
 			if (QString::compare(value, "true", Qt::CaseInsensitive) == 0) {
@@ -117,5 +116,5 @@
 
 		// srgb_framebuffer
-		key.sprintf("srgb_framebuffer%u", i);
+		key = QString("srgb_framebuffer%1").arg(i);
 		if (cgp_value(set, key, value) == FALSE) {
 			if (QString::compare(value, "true", Qt::CaseInsensitive) == 0) {
@@ -125,5 +124,5 @@
 
 		// frame_count_mod
-		key.sprintf("frame_count_mod%u", i);
+		key = QString("frame_count_mod%1").arg(i);
 		if (cgp_value(set, key, value) == FALSE) {
 			sp->frame_count_mod = value.toFloat();
@@ -131,5 +130,5 @@
 
 		// wrap_mode
-		key.sprintf("wrap_mode%u", i);
+		key = QString("wrap_mode%1").arg(i);
 		if (cgp_value(set, key, value) == FALSE) {
 			if (QString::compare(value, "clamp_to_border", Qt::CaseInsensitive) == 0) {
@@ -153,13 +152,13 @@
 			_shader_scale *sc = &sp->sc;
 
-			sc_type.sprintf("scale_type%u", i);
+			sc_type = QString("scale_type%1").arg(i);
 			cgp_value(set, sc_type, value);
 			sc_type = value;
 
-			sc_type_x.sprintf("scale_type_x%u", i);
+			sc_type_x = QString("scale_type_x%1").arg(i);
 			cgp_value(set, sc_type_x, value);
 			sc_type_x = value;
 
-			sc_type_y.sprintf("scale_type_y%u", i);
+			sc_type_y = QString("scale_type_y%1").arg(i);
 			cgp_value(set, sc_type_y, value);
 			sc_type_y = value;
@@ -200,10 +199,10 @@
 
 				// x
-				key.sprintf("scale%u", i);
+				key = QString("scale%1").arg(i);
 				if (sc->type.x == SHADER_SCALE_ABSOLUTE) {
 					if (cgp_value(set, key, value) == FALSE) {
 						sc->abs.x = value.toFloat();
 					} else {
-						key.sprintf("scale_x%u", i);
+						key = QString("scale_x%1").arg(i);
 						if (cgp_value(set, key, value) == FALSE) {
 							sc->abs.x = value.toFloat();
@@ -214,5 +213,5 @@
 						sc->scale.x = value.toFloat();
 					} else {
-						key.sprintf("scale_x%u", i);
+						key = QString("scale_x%1").arg(i);
 						if (cgp_value(set, key, value) == FALSE) {
 							sc->scale.x = value.toFloat();
@@ -222,10 +221,10 @@
 
 				// y
-				key.sprintf("scale%u", i);
+				key = QString("scale%1").arg(i);
 				if (sc->type.y == SHADER_SCALE_ABSOLUTE) {
 					if (cgp_value(set, key, value) == FALSE) {
 						sc->abs.y = value.toFloat();
 					} else {
-						key.sprintf("scale_y%u", i);
+						key = QString("scale_y%1").arg(i);
 						if (cgp_value(set, key, value) == FALSE) {
 							sc->abs.y = value.toFloat();
@@ -236,5 +235,5 @@
 						sc->scale.y = value.toFloat();
 					} else {
-						key.sprintf("scale_y%u", i);
+						key = QString("scale_y%1").arg(i);
 						if (cgp_value(set, key, value) == FALSE) {
 							sc->scale.y = value.toFloat();
@@ -250,5 +249,5 @@
 		list = value.split(';');
 
-		foreach (const QString &ele, list){
+		foreach (const QString &ele, list) {
 			_lut_pass *lp;
 
@@ -275,6 +274,5 @@
 			if (cgp_value(set, ele, value) == FALSE) {
 				value.replace('\\', '/');
-				ustrncpy(lp->path, uQStringCD(QFileInfo(fi.absolutePath() + '/' + value).absoluteFilePath()),
-					usizeof(lp->path) - 1);
+				ustrncpy(lp->path, uQStringCD(QFileInfo(fi.absolutePath() + '/' + value).absoluteFilePath()), usizeof(lp->path) - 1);
 			}
 
@@ -321,5 +319,5 @@
 		list = value.split(';');
 
-		foreach (const QString &ele, list){
+		foreach (const QString &ele, list) {
 			_param_shd *prm;
 
@@ -385,5 +383,5 @@
 			}
 
-			line = line.remove(QRegExp( "#pragma parameter.*\"" ) );
+			line = line.remove(QRegExp("#pragma parameter.*\""));
 
 			while ((pos = rx.indexIn(line, pos)) != -1) {