Browse code
Use std::make_unique where possible.
Naram Qashat authored on 2021/03/20 04:37:08
Showing 5 changed files
- src/in_2sf/XSFPlayer_2SF.cpp
- src/in_gsf/XSFPlayer_GSF.cpp
- src/in_ncsf/XSFPlayer_NCSF.cpp
- src/in_snsf/XSFPlayer_SNSF.cpp
- src/in_xsf_framework/in_xsf.cpp
| ... | ... |
@@ -146,9 +146,9 @@ bool XSFPlayer_2SF::RecursiveLoad2SF(XSFFile *xSFToLoad, int level) |
| 146 | 146 |
if (level <= 10 && xSFToLoad->GetTagExists("_lib"))
|
| 147 | 147 |
{
|
| 148 | 148 |
#ifdef _WIN32 |
| 149 |
- auto libxSF = std::unique_ptr<XSFFile>(new XSFFile(ConvertFuncs::StringToWString(ExtractDirectoryFromPath(xSFToLoad->GetFilename()) + xSFToLoad->GetTagValue("_lib")), 4, 8));
|
|
| 149 |
+ auto libxSF = std::make_unique<XSFFile>(ConvertFuncs::StringToWString(ExtractDirectoryFromPath(xSFToLoad->GetFilename()) + xSFToLoad->GetTagValue("_lib")), 4, 8);
|
|
| 150 | 150 |
#else |
| 151 |
- auto libxSF = std::unique_ptr<XSFFile>(new XSFFile(ExtractDirectoryFromPath(xSFToLoad->GetFilename()) + xSFToLoad->GetTagValue("_lib"), 4, 8));
|
|
| 151 |
+ auto libxSF = std::make_unique<XSFFile>(ExtractDirectoryFromPath(xSFToLoad->GetFilename()) + xSFToLoad->GetTagValue("_lib"), 4, 8);
|
|
| 152 | 152 |
#endif |
| 153 | 153 |
if (!this->RecursiveLoad2SF(libxSF.get(), level + 1)) |
| 154 | 154 |
return false; |
| ... | ... |
@@ -167,9 +167,9 @@ bool XSFPlayer_2SF::RecursiveLoad2SF(XSFFile *xSFToLoad, int level) |
| 167 | 167 |
{
|
| 168 | 168 |
found = true; |
| 169 | 169 |
#ifdef _WIN32 |
| 170 |
- auto libxSF = std::unique_ptr<XSFFile>(new XSFFile(ConvertFuncs::StringToWString(ExtractDirectoryFromPath(xSFToLoad->GetFilename()) + xSFToLoad->GetTagValue(libTag)), 4, 8)); |
|
| 170 |
+ auto libxSF = std::make_unique<XSFFile>(ConvertFuncs::StringToWString(ExtractDirectoryFromPath(xSFToLoad->GetFilename()) + xSFToLoad->GetTagValue(libTag)), 4, 8); |
|
| 171 | 171 |
#else |
| 172 |
- auto libxSF = std::unique_ptr<XSFFile>(new XSFFile(ExtractDirectoryFromPath(xSFToLoad->GetFilename()) + xSFToLoad->GetTagValue(libTag), 4, 8)); |
|
| 172 |
+ auto libxSF = std::make_unique<XSFFile>(ExtractDirectoryFromPath(xSFToLoad->GetFilename()) + xSFToLoad->GetTagValue(libTag), 4, 8); |
|
| 173 | 173 |
#endif |
| 174 | 174 |
if (!this->RecursiveLoad2SF(libxSF.get(), level + 1)) |
| 175 | 175 |
return false; |
| ... | ... |
@@ -152,9 +152,9 @@ static bool RecursiveLoadGSF(XSFFile *xSF, int level) |
| 152 | 152 |
if (level <= 10 && xSF->GetTagExists("_lib"))
|
| 153 | 153 |
{
|
| 154 | 154 |
#ifdef _WIN32 |
| 155 |
- auto libxSF = std::unique_ptr<XSFFile>(new XSFFile(ConvertFuncs::StringToWString(ExtractDirectoryFromPath(xSF->GetFilename()) + xSF->GetTagValue("_lib")), 8, 12));
|
|
| 155 |
+ auto libxSF = std::make_unique<XSFFile>(ConvertFuncs::StringToWString(ExtractDirectoryFromPath(xSF->GetFilename()) + xSF->GetTagValue("_lib")), 8, 12);
|
|
| 156 | 156 |
#else |
| 157 |
- auto libxSF = std::unique_ptr<XSFFile>(new XSFFile(ExtractDirectoryFromPath(xSF->GetFilename()) + xSF->GetTagValue("_lib"), 8, 12));
|
|
| 157 |
+ auto libxSF = std::make_unique<XSFFile>(ExtractDirectoryFromPath(xSF->GetFilename()) + xSF->GetTagValue("_lib"), 8, 12);
|
|
| 158 | 158 |
#endif |
| 159 | 159 |
if (!RecursiveLoadGSF(libxSF.get(), level + 1)) |
| 160 | 160 |
return false; |
| ... | ... |
@@ -173,9 +173,9 @@ static bool RecursiveLoadGSF(XSFFile *xSF, int level) |
| 173 | 173 |
{
|
| 174 | 174 |
found = true; |
| 175 | 175 |
#ifdef _WIN32 |
| 176 |
- auto libxSF = std::unique_ptr<XSFFile>(new XSFFile(ConvertFuncs::StringToWString(ExtractDirectoryFromPath(xSF->GetFilename()) + xSF->GetTagValue(libTag)), 8, 12)); |
|
| 176 |
+ auto libxSF = std::make_unique<XSFFile>(ConvertFuncs::StringToWString(ExtractDirectoryFromPath(xSF->GetFilename()) + xSF->GetTagValue(libTag)), 8, 12); |
|
| 177 | 177 |
#else |
| 178 |
- auto libxSF = std::unique_ptr<XSFFile>(new XSFFile(ExtractDirectoryFromPath(xSF->GetFilename()) + xSF->GetTagValue(libTag), 8, 12)); |
|
| 178 |
+ auto libxSF = std::make_unique<XSFFile>(ExtractDirectoryFromPath(xSF->GetFilename()) + xSF->GetTagValue(libTag), 8, 12); |
|
| 179 | 179 |
#endif |
| 180 | 180 |
if (!RecursiveLoadGSF(libxSF.get(), level + 1)) |
| 181 | 181 |
return false; |
| ... | ... |
@@ -67,9 +67,9 @@ bool XSFPlayer_NCSF::RecursiveLoadNCSF(XSFFile *xSFToLoad, int level) |
| 67 | 67 |
if (level <= 10 && xSFToLoad->GetTagExists("_lib"))
|
| 68 | 68 |
{
|
| 69 | 69 |
#ifdef _WIN32 |
| 70 |
- auto libxSF = std::unique_ptr<XSFFile>(new XSFFile(ConvertFuncs::StringToWString(ExtractDirectoryFromPath(xSFToLoad->GetFilename()) + xSFToLoad->GetTagValue("_lib")), 8, 12));
|
|
| 70 |
+ auto libxSF = std::make_unique<XSFFile>(ConvertFuncs::StringToWString(ExtractDirectoryFromPath(xSFToLoad->GetFilename()) + xSFToLoad->GetTagValue("_lib")), 8, 12);
|
|
| 71 | 71 |
#else |
| 72 |
- auto libxSF = std::unique_ptr<XSFFile>(new XSFFile(ExtractDirectoryFromPath(xSFToLoad->GetFilename()) + xSFToLoad->GetTagValue("_lib"), 8, 12));
|
|
| 72 |
+ auto libxSF = std::make_unique<XSFFile>(ExtractDirectoryFromPath(xSFToLoad->GetFilename()) + xSFToLoad->GetTagValue("_lib"), 8, 12);
|
|
| 73 | 73 |
#endif |
| 74 | 74 |
if (!this->RecursiveLoadNCSF(libxSF.get(), level + 1)) |
| 75 | 75 |
return false; |
| ... | ... |
@@ -88,9 +88,9 @@ bool XSFPlayer_NCSF::RecursiveLoadNCSF(XSFFile *xSFToLoad, int level) |
| 88 | 88 |
{
|
| 89 | 89 |
found = true; |
| 90 | 90 |
#ifdef _WIN32 |
| 91 |
- auto libxSF = std::unique_ptr<XSFFile>(new XSFFile(ConvertFuncs::StringToWString(ExtractDirectoryFromPath(xSFToLoad->GetFilename()) + xSFToLoad->GetTagValue(libTag)), 8, 12)); |
|
| 91 |
+ auto libxSF = std::make_unique<XSFFile>(ConvertFuncs::StringToWString(ExtractDirectoryFromPath(xSFToLoad->GetFilename()) + xSFToLoad->GetTagValue(libTag)), 8, 12); |
|
| 92 | 92 |
#else |
| 93 |
- auto libxSF = std::unique_ptr<XSFFile>(new XSFFile(ExtractDirectoryFromPath(xSFToLoad->GetFilename()) + xSFToLoad->GetTagValue(libTag), 8, 12)); |
|
| 93 |
+ auto libxSF = std::make_unique<XSFFile>(ExtractDirectoryFromPath(xSFToLoad->GetFilename()) + xSFToLoad->GetTagValue(libTag), 8, 12); |
|
| 94 | 94 |
#endif |
| 95 | 95 |
if (!this->RecursiveLoadNCSF(libxSF.get(), level + 1)) |
| 96 | 96 |
return false; |
| ... | ... |
@@ -167,9 +167,9 @@ static bool RecursiveLoadSNSF(XSFFile *xSF, int level) |
| 167 | 167 |
if (level <= 10 && xSF->GetTagExists("_lib"))
|
| 168 | 168 |
{
|
| 169 | 169 |
#ifdef _WIN32 |
| 170 |
- auto libxSF = std::unique_ptr<XSFFile>(new XSFFile(ConvertFuncs::StringToWString(ExtractDirectoryFromPath(xSF->GetFilename()) + xSF->GetTagValue("_lib")), 4, 8));
|
|
| 170 |
+ auto libxSF = std::make_unique<XSFFile>(ConvertFuncs::StringToWString(ExtractDirectoryFromPath(xSF->GetFilename()) + xSF->GetTagValue("_lib")), 4, 8);
|
|
| 171 | 171 |
#else |
| 172 |
- auto libxSF = std::unique_ptr<XSFFile>(new XSFFile(ExtractDirectoryFromPath(xSF->GetFilename()) + xSF->GetTagValue("_lib"), 4, 8));
|
|
| 172 |
+ auto libxSF = std::make_unique<XSFFile>(ExtractDirectoryFromPath(xSF->GetFilename()) + xSF->GetTagValue("_lib"), 4, 8);
|
|
| 173 | 173 |
#endif |
| 174 | 174 |
if (!RecursiveLoadSNSF(libxSF.get(), level + 1)) |
| 175 | 175 |
return false; |
| ... | ... |
@@ -188,9 +188,9 @@ static bool RecursiveLoadSNSF(XSFFile *xSF, int level) |
| 188 | 188 |
{
|
| 189 | 189 |
found = true; |
| 190 | 190 |
#ifdef _WIN32 |
| 191 |
- auto libxSF = std::unique_ptr<XSFFile>(new XSFFile(ConvertFuncs::StringToWString(ExtractDirectoryFromPath(xSF->GetFilename()) + xSF->GetTagValue(libTag)), 4, 8)); |
|
| 191 |
+ auto libxSF = std::make_unique<XSFFile>(ConvertFuncs::StringToWString(ExtractDirectoryFromPath(xSF->GetFilename()) + xSF->GetTagValue(libTag)), 4, 8); |
|
| 192 | 192 |
#else |
| 193 |
- auto libxSF = std::unique_ptr<XSFFile>(new XSFFile(ExtractDirectoryFromPath(xSF->GetFilename()) + xSF->GetTagValue(libTag), 4, 8)); |
|
| 193 |
+ auto libxSF = std::make_unique<XSFFile>(ExtractDirectoryFromPath(xSF->GetFilename()) + xSF->GetTagValue(libTag), 4, 8); |
|
| 194 | 194 |
#endif |
| 195 | 195 |
if (!RecursiveLoadSNSF(libxSF.get(), level + 1)) |
| 196 | 196 |
return false; |
| ... | ... |
@@ -128,14 +128,14 @@ void getFileInfo(const in_char *file, in_char *title, int *length_in_ms) |
| 128 | 128 |
|
| 129 | 129 |
int infoBox(const in_char *file, HWND hwndParent) |
| 130 | 130 |
{
|
| 131 |
- auto xSF = std::unique_ptr<XSFFile>(new XSFFile()); |
|
| 131 |
+ auto xSF = std::make_unique<XSFFile>(); |
|
| 132 | 132 |
if (!file || !*file) |
| 133 | 133 |
*xSF = *xSFFile; |
| 134 | 134 |
else |
| 135 | 135 |
{
|
| 136 | 136 |
try |
| 137 | 137 |
{
|
| 138 |
- auto tmpxSF = std::unique_ptr<XSFFile>(new XSFFile(file)); |
|
| 138 |
+ auto tmpxSF = std::make_unique<XSFFile>(file); |
|
| 139 | 139 |
*xSF = *tmpxSF; |
| 140 | 140 |
} |
| 141 | 141 |
catch (const std::exception &) |