From 517ad9d4b6eae320b708d03a9340a22893b0cab7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sun, 29 Jan 2023 15:45:51 +0100 Subject: New upstream version 4.0.3 --- src/include/xbmemo.h | 41 +++++++++++++++++++++-------------------- 1 file changed, 21 insertions(+), 20 deletions(-) (limited to 'src/include/xbmemo.h') diff --git a/src/include/xbmemo.h b/src/include/xbmemo.h index e86a65c..ad9aac2 100755 --- a/src/include/xbmemo.h +++ b/src/include/xbmemo.h @@ -59,30 +59,32 @@ class XBDLLEXPORT xbMemo : public xbFile { /* virtual methods */ virtual ~xbMemo(); - virtual xbInt16 Abort () = 0; - virtual xbInt16 CloseMemoFile (); - virtual xbInt16 Commit () = 0; + virtual xbInt16 Abort () = 0; + virtual xbInt16 CloseMemoFile (); + virtual xbInt16 Commit () = 0; + virtual xbInt16 CreateMemoFile () = 0; + + virtual xbInt16 DumpMemoHeader () = 0; - #ifdef XB_LOCKING_SUPPORT - virtual xbInt16 LockMemo ( xbInt16 iLockFunction ); - virtual xbBool GetMemoLocked () const; - #endif - /* pure virtual methods */ - virtual xbInt16 CreateMemoFile () = 0; - - virtual xbInt16 GetMemoField ( xbInt16 iFieldNo, xbString &sMemoData ) = 0; - virtual xbInt16 GetMemoFieldLen( xbInt16 iFieldNo, xbUInt32 &ulMemoFieldLen ) = 0; - virtual xbInt16 OpenMemoFile () = 0; - virtual xbInt16 GetMemoFileType(); - virtual xbInt16 PackMemo ( void (*memoStatusFunc)(xbUInt32 ulItemNum, xbUInt32 ulNumItems)) = 0; - virtual xbInt16 UpdateMemoField( xbInt16 iFieldNo, const xbString &sMemoData ) = 0; + virtual xbInt16 GetMemoField ( xbInt16 iFieldNo, xbString &sMemoData ) = 0; + virtual xbInt16 GetMemoFieldLen ( xbInt16 iFieldNo, xbUInt32 &ulMemoFieldLen ) = 0; + virtual xbInt16 OpenMemoFile () = 0; + virtual xbInt16 GetMemoFileType (); + virtual xbInt16 PackMemo ( void (*memoStatusFunc)(xbUInt32 ulItemNum, xbUInt32 ulNumItems)) = 0; + virtual xbInt16 UpdateMemoField ( xbInt16 iFieldNo, const xbString &sMemoData ) = 0; #ifdef XB_DEBUG_SUPPORT virtual xbInt16 DumpMemoFreeChain() = 0; - virtual xbInt16 DumpMemoHeader () = 0; #endif + #ifdef XB_LOCKING_SUPPORT + virtual xbInt16 LockMemo ( xbInt16 iLockFunction ); + virtual xbBool GetMemoLocked () const; + #endif + + + // *********** FIXME ************* // next two methods should be protected but are called in the xb_test_xxxx programs testing routines // so for now, they are kept as public @@ -135,6 +137,7 @@ class XBDLLEXPORT xbMemoDbt3 : public xbMemo { virtual xbInt16 Abort (); virtual xbInt16 Commit (); virtual xbInt16 CreateMemoFile (); + virtual xbInt16 DumpMemoHeader (); virtual xbInt16 GetMemoField ( xbInt16 iFieldNo, xbString &sMemoData ); virtual xbInt16 GetMemoFieldLen( xbInt16 iFieldNo, xbUInt32 &ulMemoFieldLen ); virtual xbInt16 OpenMemoFile (); @@ -143,7 +146,6 @@ class XBDLLEXPORT xbMemoDbt3 : public xbMemo { #ifdef XB_DEBUG_SUPPORT virtual xbInt16 DumpMemoFreeChain(); - virtual xbInt16 DumpMemoHeader (); #endif protected: @@ -176,7 +178,7 @@ class XBDLLEXPORT xbMemoDbt4 : public xbMemo { virtual xbInt16 Abort (); virtual xbInt16 Commit (); virtual xbInt16 CreateMemoFile (); - + virtual xbInt16 DumpMemoHeader (); virtual xbInt16 GetMemoField ( xbInt16 iFieldNo, xbString &sMemoData ); virtual xbInt16 GetMemoFieldLen ( xbInt16 iFieldNo, xbUInt32 &ulMemoFieldLen ); virtual xbInt16 GetMemoFieldLen ( xbInt16 iFieldNo, xbUInt32 &ulMemoFieldLen, xbUInt32 &lBlockNo ); @@ -186,7 +188,6 @@ class XBDLLEXPORT xbMemoDbt4 : public xbMemo { #ifdef XB_DEBUG_SUPPORT virtual xbInt16 DumpMemoFreeChain (); - virtual xbInt16 DumpMemoHeader (); virtual xbInt16 DumpMemoInternals (); virtual xbInt16 ReadFreeBlockHeader( xbUInt32 ulBlockNo, xbUInt32 &ulNextBlock, xbUInt32 &ulFreeBlockCnt ); #endif -- cgit v1.2.3