[Winmerge-svn] SF.net SVN: winmerge:[5720] trunk/Src

[<ki...@us...>]

Revision: 5720
          http://winmerge.svn.sourceforge.net/winmerge/?rev=5720&view=rev
Author:   kimmov
Date:     2008-08-02 15:42:20 +0000 (Sat, 02 Aug 2008)

Log Message:
-----------
Move SLineInfo struct definition to own header file.

Modified Paths:
--------------
    trunk/Src/Merge.vcproj
    trunk/Src/editlib/ccrystaltextbuffer.cpp
    trunk/Src/editlib/ccrystaltextbuffer.h

Added Paths:
-----------
    trunk/Src/editlib/LineInfo.h

Modified: trunk/Src/Merge.vcproj
===================================================================
--- trunk/Src/Merge.vcproj	2008-08-01 18:36:51 UTC (rev 5719)
+++ trunk/Src/Merge.vcproj	2008-08-02 15:42:20 UTC (rev 5720)
@@ -7654,6 +7654,9 @@
 				</FileConfiguration>
 			</File>
 			<File
+				RelativePath="editlib\LineInfo.h">
+			</File>
+			<File
 				RelativePath="editlib\lisp.cpp">
 				<FileConfiguration
 					Name="UnicodeRelease|Win32">

Added: trunk/Src/editlib/LineInfo.h
===================================================================
--- trunk/Src/editlib/LineInfo.h	                        (rev 0)
+++ trunk/Src/editlib/LineInfo.h	2008-08-02 15:42:20 UTC (rev 5720)
@@ -0,0 +1,35 @@
+/** 
+ * @file LineInfo.h
+ *
+ * @brief Declaration for SLineInfo structure.
+ *
+ */
+// ID line follows -- this is updated by SVN
+// $Id$
+
+#ifndef _EDITOR_LINEINFO_H_
+#define _EDITOR_LINEINFO_H_
+
+/**
+ * @brief Line information.
+ * This structure presents one line in the editor.
+ */
+struct SLineInfo
+  {
+    TCHAR *m_pcLine; /**< Line data. */
+    int m_nLength; /**< Line length (without EOL bytes). */
+    int m_nMax; /**< Allocated space for line data. */
+    int m_nEolChars; /**< # of EOL bytes. */
+    DWORD m_dwFlags; /**< Line flags. */
+    DWORD m_dwRevisionNumber; /**< Edit revision (for edit tracking). */
+
+    int FullLength() const { return m_nLength+m_nEolChars; }
+    int Length() const { return m_nLength; }
+
+    SLineInfo ()
+    {
+      memset (this, 0, sizeof (SLineInfo));
+    };
+  };
+
+#endif // _EDITOR_LINEINFO_H_


Property changes on: trunk/Src/editlib/LineInfo.h
___________________________________________________________________
Added: svn:keywords
   + Author Date Id Revision
Added: svn:eol-style
   + native

Modified: trunk/Src/editlib/ccrystaltextbuffer.cpp
===================================================================
--- trunk/Src/editlib/ccrystaltextbuffer.cpp	2008-08-01 18:36:51 UTC (rev 5719)
+++ trunk/Src/editlib/ccrystaltextbuffer.cpp	2008-08-02 15:42:20 UTC (rev 5720)
@@ -66,6 +66,7 @@
 #include <vector>
 #include <malloc.h>
 #include "editcmd.h"
+#include "LineInfo.h"
 #include "ccrystaltextbuffer.h"
 #include "ccrystaltextview.h"
 #include "filesup.h"

Modified: trunk/Src/editlib/ccrystaltextbuffer.h
===================================================================
--- trunk/Src/editlib/ccrystaltextbuffer.h	2008-08-01 18:36:51 UTC (rev 5719)
+++ trunk/Src/editlib/ccrystaltextbuffer.h	2008-08-02 15:42:20 UTC (rev 5720)
@@ -38,6 +38,7 @@
 #pragma once
 
 #include <vector>
+#include "LineInfo.h"
 #include "ccrystaltextview.h"
 
 #ifndef __AFXTEMPL_H__
@@ -45,8 +46,6 @@
 #include <afxtempl.h>
 #endif
 
-#define UNDO_DESCRIP_BUF        32
-
 enum LINEFLAGS
 {
   LF_BOOKMARK_FIRST = 0x00000001L,
@@ -132,23 +131,6 @@
 protected :
 #pragma pack(push, 1)
     //  Nested class declarations
-    struct SLineInfo
-      {
-        TCHAR *m_pcLine;
-        int m_nLength, m_nMax;
-        int m_nEolChars; // # of eolchars
-        DWORD m_dwFlags;
-        DWORD m_dwRevisionNumber;
-
-        int FullLength() const { return m_nLength+m_nEolChars; }
-        int Length() const { return m_nLength; }
-
-        SLineInfo ()
-        {
-          memset (this, 0, sizeof (SLineInfo));
-        };
-      };
-
     enum
     {
       UNDO_INSERT = 0x0001,


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.