Index: src/ch/FileInfo.h
===================================================================
diff -u -N -rd2b121c78f510b5384b8ef0ca80afbfd7f77fef7 -r6ae1d95bf7dd071fd2b65b8f7aabca1c887bdff8
--- src/ch/FileInfo.h	(.../FileInfo.h)	(revision d2b121c78f510b5384b8ef0ca80afbfd7f77fef7)
+++ src/ch/FileInfo.h	(.../FileInfo.h)	(revision 6ae1d95bf7dd071fd2b65b8f7aabca1c887bdff8)
@@ -90,7 +90,7 @@
 	CString& GetCombinedExcludeMask(CString& pMask) const;
 	void SetCombinedExcludeMask(const CString& pMask);
 
-	void Serialize(CArchive& ar);
+	void Serialize(icpf::archive& ar);
 
 protected:
 	bool MatchMask(LPCTSTR lpszMask, LPCTSTR lpszString) const;
@@ -142,7 +142,7 @@
 {
 public:
 	bool Match(const CFileInfo& rInfo) const;
-	void Serialize(CArchive& ar);
+	void Serialize(icpf::archive& ar);
 };
 
 /////////////////////////////////////////////////////////////////////////////
@@ -166,7 +166,7 @@
 
 	int GetBufferIndex() const { return m_iBufferIndex; };
 
-	void Serialize(CArchive& ar, bool bData);
+	void Serialize(icpf::archive& ar, bool bData);
 
 private:
 	CString m_strPath;				// path (ie. c:\\windows\\) - always with ending '\\'
@@ -189,7 +189,7 @@
 public:
 	~CClipboardArray() { RemoveAll(); };
 	
-	void Serialize(CArchive& ar, bool bData);
+	void Serialize(icpf::archive& ar, bool bData);
 
 	void SetAt(int nIndex, CClipboardEntry* pEntry) { delete [] GetAt(nIndex); SetAt(nIndex, pEntry); };
 	void RemoveAt(int nIndex, int nCount = 1) { while (nCount--) { delete GetAt(nIndex); static_cast<CArray<CClipboardEntry*, CClipboardEntry*>*>(this)->RemoveAt(nIndex, 1); } };
@@ -262,8 +262,8 @@
 	bool operator==(const CFileInfo& rInfo);
 	
 	// (re)/store data
-	void Store(CArchive& ar);
-	void Load(CArchive& ar);
+	void Store(icpf::archive& ar);
+	void Load(icpf::archive& ar);
 private:
 	CString m_strFilePath;	// contains relative path (first path is in CClipboardArray)
 	int m_iSrcIndex;		// index in CClipboardArray table (which contains the first part of the path)
@@ -323,7 +323,7 @@
 	int AddFile(CString strFilePath, int iSrcIndex);
 	
 	// store/restore
-	void Store(CArchive& ar, bool bOnlyFlags)
+	void Store(icpf::archive& ar, bool bOnlyFlags)
 	{
 		INT_PTR iSize = GetSize();
 		ar << iSize;
@@ -337,7 +337,7 @@
 		}
 	}
 
-	void Load(CArchive& ar, bool bOnlyFlags)
+	void Load(icpf::archive& ar, bool bOnlyFlags)
 	{
 		INT_PTR iSize;
 		ar>>iSize;