LoadPluginの_llSubOptionを_llTypeIdに、TPI_FILEINFO::llFileIDをllFileIdにリネーム。

[tpi/lychee.git] / src / plugin / cuiWrapper / cuiWrapper.cpp

diff --git a/src/plugin/cuiWrapper/cuiWrapper.cpp b/src/plugin/cuiWrapper/cuiWrapper.cpp
index a08d970..b6a53c4 100644 (file)
--- a/src/plugin/cuiWrapper/cuiWrapper.cpp
+++ b/src/plugin/cuiWrapper/cuiWrapper.cpp
@@ -208,7 +208,7 @@ int __stdcall GetPluginInformation
 \r
 int __stdcall GetFormatInformation(TPI_FORMATINFO * _fiInfo, bool _bFirst)\r
 {\r
-       static unsigned int s_uFileID;\r
+       static unsigned int s_uFileId;\r
        wxStandardPaths p;\r
        wxXmlDocument config(wxPathOnly(p.GetExecutablePath()) + wxT("/lib/cuiWrapper.xml"));\r
        // 一気に先頭のライブラリの情報を取得。\r
@@ -217,11 +217,11 @@ int __stdcall GetFormatInformation(TPI_FORMATINFO * _fiInfo, bool _bFirst)
        if (_bFirst)\r
        {\r
                // xml解析開始。\r
-               s_uFileID = 0;\r
+               s_uFileId = 0;\r
        }\r
        else\r
        {\r
-               for (unsigned int i = 0; i < s_uFileID && xmlLibrary != NULL; i++)\r
+               for (unsigned int i = 0; i < s_uFileId && xmlLibrary != NULL; i++)\r
                {\r
                        xmlLibrary = xmlLibrary->GetNext();\r
                }\r
@@ -233,7 +233,7 @@ int __stdcall GetFormatInformation(TPI_FORMATINFO * _fiInfo, bool _bFirst)
                return TPI_ERROR_S_ENDOFDATA;\r
        }\r
 \r
-       MakeFormatInfo(wxT("cuiWrapper"), _fiInfo, xmlLibrary, s_uFileID++);\r
+       MakeFormatInfo(wxT("cuiWrapper"), _fiInfo, xmlLibrary, s_uFileId++);\r
        if (myExecute(xmlLibrary->GetPropVal(wxT("name"), wxEmptyString), NULL, wxEmptyString) != TPI_ERROR_SUCCESS)\r
        {\r
                _fiInfo->llSupportedCommand = 0;\r
@@ -245,7 +245,7 @@ int __stdcall GetFormatInformation(TPI_FORMATINFO * _fiInfo, bool _bFirst)
 int __stdcall LoadPlugin\r
 (\r
        const wxString & _szArcName,\r
-       wxULongLong _llSubOption\r
+       wxULongLong _llTypeId\r
 )\r
 {\r
        // xml解析開始。\r
@@ -263,7 +263,7 @@ int __stdcall LoadPlugin
        if (! ::wxFileExists(_szArcName))\r
        {\r
                // 適当な位置まで移動。\r
-               for (g_LibInfo.nLibIndex = 0; g_LibInfo.nLibIndex < _llSubOption && xmlLibrary != NULL; g_LibInfo.nLibIndex++)\r
+               for (g_LibInfo.nLibIndex = 0; g_LibInfo.nLibIndex < _llTypeId && xmlLibrary != NULL; g_LibInfo.nLibIndex++)\r
                {\r
                        xmlLibrary = xmlLibrary->GetNext();\r
                }\r
@@ -384,7 +384,7 @@ int __stdcall GetFileInformation
 )\r
 {\r
        static size_t s_uCurrentLine;\r
-       static wxULongLong s_llFileID;\r
+       static wxULongLong s_llFileId;\r
        if (_hArchive == NULL)\r
        {\r
                return TPI_ERROR_UNDEFINED;\r
@@ -397,7 +397,7 @@ int __stdcall GetFileInformation
        static PosInfo piFName, piPSize, piUSize, piDate;\r
        if (_bFirst)\r
        {\r
-               s_llFileID = 0;\r
+               s_llFileId = 0;\r
                wxString szStartLine = g_LibInfo.node.GetPropVal(wxT("list-line-s"), wxEmptyString);\r
                if (! szStartLine.IsEmpty())\r
                {\r
@@ -448,7 +448,7 @@ int __stdcall GetFileInformation
        }\r
 \r
        // 最後に次の行へ進めておく。\r
-       _fiInfo->llFileID = s_llFileID++;\r
+       _fiInfo->llFileId = s_llFileId++;\r
        s_uCurrentLine += nProcessPerLine;\r
 \r
        return TPI_ERROR_SUCCESS;\r