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

Switched to new DoublyLinkedList class.

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/trunk/current@11191 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Ingo Weinhold
2005-02-02 02:19:23 +00:00
parent 50d68edcf4
commit b0f7c84522
2 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
headers/private/kernel/boot/menu.h
+4 -6
View File
@@ -23,7 +23,7 @@ enum menu_item_type {
MENU_ITEM_SEPARATOR, MENU_ITEM_SEPARATOR,
}; };
class MenuItem { class MenuItem : public DoublyLinkedListLinkImpl<MenuItem> {
public: public:
MenuItem(const char *label = NULL, Menu *subMenu = NULL); MenuItem(const char *label = NULL, Menu *subMenu = NULL);
~MenuItem(); ~MenuItem();
@@ -52,8 +52,6 @@ class MenuItem {
const char *Label() const { return fLabel; } const char *Label() const { return fLabel; }
Menu *Submenu() const { return fSubMenu; } Menu *Submenu() const { return fSubMenu; }
DoublyLinked::Link fLink;
private: private:
friend class Menu; friend class Menu;
void SetMenu(Menu *menu); void SetMenu(Menu *menu);
@@ -69,8 +67,8 @@ class MenuItem {
const char *fHelpText; const char *fHelpText;
}; };
typedef DoublyLinked::List<MenuItem> MenuItemList; typedef DoublyLinkedList<MenuItem> MenuItemList;
typedef DoublyLinked::Iterator<MenuItem> MenuItemIterator; typedef MenuItemList::Iterator MenuItemIterator;
enum menu_type { enum menu_type {
MAIN_MENU = 1, MAIN_MENU = 1,
@@ -90,7 +88,7 @@ class Menu {
void Show() { fIsHidden = false; } void Show() { fIsHidden = false; }
bool IsHidden() const { return fIsHidden; } bool IsHidden() const { return fIsHidden; }
MenuItemIterator ItemIterator() { return fItems.Iterator(); } MenuItemIterator ItemIterator() { return fItems.GetIterator(); }
MenuItem *ItemAt(int32 index); MenuItem *ItemAt(int32 index);
int32 IndexOf(MenuItem *item); int32 IndexOf(MenuItem *item);
int32 CountItems() const; int32 CountItems() const;
src/kernel/boot/loader/menu.cpp
+2 -1
View File
@@ -155,7 +155,8 @@ Menu::~Menu()
// take all remaining items with us // take all remaining items with us
MenuItem *item; MenuItem *item;
while ((item = fItems.RemoveHead()) != NULL) { while ((item = fItems.Head()) != NULL) {
fItems.Remove(item);
delete item; delete item;
} }
} }