From 84e92191bfb256ddc5ccc4bacfbfe77d9512ba45 Mon Sep 17 00:00:00 2001
From: cxl <cxl@f0d560ea-af0d-0410-9eb7-867de7ffcac7>
Date: Tue, 28 Apr 2009 12:17:23 +0000
Subject: [PATCH] Removed error-prone ColumnList::Serialize (and old one is now
 SerializeSettings to avoid confusion)

git-svn-id: svn://ultimatepp.org/upp/trunk@1111 f0d560ea-af0d-0410-9eb7-867de7ffcac7
---
 uppsrc/CtrlLib/ColumnList.cpp   | 9 +++++----
 uppsrc/CtrlLib/ColumnList.h     | 1 -
 uppsrc/CtrlLib/FileSel.cpp      | 2 +-
 uppsrc/ide/Browser/TopicWin.cpp | 2 +-
 uppsrc/ide/idewin.cpp           | 4 ++--
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/uppsrc/CtrlLib/ColumnList.cpp b/uppsrc/CtrlLib/ColumnList.cpp
index 0709ab32c..a25358059 100644
--- a/uppsrc/CtrlLib/ColumnList.cpp
+++ b/uppsrc/CtrlLib/ColumnList.cpp
@@ -1013,16 +1013,16 @@ void ColumnList::SerializeSettings(Stream& s) {
 	SyncInfo();
 }
 
+/* Error-prone!
 void ColumnList::Serialize(Stream& s) {
 	int version = 1;
 	s / version / ncl;
 	if(version >= 1) {
-		int cnt;
+		int cnt = item.GetCount();
 		s.Magic();
 		s / cnt;
-		if (s.IsLoading())
-			item.SetCount(cnt);
-		for (int i = 0; i < item.GetCount(); i++) {
+		item.SetCount(cnt);
+		for(int i = 0; i < cnt; i++) {
 			Item &q = item[i];
 			s % q.key % q.value % q.canselect;
 			if (s.IsLoading()) {
@@ -1035,6 +1035,7 @@ void ColumnList::Serialize(Stream& s) {
 	Refresh();
 	SyncInfo();
 }
+*/
 
 ColumnList::ColumnList() {
 	clickkill = false;
diff --git a/uppsrc/CtrlLib/ColumnList.h b/uppsrc/CtrlLib/ColumnList.h
index 99375fb41..1d8eb74be 100644
--- a/uppsrc/CtrlLib/ColumnList.h
+++ b/uppsrc/CtrlLib/ColumnList.h
@@ -1,6 +1,5 @@
 class ColumnList : public Ctrl, private CtrlFrame {
 public:
-	virtual void  Serialize(Stream& s);
 	virtual void  Paint(Draw& w);
 	virtual void  Layout();
 	virtual Image CursorImage(Point p, dword);
diff --git a/uppsrc/CtrlLib/FileSel.cpp b/uppsrc/CtrlLib/FileSel.cpp
index 73e0b33ce..2e164b705 100644
--- a/uppsrc/CtrlLib/FileSel.cpp
+++ b/uppsrc/CtrlLib/FileSel.cpp
@@ -1211,7 +1211,7 @@ void FileSel::Serialize(Stream& s) {
 	}
 	if(version >= 2) {
 		SerializePlacement(s);
-		s % list;
+		list.SerializeSettings(s);
 	}
 	if(version >= 3) {
 		s % lastsby;
diff --git a/uppsrc/ide/Browser/TopicWin.cpp b/uppsrc/ide/Browser/TopicWin.cpp
index eaf46b74e..da3b0af8d 100644
--- a/uppsrc/ide/Browser/TopicWin.cpp
+++ b/uppsrc/ide/Browser/TopicWin.cpp
@@ -58,7 +58,7 @@ void TopicEditor::Serialize(Stream& s)
 	s / version;
 	editor.SerializeSettings(s);
 	s % left_right;
-	topic.Serialize(s);
+	topic.SerializeSettings(s);
 	s % allfonts;
 	SyncFonts();
 }
diff --git a/uppsrc/ide/idewin.cpp b/uppsrc/ide/idewin.cpp
index 22a8d16fd..acd011b6e 100644
--- a/uppsrc/ide/idewin.cpp
+++ b/uppsrc/ide/idewin.cpp
@@ -90,8 +90,8 @@ void Ide::Serialize(Stream& s) {
 	s % AnyPackageFs();
 	s % pfsplit;
 	s % wesplit;
-	s % package;
-	s % filelist;
+	package.SerializeSettings(s);
+	filelist.SerializeSettings(s);
 	s % editorfont;
 	if(version >= 6)
 		s % tfont;