refactoring

src/colorer/Exception.h

@@ -25,7 +25,7 @@ class Exception : public std::exception
   [[nodiscard]]
   const char* what() const noexcept override;
 
- protected:
+ private:
   std::string what_str;
 };
 

src/colorer/editor/BaseEditor.cpp

@@ -132,7 +132,7 @@ FileType* BaseEditor::chooseFileTypeCh(const UnicodeString* fileName, int choose
   UnicodeString textStart;
   int totalLength = 0;
   for (int i = 0; i < chooseStr; i++) {
-    UnicodeString* iLine = lineSource->getLine(i);
+    const UnicodeString* iLine = lineSource->getLine(i);
     if (iLine == nullptr) {
       break;
     }
@@ -164,10 +164,11 @@ FileType* BaseEditor::chooseFileType(const UnicodeString* fileName)
     currentFileType = parserFactory->getHrcLibrary().chooseFileType(fileName, nullptr);
   }
   else {
-    int chooseStr = CHOOSE_STR, chooseLen = CHOOSE_LEN;
+    int chooseStr = CHOOSE_STR;
+    int chooseLen = CHOOSE_LEN;
 
     UnicodeString ds_def = UnicodeString("default");
-    FileType* def = parserFactory->getHrcLibrary().getFileType(&ds_def);
+    const FileType* def = parserFactory->getHrcLibrary().getFileType(&ds_def);
     if (def) {
       chooseStr = def->getParamValueInt("firstlines", chooseStr);
       chooseLen = def->getParamValueInt("firstlinebytes", chooseLen);
@@ -360,7 +361,7 @@ void BaseEditor::lineCountEvent(int newLineCount)
   lineCount = newLineCount;
 }
 
-inline int BaseEditor::getLastVisibleLine()
+inline int BaseEditor::getLastVisibleLine() const
 {
   int r1 = (wStart + wSize);
   int r2 = lineCount;
@@ -369,7 +370,8 @@ inline int BaseEditor::getLastVisibleLine()
 
 void BaseEditor::validate(int lno, bool rebuildRegions)
 {
-  int parseFrom, parseTo;
+  int parseFrom;
+  int parseTo;
   bool layoutChanged = false;
   TextParser::TextParseMode tpmode = TextParser::TextParseMode::TPM_CACHE_READ;
 
@@ -420,8 +422,7 @@ void BaseEditor::validate(int lno, bool rebuildRegions)
     }
     firstLine = newFirstLine;
     layoutChanged = true;
-    COLORER_LOG_DEBUG("[BaseEditor] newFirstLine=%, parseFrom=%, parseTo=%", firstLine, parseFrom,
-                  parseTo);
+    COLORER_LOG_DEBUG("[BaseEditor] newFirstLine=%, parseFrom=%, parseTo=%", firstLine, parseFrom, parseTo);
   }
 
   if (!layoutChanged) {
@@ -445,7 +446,7 @@ void BaseEditor::validate(int lno, bool rebuildRegions)
   /* Runs parser */
   if (parseTo - parseFrom > 0) {
     COLORER_LOG_DEBUG("[BaseEditor] validate:parse:%-%, %", parseFrom, parseTo,
-                  tpmode == TextParser::TextParseMode::TPM_CACHE_READ ? "READ" : "UPDATE");
+                      tpmode == TextParser::TextParseMode::TPM_CACHE_READ ? "READ" : "UPDATE");
     int stopLine = textParser->parse(parseFrom, parseTo - parseFrom, tpmode);
 
     if (tpmode == TextParser::TextParseMode::TPM_CACHE_UPDATE) {
@@ -518,7 +519,7 @@ void BaseEditor::leaveScheme(size_t lno, UnicodeString* line, int sx, int ex, co
   }
 }
 
-bool BaseEditor::haveInvalidLine()
+bool BaseEditor::haveInvalidLine() const
 {
   return invalidLine < lineCount;
 }

src/colorer/editor/BaseEditor.h

@@ -242,7 +242,7 @@ class BaseEditor : public RegionHandler
   void leaveScheme(size_t lno, UnicodeString* line, int sx, int ex, const Region* region,
                    const Scheme* scheme) override;
 
-  bool haveInvalidLine();
+  bool haveInvalidLine() const;
   void setMaxBlockSize(int max_block_size);
 
  private:
@@ -276,7 +276,7 @@ class BaseEditor : public RegionHandler
   bool internalRM;
   bool regionCompact;
 
-  inline int getLastVisibleLine();
+  inline int getLastVisibleLine() const;
   void remapLRS(bool recreate);
   /**
    * Searches for the paired token and creates PairMatch

src/colorer/editor/Outliner.cpp

@@ -24,17 +24,17 @@ OutlineItem* Outliner::getItem(size_t idx)
   return outline.at(idx);
 }
 
-size_t Outliner::itemCount()
+size_t Outliner::itemCount() const
 {
   return outline.size();
 }
 
 size_t Outliner::manageTree(std::vector<int>& treeStack, int newLevel)
 {
-  while (treeStack.size() > 0 && newLevel < treeStack.back()) {
+  while (!treeStack.empty() && newLevel < treeStack.back()) {
     treeStack.pop_back();
   }
-  if (treeStack.size() == 0 || newLevel > treeStack.back()) {
+  if (treeStack.empty() || newLevel > treeStack.back()) {
     treeStack.push_back(newLevel);
     return treeStack.size() - 1;
   }
@@ -44,7 +44,7 @@ size_t Outliner::manageTree(std::vector<int>& treeStack, int newLevel)
   return 0;
 }
 
-bool Outliner::isOutlined(const Region* region)
+bool Outliner::isOutlined(const Region* region) const
 {
   return region->hasParent(searchRegion);
 }
@@ -92,7 +92,8 @@ void Outliner::addRegion(size_t lno, UnicodeString* line, int sx, int ex, const
 
   if (lineIsEmpty) {
     outline.push_back(new OutlineItem(lno, sx, curLevel, &itemLabel, region));
-  } else {
+  }
+  else {
     OutlineItem* thisItem = outline.back();
     if (thisItem->token != nullptr && thisItem->lno == lno) {
       thisItem->token->append(itemLabel);
@@ -101,12 +102,14 @@ void Outliner::addRegion(size_t lno, UnicodeString* line, int sx, int ex, const
   lineIsEmpty = false;
 }
 
-void Outliner::enterScheme(size_t /*lno*/, UnicodeString* /*line*/, int /*sx*/, int /*ex*/, const Region* /*region*/, const Scheme* /*scheme*/)
+void Outliner::enterScheme(size_t /*lno*/, UnicodeString* /*line*/, int /*sx*/, int /*ex*/, const Region* /*region*/,
+                           const Scheme* /*scheme*/)
 {
   curLevel++;
 }
 
-void Outliner::leaveScheme(size_t /*lno*/, UnicodeString* /*line*/, int /*sx*/, int /*ex*/, const Region* /*region*/, const Scheme* /*scheme*/)
+void Outliner::leaveScheme(size_t /*lno*/, UnicodeString* /*line*/, int /*sx*/, int /*ex*/, const Region* /*region*/,
+                           const Scheme* /*scheme*/)
 {
   curLevel--;
 }

src/colorer/editor/Outliner.h

@@ -53,7 +53,7 @@ class Outliner : public RegionHandler, public EditorListener
   /**
    * Total number of currently available outline items
    */
-  size_t itemCount();
+  size_t itemCount() const;
 
   void startParsing(size_t lno) override;
   void endParsing(size_t lno) override;
@@ -64,7 +64,7 @@ class Outliner : public RegionHandler, public EditorListener
   void modifyEvent(size_t topLine) override;
 
  protected:
-  bool isOutlined(const Region* region);
+  bool isOutlined(const Region* region) const;
 
   BaseEditor* baseEditor;
   const Region* searchRegion;

src/colorer/handlers/LineRegion.cpp

@@ -45,12 +45,12 @@ LineRegion::LineRegion()
   special = false;
 }
 
-const StyledRegion* LineRegion::styled()
+const StyledRegion* LineRegion::styled() const
 {
   return StyledRegion::cast(rdef);
 }
 
-const TextRegion* LineRegion::texted()
+const TextRegion* LineRegion::texted() const
 {
   return TextRegion::cast(rdef);
 }

src/colorer/handlers/LineRegion.h

@@ -50,12 +50,12 @@ class LineRegion
   /** Transforms this region's reference into styled region define
       and returns new pointer.
   */
-  const StyledRegion* styled();
+  const StyledRegion* styled() const;
 
   /** Transforms this region's reference into text region define
       and returns new pointer.
   */
-  const TextRegion* texted();
+  const TextRegion* texted() const;
 
   /** Copy operator */
   LineRegion& operator=(const LineRegion& lr);

src/colorer/handlers/LineRegionsSupport.cpp

@@ -24,7 +24,7 @@ void LineRegionsSupport::resize(size_t lineCount_)
   this->lineCount = lineCount_;
 }
 
