[REFACT] Cleanup types. Add explicit cast

Author: hasherezade

parser/include/bearparser/pe/LdConfigDirWrapper.h

@@ -180,7 +180,7 @@ class LdConfigDirWrapper : public DataDirEntryWrapper
 
     std::vector<ExeNodeWrapper*>* getSubEntriesList(size_t parentType)
     {
-        std::map<uint32_t, std::vector<ExeNodeWrapper*> >::iterator itr = subEntriesMap.find(parentType);
+        auto itr = subEntriesMap.find((uint32_t)parentType);
         if (itr == subEntriesMap.end()){
             return NULL;
         }

parser/include/bearparser/pe/PEFile.h

@@ -324,7 +324,7 @@ class PEFile : public MappedExe
 
     /* wrappers:
     */
-    bool hasDirectory(pe::dir_entry dirNum)
+    bool hasDirectory(const pe::dir_entry &dirNum)
     {
         return this->getDataDirEntry(dirNum) ? true : false;
     }
@@ -339,8 +339,7 @@ class PEFile : public MappedExe
         return this->getAlignment(Executable::RVA);
     }
 
-
-    void setImageSize(size_t newSize)
+    void setImageSize(bufsize_t newSize)
     {
         this->setVirtualSize(newSize);
     }

parser/include/bearparser/pe/rsrc/ResourceStringsWrapper.h

@@ -36,7 +36,7 @@ class ResString : public ExeNodeWrapper {
         WORD *content = (WORD*) this->m_Exe->getContentAt(offset,Executable::RAW, size);
         if (content == NULL) return "";
 
-        return QString::fromUtf16(content, size);
+        return QString::fromUtf16(reinterpret_cast<const char16_t*>(content), size);
     }
 
     virtual size_t getStrLen() { return (sizePtr == NULL) ? 0 : static_cast<size_t>(*sizePtr); }

parser/include/bearparser/pe/rsrc/ResourceVersionWrapper.h

@@ -46,16 +46,17 @@ class ResourceVersionWrapper : public ResourceContentWrapper
     virtual WrappedValue::data_type containsDataType(size_t fieldId, size_t subField = FIELD_NONE);
 
     pe::version_info *getVersionInfo();
+
     QString getVersionText()
     {
         pe::version_info *info = getVersionInfo();
-        if (info == NULL) return ""; //ERROR
+        if (!info) return ""; //ERROR
 
         int size = INFOTEXT_LEN;
-        WORD *content = info->key;
-        if (content == NULL) return "";
+        const WORD *content = info->key;
+        if (!content) return "";
 
-        return QString::fromUtf16(content, size);
+        return QString::fromUtf16(reinterpret_cast<const char16_t*>(content), size);
     }
 
 

parser/pe/RichHdrWrapper.cpp

@@ -164,7 +164,7 @@ DWORD RichHdrWrapper::calcChecksum()
     if (!data || dansOffset == INVALID_ADDR) return 0;
 
     DWORD cksum = dansOffset;
-    for (size_t i = 0; i < dansOffset && i < dataSize; i++) {
+    for (size_t i = 0; i < (size_t)dansOffset && i < dataSize; i++) {
         //skip e_lfanew
         if (i >= 0x3c && i < 0x40) {
             continue;

parser/pe/SectHdrsWrapper.cpp

@@ -327,7 +327,7 @@ bufsize_t SectionHdrWrapper::getMappedVirtualSize()
     }
 
     // trim to next section
-    int secCounter = m_PE->_getSectionsCount(true);
+    size_t secCounter = m_PE->_getSectionsCount(true);
     for (size_t i = 0; i < secCounter; i++) {
         SectionHdrWrapper *sec = m_PE->_getSecHdr(i);
         if (!sec) continue;