i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

showimage,stylededit: remove bs_printf

Browse Source 
Change-Id: If5d562376f8a889aa482f300d817e17272deb29e
Reviewed-on: https://review.haiku-os.org/c/haiku/+/10453
Reviewed-by: waddlesplash <[email protected]>
Tested-by: Commit checker robot <[email protected]>
Reviewed-by: humdinger humdinger <[email protected]>
This commit is contained in:
Pascal Abresch
2026-03-10 14:11:18 +00:00
committed by waddlesplash
parent 32a55535a4
commit 7e7ae37854
2 changed files with 39 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/apps/showimage/ShowImageWindow.cpp
+9 -24
View File
@@ -110,22 +110,6 @@ enum {
};
// This is temporary solution for building BString with printf like format.
// will be removed in the future.
static void
bs_printf(BString* string, const char* format, ...)
{
va_list ap;
char* buf;
va_start(ap, format);
vasprintf(&buf, format, ap);
string->SetTo(buf);
free(buf);
va_end(ap);
}
// #pragma mark -- ShowImageWindow
@@ -1305,15 +1289,16 @@ ShowImageWindow::_ClosePrompt()
BString prompt;
if (count > 1) {
bs_printf(&prompt,
B_TRANSLATE("The document '%s' (page %d) has been changed. Do you "
"want to close the document?"),
fImageView->Image()->name, page);
BString pageString;
pageString << page;
prompt = B_TRANSLATE("The document '%filename%' (page %number%)"
" has been changed. Do you want to close the document?");
prompt.ReplaceFirst("%filename%", fImageView->Image()->name);
prompt.ReplaceFirst("%number%", pageString);
} else {
bs_printf(&prompt,
B_TRANSLATE("The document '%s' has been changed. Do you want to "
"close the document?"),
fImageView->Image()->name);
prompt = B_TRANSLATE("The document '%filename%' has been changed."
" Do you want to close the document?"),
prompt.ReplaceFirst("%filename%", fImageView->Image()->name);
}
BAlert* alert = new BAlert(B_TRANSLATE("Close document"), prompt.String(),
src/apps/stylededit/StyledEditWindow.cpp
+30 -43
View File
@@ -65,21 +65,6 @@ const char* kInfoAttributeName = "StyledEdit-info";
#define B_TRANSLATION_CONTEXT "StyledEditWindow"
// This is a temporary solution for building BString with printf like format.
// will be removed in the future.
static void
bs_printf(BString* string, const char* format, ...)
{
va_list ap;
va_start(ap, format);
char* buf;
vasprintf(&buf, format, ap);
string->SetTo(buf);
free(buf);
va_end(ap);
}
// #pragma mark -
@@ -146,9 +131,9 @@ StyledEditWindow::QuitRequested()
if (fTextView->TextLength() == 0 && fSaveMessage == NULL)
return true;
BString alertText;
bs_printf(&alertText,
B_TRANSLATE("Save changes to the document \"%s\"? "), Title());
BString alertText =
B_TRANSLATE("Save changes to the document \"%title%\"?");
alertText.ReplaceFirst("%title%", Title());
int32 index = _ShowAlert(alertText, B_TRANSLATE("Cancel"),
B_TRANSLATE("Don't save"), B_TRANSLATE("Save"), B_WARNING_ALERT);
@@ -672,11 +657,10 @@ StyledEditWindow::MessageReceived(BMessage* message)
{
status_t status = _UnlockFile();
if (status != B_OK) {
BString text;
bs_printf(&text,
B_TRANSLATE("Unable to unlock file\n\t%s"),
strerror(status));
_ShowAlert(text, B_TRANSLATE("OK"), "", "", B_STOP_ALERT);
BString alertText
= B_TRANSLATE("Unable to unlock file\n\t%error%");
alertText.ReplaceFirst("%error%", strerror(status));
_ShowAlert(alertText, B_TRANSLATE("OK"), "", "", B_STOP_ALERT);
}
PostMessage(UPDATE_STATUS);
break;
@@ -854,9 +838,9 @@ StyledEditWindow::Save(BMessage* message)
if (!((getuid() == st.st_uid && (S_IWUSR & st.st_mode))
|| (getgid() == st.st_gid && (S_IWGRP & st.st_mode))
|| (S_IWOTH & st.st_mode))) {
BString alertText;
bs_printf(&alertText, B_TRANSLATE("This file is marked "
"read-only. Save changes to the document \"%s\"? "), name);
BString alertText = B_TRANSLATE("This file is marked read-only."
" Save changes to the document \"%filename%\"? ");
alertText.ReplaceFirst("%filename%", name);
switch (_ShowAlert(alertText, B_TRANSLATE("Cancel"),
B_TRANSLATE("Don't save"),
B_TRANSLATE("Save"), B_WARNING_ALERT)) {
@@ -874,9 +858,10 @@ StyledEditWindow::Save(BMessage* message)
}
if (status != B_OK) {
BString alertText;
bs_printf(&alertText, B_TRANSLATE("Error saving \"%s\":\n%s"), name,
strerror(status));
BString alertText =
B_TRANSLATE("Error saving \"%filename%\":\n%error%");
alertText.ReplaceFirst("%filename%", name);
alertText.ReplaceFirst("%error%", strerror(status));
_ShowAlert(alertText, B_TRANSLATE("OK"), "", "", B_STOP_ALERT);
return status;
@@ -1551,19 +1536,21 @@ StyledEditWindow::_LoadFile(entry_ref* ref, const char* forceEncoding)
}
if (status != B_OK) {
// If an error occured, bail out and tell the user what happened
BEntry entry(ref, true);
char name[B_FILE_NAME_LENGTH];
if (entry.GetName(name) != B_OK)
strlcpy(name, B_TRANSLATE("???"), sizeof(name));
BString text;
if (status == B_BAD_TYPE)
bs_printf(&text,
B_TRANSLATE("Error loading \"%s\":\n\tUnsupported format"), name);
else
bs_printf(&text, B_TRANSLATE("Error loading \"%s\":\n\t%s"),
name, strerror(status));
if (status == B_BAD_TYPE) {
text = B_TRANSLATE("Error loading \"%filename%\""
":\n\tUnsupported format");
text.ReplaceFirst("%filename%", name);
} else {
text = B_TRANSLATE("Error loading \"%filename%\":\n\t%error%");
text.ReplaceFirst("%filename%", name);
text.ReplaceFirst("%error%", strerror(status));
}
_ShowAlert(text, B_TRANSLATE("OK"), "", "", B_STOP_ALERT);
return status;
@@ -1624,18 +1611,18 @@ StyledEditWindow::_ReloadDocument(BMessage* message)
status = entry.GetRef(&ref);
if (status != B_OK || !entry.Exists()) {
BString alertText;
bs_printf(&alertText,
B_TRANSLATE("Cannot revert, file not found: \"%s\"."), name);
BString alertText =
B_TRANSLATE("Cannot revert, file not found: \"%filename%\".");
alertText.ReplaceFirst("%filename%", name);
_ShowAlert(alertText, B_TRANSLATE("OK"), "", "", B_STOP_ALERT);
return;
}
if (!fClean) {
BString alertText;
bs_printf(&alertText,
B_TRANSLATE("\"%s\" has unsaved changes.\n"
"Revert it to the last saved version? "), Title());
BString alertText = B_TRANSLATE("\"%title%\" has unsaved changes.\n"
"Revert it to the last saved version?");
alertText.ReplaceFirst("%title%", Title());
if (_ShowAlert(alertText, B_TRANSLATE("Cancel"), B_TRANSLATE("Revert"),
"", B_WARNING_ALERT) != 1)
return;