piwalker/melonDS
1
0
Fork 0
mirror of https://github.com/melonDS-emu/melonDS.git synced 2025-07-24 14:49:53 -06:00
Code Issues Packages Projects Releases Wiki Activity

remove some more shitty strings

Browse Source
This commit is contained in:
Arisotura
2021-11-17 20:57:30 +01:00
parent 5bb8f4c922
commit 13afaa0303
5 changed files with 32 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/frontend/qt_sdl/Platform.cpp
View File

@ -61,7 +61,7 @@
#endif
char* EmuDirectory;
std::string EmuDirectory;
void emuStop();
@ -90,35 +90,29 @@ void Init(int argc, char** argv)
}
if (len > 0)
{
EmuDirectory = new char[len+1];
strncpy(EmuDirectory, argv[0], len);
EmuDirectory[len] = '\0';
std::string emudir = argv[0];
EmuDirectory = emudir.substr(0, len);
}
else
{
EmuDirectory = new char[2];
strcpy(EmuDirectory, ".");
EmuDirectory = ".";
}
}
else
{
EmuDirectory = new char[2];
strcpy(EmuDirectory, ".");
EmuDirectory = ".";
}
#else
QString confdir;
QDir config(QStandardPaths::writableLocation(QStandardPaths::ConfigLocation));
config.mkdir("melonDS");
confdir = config.absolutePath() + "/melonDS/";
EmuDirectory = new char[confdir.length() + 1];
memcpy(EmuDirectory, confdir.toUtf8().data(), confdir.length());
EmuDirectory[confdir.length()] = '\0';
EmuDirectory = confdir.toStdString();
#endif
}
void DeInit()
{
delete[] EmuDirectory;
}
@ -197,7 +191,7 @@ std::string GetConfigString(ConfigEntry entry)
FILE* OpenFile(std::string path, std::string mode, bool mustexist)
{
QFile f(path.c_str());
QFile f(QString::fromStdString(path));
if (mustexist && !f.exists())
{
@ -231,24 +225,25 @@ FILE* OpenFile(std::string path, std::string mode, bool mustexist)
FILE* OpenLocalFile(std::string path, std::string mode)
{
QDir dir(path.c_str());
QString qpath = QString::fromStdString(path);
QDir dir(qpath);
QString fullpath;
if (dir.isAbsolute())
{
// If it's an absolute path, just open that.
fullpath = path.c_str();
fullpath = qpath;
}
else
{
#ifdef PORTABLE
fullpath = QString(EmuDirectory) + QDir::separator() + path.c_str();
fullpath = QString::fromStdString(EmuDirectory) + QDir::separator() + qpath;
#else
// Check user configuration directory
QDir config(QStandardPaths::writableLocation(QStandardPaths::GenericConfigLocation));
config.mkdir("melonDS");
fullpath = config.absolutePath() + "/melonDS/";
fullpath.append(path.c_str());
fullpath.append(qpath);
#endif
}