mirror of https://github.com/OpenRCT2/OpenRCT2.git
Fix string errors and warnings
This commit is contained in:
parent
f1a8b32db4
commit
3fa764321e
|
@ -123,7 +123,12 @@ namespace OpenRCT2 { namespace Ui
|
||||||
(desc.Type == FILE_DIALOG_TYPE::OPEN) ? "--getopenfilename" :
|
(desc.Type == FILE_DIALOG_TYPE::OPEN) ? "--getopenfilename" :
|
||||||
"--getsavefilename";
|
"--getsavefilename";
|
||||||
std::string filter = GetKDialogFilterString(desc.Filters);
|
std::string filter = GetKDialogFilterString(desc.Filters);
|
||||||
std::string cmd = String::StdFormat("%s --title '%s' %s '%s/' ~ '%s'", executablePath, desc.Title, action, desc.InitialDirectory, filter);
|
std::string cmd = String::StdFormat("%s --title '%s' %s '%s/' ~ '%s'",
|
||||||
|
executablePath.c_str(),
|
||||||
|
desc.Title.c_str(),
|
||||||
|
action.c_str(),
|
||||||
|
desc.InitialDirectory.c_str(),
|
||||||
|
filter.c_str());
|
||||||
std::string output;
|
std::string output;
|
||||||
if (Execute(cmd, &output) != 0)
|
if (Execute(cmd, &output) != 0)
|
||||||
{
|
{
|
||||||
|
@ -140,7 +145,13 @@ namespace OpenRCT2 { namespace Ui
|
||||||
flags = "--confirm-overwrite --save";
|
flags = "--confirm-overwrite --save";
|
||||||
}
|
}
|
||||||
std::string filters = GetZenityFilterString(desc.Filters);
|
std::string filters = GetZenityFilterString(desc.Filters);
|
||||||
std::string cmd = String::StdFormat("%s %s --filename='%s/' %s --title='%s' / %s", executablePath, action, desc.InitialDirectory, flags, desc.Title, filters);
|
std::string cmd = String::StdFormat("%s %s --filename='%s/' %s --title='%s' / %s",
|
||||||
|
executablePath.c_str(),
|
||||||
|
action.c_str(),
|
||||||
|
desc.InitialDirectory.c_str(),
|
||||||
|
flags.c_str(),
|
||||||
|
desc.Title.c_str(),
|
||||||
|
filters.c_str());
|
||||||
std::string output;
|
std::string output;
|
||||||
if (Execute(cmd, &output) != 0)
|
if (Execute(cmd, &output) != 0)
|
||||||
{
|
{
|
||||||
|
@ -163,7 +174,7 @@ namespace OpenRCT2 { namespace Ui
|
||||||
}
|
}
|
||||||
else if (desc.Type == FILE_DIALOG_TYPE::SAVE && access(result.c_str(), F_OK) != -1 && dtype == DIALOG_TYPE::KDIALOG)
|
else if (desc.Type == FILE_DIALOG_TYPE::SAVE && access(result.c_str(), F_OK) != -1 && dtype == DIALOG_TYPE::KDIALOG)
|
||||||
{
|
{
|
||||||
std::string cmd = String::StdFormat("%s --yesno \"Overwrite %s?\"", executablePath, result.c_str());
|
std::string cmd = String::StdFormat("%s --yesno \"Overwrite %s?\"", executablePath.c_str(), result.c_str());
|
||||||
if (Execute(cmd) != 0)
|
if (Execute(cmd) != 0)
|
||||||
{
|
{
|
||||||
result = std::string();
|
result = std::string();
|
||||||
|
@ -181,7 +192,7 @@ namespace OpenRCT2 { namespace Ui
|
||||||
case DIALOG_TYPE::KDIALOG:
|
case DIALOG_TYPE::KDIALOG:
|
||||||
{
|
{
|
||||||
std::string output;
|
std::string output;
|
||||||
std::string cmd = String::Format("%s --title '%s' --getexistingdirectory /", executablePath.c_str(), title);
|
std::string cmd = String::Format("%s --title '%s' --getexistingdirectory /", executablePath.c_str(), title.c_str());
|
||||||
if (Execute(cmd, &output) == 0)
|
if (Execute(cmd, &output) == 0)
|
||||||
{
|
{
|
||||||
result = output;
|
result = output;
|
||||||
|
@ -191,7 +202,7 @@ namespace OpenRCT2 { namespace Ui
|
||||||
case DIALOG_TYPE::ZENITY:
|
case DIALOG_TYPE::ZENITY:
|
||||||
{
|
{
|
||||||
std::string output;
|
std::string output;
|
||||||
std::string cmd = String::Format("%s --title='%s' --file-selection --directory /", executablePath.c_str(), title);
|
std::string cmd = String::Format("%s --title='%s' --file-selection --directory /", executablePath.c_str(), title.c_str());
|
||||||
if (Execute(cmd, &output) == 0)
|
if (Execute(cmd, &output) == 0)
|
||||||
{
|
{
|
||||||
result = output;
|
result = output;
|
||||||
|
@ -243,7 +254,7 @@ namespace OpenRCT2 { namespace Ui
|
||||||
|
|
||||||
// Trim line breaks
|
// Trim line breaks
|
||||||
size_t outputLength = outputBuffer.size();
|
size_t outputLength = outputBuffer.size();
|
||||||
for (size_t i = outputBuffer.size() - 1; i >= 0; i--)
|
for (size_t i = outputLength - 1; i != SIZE_MAX; i--)
|
||||||
{
|
{
|
||||||
if (outputBuffer[i] == '\n')
|
if (outputBuffer[i] == '\n')
|
||||||
{
|
{
|
||||||
|
|
|
@ -234,6 +234,7 @@ public:
|
||||||
: _uiContext(uiContext),
|
: _uiContext(uiContext),
|
||||||
_hardwareDisplay(hardwareDisplay)
|
_hardwareDisplay(hardwareDisplay)
|
||||||
{
|
{
|
||||||
|
UNUSED(_uiContext); // Will be used in due course to retrieve window information
|
||||||
_drawingContext = new SoftwareDrawingContext(this);
|
_drawingContext = new SoftwareDrawingContext(this);
|
||||||
#ifdef __ENABLE_LIGHTFX__
|
#ifdef __ENABLE_LIGHTFX__
|
||||||
_lastLightFXenabled = (gConfigGeneral.enable_light_fx != 0);
|
_lastLightFXenabled = (gConfigGeneral.enable_light_fx != 0);
|
||||||
|
|
|
@ -251,6 +251,7 @@ public:
|
||||||
OpenGLDrawingEngine(IUiContext * uiContext)
|
OpenGLDrawingEngine(IUiContext * uiContext)
|
||||||
: _uiContext(uiContext)
|
: _uiContext(uiContext)
|
||||||
{
|
{
|
||||||
|
UNUSED(_uiContext); // Will be used in due course to retrieve window information
|
||||||
_drawingContext = new OpenGLDrawingContext(this);
|
_drawingContext = new OpenGLDrawingContext(this);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue