From c1e45a1e822c70ef67254ce678bd9edaf37eded6 Mon Sep 17 00:00:00 2001
From: Rene Gollent <anevilyak@gmail.com>
Date: Wed, 7 Nov 2012 14:45:53 +0100
Subject: [PATCH] Persist watchpoints in TeamSettings.

---
 src/apps/debugger/settings/TeamSettings.cpp | 45 +++++++++++++++++++++
 1 file changed, 45 insertions(+)

diff --git a/src/apps/debugger/settings/TeamSettings.cpp b/src/apps/debugger/settings/TeamSettings.cpp
index fbed4c8f74..c379f40054 100644
--- a/src/apps/debugger/settings/TeamSettings.cpp
+++ b/src/apps/debugger/settings/TeamSettings.cpp
@@ -119,6 +119,24 @@ TeamSettings::SetTo(const BMessage& archive)
 		}
 	}
 
+	// add watchpoints
+	for (int32 i = 0; archive.FindMessage("watchpoints", i, &childArchive)
+			== B_OK; i++) {
+		WatchpointSetting* watchpointSetting
+			= new(std::nothrow) WatchpointSetting;
+		if (watchpointSetting == NULL)
+			return B_NO_MEMORY;
+
+		error = watchpointSetting->SetTo(childArchive);
+		if (error == B_OK && !fWatchpoints.AddItem(watchpointSetting))
+			error = B_NO_MEMORY;
+		if (error != B_OK) {
+			delete watchpointSetting;
+			return error;
+		}
+	}
+
+
 	// add UI settings
 	for (int32 i = 0; archive.FindMessage("uisettings", i, &childArchive)
 		== B_OK; i++) {
@@ -155,6 +173,17 @@ TeamSettings::WriteTo(BMessage& archive) const
 			return error;
 	}
 
+	for (int32 i = 0; WatchpointSetting* watchpoint = fWatchpoints.ItemAt(i);
+			i++) {
+		error = watchpoint->WriteTo(childArchive);
+		if (error != B_OK)
+			return error;
+
+		error = archive.AddMessage("watchpoints", &childArchive);
+		if (error != B_OK)
+			return error;
+	}
+
 	for (int32 i = 0; TeamUiSettings* uiSetting = fUiSettings.ItemAt(i);
 			i++) {
 		error = uiSetting->WriteTo(childArchive);
@@ -255,6 +284,16 @@ TeamSettings::operator=(const TeamSettings& other)
 		}
 	}
 
+	for (int32 i = 0; WatchpointSetting* watchpoint
+			= other.fWatchpoints.ItemAt(i); i++) {
+		WatchpointSetting* clonedWatchpoint
+			= new WatchpointSetting(*watchpoint);
+		if (!fWatchpoints.AddItem(clonedWatchpoint)) {
+			delete clonedWatchpoint;
+			throw std::bad_alloc();
+		}
+	}
+
 	for (int32 i = 0; TeamUiSettings* uiSetting
 			= other.fUiSettings.ItemAt(i); i++) {
 		TeamUiSettings* clonedSetting
@@ -277,10 +316,16 @@ TeamSettings::_Unset()
 		delete breakpoint;
 	}
 
+	for (int32 i = 0; WatchpointSetting* watchpoint = fWatchpoints.ItemAt(i);
+			i++) {
+		delete watchpoint;
+	}
+
 	for (int32 i = 0; TeamUiSettings* uiSetting = fUiSettings.ItemAt(i); i++)
 		delete uiSetting;
 
 	fBreakpoints.MakeEmpty();
+	fWatchpoints.MakeEmpty();
 	fUiSettings.MakeEmpty();
 
 	fTeamName.Truncate(0);