history-museum/winamp
1
0
Fork 0
mirror of https://github.com/WinampDesktop/winamp.git synced 2025-06-18 03:25:46 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

Sync filesystem.h/path.h

Browse Source
This commit is contained in:
Connor McLaughlin
2022-07-08 21:57:06 +10:00
parent f89529015c
commit d2ca454576
50 changed files with 1395 additions and 1861 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/duckstation-qt/gamelistmodel.cpp
View File

@ -1,5 +1,6 @@
#include "gamelistmodel.h"
#include "common/file_system.h"
#include "common/path.h"
#include "common/string_util.h"
#include "core/system.h"
#include <QtCore/QDate>
@ -182,7 +183,7 @@ QVariant GameListModel::data(const QModelIndex& index, int role) const
case Column_FileTitle:
{
const std::string_view file_title(FileSystem::GetFileTitleFromPath(ge.path));
const std::string_view file_title(Path::GetFileTitle(ge.path));
return QString::fromUtf8(file_title.data(), static_cast<int>(file_title.length()));
}
@ -248,7 +249,7 @@ QVariant GameListModel::data(const QModelIndex& index, int role) const
case Column_FileTitle:
{
const std::string_view file_title(FileSystem::GetFileTitleFromPath(ge.path));
const std::string_view file_title(Path::GetFileTitle(ge.path));
return QString::fromUtf8(file_title.data(), static_cast<int>(file_title.length()));
}
@ -427,8 +428,8 @@ bool GameListModel::lessThan(const QModelIndex& left_index, const QModelIndex& r
case Column_FileTitle:
{
const std::string_view file_title_left(FileSystem::GetFileTitleFromPath(left.path));
const std::string_view file_title_right(FileSystem::GetFileTitleFromPath(right.path));
const std::string_view file_title_left(Path::GetFileTitle(left.path));
const std::string_view file_title_right(Path::GetFileTitle(right.path));
if (file_title_left == file_title_right)
return titlesLessThan(left_row, right_row);

3
src/duckstation-qt/qthostinterface.cpp
View File

@ -4,6 +4,7 @@
#include "common/byte_stream.h"
#include "common/file_system.h"
#include "common/log.h"
#include "common/path.h"
#include "common/string_util.h"
#include "core/cheats.h"
#include "core/controller.h"
@ -1153,7 +1154,7 @@ void QtHostInterface::populateGameListContextMenu(const GameListEntry* entry, QW
{
const std::string display_name(FileSystem::GetDisplayNameFromPath(entry->path));
paths[i] = QString::fromStdString(GetGameMemoryCardPath(
MemoryCard::SanitizeGameTitleForFileName(FileSystem::GetFileTitleFromPath(display_name)).c_str(), i));
MemoryCard::SanitizeGameTitleForFileName(Path::GetFileTitle(display_name)).c_str(), i));
}
break;
default: