1 files changed, 29 insertions, 24 deletions

diff --git a/lib/rpcs32.h b/lib/rpcs32.h
index 0cab1b2..5230247 100644
--- a/lib/rpcs32.h
+++ b/lib/rpcs32.h
@@ -4,40 +4,45 @@
 #include "rpcs.h"
 
 class ppsocket;
+class rpcsfactory;
 
 /**
  * This is the implementation of the @ref rpcs protocol for
- * Psion series 5 (EPOC) variant.
- * For a complete documentation, see @ref rpcs .
+ * Psion series 5 (EPOC) variant. You normally never create
+ * objects of this class directly. Thus the constructor is
+ * private. Use @ref rpcsfactory for creating an instance of
+ * @ref rpcs . For a complete documentation, see @ref rpcs .
  */
 class rpcs32 : public rpcs {
-	public:
-		rpcs32(ppsocket *);
-		~rpcs32();
+	friend rpcsfactory;
 
-		Enum<rfsv::errs> queryDrive(const char, bufferArray &);
-		Enum<rfsv::errs> getCmdLine(const char *, bufferStore &); 
-		Enum<rfsv::errs> getMachineInfo(machineInfo &);
-		Enum<rfsv::errs> configOpen(void);
-		Enum<rfsv::errs> configRead(void);
+ public:
+	~rpcs32();
+
+	Enum<rfsv::errs> queryDrive(const char, bufferArray &);
+	Enum<rfsv::errs> getCmdLine(const char *, bufferStore &); 
+	Enum<rfsv::errs> getMachineInfo(machineInfo &);
+	Enum<rfsv::errs> configOpen(void);
+	Enum<rfsv::errs> configRead(void);
 #if 0
-		Enum<rfsv::errs> closeHandle(int);
+	Enum<rfsv::errs> closeHandle(int);
 #endif
-		Enum<rfsv::errs> regOpenIter(void);
+	Enum<rfsv::errs> regOpenIter(void);
 #if 0
-		Enum<rfsv::errs> regReadIter(void);
-		Enum<rfsv::errs> regWrite(void);
-		Enum<rfsv::errs> regRead(void);
-		Enum<rfsv::errs> regDelete(void);
-		Enum<rfsv::errs> setTime(void);
-		Enum<rfsv::errs> configOpen(void);
-		Enum<rfsv::errs> configRead(void);
-		Enum<rfsv::errs> configWrite(void);
-		Enum<rfsv::errs> queryOpen(void);
-		Enum<rfsv::errs> queryRead(void);
-		Enum<rfsv::errs> quitServer(void);
+	Enum<rfsv::errs> regReadIter(void);
+	Enum<rfsv::errs> regWrite(void);
+	Enum<rfsv::errs> regRead(void);
+	Enum<rfsv::errs> regDelete(void);
+	Enum<rfsv::errs> setTime(void);
+	Enum<rfsv::errs> configOpen(void);
+	Enum<rfsv::errs> configRead(void);
+	Enum<rfsv::errs> configWrite(void);
+	Enum<rfsv::errs> queryOpen(void);
+	Enum<rfsv::errs> queryRead(void);
+	Enum<rfsv::errs> quitServer(void);
 #endif
-
+ private:
+	rpcs32(ppsocket *);
 };
 
 #endif