minor fixes; cosmetics

11 files changed, 17 insertions, 30 deletions

diff --git a/WinPort/src/APIFiles.cpp b/WinPort/src/APIFiles.cpp
index b1907a26..46ea4cc4 100644
--- a/WinPort/src/APIFiles.cpp
+++ b/WinPort/src/APIFiles.cpp
@@ -79,7 +79,8 @@ extern "C"
 		{
 			bool out = (fd == -1 || os_call_int(sdc_close, fd) == 0);
 			if (!out) {
-				fprintf(stderr, "WinPortHandleFile: error %u closing fd %d\n", errno, fd);
+				ErrnoSaver es;
+				fprintf(stderr, "WinPortHandleFile: error %u closing fd %d\n", es.Get(), fd);
 			}
 
 			fd = -1;
diff --git a/colorer/configs/plug/colorere.hlf b/colorer/configs/plug/colorere.hlf
index 16e50706..fcf7cf0a 100644
--- a/colorer/configs/plug/colorere.hlf
+++ b/colorer/configs/plug/colorere.hlf
@@ -68,13 +68,13 @@ $^#FarColorer's settings.#
   #Log file#
      Full path in this field specifies the file that will store diagnostic messages
 
-  #--------------------------TrueMod Settings------------------------#
+  #--------------------------TrueColor Settings------------------------#
   #Enabled#
-     Enable/Disable TrueMod in plugin.
+     Enable/Disable using of TrueColor (24 bit RGB) coloring.
 
   #Color style:#
-     Choose a color style, which will be used for coloring text in TrueMod. 
-     The choice does not work if the plugin is disabled.
+     Choose a color style, which will be used for coloring text in TrueColor. 
+     The choice does not work if TrueColor is disabled or unavailable.
   #------------------------------------------------------------------#
 
   #[ Test schema library ]#
diff --git a/colorer/configs/plug/colorere.lng b/colorer/configs/plug/colorere.lng
index 1e718ff3..02d42484 100644
--- a/colorer/configs/plug/colorere.lng
+++ b/colorer/configs/plug/colorere.lng
@@ -48,7 +48,7 @@
 "Fatal error loading the library schemes"
 "Select color style"
 "Change Editor &background"
-"TrueMod settings"
+"TrueColor settings"
 "&Users file of color styles"
 "Users &file of schemes"
 "Sc&heme settings"
diff --git a/colorer/configs/plug/colorerr.hlf b/colorer/configs/plug/colorerr.hlf
index 95efe54d..d2fa991d 100644
--- a/colorer/configs/plug/colorerr.hlf
+++ b/colorer/configs/plug/colorerr.hlf
@@ -73,13 +73,13 @@ $^#Настройки плагина.#
   #Log файл#
      Полный путь в этом поле задает файл, в который будут записываться диагностические сообщения.
 
-  #--------------------------Настройки TrueMod-----------------------#
+  #--------------------------Настройки TrueColor-----------------------#
   #Включить#
-     Включает/Отключает TrueMod режим работы плагина.
+     Включает/Отключает TrueColor (24-битные цвета) режим работы плагина.
 
   #Цветовой стиль#
      Выбор цветового стиля, который будет использоваться при раскраске текста в 
-     режиме TrueMod. Выбор не работает, если плагин отключен или недоступен режим TrueMod.
+     режиме TrueColor. Выбор не работает, если TrueColor отключен или недоступен.
   #------------------------------------------------------------------#
 
   #[ Тест библиотеки схем ]#
diff --git a/colorer/configs/plug/colorerr.lng b/colorer/configs/plug/colorerr.lng
index 7d25bc86..61e57158 100644
--- a/colorer/configs/plug/colorerr.lng
+++ b/colorer/configs/plug/colorerr.lng
@@ -48,7 +48,7 @@
 "Ошибка загрузки библиотеки схем"
 "Выбор цветового стиля"
 "И&зменять цвет фона редактора"
-"Настройки TrueMod"
+"Настройки TrueColor"
 "&Файл цветовых стилей пользователя"
 "Фай&л списка схем пользователя"
 "&Настройки схем"
diff --git a/colorer/src/Colorer-library/src/colorer/parsers/FileTypeImpl.cpp b/colorer/src/Colorer-library/src/colorer/parsers/FileTypeImpl.cpp
index 026d7ff2..e5e14b8f 100644
--- a/colorer/src/Colorer-library/src/colorer/parsers/FileTypeImpl.cpp
+++ b/colorer/src/Colorer-library/src/colorer/parsers/FileTypeImpl.cpp
@@ -13,14 +13,7 @@ FileTypeImpl::FileTypeImpl(HRCParserImpl* hrcParser): name(nullptr), group(nullp
 }
 
 FileTypeImpl::~FileTypeImpl(){
-  for(auto it : chooserVector){
-    delete it;
-  }
   chooserVector.clear();
-
-  for(const auto& it: paramsHash){
-    delete it.second;
-  }
   paramsHash.clear();
 
   importVector.clear();
@@ -135,7 +128,7 @@ size_t FileTypeImpl::getParamUserValueCount() const{
 double FileTypeImpl::getPriority(const String *fileName, const String *fileContent) const{
   SMatches match;
   double cur_prior = 0;
-  for(auto ftc : chooserVector){
+  for(const auto &ftc : chooserVector){
     if (fileName != nullptr && ftc->isFileName() && ftc->getRE()->parse(fileName, &match))
       cur_prior += ftc->getPriority();
     if (fileContent != nullptr && ftc->isFileContent() && ftc->getRE()->parse(fileContent, &match))
diff --git a/colorer/src/Colorer-library/src/colorer/parsers/FileTypeImpl.h b/colorer/src/Colorer-library/src/colorer/parsers/FileTypeImpl.h
index 5c7fa8a2..12e5c85c 100644
--- a/colorer/src/Colorer-library/src/colorer/parsers/FileTypeImpl.h
+++ b/colorer/src/Colorer-library/src/colorer/parsers/FileTypeImpl.h
@@ -91,8 +91,8 @@ protected:
   HRCParserImpl *hrcParser;
   SchemeImpl *baseScheme;
 
-  std::vector<FileTypeChooser*> chooserVector;
-  std::unordered_map<SString, TypeParameter*> paramsHash;
+  std::vector<std::unique_ptr<FileTypeChooser> > chooserVector;
+  std::unordered_map<SString, std::unique_ptr<TypeParameter> > paramsHash;
   std::vector<UString> importVector;
   uXmlInputSource inputSource;
 
diff --git a/colorer/src/Colorer-library/src/colorer/parsers/HRCParserImpl.cpp b/colorer/src/Colorer-library/src/colorer/parsers/HRCParserImpl.cpp
index 66a49a27..d318817c 100644
--- a/colorer/src/Colorer-library/src/colorer/parsers/HRCParserImpl.cpp
+++ b/colorer/src/Colorer-library/src/colorer/parsers/HRCParserImpl.cpp
@@ -368,7 +368,7 @@ void HRCParserImpl::addPrototypeDetectParam(const xercesc::DOMElement* elem)
   CString weight = CString(elem->getAttribute(hrcFilenameAttrWeight));
   UnicodeTools::getNumber(&weight, &prior);
   auto* ftc = new FileTypeChooser(ctype, prior, matchRE);
-  parseProtoType->chooserVector.push_back(ftc);
+  parseProtoType->chooserVector.emplace_back(ftc);
 }
 
 void HRCParserImpl::addPrototypeParameters(const xercesc::DOMElement* elem)
diff --git a/colorer/src/pcolorer2/FarEditorSet.cpp b/colorer/src/pcolorer2/FarEditorSet.cpp
index 9afd4ea7..ff144d6a 100644
--- a/colorer/src/pcolorer2/FarEditorSet.cpp
+++ b/colorer/src/pcolorer2/FarEditorSet.cpp
@@ -1748,18 +1748,15 @@ void FarEditorSet::SaveChangedValueParam(HANDLE hDlg)
     //если его изменили  
     if (!v.equals(def_value)){
       if (type->getParamValue(p)==nullptr){
-        ((FileTypeImpl*)type)->addParam(&p);
+        type->addParam(&p);
       }
       type->setParamValue(p,&v);
     }
   }else{//было пользовательское значение
     if (!v.equals(value)){//changed
       if (v.equals(def_value)){
-         //delete value
-         delete type->getParamUserValue(p);
-        ((FileTypeImpl*)type)->removeParamValue(p);
+        type->removeParamValue(p);
       }else{
-        delete type->getParamUserValue(p);
         type->setParamValue(p,&v);
       }
     }
diff --git a/far2l/src/edit.hpp b/far2l/src/edit.hpp
index 66916245..2ba16dc0 100644
--- a/far2l/src/edit.hpp
+++ b/far2l/src/edit.hpp
@@ -148,8 +148,6 @@ class Edit:public ScreenObject
 
 		wchar_t *Mask;
 
-//		ColorItem *ColorList;
-//		int    ColorCount;
 		std::vector<ColorItem> ColorList;
 
 		int    Color;
diff --git a/far2l/src/setcolor.cpp b/far2l/src/setcolor.cpp
index 85df3512..085f75ba 100644
--- a/far2l/src/setcolor.cpp
+++ b/far2l/src/setcolor.cpp
@@ -567,13 +567,11 @@ static void GetColorDlgProc_OnDrawn(HANDLE hDlg)
 
 			if (ci.Attributes & FOREGROUND_TRUECOLOR)
 			{
-				InvColors|= BACKGROUND_TRUECOLOR;
 				SET_RGB_BACK(InvColors, GET_RGB_FORE(ci.Attributes));
 			}
 
 			if (ci.Attributes & BACKGROUND_TRUECOLOR)
 			{
-				InvColors|= FOREGROUND_TRUECOLOR;
 				SET_RGB_FORE(InvColors, GET_RGB_BACK(ci.Attributes));
 			}