more IcePatch stuff

1 files changed, 16 insertions, 2 deletions

diff --git a/cpp/include/IcePatch/Util.h b/cpp/include/IcePatch/Util.h
index 6c080ecc65e..159e79055b4 100644
--- a/cpp/include/IcePatch/Util.h
+++ b/cpp/include/IcePatch/Util.h
@@ -17,6 +17,8 @@
 namespace IcePatch
 {
 
+extern const std::string tmpName;
+
 std::string identityToPath(const Ice::Identity&);
 Ice::Identity pathToIdentity(const std::string&);
 
@@ -36,14 +38,26 @@ void removeRecursive(const std::string&);
 void createDirectory(const std::string&);
 
 Ice::ByteSeq getMD5(const std::string&);
-std::string MD5ToString(const Ice::ByteSeq&);
+void createMD5(const std::string&);
+void createMD5Recursive(const std::string&);
 
 void writeBZ2(const std::string&, const Ice::ByteSeq&);
 Ice::ByteSeq readBZ2(const std::string&);
 
+Ice::Int getSizeBZ2(const std::string&);
 Ice::ByteSeq getBytesBZ2(const std::string&, Ice::Int, Ice::Int);
+void createBZ2(const std::string&);
+void createBZ2Recursive(const std::string&);
+
+class ProgressCB
+{
+public:
 
-void getFile(const IcePatch::FilePrx&);
+    virtual void start(Ice::Int) = 0;
+    virtual void update(Ice::Int, Ice::Int) = 0;
+    virtual void finished(Ice::Int) = 0;
+};
+void getFile(const IcePatch::FilePrx&, ProgressCB&);
 
 }