Ticket #7004: BIconRuleRemoveIcons.patch

src/preferences/notifications/IconRule.cpp

@@ -12 +12 @@
 #include <Message.h>
 #include <Bitmap.h>
 #include <Window.h>
-#include <List.h>
 
 #include "IconRule.h"
-#include "IconItem.h"
 
 const int32 kEdgeOffset = 8;
 const int32 kBorderOffset = 1;
@@ -27 +25 @@
     BView(name, B_WILL_DRAW),
     fSelIndex(-1)
 {
-    fIcons = new BList();
+    fIcons = new BObjectList<BIconItem>();
 }
 
 
@@ -161 +159 @@
 void
 BIconRule::RemoveIconAt(int32 index)
 {
+    int32 count = fIcons->CountItems();
+    if ((index < count) && (index >= (int32)0))
+        fIcons->RemoveItemAt((int32)index);
 }
 
 
 void
 BIconRule::RemoveAllIcons()
 {
+    int32 count = fIcons->CountItems();
+    for (int32 i = 0; i < count; i++)
+        fIcons->RemoveItemAt(i);
 }
 
 

src/preferences/notifications/IconRule.h

@@ -7 +7 @@
 #define _ICON_RULE_H
 
 #include <Invoker.h>
+#include <ObjectList.h>
 #include <View.h>
 
-class BList;
+#include "IconItem.h"
+
+
 class BMessage;
 
 class BIconRule : public BView, public BInvoker {
@@ -44 +47 @@
     virtual BSize       PreferredSize();
 
 private:
-            BList*      fIcons;
+            typedef BObjectList<BIconItem> IconItems;
+            IconItems*  fIcons;
             int32       fSelIndex;
             BMessage*   fMessage;
 };

src/preferences/notifications/Jamfile

@@ -1 +1 @@
 SubDir HAIKU_TOP src preferences notifications ;
 
+UsePrivateHeaders shared ;
+
 UsePrivateHeaders interface ;
 
 Application Notifications :