Fix issue #940: Replace slow (2)

[winmerge-jp/winmerge-jp.git] / Src / DirViewColItems.h

diff --git a/Src/DirViewColItems.h b/Src/DirViewColItems.h
index dac14ae..526aca9 100644 (file)
--- a/Src/DirViewColItems.h
+++ b/Src/DirViewColItems.h
@@ -11,7 +11,7 @@
 #include <vector>
 #include <sstream>
 
-struct DIFFITEM;
+class DIFFITEM;
 class CDiffContext;
 
 // DirViewColItems typedefs
@@ -32,11 +32,12 @@ struct DirColInfo
        };
        const TCHAR *regName; /**< Internal name used for registry entries etc */
        // localized string resources
+       const char *idNameContext; 
        const char *idName; /**< Displayed name, ID of string resource */
        const char *idDesc; /**< Description, ID of string resource */
        ColGetFncPtrType getfnc; /**< Handler giving display string */
        ColSortFncPtrType sortfnc; /**< Handler for sorting this column */
-       size_t offset;
+       size_t offset;  /**< Offset into DIFFITEM::diffFileInfo[] */
        int physicalIndex; /**< Current physical index, -1 if not displayed */
        bool defSortUp; /**< Does column start with ascending sort (most do) */
        int alignment; /**< Column alignment */
@@ -65,8 +66,8 @@ public:
        String GetColDescription(int col) const;
        int     GetColCount() const;
        int GetDispColCount() const { return m_dispcols; }
-       String ColGetTextToDisplay(const CDiffContext *pCtxt, int col, const DIFFITEM & di) const;
-       int ColSort(const CDiffContext *pCtxt, int col, const DIFFITEM & ldi, const DIFFITEM &rdi, bool bTreeMode) const;
+       String ColGetTextToDisplay(const CDiffContext *pCtxt, int col, const DIFFITEM &di) const;
+       int ColSort(const CDiffContext *pCtxt, int col, const DIFFITEM &ldi, const DIFFITEM &rdi, bool bTreeMode) const;
 
        int ColPhysToLog(int i) const { return m_invcolorder[i]; }
        int ColLogToPhys(int i) const { return m_colorder[i]; } /**< -1 if not displayed */
@@ -107,7 +108,7 @@ public:
                        if (phy >= 0)
                        {
                                if (!result.empty()) result += ' ';
-                               result += string_to_str(getcolwidth(phy));
+                               result += strutils::to_str(getcolwidth(phy));
                        }
                }
                return result;