-size_t LineRegionsSupport::size()
+size_t LineRegionsSupport::size() const
 {
   return lineCount;
 }
@@ -60,7 +60,7 @@ void LineRegionsSupport::setFirstLine(size_t first)
   firstLineNo = first;
 }
 
-size_t LineRegionsSupport::getFirstLine()
+size_t LineRegionsSupport::getFirstLine() const
 {
   return firstLineNo;
 }

src/colorer/handlers/LineRegionsSupport.h

@@ -24,7 +24,7 @@ class LineRegionsSupport : public RegionHandler
   /**
    * Return current size of this line regions structure
    */
-  size_t size();
+  size_t size() const;
 
   /**
    * Drops all internal structures
@@ -41,7 +41,7 @@ class LineRegionsSupport : public RegionHandler
   /**
    * Returns first line position, installed in this line structures.
    */
-  size_t getFirstLine();
+  size_t getFirstLine() const;
 
   /**
    * Background region define, which is used to

src/colorer/handlers/RegionMapper.cpp

@@ -3,8 +3,8 @@
 std::vector<const RegionDefine*> RegionMapper::enumerateRegionDefines() const
 {
   std::vector<const RegionDefine*> result(regionDefines.size());
-  for (const auto& regionDefine : regionDefines) {
-    result.push_back(regionDefine.second.get());
+  for (const auto& [key, value] : regionDefines) {
+    result.push_back(value.get());
   }
   return result;
 }

src/colorer/handlers/StyledHRDMapper.cpp

@@ -59,11 +59,11 @@ void StyledHRDMapper::saveRegionMappings(Writer* writer) const
 {
   writer->write(u"<?xml version=\"1.0\"?>\n");
 
-  for (const auto& regionDefine : regionDefines) {
-    const StyledRegion* rdef = StyledRegion::cast(regionDefine.second.get());
+  for (const auto& [key, value] : regionDefines) {
+    const StyledRegion* rdef = StyledRegion::cast(value.get());
     constexpr auto size_temporary = 256;
     char temporary[size_temporary];
-    writer->write(u"\t<define name='" + regionDefine.first + u"'");
+    writer->write(u"\t<define name='" + key + u"'");
     if (rdef->isForeSet) {
       snprintf(temporary, size_temporary, " fore=\"#%06x\"", rdef->fore);
       writer->write(temporary);

src/colorer/handlers/TextHRDMapper.cpp

@@ -44,9 +44,9 @@ void TextHRDMapper::saveRegionMappings(Writer* writer) const
 {
   writer->write(u"<?xml version=\"1.0\"?>\n");
 
-  for (const auto& regionDefine : regionDefines) {
-    const TextRegion* rdef = TextRegion::cast(regionDefine.second.get());
-    writer->write(u"\t<define name='" + regionDefine.first + u"'");
+  for (const auto& [key, value] : regionDefines) {
+    const TextRegion* rdef = TextRegion::cast(value.get());
+    writer->write(u"\t<define name='" + key + u"'");
     if (rdef->start_text != nullptr) {
       writer->write(u" start_text='" + *rdef->start_text + u"'");
     }

src/colorer/io/FileWriter.h

@@ -16,7 +16,6 @@ class FileWriter : public StreamWriter{
   */
   FileWriter(const UnicodeString* fileName, bool useBOM);
   ~FileWriter() override;
