wxEmptyStringの代入をwxString::Clear()に変更。

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

diff --git a/src/common/handle/TPIHandle.cpp b/src/common/handle/TPIHandle.cpp
index d2184c4..20dd9a0 100644 (file)
--- a/src/common/handle/TPIHandle.cpp
+++ b/src/common/handle/TPIHandle.cpp
@@ -116,10 +116,10 @@ bool TPIHandle::GetFormatInformation(TPI_FORMATINFO * _fiInfo, bool _bFirst)
        _fiInfo->sCompressLevelMax  = 0;\r
        _fiInfo->sRecoveryRecordMin = 0;\r
        _fiInfo->sRecoveryRecordMax = 0;\r
-       _fiInfo->szTypeName         = wxEmptyString;\r
-       _fiInfo->szSuffix           = wxEmptyString;\r
-       _fiInfo->szEngineName       = wxEmptyString;\r
-       _fiInfo->szTPIName          = wxEmptyString;\r
+       _fiInfo->szTypeName.Clear();\r
+       _fiInfo->szSuffix.Clear();\r
+       _fiInfo->szEngineName.Clear();\r
+       _fiInfo->szTPIName.Clear();\r
        _fiInfo->llSupportedCommand = 0;\r
        _fiInfo->llTypeId           = 0;\r
        _fiInfo->pCustomInfo    = NULL;\r
@@ -171,9 +171,9 @@ bool TPIHandle::GetFileInformation(TPI_FILEINFO * _fiInfo, bool _bFirst)
        _fiInfo->uOSType        = 0;\r
        _fiInfo->llPackedSize   = 0;\r
        _fiInfo->llUnpackedSize = 0;\r
-       _fiInfo->szStoredName   = wxEmptyString;\r
-       _fiInfo->szMethod       = wxEmptyString;\r
-       _fiInfo->szComment      = wxEmptyString;\r
+       _fiInfo->szStoredName.Clear();\r
+       _fiInfo->szMethod.Clear();\r
+       _fiInfo->szComment.Clear();\r
        _fiInfo->wCompressRatio = 0;\r
        _fiInfo->llFileID       = 0;\r
        _fiInfo->pCustomInfo    = NULL;\r
@@ -208,7 +208,7 @@ bool TPIHandle::GetArchiveInformation(TPI_ARCHIVEINFO * _aiInfo)
        _aiInfo->llReadSize     = 0;\r
        _aiInfo->llUnpackedSize = 0;\r
        _aiInfo->llSplitSize    = 0;\r
-       _aiInfo->szComment      = wxEmptyString;\r
+       _aiInfo->szComment.Clear();\r
        _aiInfo->wCompressRatio = 0;\r
        _aiInfo->pCustomInfo    = NULL;\r
        // FORMATINFO\r
@@ -223,10 +223,10 @@ bool TPIHandle::GetArchiveInformation(TPI_ARCHIVEINFO * _aiInfo)
        _aiInfo->fiInfo.sCompressLevelMax  = 0;\r
        _aiInfo->fiInfo.sRecoveryRecordMin = 0;\r
        _aiInfo->fiInfo.sRecoveryRecordMax = 0;\r
-       _aiInfo->fiInfo.szTypeName         = wxEmptyString;\r
-       _aiInfo->fiInfo.szSuffix           = wxEmptyString;\r
-       _aiInfo->fiInfo.szEngineName       = wxEmptyString;\r
-       _aiInfo->fiInfo.szTPIName          = wxEmptyString;\r
+       _aiInfo->fiInfo.szTypeName.Clear();\r
+       _aiInfo->fiInfo.szSuffix.Clear();\r
+       _aiInfo->fiInfo.szEngineName.Clear();\r
+       _aiInfo->fiInfo.szTPIName.Clear();\r
        _aiInfo->fiInfo.llSupportedCommand = 0;\r
        _aiInfo->fiInfo.llTypeId           = 0;\r
        _aiInfo->fiInfo.pCustomInfo    = NULL;\r

diff --git a/src/plugin/rarArc/rarArc.cpp b/src/plugin/rarArc/rarArc.cpp
index 1653128..189db79 100644 (file)
--- a/src/plugin/rarArc/rarArc.cpp
+++ b/src/plugin/rarArc/rarArc.cpp
@@ -60,7 +60,7 @@ int __stdcall CallbackProc(unsigned int msg, long, long P1, long P2)
                        // \95ª\8a\84\8f\91\8cÉ\82Ì\8e\9f\82Ì\95\94\95ª\82ð\97v\8b\81\81B\r
                        piInfo.uMessage = TPI_MESSAGE_ASK;\r
                        piInfo.uStatus  = TPI_PARAM_NEXTVOLUME;\r
-                       piInfo.szParam  = wxEmptyString;\r
+                       piInfo.szParam.Clear();\r
                        break;\r
                case RAR_VOL_NOTIFY:\r
                        // \95ª\8a\84\95\94\95ª\82Ì\93Ç\82Ý\8d\9e\82Ý\82ð\8aJ\8en\81B\r
@@ -80,7 +80,7 @@ int __stdcall CallbackProc(unsigned int msg, long, long P1, long P2)
        case UCM_NEEDPASSWORD:\r
                piInfo.uMessage = TPI_MESSAGE_ASK;\r
                piInfo.uStatus  = TPI_PARAM_PASSWORD;\r
-               piInfo.szParam  = wxEmptyString;\r
+               piInfo.szParam.Clear();\r
                break;\r
        default:\r
                return 1;\r

diff --git a/src/plugin/spiLibrary/spiLibrary.cpp b/src/plugin/spiLibrary/spiLibrary.cpp
index 9a23c5f..7c79903 100644 (file)
--- a/src/plugin/spiLibrary/spiLibrary.cpp
+++ b/src/plugin/spiLibrary/spiLibrary.cpp
@@ -141,7 +141,7 @@ int __stdcall LoadPlugin
 )\r
 {\r
        wxStandardPaths p;\r
-       wxString szSPIPath = wxPathOnly(p.GetExecutablePath()) + wxT("/lib/"), szSPIName = wxEmptyString;\r
+       wxString szSPIPath = wxPathOnly(p.GetExecutablePath()) + wxT("/lib/"), szSPIName;\r
        wxDir fs(szSPIPath);\r
        bool b = fs.GetFirst(& szSPIName, wxT("*.spi"));\r
        while (b)\r