wxArrayString::CountをGetCountへ修正。

git-svn-id: svn+ssh://svn.sourceforge.jp/svnroot/tpi/tpi@104 9df91469-1e22-0410-86e7-ea8537beb833

diff --git a/src/frontend/cls_filedroptarget.cpp b/src/frontend/cls_filedroptarget.cpp
index 817f10a..b3a62d6 100644 (file)
--- a/src/frontend/cls_filedroptarget.cpp
+++ b/src/frontend/cls_filedroptarget.cpp
@@ -42,7 +42,7 @@ bool myFileDropTarget::OnDropFiles(wxCoord, wxCoord, const wxArrayString & asFil
        wxCommandEvent e;
 
        // \8f\91\8cÉ\82É\91Î\89\9e\82µ\82Ä\82¢\82é\82©\82Ç\82¤\82©\8am\94F\81B
-       if (asFiles.Count() == 1 && this->mainFrame->LoadTPI(asFiles[0]) != -1)
+       if (asFiles.GetCount() == 1 && this->mainFrame->LoadTPI(asFiles[0]) != -1)
        {
                // \8f\91\8cÉ\82ð\8aJ\82­\81B
                this->mainFrame->fnArchive = wxFileName(asFiles[0]);

diff --git a/src/frontend/cls_listctrl.cpp b/src/frontend/cls_listctrl.cpp
index 10d850e..a6d9490 100644 (file)
--- a/src/frontend/cls_listctrl.cpp
+++ b/src/frontend/cls_listctrl.cpp
@@ -108,8 +108,8 @@ void myListCtrl::OnColClick(wxListEvent& e)
 \r
        // \83\\81[\83g\81B\r
        this->showFileInfo.Sort(& ListCtrlCompareProc);\r
-       this->SetItemCount(this->showFileInfo.Count());\r
-       this->RefreshItems(0, this->showFileInfo.Count() - 1);\r
+       this->SetItemCount(this->showFileInfo.GetCount());\r
+       this->RefreshItems(0, this->showFileInfo.GetCount() - 1);\r
 }\r
 \r
 //******************************************************************************\r

diff --git a/src/frontend/dlg_make.cpp b/src/frontend/dlg_make.cpp
index 8d00506..dc28094 100644 (file)
--- a/src/frontend/dlg_make.cpp
+++ b/src/frontend/dlg_make.cpp
@@ -119,7 +119,7 @@ void MakeDialog::OnInit(wxInitDialogEvent&)
                this->cbFileName->SetValue(((MainFrame *) this->GetParent())->fnArchive.GetFullName());
 
                // \93W\8aJ\90æ\82ð\97\\91ª\81B\82½\82¾\82µDTV\83X\83L\83\83\83\93\82É\8e\9e\8aÔ\82ª\82©\82©\82é\8fê\8d\87\82Í\83X\83L\83b\83v\89Â\94\\81B
-               if (this->files.Count() < 3000 || ::AskDlg(wxT("This archive contains so many files that it takes long to check Directory Traversal Vulnerability(DTV) problem. If you are sure this archive is safe, you can skip this scanning process. Do you want to scan for DTV problem?"), this) == wxYES)
+               if (this->files.GetCount() < 3000 || ::AskDlg(wxT("This archive contains so many files that it takes long to check Directory Traversal Vulnerability(DTV) problem. If you are sure this archive is safe, you can skip this scanning process. Do you want to scan for DTV problem?"), this) == wxYES)
                {
                        wxNotebookEvent e;
                        e.SetSelection(-3);
@@ -251,7 +251,7 @@ void MakeDialog::OnTabChanged(wxNotebookEvent& e)
        if (bReallyShow && this->lcFiles->GetItemCount() == 0)
        {
                // \83t\83@\83C\83\8b\83\8a\83X\83g\82ð\92Ç\89Á\81B
-               for (size_t i = 0; i < this->files.Count(); i++)
+               for (size_t i = 0; i < this->files.GetCount(); i++)
                {
                        this->lcFiles->InsertItem(i, this->files[i]);
                }
@@ -260,7 +260,7 @@ void MakeDialog::OnTabChanged(wxNotebookEvent& e)
        if (bIsMake)
        {
                // \8ai\94[\83p\83X\82ð\90\84\91ª\81B
-               for (size_t i = 0; i < this->files.Count(); i++)
+               for (size_t i = 0; i < this->files.GetCount(); i++)
                {
                        if (bReallyShow)
                        {
@@ -275,7 +275,7 @@ void MakeDialog::OnTabChanged(wxNotebookEvent& e)
 
                // \8ae\83t\83@\83C\83\8b\82É\83p\83X\82ð\95t\89Á\81B
                bool fDTVWarning = false;
-               for (size_t i = 0; i < this->files.Count(); i++)
+               for (size_t i = 0; i < this->files.GetCount(); i++)
                {
                        wxString szOutputFile = szOutputRootDir + wxFileName::GetPathSeparator();
                        wxFileName fnStored(this->files[i]);

diff --git a/src/frontend/frm_main.cpp b/src/frontend/frm_main.cpp
index 561e77b..3636ed9 100644 (file)
--- a/src/frontend/frm_main.cpp
+++ b/src/frontend/frm_main.cpp
@@ -251,7 +251,7 @@ void MainFrame::OnArcCreate(wxCommandEvent& e)
                mkDlg.files = * (wxArrayString *) e.GetClientData();
                swInfo.fnDestinationDirectory = wxFileName::DirName(wxFileName(mkDlg.files[0]).GetPath());
                // \91\8a\91Î\83p\83X\82É\95Ï\8a·\81B
-               for (size_t n = 0; n < mkDlg.files.Count(); n++)
+               for (size_t n = 0; n < mkDlg.files.GetCount(); n++)
                {
                        wxFileName fn(mkDlg.files[n]);
                        bool fIsDir = fn.DirExists() && ! fn.FileExists();
@@ -496,7 +496,7 @@ void MainFrame::OnArcOpen(wxCommandEvent& e)
 
        // \83X\83e\81[\83^\83X\83o\81[\90Ý\92è\81B
        this->statusbar->SetStatusText(aiInfo.fiInfo.szTypeName, 0);
-       this->statusbar->SetStatusText(wxString::Format(wxT("%d file(s)"), this->fileinfo.Count()), 1);
+       this->statusbar->SetStatusText(wxString::Format(wxT("%d file(s)"), this->fileinfo.GetCount()), 1);
        this->statusbar->SetStatusText(aiInfo.llUnpackedSize.ToString() + wxT(" B -> ") + aiInfo.llPackedSize.ToString() + wxT(" B"), 2);
        this->statusbar->SetStatusText(wxString::Format(wxT("%3.1f%%"), aiInfo.wCompressRatio / 10.0), 3);
        this->statusbar->SetStatusText(this->fnArchive.GetFullPath(), 4);
@@ -711,7 +711,7 @@ void MainFrame::OnArcExtract(wxCommandEvent& e)
                {
                        // \93W\8aJ\91Î\8fÛ\82ð\8c\88\92è\81B
                        wxFileDataObject objFile;
-                       for (size_t i = 0; i < mkDlg.files.Count(); i++)
+                       for (size_t i = 0; i < mkDlg.files.GetCount(); i++)
                        {
                                wxString szFileName = swInfo.fnDestinationDirectory.GetPathWithSep() + wxFileName(mkDlg.files[i]).GetFullName();
                                if (nMode == 2)
@@ -868,7 +868,7 @@ void MainFrame::OnTreeChanged(wxTreeEvent& e)
 
        // \83\\81[\83g\82µ\82Ä\95\\8e¦\81B
        this->list_ctrl->showFileInfo.Sort(& ListCtrlCompareProc);
-       this->list_ctrl->SetItemCount(this->list_ctrl->showFileInfo.Count());
+       this->list_ctrl->SetItemCount(this->list_ctrl->showFileInfo.GetCount());
 }
 
 void MainFrame::OnTreeBeginDrag(wxTreeEvent& e)

diff --git a/src/plugin/cuiWrapper/cuiWrapper.cpp b/src/plugin/cuiWrapper/cuiWrapper.cpp
index 8a52f64..0179bdf 100644 (file)
--- a/src/plugin/cuiWrapper/cuiWrapper.cpp
+++ b/src/plugin/cuiWrapper/cuiWrapper.cpp
@@ -336,7 +336,7 @@ int __stdcall CheckArchive
                        if (_nFileCount != NULL)\r
                        {\r
                                // \83t\83@\83C\83\8b\90\94\82Í\91½\82ß\82É\8eæ\82Á\82Ä\82¨\82­\81B\r
-                               * _nFileCount = g_asOutput.Count();\r
+                               * _nFileCount = g_asOutput.GetCount();\r
                        }\r
                        return nErrorCode;\r
                }\r
@@ -366,7 +366,7 @@ int __stdcall OpenArchive
        {\r
                * _hArchive = & g_asOutput;\r
        }\r
-       return g_asOutput.Count() == 0 ? TPI_ERROR_UNDEFINED : TPI_ERROR_SUCCESS;\r
+       return g_asOutput.GetCount() == 0 ? TPI_ERROR_UNDEFINED : TPI_ERROR_SUCCESS;\r
 }\r
 \r
 int __stdcall CloseArchive\r
@@ -422,7 +422,7 @@ int __stdcall GetFileInformation
                piDate = MakePosInfo(wxT("date"));\r
        }\r
 \r
-       if (s_uCurrentLine >= asOutput.Count())\r
+       if (s_uCurrentLine >= asOutput.GetCount())\r
        {\r
                // \8f\91\8cÉ\82ª\93Ç\82Ý\8d\9e\82ß\82È\82©\82Á\82½\81H\r
                return TPI_ERROR_ARC_UNSUPPORTED;\r

diff --git a/src/plugin/rarArc/rarArc.cpp b/src/plugin/rarArc/rarArc.cpp
index 45ccd37..57053f0 100644 (file)
--- a/src/plugin/rarArc/rarArc.cpp
+++ b/src/plugin/rarArc/rarArc.cpp
@@ -399,7 +399,7 @@ int __stdcall Command
                        nErrorCodeConvert(\r
                                ((int (__stdcall *)(void *, int, wchar_t *, wchar_t *)) pP)(\r
                                        hArc,\r
-                                       (_szFiles.Count() != 0 && _szFiles.Index(wxString(hdInfo.FileNameW)) == wxNOT_FOUND) ? RAR_SKIP : _uCommand == TPI_COMMAND_EXTRACT ? RAR_EXTRACT : RAR_TEST,\r
+                                       (_szFiles.GetCount() != 0 && _szFiles.Index(wxString(hdInfo.FileNameW)) == wxNOT_FOUND) ? RAR_SKIP : _uCommand == TPI_COMMAND_EXTRACT ? RAR_EXTRACT : RAR_TEST,\r
                                        _swInfo->fStoreDirectoryPathes ? _swInfo->fnDestinationDirectory.GetFullPath().wchar_str() : NULL,\r
                                        _swInfo->fStoreDirectoryPathes ? NULL : (_swInfo->fnDestinationDirectory.GetPathWithSep() + wxFileName(hdInfo.FileNameW).GetFullName()).wchar_str()\r
                                )\r

diff --git a/src/plugin/spiLibrary/spiLibrary.cpp b/src/plugin/spiLibrary/spiLibrary.cpp
index 63d1cfe..3a330b1 100644 (file)
--- a/src/plugin/spiLibrary/spiLibrary.cpp
+++ b/src/plugin/spiLibrary/spiLibrary.cpp
@@ -403,7 +403,7 @@ int __stdcall Command
                        }\r
 \r
                        // \8f\88\97\9d\91Î\8fÛ\82©\82Ç\82¤\82©\94»\92è\81B\r
-                       if (_szFiles.Count() != 0 && _szFiles.Index(fiInfo.szStoredName) == wxNOT_FOUND)\r
+                       if (_szFiles.GetCount() != 0 && _szFiles.Index(fiInfo.szStoredName) == wxNOT_FOUND)\r
                        {\r
                                continue;\r
                        }\r