Skip to content
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

fixed compiler warnings #288

Merged
merged 2 commits into from
Feb 16, 2024
Merged

fixed compiler warnings #288

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dd16f39
fixed compiler warnings
kyomawolf Feb 16, 2024
ea4ff37
#244 updated Example
kyomawolf Feb 16, 2024
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
2 changes: 1 addition & 1 deletion include/AutomationEventList.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ class AutomationEventList : public ::AutomationEventList {
}

void Play(int index) {
if (index < 0 || index >= this->count) {
if (index < 0 || static_cast<unsigned int>(index) >= this->count) {
return;
}

Expand Down
92 changes: 46 additions & 46 deletions include/Functions.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,56 +21,56 @@ namespace raylib {
/**
* Initialize window and OpenGL context
*/
RLCPPAPI inline void InitWindow(int width, int height, const std::string& title = "raylib") {
[[maybe_unused]] RLCPPAPI inline void InitWindow(int width, int height, const std::string& title = "raylib") {
::InitWindow(width, height, title.c_str());
}

/**
* Set title for window
*/
RLCPPAPI inline void SetWindowTitle(const std::string& title) {
[[maybe_unused]] RLCPPAPI inline void SetWindowTitle(const std::string& title) {
::SetWindowTitle(title.c_str());
}

/**
* Get the human-readable, UTF-8 encoded name of the primary monitor
*/
RLCPPAPI inline std::string GetMonitorName(int monitor = 0) {
[[maybe_unused]] RLCPPAPI inline std::string GetMonitorName(int monitor = 0) {
return ::GetMonitorName(monitor);
}

/**
* Set clipboard text content
*/
RLCPPAPI inline void SetClipboardText(const std::string& text) {
[[maybe_unused]] RLCPPAPI inline void SetClipboardText(const std::string& text) {
::SetClipboardText(text.c_str());
}

/**
* Get clipboard text content
*/
RLCPPAPI inline std::string GetClipboardText() {
[[maybe_unused]] RLCPPAPI inline std::string GetClipboardText() {
return ::GetClipboardText();
}

/**
* Takes a screenshot of current screen (saved a .png)
*/
RLCPPAPI inline void TakeScreenshot(const std::string& fileName) {
[[maybe_unused]] RLCPPAPI inline void TakeScreenshot(const std::string& fileName) {
::TakeScreenshot(fileName.c_str());
}

/**
* Get gamepad internal name id
*/
RLCPPAPI inline std::string GetGamepadName(int gamepad) {
[[maybe_unused]] RLCPPAPI inline std::string GetGamepadName(int gamepad) {
return ::GetGamepadName(gamepad);
}

/**
* Load text data from file (read)
*/
RLCPPAPI std::string LoadFileText(const std::string& fileName) {
[[maybe_unused]] RLCPPAPI std::string LoadFileText(const std::string& fileName) {
char* text = ::LoadFileText(fileName.c_str());
std::string output(text);
::UnloadFileText(text);
Expand All @@ -80,77 +80,77 @@ RLCPPAPI std::string LoadFileText(const std::string& fileName) {
/**
* Save text data to file (write)
*/
RLCPPAPI inline bool SaveFileText(const std::string& fileName, const std::string& text) {
[[maybe_unused]] RLCPPAPI inline bool SaveFileText(const std::string& fileName, const std::string& text) {
return ::SaveFileText(fileName.c_str(), const_cast<char*>(text.c_str()));
}

/**
* Check if file exists
*/
RLCPPAPI inline bool FileExists(const std::string& fileName) {
[[maybe_unused]] RLCPPAPI inline bool FileExists(const std::string& fileName) {
return ::FileExists(fileName.c_str());
}

/**
* Check if directory path exists
*/
RLCPPAPI inline bool DirectoryExists(const std::string& dirPath) {
[[maybe_unused]] RLCPPAPI inline bool DirectoryExists(const std::string& dirPath) {
return ::DirectoryExists(dirPath.c_str());
}

/**
* Check file extension (including point: .png, .wav)
*/
RLCPPAPI inline bool IsFileExtension(const std::string& fileName, const std::string& ext) {
[[maybe_unused]] RLCPPAPI inline bool IsFileExtension(const std::string& fileName, const std::string& ext) {
return ::IsFileExtension(fileName.c_str(), ext.c_str());
}

/**
* Get pointer to extension for a filename string (including point: ".png")
*/
RLCPPAPI inline std::string GetFileExtension(const std::string& fileName) {
[[maybe_unused]] RLCPPAPI inline std::string GetFileExtension(const std::string& fileName) {
return ::GetFileExtension(fileName.c_str());
}

/**
* Get pointer to filename for a path string
*/
RLCPPAPI inline std::string GetFileName(const std::string& filePath) {
[[maybe_unused]] RLCPPAPI inline std::string GetFileName(const std::string& filePath) {
return ::GetFileName(filePath.c_str());
}

/**
* Get filename string without extension
*/
RLCPPAPI inline std::string GetFileNameWithoutExt(const std::string& filePath) {
[[maybe_unused]] RLCPPAPI inline std::string GetFileNameWithoutExt(const std::string& filePath) {
return ::GetFileNameWithoutExt(filePath.c_str());
}

/**
* Get full path for a given fileName with path
*/
RLCPPAPI inline std::string GetDirectoryPath(const std::string& filePath) {
[[maybe_unused]] RLCPPAPI inline std::string GetDirectoryPath(const std::string& filePath) {
return ::GetDirectoryPath(filePath.c_str());
}

/**
* Get previous directory path for a given path
*/
RLCPPAPI inline std::string GetPrevDirectoryPath(const std::string& dirPath) {
[[maybe_unused]] RLCPPAPI inline std::string GetPrevDirectoryPath(const std::string& dirPath) {
return ::GetPrevDirectoryPath(dirPath.c_str());
}

/**
* Get current working directory
*/
RLCPPAPI inline std::string GetWorkingDirectory() {
[[maybe_unused]] RLCPPAPI inline std::string GetWorkingDirectory() {
return ::GetWorkingDirectory();
}

/**
* Get filenames in a directory path
*/
RLCPPAPI std::vector<std::string> LoadDirectoryFiles(const std::string& dirPath) {
[[maybe_unused]] RLCPPAPI std::vector<std::string> LoadDirectoryFiles(const std::string& dirPath) {
FilePathList files = ::LoadDirectoryFiles(dirPath.c_str());
std::vector<std::string> output(files.paths, files.paths + files.count);
::UnloadDirectoryFiles(files);
Expand All @@ -160,14 +160,14 @@ RLCPPAPI std::vector<std::string> LoadDirectoryFiles(const std::string& dirPath)
/**
* Change working directory, return true on success
*/
RLCPPAPI inline bool ChangeDirectory(const std::string& dir) {
[[maybe_unused]] RLCPPAPI inline bool ChangeDirectory(const std::string& dir) {
return ::ChangeDirectory(dir.c_str());
}

/**
* Get dropped files names
*/
RLCPPAPI std::vector<std::string> LoadDroppedFiles() {
[[maybe_unused]] RLCPPAPI std::vector<std::string> LoadDroppedFiles() {
if (!::IsFileDropped()) {
return std::vector<std::string>();
}
Expand All @@ -180,28 +180,28 @@ RLCPPAPI std::vector<std::string> LoadDroppedFiles() {
/**
* Get file modification time (last write time)
*/
RLCPPAPI inline long GetFileModTime(const std::string& fileName) { // NOLINT
[[maybe_unused]] RLCPPAPI inline long GetFileModTime(const std::string& fileName) { // NOLINT
return ::GetFileModTime(fileName.c_str());
}

/**
* Open URL with default system browser (if available)
*/
RLCPPAPI inline void OpenURL(const std::string& url) {
[[maybe_unused]] RLCPPAPI inline void OpenURL(const std::string& url) {
return ::OpenURL(url.c_str());
}

/**
* Load an image.
*/
RLCPPAPI inline ::Image LoadImage(const std::string& fileName) {
[[maybe_unused]] RLCPPAPI inline ::Image LoadImage(const std::string& fileName) {
return ::LoadImage(fileName.c_str());
}

/**
* Load an image from RAW file data
*/
RLCPPAPI inline ::Image LoadImageRaw(const std::string& fileName,
[[maybe_unused]] RLCPPAPI inline ::Image LoadImageRaw(const std::string& fileName,
int width, int height,
int format, int headerSize) {
return ::LoadImageRaw(fileName.c_str(), width, height, format, headerSize);
Expand All @@ -210,14 +210,14 @@ RLCPPAPI inline ::Image LoadImageRaw(const std::string& fileName,
/**
* Load animated image data
*/
RLCPPAPI inline ::Image LoadImageAnim(const std::string& fileName, int *frames) {
[[maybe_unused]] RLCPPAPI inline ::Image LoadImageAnim(const std::string& fileName, int *frames) {
return ::LoadImageAnim(fileName.c_str(), frames);
}

/**
* Load image from memory buffer, fileType refers to extension like "png"
*/
RLCPPAPI inline ::Image LoadImageFromMemory(const std::string& fileType,
[[maybe_unused]] RLCPPAPI inline ::Image LoadImageFromMemory(const std::string& fileType,
const unsigned char *fileData,
int dataSize) {
return ::LoadImageFromMemory(fileType.c_str(), fileData, dataSize);
Expand All @@ -226,86 +226,86 @@ RLCPPAPI inline ::Image LoadImageFromMemory(const std::string& fileType,
/**
* Export image data to file
*/
RLCPPAPI inline bool ExportImage(const Image& image, const std::string& fileName) {
[[maybe_unused]] RLCPPAPI inline bool ExportImage(const Image& image, const std::string& fileName) {
return ::ExportImage(image, fileName.c_str());
}

/**
* Export image as code file (.h) defining an array of bytes
*/
RLCPPAPI inline bool ExportImageAsCode(const Image& image, const std::string& fileName) {
[[maybe_unused]] RLCPPAPI inline bool ExportImageAsCode(const Image& image, const std::string& fileName) {
return ::ExportImageAsCode(image, fileName.c_str());
}

/**
* Draw text (using default font)
*/
RLCPPAPI inline void DrawText(const std::string& text, int posX, int posY, int fontSize, ::Color color) {
[[maybe_unused]] RLCPPAPI inline void DrawText(const std::string& text, int posX, int posY, int fontSize, ::Color color) {
::DrawText(text.c_str(), posX, posY, fontSize, color);
}

/**
* Draw text using font and additional parameters
*/
RLCPPAPI inline void DrawTextEx(const Font& font, const std::string& text, Vector2 position,
[[maybe_unused]] RLCPPAPI inline void DrawTextEx(const Font& font, const std::string& text, Vector2 position,
float fontSize, float spacing, ::Color tint) {
::DrawTextEx(font, text.c_str(), position, fontSize, spacing, tint);
}

/**
* Draw text using Font and pro parameters (rotation)
*/
RLCPPAPI inline void DrawTextPro(const Font& font, const std::string& text, Vector2 position,
[[maybe_unused]] RLCPPAPI inline void DrawTextPro(const Font& font, const std::string& text, Vector2 position,
Vector2 origin, float rotation, float fontSize, float spacing, ::Color tint) {
::DrawTextPro(font, text.c_str(), position, origin, rotation, fontSize, spacing, tint);
}

/**
* Load font from file (filename must include file extension)
*/
RLCPPAPI inline ::Font LoadFont(const std::string& fileName) {
[[maybe_unused]] RLCPPAPI inline ::Font LoadFont(const std::string& fileName) {
return ::LoadFont(fileName.c_str());
}

/**
* Load font from file (filename must include file extension)
*/
RLCPPAPI inline ::Font LoadFontEx(const std::string& fileName, int fontSize, int *fontChars, int charsCount) {
[[maybe_unused]] RLCPPAPI inline ::Font LoadFontEx(const std::string& fileName, int fontSize, int *fontChars, int charsCount) {
return ::LoadFontEx(fileName.c_str(), fontSize, fontChars, charsCount);
}

/**
* Measure string width for default font
*/
RLCPPAPI inline int MeasureText(const std::string& text, int fontSize) {
[[maybe_unused]] RLCPPAPI inline int MeasureText(const std::string& text, int fontSize) {
return ::MeasureText(text.c_str(), fontSize);
}

/**
* Check if two text string are equal
*/
RLCPPAPI inline bool TextIsEqual(const std::string& text1, const std::string& text2) {
[[maybe_unused]] RLCPPAPI inline bool TextIsEqual(const std::string& text1, const std::string& text2) {
return ::TextIsEqual(text1.c_str(), text2.c_str());
}

/**
* Check if two text string are equal
*/
RLCPPAPI inline unsigned int TextLength(const std::string& text) {
[[maybe_unused]] RLCPPAPI inline unsigned int TextLength(const std::string& text) {
return ::TextLength(text.c_str());
}

/**
* Get text length, checks for '\0' ending
*/
RLCPPAPI inline std::string TextSubtext(const std::string& text, int position, int length) {
[[maybe_unused]] RLCPPAPI inline std::string TextSubtext(const std::string& text, int position, int length) {
return ::TextSubtext(text.c_str(), position, length);
}

/**
* Replace text string
*/
RLCPPAPI std::string TextReplace(const std::string& text, const std::string& replace, const std::string& by) {
[[maybe_unused]] RLCPPAPI std::string TextReplace(const std::string& text, const std::string& replace, const std::string& by) {
const char* input = text.c_str();
char* output = ::TextReplace(const_cast<char*>(input), replace.c_str(), by.c_str());
if (output != NULL) {
Expand All @@ -319,7 +319,7 @@ RLCPPAPI std::string TextReplace(const std::string& text, const std::string& rep
/**
* Insert text in a position
*/
RLCPPAPI std::string TextInsert(const std::string& text, const std::string& insert, int position) {
[[maybe_unused]] RLCPPAPI std::string TextInsert(const std::string& text, const std::string& insert, int position) {
char* output = ::TextInsert(text.c_str(), insert.c_str(), position);
if (output != NULL) {
std::string stringOutput(output);
Expand All @@ -332,7 +332,7 @@ RLCPPAPI std::string TextInsert(const std::string& text, const std::string& inse
/**
* Split text into multiple strings
*/
RLCPPAPI std::vector<std::string> TextSplit(const std::string& text, char delimiter) {
[[maybe_unused]] RLCPPAPI std::vector<std::string> TextSplit(const std::string& text, char delimiter) {
int count;
const char** split = ::TextSplit(text.c_str(), delimiter, &count);
return std::vector<std::string>(split, split + count);
Expand All @@ -341,35 +341,35 @@ RLCPPAPI std::vector<std::string> TextSplit(const std::string& text, char delimi
/**
* Find first text occurrence within a string
*/
RLCPPAPI inline int TextFindIndex(const std::string& text, const std::string& find) {
[[maybe_unused]] RLCPPAPI inline int TextFindIndex(const std::string& text, const std::string& find) {
return ::TextFindIndex(text.c_str(), find.c_str());
}

/**
* Get upper case version of provided string
*/
RLCPPAPI inline std::string TextToUpper(const std::string& text) {
[[maybe_unused]] RLCPPAPI inline std::string TextToUpper(const std::string& text) {
return ::TextToUpper(text.c_str());
}

/**
* Get lower case version of provided string
*/
RLCPPAPI inline std::string TextToLower(const std::string& text) {
[[maybe_unused]] RLCPPAPI inline std::string TextToLower(const std::string& text) {
return ::TextToLower(text.c_str());
}

/**
* Get Pascal case notation version of provided string
*/
RLCPPAPI inline std::string TextToPascal(const std::string& text) {
[[maybe_unused]] RLCPPAPI inline std::string TextToPascal(const std::string& text) {
return ::TextToPascal(text.c_str());
}

/**
* Get integer value from text (negative values not supported)
*/
RLCPPAPI inline int TextToInteger(const std::string& text) {
[[maybe_unused]] RLCPPAPI inline int TextToInteger(const std::string& text) {
return ::TextToInteger(text.c_str());
}

Expand Down
Loading
Loading