Changeset 651 in dev for trunk/ab5.0/abdev/abdev/CFileInfo.cpp

Timestamp:

Jun 17, 2008, 9:30:54 PM (16 years ago)

Author:

dai_9181

Message:

・BreakPoint周りをリファクタリング
・FileTree周りをリファクタリング

File:

• trunk/ab5.0/abdev/abdev/CFileInfo.cpp (modified) (5 diffs)

trunk/ab5.0/abdev/abdev/CFileInfo.cpp

@@ -3 +3 @@
 #include "common.h"
 
-CFileInfo::CFileInfo(char *path,HTREEITEM hTreeItem){
-    m_path=(char *)HeapAlloc(hHeap,0,lstrlen(path)+1);
-    lstrcpy(m_path,path);
-    m_hTreeItem=hTreeItem;
-}
-CFileInfo::~CFileInfo(){
-    HeapDefaultFree(m_path);
+CFileInfo::CFileInfo( const std::string &filepath, HTREEITEM hTreeItem )
+    : filepath( filepath )
+    , m_hTreeItem( hTreeItem )
+{
 }
 void CFileInfo::GetFullPath(char *buffer){
-    lstrcpy(buffer,m_path);
+    lstrcpy(buffer,this->GetPath().c_str());
     lstrcpy( buffer, projectInfo.GetWorkDir().GetFullPath( buffer ).c_str() );
 }
@@ -46 +43 @@
     for(;i<iNum;i++) ppobj_FileInfo[i]=ppobj_FileInfo[i+1];
 }
-char *CDBFileInfo::GetPath(HTREEITEM hTreeItem){
-    int i;
-    for(i=0;i<iNum;i++){
-        if(ppobj_FileInfo[i]->m_hTreeItem==hTreeItem) break;
+const std::string &CDBFileInfo::GetPath(HTREEITEM hTreeItem)
+{
+    for( int i=0; i<iNum; i++ )
+    {
+        if(ppobj_FileInfo[i]->m_hTreeItem==hTreeItem)
+        {
+            return ppobj_FileInfo[i]->GetPath();
+        }
     }
-    if(i==iNum) return 0;
-    return ppobj_FileInfo[i]->m_path;
+
+    _ASSERTE( false );
+    throw;
 }
 BOOL CDBFileInfo::IsMainFile(HTREEITEM hTreeItem){
@@ -68 +70 @@
     TV_INSERTSTRUCT tv;
 
-    TreeView_DeleteAllItems(pobj_FileTree->hTree);
+    pobj_FileTree->DeleteAllItems();
 
     tv.hInsertAfter=TVI_SORT;
@@ -77 +79 @@
     tv.item.iSelectedImage=0;
     tv.item.pszText="Source Files";
-    tv.hParent=TreeView_InsertItem(pobj_FileTree->hTree,&tv);
+    tv.hParent = pobj_FileTree->InsertItem( &tv );
 
     int i;
     char temporary[MAX_PATH],temp2[MAX_PATH];
     for(i=0;i<iNum;i++){
-        _splitpath(ppobj_FileInfo[i]->m_path,0,0,temporary,temp2);
+        _splitpath(ppobj_FileInfo[i]->GetPath().c_str(),0,0,temporary,temp2);
         lstrcat(temporary,temp2);
         tv.item.iImage=2;
         tv.item.iSelectedImage=2;
         tv.item.pszText=temporary;
-        ppobj_FileInfo[i]->m_hTreeItem=TreeView_InsertItem(pobj_FileTree->hTree,&tv);
+        ppobj_FileInfo[i]->m_hTreeItem = pobj_FileTree->InsertItem( &tv );
     }
 }
@@ -94 +96 @@
     int i;
     for(i=0;i<iNum;i++){
-        if(lstrcmpi(ppobj_FileInfo[i]->m_path,path)==0){
+        if(lstrcmpi(ppobj_FileInfo[i]->GetPath().c_str(),path)==0){
             return 1;
         }