[haiku-commits] haiku: hrev45783 - src/apps/people
- From: stpere@xxxxxxxxx
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Sun, 23 Jun 2013 19:48:24 +0200 (CEST)
hrev45783 adds 1 changeset to branch 'master'
old head: dc5cd9e4db3c59a29af5a827d8ce1251dd5de0c5
new head: 89d2bf3aa73d4479920cf065c69ad71770a34494
overview: http://cgit.haiku-os.org/haiku/log/?qt=range&q=89d2bf3+%5Edc5cd9e
----------------------------------------------------------------------------
89d2bf3: People: allocate BFile on stack
[ Philippe Saint-Pierre <stpere@xxxxxxxxx> ]
----------------------------------------------------------------------------
Revision: hrev45783
Commit: 89d2bf3aa73d4479920cf065c69ad71770a34494
URL: http://cgit.haiku-os.org/haiku/commit/?id=89d2bf3
Author: Philippe Saint-Pierre <stpere@xxxxxxxxx>
Date: Sun Jun 23 17:46:42 2013 UTC
----------------------------------------------------------------------------
1 file changed, 7 insertions(+), 10 deletions(-)
src/apps/people/PersonView.cpp | 17 +++++++----------
----------------------------------------------------------------------------
diff --git a/src/apps/people/PersonView.cpp b/src/apps/people/PersonView.cpp
index 2cf3484..9d25a22 100644
--- a/src/apps/people/PersonView.cpp
+++ b/src/apps/people/PersonView.cpp
@@ -292,11 +292,9 @@ PersonView::IsSaved() const
void
PersonView::Save()
{
- BFile* file = new(std::nothrow) BFile(fRef, B_READ_WRITE);
- if (file == NULL || file->InitCheck() != B_NO_ERROR) {
- delete file;
+ BFile file(fRef, B_READ_WRITE);
+ if (file.InitCheck() != B_NO_ERROR)
return;
- }
fSaving = true;
@@ -304,7 +302,7 @@ PersonView::Save()
for (int32 i = 0; i < count; i++) {
AttributeTextControl* control = fControls.ItemAt(i);
const char* value = control->Text();
- file->WriteAttr(control->Attribute().String(), B_STRING_TYPE, 0,
+ file.WriteAttr(control->Attribute().String(), B_STRING_TYPE, 0,
value, strlen(value) + 1);
control->Update();
}
@@ -312,8 +310,8 @@ PersonView::Save()
// Write the picture, if any, in the person file content
if (fPictureView) {
// Trim any previous content
- file->Seek(0, SEEK_SET);
- file->SetSize(0);
+ file.Seek(0, SEEK_SET);
+ file.SetSize(0);
BBitmap* picture = fPictureView->Bitmap();
if (picture) {
@@ -323,7 +321,7 @@ PersonView::Save()
stream.DetachBitmap(&picture);
BTranslatorRoster* roster =
BTranslatorRoster::Default();
- roster->Translate(&stream, NULL, NULL, file,
+ roster->Translate(&stream, NULL, NULL, &file,
fPictureView->SuggestedType(),
B_TRANSLATOR_BITMAP,
fPictureView->SuggestedMIMEType());
@@ -332,10 +330,9 @@ PersonView::Save()
fPictureView->Update();
}
- file->GetModificationTime(&fLastModificationTime);
+ file.GetModificationTime(&fLastModificationTime);
fSaving = false;
- delete file;
}
Other related posts:
- » [haiku-commits] haiku: hrev45783 - src/apps/people - stpere
