Cleanup a few comments and strings.
--- a/src/in_2sf/XSFPlayer_2SF.cpp
+++ b/src/in_2sf/XSFPlayer_2SF.cpp
@@ -211,7 +211,7 @@
if (NDS_Init())
return false;
- static const int BUFFERSIZE = DESMUME_SAMPLE_RATE / 59.837; //truncates to 737, the traditional value, for 44100
+ static const int BUFFERSIZE = DESMUME_SAMPLE_RATE / 59.837; // truncates to 737, the traditional value, for 44100
SPU_ChangeSoundCore(SNDIFID_2SF, BUFFERSIZE);
execute = false;
--- a/src/in_ncsf/SSEQPlayer/SWAR.h
+++ b/src/in_ncsf/SSEQPlayer/SWAR.h
@@ -13,9 +13,6 @@
#include "INFOEntry.h"
#include "common.h"
-/*
- * The size has been left out of this structure as it is unused by this player.
- */
struct SWAR
{
std::string filename;
--- a/src/in_ncsf/SSEQPlayer/SYMBSection.h
+++ b/src/in_ncsf/SSEQPlayer/SYMBSection.h
@@ -20,9 +20,6 @@
void Read(PseudoFile &file, uint32_t startOffset);
};
-/*
- * The size has been left out of this structure as it is unused by this player.
- */
struct SYMBSection
{
SYMBRecord SEQrecord;
--- a/src/in_ncsf/SSEQPlayer/common.h
+++ b/src/in_ncsf/SSEQPlayer/common.h
@@ -17,7 +17,6 @@
/*
* Pseudo-file data structure
*/
-
struct PseudoFile
{
std::vector<uint8_t> *data;
@@ -90,8 +89,8 @@
}
/*
- * The following function is used to convert an integer into a hexidecimal
- * string, the length being determined by the size of the integer. 8-bit
+ * The following function is used to convert an integer into a hexadecimal
+ * string, the length being determined by the size of the integer. 8-bit
* integers are in the format of 0x00, 16-bit integers are in the format of
* 0x0000, and so on.
*/
--- a/src/in_xsf_framework/DialogBuilder.cpp
+++ b/src/in_xsf_framework/DialogBuilder.cpp
@@ -313,7 +313,7 @@
if (valid && control->controlType == GROUP_CONTROL)
{
dynamic_cast<DialogGroup *>(control.get())->CalculatePositions(false);
- // Techically step 2, but calculate the size of the group
+ // Technically step 2, but calculate the size of the group
dynamic_cast<DialogGroup *>(control.get())->CalculateSize();
if (control->rect.size.width > maxGroupWidth)
maxGroupWidth = control->rect.size.width;
--- a/src/in_xsf_framework/XSFConfig.cpp
+++ b/src/in_xsf_framework/XSFConfig.cpp
@@ -155,8 +155,8 @@
WithRelativePositionToParent(RelativePosition::FROM_TOPLEFT, Point<short>(6, 11)).IsLeftJustified());
this->configDialog.AddEditBoxControl(DialogEditBoxBuilder().WithSize(150, 14).InGroup(L"Title Format").WithRelativePositionToSibling(RelativePosition::FROM_BOTTOMLEFT, Point<short>(0, 4)).IsLeftJustified().
WithAutoHScroll().WithBorder().WithTabStop().WithID(idTitleFormat));
- this->configDialog.AddLabelControl(DialogLabelBuilder(L"Names between percent symbols (e.g. %game%, %title%) will be replaced with the respective value from the file's tags. Using square brackets around any "
- L"items will cause them to only be displayed if there was a replacement done (e.g. [%disc%.] will display 01. if disc was in the tags as 01, but will display nothing if disc was not in the tags). Square "
+ this->configDialog.AddLabelControl(DialogLabelBuilder(L"Names between percent symbols (e.g. %game%, %title%) will be replaced with the respective value from the file's tags. Using square brackets around any "
+ L"items will cause them to only be displayed if there was a replacement done (e.g. [%disc%.] will display 01. if disc was in the tags as 01, but will display nothing if disc was not in the tags). Square "
L"bracket blocks can be nested.").WithSize(150, 72).InGroup(L"Title Format").WithRelativePositionToSibling(RelativePosition::FROM_BOTTOMLEFT, Point<short>(0, 4)).IsLeftJustified());
this->GenerateSpecificDialogs();
--- a/src/in_xsf_framework/XSFPlayer.h
+++ b/src/in_xsf_framework/XSFPlayer.h
@@ -32,7 +32,7 @@
XSFPlayer();
XSFPlayer(const XSFPlayer &xSFPLayer);
public:
- // These are not defined in XSFPlayer.cpp, they should be defined in your own player's source. The Create functions should return a pointer to your player's class.
+ // These are not defined in XSFPlayer.cpp, they should be defined in your own player's source. The Create functions should return a pointer to your player's class.
static const char *WinampDescription;
static const char *WinampExts;
static XSFPlayer *Create(const std::string &fn);
--- a/src/in_xsf_framework/convert.h
+++ b/src/in_xsf_framework/convert.h
@@ -14,14 +14,14 @@
#include <cmath>
#include "windowsh_wrapper.h"
- /*
- * Originally the convert* functions came from the C++ FAQ, Miscellaneous Technical Issues:
- * https://isocpp.org/wiki/faq/misc-technical-issues#convert-string-to-any
- *
- * They have been replaced with a couple functions that use the C++11 std::enable_if
- * construct along with various other type traits constructs to use the proper
- * string conversions.
- */
+/*
+ * Originally the convert* functions came from the C++ FAQ, Miscellaneous Technical Issues:
+ * https://isocpp.org/wiki/faq/misc-technical-issues#convert-string-to-any
+ *
+ * They have been replaced with a couple functions that use the C++11 std::enable_if
+ * construct along with various other type traits constructs to use the proper
+ * string conversions.
+ */
template<typename T, typename S> inline typename std::enable_if_t<!std::is_enum_v<T> &&std::is_arithmetic_v<T>, T> convertTo(const std::basic_string<S> &s)
{
if (std::is_integral_v<T>)