From 8d7c9617f10ae6d0757f4b69ed6a17abef30e1e7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Duval?= Date: Sun, 8 Aug 2010 00:08:10 +0000 Subject: [PATCH] CID 1318: IconView::Invoke() should match BControl::Invoke() signature. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@37965 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/preferences/filetypes/IconView.cpp | 10 ++++------ src/preferences/filetypes/IconView.h | 2 +- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/src/preferences/filetypes/IconView.cpp b/src/preferences/filetypes/IconView.cpp index b07b60c9bc..0af0616b3e 100644 --- a/src/preferences/filetypes/IconView.cpp +++ b/src/preferences/filetypes/IconView.cpp @@ -1131,14 +1131,12 @@ IconView::SetModificationMessage(BMessage* message) status_t -IconView::Invoke(const BMessage* _message) +IconView::Invoke(BMessage* message) { - if (_message == NULL) + if (message == NULL) fTarget.SendMessage(kMsgIconInvoked); - else { - BMessage message(*_message); - fTarget.SendMessage(&message); - } + else + fTarget.SendMessage(message); return B_OK; } diff --git a/src/preferences/filetypes/IconView.h b/src/preferences/filetypes/IconView.h index f65ab1ced0..f321bd9393 100644 --- a/src/preferences/filetypes/IconView.h +++ b/src/preferences/filetypes/IconView.h @@ -98,7 +98,7 @@ class IconView : public BControl { void ShowEmptyFrame(bool show); status_t SetTarget(const BMessenger& target); void SetModificationMessage(BMessage* message); - status_t Invoke(const BMessage* message = NULL); + status_t Invoke(BMessage* message = NULL); ::Icon* Icon(); int32 IconSize() const { return fIconSize; }