Skip to content

Fixes for msvc warnings 4242 and 4800 #21

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
MennoVink wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fixes for msvc warnings 4242 and 4800 #21

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 11 additions & 7 deletions ImFileDialog.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,10 @@
#define DEFAULT_ICON_SIZE 32
#define PI 3.141592f

static char tolowerc( char value )
{
return (char)::tolower( value );
}
namespace ifd {
static const char* GetDefaultFolderIcon();
static const char* GetDefaultFileIcon();
Expand Down Expand Up @@ -969,8 +973,8 @@ namespace ifd {

std::string filenameSearch = filename;
std::string query(m_searchBuffer);
std::transform(filenameSearch.begin(), filenameSearch.end(), filenameSearch.begin(), ::tolower);
std::transform(query.begin(), query.end(), query.begin(), ::tolower);
std::transform(filenameSearch.begin(), filenameSearch.end(), filenameSearch.begin(), ::tolowerc);
std::transform(query.begin(), query.end(), query.begin(), ::tolowerc);

if (filenameSearch.find(query, 0) == std::string::npos)
continue;
Expand Down Expand Up @@ -1022,8 +1026,8 @@ namespace ifd {
std::string lName = left.Path.u8string();
std::string rName = right.Path.u8string();

std::transform(lName.begin(), lName.end(), lName.begin(), ::tolower);
std::transform(rName.begin(), rName.end(), rName.begin(), ::tolower);
std::transform(lName.begin(), lName.end(), lName.begin(), ::tolowerc);
std::transform(rName.begin(), rName.end(), rName.begin(), ::tolowerc);

int comp = lName.compare(rName);

Expand Down Expand Up @@ -1117,7 +1121,7 @@ namespace ifd {
if (filename.size() == 0)
filename = entry.Path.u8string(); // drive

bool isSelected = std::count(m_selections.begin(), m_selections.end(), entry.Path);
bool isSelected = std::count(m_selections.begin(), m_selections.end(), entry.Path) > 0;

ImGui::TableNextRow();

Expand Down Expand Up @@ -1174,7 +1178,7 @@ namespace ifd {
if (filename.size() == 0)
filename = entry.Path.u8string(); // drive

bool isSelected = std::count(m_selections.begin(), m_selections.end(), entry.Path);
bool isSelected = std::count(m_selections.begin(), m_selections.end(), entry.Path) > 0;

if (FileIcon(filename.c_str(), isSelected, entry.HasIconPreview ? entry.IconPreview : (ImTextureID)m_getIcon(entry.Path), ImVec2(32 + 16 * m_zoom, 32 + 16 * m_zoom), entry.HasIconPreview, entry.IconPreviewWidth, entry.IconPreviewHeight)) {
std::error_code ec;
Expand Down Expand Up @@ -1315,7 +1319,7 @@ namespace ifd {
m_setDirectory(curDirCopy);
ImGui::SameLine();

if (FavoriteButton("##dirfav", std::count(m_favorites.begin(), m_favorites.end(), m_currentDirectory.u8string()))) {
if (FavoriteButton("##dirfav", std::count(m_favorites.begin(), m_favorites.end(), m_currentDirectory.u8string()) > 0)) {
if (std::count(m_favorites.begin(), m_favorites.end(), m_currentDirectory.u8string()))
RemoveFavorite(m_currentDirectory.u8string());
else
Expand Down
2 changes: 1 addition & 1 deletion ImFileDialog.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ namespace ifd {

bool IsDone(const std::string& key);

inline bool HasResult() { return m_result.size(); }
inline bool HasResult() { return m_result.size() > 0; }
inline const std::filesystem::path& GetResult() { return m_result[0]; }
inline const std::vector<std::filesystem::path>& GetResults() { return m_result; }

Expand Down