#2086 Moved RifStringTools -> RiaStringEncodingTools

ApplicationCode/Application/Tools/CMakeLists_files.cmake

@@ -24,6 +24,7 @@ ${CEE_CURRENT_LIST_DIR}RiaStdStringTools.h
 ${CEE_CURRENT_LIST_DIR}RiaSummaryCurveAnalyzer.h
 ${CEE_CURRENT_LIST_DIR}RiaSimWellBranchTools.h
 ${CEE_CURRENT_LIST_DIR}RiaProjectFileVersionTools.h
+${CEE_CURRENT_LIST_DIR}RiaStringEncodingTools.h
 )
 
 set (SOURCE_GROUP_SOURCE_FILES
@@ -45,6 +46,7 @@ ${CEE_CURRENT_LIST_DIR}RiaStdStringTools.cpp
 ${CEE_CURRENT_LIST_DIR}RiaSummaryCurveAnalyzer.cpp
 ${CEE_CURRENT_LIST_DIR}RiaSimWellBranchTools.cpp
 ${CEE_CURRENT_LIST_DIR}RiaProjectFileVersionTools.cpp
+${CEE_CURRENT_LIST_DIR}RiaStringEncodingTools.cpp
 )
 
 list(APPEND CODE_HEADER_FILES

ApplicationCode/Application/Tools/RiaStringEncodingTools.cpp

@@ -18,10 +18,10 @@
 //
 /////////////////////////////////////////////////////////////////////////////////
 
-#include "RifStringTools.h"
+#include "RiaStringEncodingTools.h"
 
 
-const std::string RifStringTools::toNativeEncoded(const QString& qstring)
+const std::string RiaStringEncodingTools::toNativeEncoded(const QString& qstring)
 {
 #ifdef WIN32
     return std::string(qstring.toLatin1().data());
@@ -33,7 +33,7 @@ const std::string RifStringTools::toNativeEncoded(const QString& qstring)
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-const QString RifStringTools::fromNativeEncoded(const char* native)
+const QString RiaStringEncodingTools::fromNativeEncoded(const char* native)
 {
 #ifdef WIN32
     return QString::fromLatin1(native);

ApplicationCode/Application/Tools/RiaStringEncodingTools.h

@@ -29,7 +29,7 @@
 // 
 //
 //==================================================================================================
-class RifStringTools
+class RiaStringEncodingTools
 {
 public:
     static const std::string    toNativeEncoded(const QString& qstring);

ApplicationCode/FileInterface/CMakeLists_files.cmake

@@ -40,7 +40,6 @@ ${CEE_CURRENT_LIST_DIR}RifCsvUserData.h
 ${CEE_CURRENT_LIST_DIR}RifCsvUserDataParser.h
 ${CEE_CURRENT_LIST_DIR}RifWellPathFormationReader.h
 ${CEE_CURRENT_LIST_DIR}RifWellPathFormationsImporter.h
-${CEE_CURRENT_LIST_DIR}RifStringTools.h
 # HDF5 file reader is directly included in ResInsight main CmakeList.txt
 #${CEE_CURRENT_LIST_DIR}RifHdf5Reader.h
 )
@@ -85,7 +84,6 @@ ${CEE_CURRENT_LIST_DIR}RifCsvUserData.cpp
 ${CEE_CURRENT_LIST_DIR}RifCsvUserDataParser.cpp
 ${CEE_CURRENT_LIST_DIR}RifWellPathFormationReader.cpp
 ${CEE_CURRENT_LIST_DIR}RifWellPathFormationsImporter.cpp
-${CEE_CURRENT_LIST_DIR}RifStringTools.cpp
 
 # HDF5 file reader is directly included in ResInsight main CmakeList.txt
 #${CEE_CURRENT_LIST_DIR}RifHdf5Reader.cpp

ApplicationCode/FileInterface/RifEclipseOutputFileTools.cpp

@@ -22,7 +22,7 @@
 
 #include "RifEclipseRestartFilesetAccess.h"
 #include "RifEclipseUnifiedRestartFileAccess.h"
-#include "RifStringTools.h"
+#include "RiaStringEncodingTools.h"
 #include "RiaQDateTimeTools.h"
 
 #include "ert/ecl/ecl_file.h"
@@ -184,7 +184,7 @@ void RifEclipseOutputFileTools::timeSteps(ecl_file_type* ecl_file, std::vector<Q
 //--------------------------------------------------------------------------------------------------
 bool RifEclipseOutputFileTools::keywordData(ecl_file_type* ecl_file, const QString& keyword, size_t fileKeywordOccurrence, std::vector<double>* values)
 {
-    ecl_kw_type* kwData = ecl_file_iget_named_kw(ecl_file, RifStringTools::toNativeEncoded(keyword).data(), static_cast<int>(fileKeywordOccurrence));
+    ecl_kw_type* kwData = ecl_file_iget_named_kw(ecl_file, RiaStringEncodingTools::toNativeEncoded(keyword).data(), static_cast<int>(fileKeywordOccurrence));
     if (kwData)
     {
         size_t numValues = ecl_kw_get_size(kwData);
@@ -206,7 +206,7 @@ bool RifEclipseOutputFileTools::keywordData(ecl_file_type* ecl_file, const QStri
 //--------------------------------------------------------------------------------------------------
 bool RifEclipseOutputFileTools::keywordData(ecl_file_type* ecl_file, const QString& keyword, size_t fileKeywordOccurrence, std::vector<int>* values)
 {
-    ecl_kw_type* kwData = ecl_file_iget_named_kw(ecl_file, RifStringTools::toNativeEncoded(keyword).data(), static_cast<int>(fileKeywordOccurrence));
+    ecl_kw_type* kwData = ecl_file_iget_named_kw(ecl_file, RiaStringEncodingTools::toNativeEncoded(keyword).data(), static_cast<int>(fileKeywordOccurrence));
     if (kwData)
     {
         size_t numValues = ecl_kw_get_size(kwData);
@@ -233,7 +233,7 @@ QString RifEclipseOutputFileTools::firstFileNameOfType(const QStringList& fileSe
     {
         bool formatted = false;
         int reportNumber = -1;
-        if (ecl_util_get_file_type(RifStringTools::toNativeEncoded(fileSet.at(i)).data(), &formatted, &reportNumber) == fileType)
+        if (ecl_util_get_file_type(RiaStringEncodingTools::toNativeEncoded(fileSet.at(i)).data(), &formatted, &reportNumber) == fileType)
         {
             return fileSet.at(i);
         }
@@ -254,7 +254,7 @@ QStringList RifEclipseOutputFileTools::filterFileNamesOfType(const QStringList&
     {
         bool formatted = false;
         int reportNumber = -1;
-        if (ecl_util_get_file_type(RifStringTools::toNativeEncoded(fileSet.at(i)).data(), &formatted, &reportNumber) == fileType)
+        if (ecl_util_get_file_type(RiaStringEncodingTools::toNativeEncoded(fileSet.at(i)).data(), &formatted, &reportNumber) == fileType)
         {
             fileNames.append(fileSet.at(i));
         }
@@ -277,12 +277,12 @@ bool RifEclipseOutputFileTools::findSiblingFilesWithSameBaseName(const QString&
     QString fileNameBase = QFileInfo(fullPathFileName).baseName();
 
     stringlist_type* eclipseFiles = stringlist_alloc_new();
-    ecl_util_select_filelist(RifStringTools::toNativeEncoded(filePath).data(), RifStringTools::toNativeEncoded(fileNameBase).data(), ECL_OTHER_FILE, false, eclipseFiles);
+    ecl_util_select_filelist(RiaStringEncodingTools::toNativeEncoded(filePath).data(), RiaStringEncodingTools::toNativeEncoded(fileNameBase).data(), ECL_OTHER_FILE, false, eclipseFiles);
 
     int i;
     for (i = 0; i < stringlist_get_size(eclipseFiles); i++)
     {
-        baseNameFiles->append(RifStringTools::fromNativeEncoded(stringlist_safe_iget(eclipseFiles, i)));
+        baseNameFiles->append(RiaStringEncodingTools::fromNativeEncoded(stringlist_safe_iget(eclipseFiles, i)));
     }
 
     stringlist_free(eclipseFiles);
@@ -295,7 +295,7 @@ bool RifEclipseOutputFileTools::findSiblingFilesWithSameBaseName(const QString&
 //--------------------------------------------------------------------------------------------------
 void RifEclipseOutputFileTools::readGridDimensions(const QString& gridFileName, std::vector< std::vector<int> >& gridDimensions)
 {
-    ecl_grid_type * grid         = ecl_grid_alloc(RifStringTools::toNativeEncoded(gridFileName).data());                               // bootstrap ecl_grid instance
+    ecl_grid_type * grid         = ecl_grid_alloc(RiaStringEncodingTools::toNativeEncoded(gridFileName).data());                               // bootstrap ecl_grid instance
     stringlist_type * lgr_names  = ecl_grid_alloc_lgr_name_list( grid );                                   // get a list of all the lgr names.
 
     //printf("grid:%s has %d a total of %d lgr's \n", grid_filename , stringlist_get_size( lgr_names ));

ApplicationCode/FileInterface/RifEclipseRestartFilesetAccess.cpp

@@ -20,7 +20,7 @@
 
 #include "RifEclipseRestartFilesetAccess.h"
 #include "RifEclipseOutputFileTools.h"
-#include "RifStringTools.h"
+#include "RiaStringEncodingTools.h"
 
 #include "cafProgressInfo.h"
 
@@ -272,7 +272,7 @@ void RifEclipseRestartFilesetAccess::openTimeStep(size_t timeStep)
     if (m_ecl_files[timeStep] == NULL)
     {
         int index = static_cast<int>(timeStep);
-        ecl_file_type* ecl_file = ecl_file_open(RifStringTools::toNativeEncoded(m_fileNames[index]).data(), ECL_FILE_CLOSE_STREAM);
+        ecl_file_type* ecl_file = ecl_file_open(RiaStringEncodingTools::toNativeEncoded(m_fileNames[index]).data(), ECL_FILE_CLOSE_STREAM);
 
         m_ecl_files[timeStep] = ecl_file;
 
@@ -297,7 +297,7 @@ int RifEclipseRestartFilesetAccess::reportNumber(const ecl_file_type* ecl_file)
     fileNameUpper = fileNameUpper.toUpper();
 
     // Convert to upper case, as ecl_util_filename_report_nr does not handle lower case file extensions
-    int reportNumber = ecl_util_filename_report_nr(RifStringTools::toNativeEncoded(fileNameUpper).data());
+    int reportNumber = ecl_util_filename_report_nr(RiaStringEncodingTools::toNativeEncoded(fileNameUpper).data());
 
     return reportNumber;
 }

ApplicationCode/FileInterface/RifEclipseSummaryTools.cpp

@@ -20,7 +20,7 @@
 
 #include "RiaSummaryCurveAnalyzer.h"
 #include "RifReaderEclipseSummary.h"
-#include "RifStringTools.h"
+#include "RiaStringEncodingTools.h"
 
 #include "cafAppEnum.h"
 
@@ -53,10 +53,10 @@ void RifEclipseSummaryTools::findSummaryFiles(const QString& inputFile,
     char* myBase = NULL;
     char* myExtention = NULL;
 
-    util_alloc_file_components(RifStringTools::toNativeEncoded(inputFile).data(), &myPath, &myBase, &myExtention);
+    util_alloc_file_components(RiaStringEncodingTools::toNativeEncoded(inputFile).data(), &myPath, &myBase, &myExtention);
 
-    QString path; if(myPath) path = RifStringTools::fromNativeEncoded(myPath);
+    QString path; if(myPath) path = RiaStringEncodingTools::fromNativeEncoded(myPath);
-    QString base; if(myBase) base = RifStringTools::fromNativeEncoded(myBase);
+    QString base; if(myBase) base = RiaStringEncodingTools::fromNativeEncoded(myBase);
     std::string extention; if(myExtention) extention = myExtention;
 
     if(path.isEmpty() || base.isEmpty()) return ;
@@ -64,10 +64,10 @@ void RifEclipseSummaryTools::findSummaryFiles(const QString& inputFile,
     char* myHeaderFile = NULL;
     stringlist_type* summary_file_list = stringlist_alloc_new();
 
-    ecl_util_alloc_summary_files(RifStringTools::toNativeEncoded(path).data(), RifStringTools::toNativeEncoded(base).data(), extention.data(), &myHeaderFile, summary_file_list);
+    ecl_util_alloc_summary_files(RiaStringEncodingTools::toNativeEncoded(path).data(), RiaStringEncodingTools::toNativeEncoded(base).data(), extention.data(), &myHeaderFile, summary_file_list);
     if(myHeaderFile)
     {
-        (*headerFile) = RifStringTools::fromNativeEncoded(myHeaderFile);
+        (*headerFile) = RiaStringEncodingTools::fromNativeEncoded(myHeaderFile);
         util_safe_free(myHeaderFile);
     }
 
@@ -75,7 +75,7 @@ void RifEclipseSummaryTools::findSummaryFiles(const QString& inputFile,
     {
         for(int i = 0; i < stringlist_get_size(summary_file_list); i++)
         {
-            dataFiles->push_back(RifStringTools::fromNativeEncoded(stringlist_iget(summary_file_list,i)));
+            dataFiles->push_back(RiaStringEncodingTools::fromNativeEncoded(stringlist_iget(summary_file_list,i)));
         }
     }
     stringlist_free(summary_file_list);
@@ -113,12 +113,12 @@ QStringList RifEclipseSummaryTools::findSummaryDataFiles(const QString& caseFile
     char* header_file = NULL;
     stringlist_type* summary_file_list = stringlist_alloc_new();
 
-    ecl_util_alloc_summary_files(RifStringTools::toNativeEncoded(path).data(), RifStringTools::toNativeEncoded(base).data(), NULL, &header_file, summary_file_list);
+    ecl_util_alloc_summary_files(RiaStringEncodingTools::toNativeEncoded(path).data(), RiaStringEncodingTools::toNativeEncoded(base).data(), NULL, &header_file, summary_file_list);
     if (stringlist_get_size( summary_file_list ) > 0)
     {
         for (int i = 0; i < stringlist_get_size(summary_file_list); i++)
         {
-            fileNames.push_back(RifStringTools::fromNativeEncoded(stringlist_iget(summary_file_list, i)));
+            fileNames.push_back(RiaStringEncodingTools::fromNativeEncoded(stringlist_iget(summary_file_list, i)));
         }
     }
 
@@ -173,7 +173,7 @@ void RifEclipseSummaryTools::findSummaryHeaderFileInfo(const QString& inputFile,
     char* myBase = NULL;
     bool formattedFile = true;
 
-    util_alloc_file_components(RifStringTools::toNativeEncoded(inputFile).data(), &myPath, &myBase, NULL);
+    util_alloc_file_components(RiaStringEncodingTools::toNativeEncoded(inputFile).data(), &myPath, &myBase, NULL);
 
     char* myHeaderFile = ecl_util_alloc_exfilename(myPath, myBase, ECL_SUMMARY_HEADER_FILE, true, -1);
     if (!myHeaderFile)

ApplicationCode/FileInterface/RifEclipseUnifiedRestartFileAccess.cpp

@@ -26,7 +26,7 @@
 
 #include "RifEclipseOutputFileTools.h"
 #include "RifReaderSettings.h"
-#include "RifStringTools.h"
+#include "RiaStringEncodingTools.h"
 
 #include "ert/ecl/ecl_file.h"
 #include "ert/ecl/ecl_kw_magic.h"
@@ -84,7 +84,7 @@ bool RifEclipseUnifiedRestartFileAccess::openFile()
 
                 if (resultFileInfo.lastModified() < indexFileInfo.lastModified())
                 {
-                    m_ecl_file = ecl_file_fast_open(RifStringTools::toNativeEncoded(m_filename).data(), RifStringTools::toNativeEncoded(indexFileName).data(), ECL_FILE_CLOSE_STREAM);
+                    m_ecl_file = ecl_file_fast_open(RiaStringEncodingTools::toNativeEncoded(m_filename).data(), RiaStringEncodingTools::toNativeEncoded(indexFileName).data(), ECL_FILE_CLOSE_STREAM);
                     if (!m_ecl_file)
                     {
                         RiaLogging::error(QString("Failed to open file %1 using index file.").arg(m_filename));
@@ -100,7 +100,7 @@ bool RifEclipseUnifiedRestartFileAccess::openFile()
 
         if (!m_ecl_file)
         {
-            m_ecl_file = ecl_file_open(RifStringTools::toNativeEncoded(m_filename).data(), ECL_FILE_CLOSE_STREAM);
+            m_ecl_file = ecl_file_open(RiaStringEncodingTools::toNativeEncoded(m_filename).data(), ECL_FILE_CLOSE_STREAM);
             if (!m_ecl_file)
             {
                 RiaLogging::error(QString("Failed to open file %1").arg(m_filename));
@@ -113,7 +113,7 @@ bool RifEclipseUnifiedRestartFileAccess::openFile()
                     QString resultPath = fi.absolutePath();
                     if (caf::Utils::isFolderWritable(resultPath))
                     {
-                        bool success = ecl_file_write_index(m_ecl_file, RifStringTools::toNativeEncoded(indexFileName).data());
+                        bool success = ecl_file_write_index(m_ecl_file, RiaStringEncodingTools::toNativeEncoded(indexFileName).data());
 
                         if (success)
                         {

ApplicationCode/FileInterface/RifReaderEclipseOutput.cpp

@@ -28,7 +28,7 @@
 #include "RifEclipseOutputFileTools.h"
 #include "RifHdf5ReaderInterface.h"
 #include "RifReaderSettings.h"
-#include "RifStringTools.h"
+#include "RiaStringEncodingTools.h"
 
 #ifdef USE_HDF5
 #include "RifHdf5Reader.h"
@@ -375,7 +375,7 @@ bool RifReaderEclipseOutput::open(const QString& fileName, RigEclipseCaseData* e
 
     // Read geometry
     // Todo: Needs to check existence of file before calling ert, else it will abort
-    ecl_grid_type * mainEclGrid = ecl_grid_alloc( RifStringTools::toNativeEncoded(fileName).data() );
+    ecl_grid_type * mainEclGrid = ecl_grid_alloc( RiaStringEncodingTools::toNativeEncoded(fileName).data() );
 
     progInfo.incrementProgress();
 
@@ -723,7 +723,7 @@ bool RifReaderEclipseOutput::readActiveCellInfo()
     QString egridFileName = RifEclipseOutputFileTools::firstFileNameOfType(m_filesWithSameBaseName, ECL_EGRID_FILE);
     if (egridFileName.size() > 0)
     {
-        ecl_file_type* ecl_file = ecl_file_open(RifStringTools::toNativeEncoded(egridFileName).data(), ECL_FILE_CLOSE_STREAM);
+        ecl_file_type* ecl_file = ecl_file_open(RiaStringEncodingTools::toNativeEncoded(egridFileName).data(), ECL_FILE_CLOSE_STREAM);
         if (!ecl_file) return false;
 
         int actnumKeywordCount = ecl_file_get_num_named_kw(ecl_file, ACTNUM_KW);
@@ -2214,7 +2214,7 @@ void RifReaderEclipseOutput::openInitFile()
     QString initFileName = RifEclipseOutputFileTools::firstFileNameOfType(m_filesWithSameBaseName, ECL_INIT_FILE);
     if (initFileName.size() > 0)
     {
-        m_ecl_init_file = ecl_file_open(RifStringTools::toNativeEncoded(initFileName).data(), ECL_FILE_CLOSE_STREAM);
+        m_ecl_init_file = ecl_file_open(RiaStringEncodingTools::toNativeEncoded(initFileName).data(), ECL_FILE_CLOSE_STREAM);
     }
 }
 

ApplicationCode/FileInterface/RifReaderEclipseRft.cpp

@@ -21,7 +21,7 @@
 #include "RiaLogging.h"
 #include "RiaQDateTimeTools.h"
 
-#include "RifStringTools.h"
+#include "RiaStringEncodingTools.h"
 
 #include "cafVecIjk.h"
 
@@ -51,7 +51,7 @@ void RifReaderEclipseRft::open()
 
     RiaLogging::info(QString("Opening file '%1'").arg( m_fileName));
 
-    m_ecl_rft_file = ecl_rft_file_alloc_case(RifStringTools::toNativeEncoded(m_fileName).data());
+    m_ecl_rft_file = ecl_rft_file_alloc_case(RiaStringEncodingTools::toNativeEncoded(m_fileName).data());
 
     if (m_ecl_rft_file == NULL)
     {

ApplicationCode/FileInterface/RifReaderEclipseSummary.cpp

@@ -17,7 +17,7 @@
 /////////////////////////////////////////////////////////////////////////////////
 
 #include "RifReaderEclipseSummary.h"
-#include "RifStringTools.h"
+#include "RiaStringEncodingTools.h"
 
 #include "ert/ecl/ecl_sum.h"
 
@@ -66,11 +66,11 @@ bool RifReaderEclipseSummary::open(const QString& headerFileName, const QStringL
     stringlist_type* dataFiles = stringlist_alloc_new();
     for (int i = 0; i < dataFileNames.size(); i++)
     {
-        stringlist_append_copy(dataFiles, RifStringTools::toNativeEncoded(dataFileNames[i]).data());
+        stringlist_append_copy(dataFiles, RiaStringEncodingTools::toNativeEncoded(dataFileNames[i]).data());
     }
 
     std::string itemSeparatorInVariableNames = ":";
-    m_ecl_sum = ecl_sum_fread_alloc(RifStringTools::toNativeEncoded(headerFileName).data(), dataFiles, itemSeparatorInVariableNames.data(), false);
+    m_ecl_sum = ecl_sum_fread_alloc(RiaStringEncodingTools::toNativeEncoded(headerFileName).data(), dataFiles, itemSeparatorInVariableNames.data(), false);
 
     stringlist_free(dataFiles);
 

ApplicationCode/ReservoirDataModel/RigWellLogFile.cpp

@@ -21,7 +21,7 @@
 
 #include "RigWellLogCurveData.h"
 
-#include "RifStringTools.h"
+#include "RiaStringEncodingTools.h"
 
 #include "RimWellLogCurve.h"
 
@@ -83,7 +83,7 @@ bool RigWellLogFile::open(const QString& fileName, QString* errorMessage)
     {
         int wellFormat = NRLib::Well::LAS;
 
-        well = NRLib::Well::ReadWell(RifStringTools::toNativeEncoded(fileName).data(), wellFormat);
+        well = NRLib::Well::ReadWell(RiaStringEncodingTools::toNativeEncoded(fileName).data(), wellFormat);
         if (!well)
         {
             return false;
@@ -151,7 +151,7 @@ void RigWellLogFile::close()
 QString RigWellLogFile::wellName() const
 {
     CVF_ASSERT(m_wellLogFile);
-    return RifStringTools::fromNativeEncoded(m_wellLogFile->GetWellName().data());
+    return RiaStringEncodingTools::fromNativeEncoded(m_wellLogFile->GetWellName().data());
 }
 
 //--------------------------------------------------------------------------------------------------