Added FileTransfer::initialize(...) method.
Minor code improvements.
git-svn-id: svn://svn.code.sf.net/p/tigervnc/code/trunk@385 3789f03b-4d11-0410-bbf8-ca57d06f2519
diff --git a/vncviewer/FileTransfer.cxx b/vncviewer/FileTransfer.cxx
index 39c387a..64c48dd 100644
--- a/vncviewer/FileTransfer.cxx
+++ b/vncviewer/FileTransfer.cxx
@@ -29,7 +29,11 @@
FileTransfer::FileTransfer()
{
m_bFTDlgShown = false;
+ m_bInitialized = false;
+
m_pFTDialog = new FTDialog(GetModuleHandle(0), this);
+ m_pInStream = NULL;
+ m_pOutStream = NULL;
}
FileTransfer::~FileTransfer()
@@ -40,8 +44,21 @@
}
}
-void
-FileTransfer::createFileTransfer()
+bool
+FileTransfer::initialize(rdr::InStream *pIS, rdr::OutStream *pOS)
+{
+ if (m_bInitialized) return false;
+
+ m_pInStream = pIS;
+ m_pOutStream = pOS;
+
+ m_bInitialized = true;
+ return true;
+}
+
+bool
+FileTransfer::create()
{
m_bFTDlgShown = m_pFTDialog->createFTDialog();
+ return m_bFTDlgShown;
}
diff --git a/vncviewer/FileTransfer.h b/vncviewer/FileTransfer.h
index 0d385e3..64d951a 100644
--- a/vncviewer/FileTransfer.h
+++ b/vncviewer/FileTransfer.h
@@ -24,6 +24,8 @@
#ifndef __RFB_WIN32_FILETRANSFER_H__
#define __RFB_WIN32_FILETRANSFER_H__
+#include <rdr/InStream.h>
+#include <rdr/OutStream.h>
#include <vncviewer/FTDialog.h>
namespace rfb {
@@ -36,13 +38,17 @@
FileTransfer();
~FileTransfer();
- void createFileTransfer();
+ bool initialize(rdr::InStream *pIS, rdr::OutStream *pOS);
+ bool create();
private:
bool m_bFTDlgShown;
+ bool m_bInitialized;
FTDialog *m_pFTDialog;
-
+
+ rdr::InStream *m_pInStream;
+ rdr::OutStream *m_pOutStream;
};
}
}