-protected:
 };
 
 #endif

src/colorer/parsers/FileTypeImpl.cpp

@@ -51,8 +51,8 @@ std::vector<UnicodeString> FileType::Impl::enumParams() const
 {
   std::vector<UnicodeString> r;
   r.reserve(paramsHash.size());
-  for (const auto& p : paramsHash) {
-    r.push_back(p.first);
+  for (const auto& [key, value] : paramsHash) {
+    r.push_back(key);
   }
   return r;
 }
@@ -113,8 +113,8 @@ const UnicodeString* FileType::Impl::getParamUserValue(const UnicodeString& para
 
 TypeParameter& FileType::Impl::addParam(const UnicodeString& param_name, const UnicodeString& value)
 {
-  auto it = paramsHash.try_emplace(param_name, TypeParameter(param_name, value));
-  return it.first->second;
+  auto [fst, snd] = paramsHash.try_emplace(param_name, param_name, value);
+  return fst->second;
 }
 
 void FileType::Impl::setParamValue(const UnicodeString& param_name, const UnicodeString* value)

src/colorer/parsers/HrcLibraryImpl.cpp

@@ -867,8 +867,7 @@ void HrcLibrary::Impl::updateLinks()
 {
   while (structureChanged) {
     structureChanged = false;
-    for (auto& scheme_it : schemeHash) {
-      const SchemeImpl* scheme = scheme_it.second;
+    for (auto const& [key, scheme] : schemeHash) {
       if (!scheme->fileType->pimpl->loadDone) {
         continue;
       }
@@ -1061,7 +1060,7 @@ const Region* HrcLibrary::Impl::getNCRegion(const UnicodeString* name, const boo
       Regions with this name are always transparent
   */
   if (reg != nullptr) {
-    const auto s_name = reg->getName();
+    const auto& s_name = reg->getName();
     const auto idx = s_name.indexOf(":default");
     if (idx != -1 && idx + 8 == s_name.length()) {
       return nullptr;

src/colorer/parsers/ParserFactoryImpl.cpp

@@ -46,7 +46,7 @@ void ParserFactory::Impl::loadHrcPath(const UnicodeString& location)
     COLORER_LOG_DEBUG("try load '%'", location);
     if (XmlInputSource::isFsURI(*base_catalog_path, &location)) {
       auto files = colorer::Environment::getFilesFromPath(base_catalog_path.get(), &location, ".hrc");
-      for (auto& file : files) {
+      for (const auto& file : files) {
         loadHrc(file, nullptr);
       }
     }
@@ -89,7 +89,7 @@ std::vector<UnicodeString> ParserFactory::Impl::enumHrdClasses()
 {
   std::vector<UnicodeString> result;
   result.reserve(hrd_nodes.size());
-  for (auto& hrd_node : hrd_nodes) {
+  for (const auto& hrd_node : hrd_nodes) {
     result.push_back(hrd_node.first);
   }
   return result;
@@ -100,7 +100,7 @@ std::vector<const HrdNode*> ParserFactory::Impl::enumHrdInstances(const UnicodeS
   auto hash = hrd_nodes.find(classID);
   std::vector<const HrdNode*> result;
   result.reserve(hash->second->size());
-  for (auto& p : *hash->second) {
+  for (const auto& p : *hash->second) {
     result.push_back(p.get());
   }
   return result;
@@ -112,7 +112,7 @@ const HrdNode& ParserFactory::Impl::getHrdNode(const UnicodeString& classID, con
   if (hash == hrd_nodes.end()) {
     throw ParserFactoryException("can't find HRDClass '" + classID + "'");
   }
-  for (auto& p : *hash->second) {
+  for (const auto& p : *hash->second) {
     if (nameID.compare(p->hrd_name) == 0) {
       return *p;
     }

src/colorer/parsers/TextParserHelpers.cpp

@@ -5,7 +5,7 @@
 
 ParseCache::~ParseCache()
 {
-  //COLORER_LOG_DEEPTRACE("[TPCache] ~ParseCache():%,%-%", *scheme->getName(), sline, eline);
+  // COLORER_LOG_DEEPTRACE("[TPCache] ~ParseCache():%,%-%", *scheme->getName(), sline, eline);
   delete backLine;
   delete children;
   prev = nullptr;
@@ -29,7 +29,9 @@ ParseCache::~ParseCache()
 
 ParseCache* ParseCache::searchLine(int ln, ParseCache** cache)
 {
-  ParseCache *r1 = nullptr, *r2 = nullptr, *tmp = this;
+  ParseCache* r1 = nullptr;
+  ParseCache* r2 = nullptr;
+  ParseCache* tmp = this;
   *cache = nullptr;
   while (tmp) {
     COLORER_LOG_DEEPTRACE("[TPCache] searchLine() tmp:%,%-%", *tmp->scheme->getName(), tmp->sline, tmp->eline);