more IcePatch work

2 files changed, 41 insertions, 13 deletions

diff --git a/cpp/include/IcePatch/ClientUtil.h b/cpp/include/IcePatch/ClientUtil.h
new file mode 100644
index 00000000000..4797ab5f6da
--- /dev/null
+++ b/cpp/include/IcePatch/ClientUtil.h
@@ -0,0 +1,39 @@
+// **********************************************************************
+//
+// Copyright (c) 2002
+// Mutable Realms, Inc.
+// Huntsville, AL, USA
+//
+// All Rights Reserved
+//
+// **********************************************************************
+
+#ifndef ICE_PATCH_CLIENT_UTIL_H
+#define ICE_PATCH_CLIENT_UTIL_H
+
+#include <Ice/Ice.h>
+#include <IcePatch/IcePatch.h>
+
+namespace IcePatch
+{
+
+ICE_PATCH_API std::string pathToName(const std::string&);
+
+class ICE_PATCH_API ProgressCB
+{
+public:
+
+    virtual void startDownload(Ice::Int, Ice::Int) = 0;
+    virtual void updateDownload(Ice::Int, Ice::Int) = 0;
+    virtual void finishedDownload(Ice::Int) = 0;
+
+    virtual void startUncompress(Ice::Int, Ice::Int) = 0;
+    virtual void updateUncompress(Ice::Int, Ice::Int) = 0;
+    virtual void finishedUncompress(Ice::Int) = 0;
+};
+
+ICE_PATCH_API void getRegular(const IcePatch::RegularPrx&, ProgressCB&);
+
+}
+
+#endif
diff --git a/cpp/include/IcePatch/Util.h b/cpp/include/IcePatch/Util.h
index 200cd9c1b9e..d5a62f75668 100644
--- a/cpp/include/IcePatch/Util.h
+++ b/cpp/include/IcePatch/Util.h
@@ -52,19 +52,8 @@ ICE_PATCH_API Ice::ByteSeq calcPartialMD5(const std::string&, Ice::Int);
 ICE_PATCH_API Ice::ByteSeq getBZ2(const std::string&, Ice::Int, Ice::Int);
 ICE_PATCH_API void createBZ2(const std::string&);
 
-class ICE_PATCH_API ProgressCB
-{
-public:
-
-    virtual void startDownload(Ice::Int, Ice::Int) = 0;
-    virtual void updateDownload(Ice::Int, Ice::Int) = 0;
-    virtual void finishedDownload(Ice::Int) = 0;
-
-    virtual void startUncompress(Ice::Int, Ice::Int) = 0;
-    virtual void updateUncompress(Ice::Int, Ice::Int) = 0;
-    virtual void finishedUncompress(Ice::Int) = 0;
-};
-ICE_PATCH_API void getRegular(const IcePatch::RegularPrx&, ProgressCB&);
+ICE_PATCH_API Ice::Long readStamp();
+ICE_PATCH_API void writeStamp(Ice::Long stamp);
 
 }