From 5d10a74cfb0cda1cd6253ac210dc9cea28faf700 Mon Sep 17 00:00:00 2001 From: John Scipione Date: Tue, 4 Mar 2014 14:23:51 -0500 Subject: [PATCH] BSeparatorItem: Style fix, rename archive to data ... missed it in a few places, trying to make variables names consistent. Update hrev in docs --- docs/user/interface/SeparatorItem.dox | 4 ++-- headers/os/interface/SeparatorItem.h | 2 +- src/kits/interface/SeparatorItem.cpp | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/docs/user/interface/SeparatorItem.dox b/docs/user/interface/SeparatorItem.dox index d78bfac3f1..065ef0168b 100644 --- a/docs/user/interface/SeparatorItem.dox +++ b/docs/user/interface/SeparatorItem.dox @@ -6,8 +6,8 @@ * John Scipione, jscipione@gmail.com * * Corresponds to: - * headers/os/interface/SeparatorItem.h hrev46969 - * src/kits/interface/SeparatorItem.cpp hrev46969 + * headers/os/interface/SeparatorItem.h hrev46970 + * src/kits/interface/SeparatorItem.cpp hrev46970 */ diff --git a/headers/os/interface/SeparatorItem.h b/headers/os/interface/SeparatorItem.h index ac102d852a..2c1af457ed 100644 --- a/headers/os/interface/SeparatorItem.h +++ b/headers/os/interface/SeparatorItem.h @@ -14,7 +14,7 @@ class BMessage; class BSeparatorItem : public BMenuItem { public: BSeparatorItem(); - BSeparatorItem(BMessage* archive); + BSeparatorItem(BMessage* data); virtual ~BSeparatorItem(); static BArchivable* Instantiate(BMessage* data); diff --git a/src/kits/interface/SeparatorItem.cpp b/src/kits/interface/SeparatorItem.cpp index ac9b8a67e0..ef4abf794c 100644 --- a/src/kits/interface/SeparatorItem.cpp +++ b/src/kits/interface/SeparatorItem.cpp @@ -43,10 +43,10 @@ BSeparatorItem::Archive(BMessage* data, bool deep) const BArchivable* -BSeparatorItem::Instantiate(BMessage* archive) +BSeparatorItem::Instantiate(BMessage* data) { - if (validate_instantiation(archive, "BSeparatorItem")) - return new BSeparatorItem(archive); + if (validate_instantiation(data, "BSeparatorItem")) + return new BSeparatorItem(data); return NULL; }