Revert "- Attempt to cope with utf8 encoded strings in fluid_settings…

… (GH issue #82 possible fix)" This reverts commit 1ec61bf.
rncbc · Apr 30, 2024 · 853a1ad · 853a1ad
1 parent b728bf6
commit 853a1ad
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 10 deletions.
diff --git a/src/qsynthSetupForm.cpp b/src/qsynthSetupForm.cpp
@@ -1,7 +1,7 @@
 // qsynthSetupForm.cpp
 //
 /****************************************************************************
-   Copyright (C) 2003-2024, rncbc aka Rui Nuno Capela. All rights reserved.
+   Copyright (C) 2003-2022, rncbc aka Rui Nuno Capela. All rights reserved.
 
    This program is free software; you can redistribute it and/or
    modify it under the terms of the GNU General Public License
@@ -52,7 +52,7 @@ static void qsynth_settings_foreach_option (
 {
 	qsynth_settings_data *pData = (qsynth_settings_data *) pvData;
 
-	pData->options.append(QString::fromUtf8(pszOption));
+	pData->options.append(pszOption);
 }
 
 static void qsynth_settings_foreach (
@@ -163,24 +163,24 @@ static void qsynth_settings_foreach (
 	#else
 		::fluid_settings_getstr(pFluidSettings, pszName, &pszCurrent);
 	#endif
-		(pData->pListItem)->setText(iCol++, QString::fromUtf8(pszCurrent));
-		(pData->pListItem)->setText(iCol++, QString::fromUtf8(pszDefault));
+		(pData->pListItem)->setText(iCol++, pszCurrent);
+		(pData->pListItem)->setText(iCol++, pszDefault);
 		(pData->pListItem)->setText(iCol++, QString());
 		(pData->pListItem)->setText(iCol++, QString());
 	#ifdef CONFIG_FLUID_SETTINGS_DUPSTR
-	#ifdef CONFIG_FLUID_FREE
+    #ifdef CONFIG_FLUID_FREE
 		::fluid_free(pszCurrent);
-	#else
+    #else
 		::free(pszCurrent);
-	#endif
+    #endif
 	#endif
 		break;
 	}}
 
 	// Check for options.
 	pData->options.clear();
 	::fluid_settings_foreach_option(pFluidSettings, pszName, pvData, qsynth_settings_foreach_option);
-	(pData->pListItem)->setText(iCol++, pData->options.join(' '));
+	(pData->pListItem)->setText(iCol++, pData->options.join(" "));
 }
 
 

diff --git a/src/qsynthSetupForm.h b/src/qsynthSetupForm.h
@@ -1,7 +1,7 @@
 // qsynthSetupForm.h
 //
 /****************************************************************************
-   Copyright (C) 2003-2024, rncbc aka Rui Nuno Capela. All rights reserved.
+   Copyright (C) 2003-2022, rncbc aka Rui Nuno Capela. All rights reserved.
 
    This program is free software; you can redistribute it and/or
    modify it under the terms of the GNU General Public License

diff --git a/src/qsynthSetupForm.ui b/src/qsynthSetupForm.ui
@@ -3,7 +3,7 @@
  <author>rncbc aka Rui Nuno Capela</author>
  <comment>qsynth - A fluidsynth Qt GUI Interface.
 
-   Copyright (C) 2003-2024, rncbc aka Rui Nuno Capela. All rights reserved.
+   Copyright (C) 2003-2022, rncbc aka Rui Nuno Capela. All rights reserved.
 
    This program is free software; you can redistribute it and/or
    modify it under the terms of the GNU General Public License