Leave the class name as CIniOptionsMgr, but rename the filename to IniOptionsMgr.*

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

diff --git a/Src/Merge7zFormatRegister.h b/Src/Merge7zFormatRegister.h
index 937182e..a94046c 100644 (file)
--- a/Src/Merge7zFormatRegister.h
+++ b/Src/Merge7zFormatRegister.h
@@ -7,7 +7,7 @@
 
 struct Merge7zFormatRegister
 {
-       Merge7zFormatRegister(Merge7z::Format *(*pfnGuessFormat)(const String& path))
+       explicit Merge7zFormatRegister(Merge7z::Format *(*pfnGuessFormat)(const String& path))
        {
                Add(pfnGuessFormat);
        }
@@ -17,13 +17,13 @@ struct Merge7zFormatRegister
        }
        static Merge7z::Format *GuessFormat(const String& path)
        {
-               for (int i = 0; i < Merge7zFormatRegister::optionalFormats.size(); ++i)
+               for (size_t i = 0; i < Merge7zFormatRegister::optionalFormats.size(); ++i)
                {
                        Merge7z::Format* pFormat = Merge7zFormatRegister::optionalFormats[i](path);
-                       if (pFormat)
+                       if (pFormat != nullptr)
                                return pFormat;
                }
-               return NULL;
+               return nullptr;
        }
 
        static std::vector<Merge7z::Format *(*)(const String& path)> optionalFormats;