Rename Utilities namespace.

Author: przemek83

CMakeLists.txt

@@ -27,8 +27,8 @@ include(ZlibConfig.cmake)
 include(QuaZipConfig.cmake)
 
 set(${PROJECT_NAME}_SOURCES 
-    src/EibleUtilities.h
-    src/EibleUtilities.cpp
+    src/Utilities.h
+    src/Utilities.cpp
     src/ExportXlsx.cpp
     src/ExportDsv.cpp
     src/ExportData.cpp

src/ExportXlsx.cpp

@@ -8,14 +8,13 @@
 #include <QRegExp>
 #include <QVariant>
 
-#include "EibleUtilities.h"
+#include "Utilities.h"
 
 ExportXlsx::ExportXlsx(QObject* parent) : ExportData(parent) {}
 
 bool ExportXlsx::writeContent(const QByteArray& content, QIODevice& ioDevice)
 {
-    QFile xlsxTemplate(QStringLiteral(":/") +
-                       EibleUtilities::getXlsxTemplateName());
+    QFile xlsxTemplate(QStringLiteral(":/") + utilities::getXlsxTemplateName());
     QuaZip inZip(&xlsxTemplate);
     inZip.open(QuaZip::mdUnzip);
 
@@ -116,8 +115,7 @@ QByteArray ExportXlsx::generateRowContent(const QAbstractItemModel& model,
         if (cell.typeId() == QMetaType::QDate ||
             cell.typeId() == QMetaType::QDateTime)
             rowContent.append(QByteArray::number(
-                -1 *
-                cell.toDate().daysTo(EibleUtilities::getStartOfExcelWorld())));
+                -1 * cell.toDate().daysTo(utilities::getStartOfExcelWorld())));
         else
             rowContent.append(cell.toByteArray());
         rowContent.append(CELL_END);
@@ -152,7 +150,7 @@ void ExportXlsx::initColumnNames(int modelColumnCount)
 {
     columnNames_.clear();
     QHash<QByteArray, int> nameToIndexMap{
-        EibleUtilities::generateExcelColumnNames(modelColumnCount)};
+        utilities::generateExcelColumnNames(modelColumnCount)};
     columnNames_.resize(nameToIndexMap.size());
     for (auto it = nameToIndexMap.begin(); it != nameToIndexMap.end(); ++it)
         columnNames_[it.value()] = it.key();

src/ImportSpreadsheet.cpp

@@ -6,7 +6,7 @@
 #include <QVariant>
 #include <QVector>
 
-#include "EibleUtilities.h"
+#include "Utilities.h"
 
 ImportSpreadsheet::ImportSpreadsheet(QIODevice& ioDevice)
     : ioDevice_(ioDevice),
@@ -128,7 +128,7 @@ QVector<QVariant> ImportSpreadsheet::createTemplateDataRow(
         if (!excludedColumns.contains(i))
         {
             templateDataRow[columnToFill] =
-                EibleUtilities::getDefaultVariantForFormat(
+                utilities::getDefaultVariantForFormat(
                     columnTypes[static_cast<int>(i)]);
             columnToFill++;
         }

src/ImportXlsx.cpp

@@ -12,12 +12,12 @@
 #include <QXmlStreamReader>
 #include <QtXml/QDomDocument>
 
-#include "EibleUtilities.h"
+#include "Utilities.h"
 
 ImportXlsx::ImportXlsx(QIODevice& ioDevice)
     : ImportSpreadsheet(ioDevice),
-      excelColNames_(EibleUtilities::generateExcelColumnNames(
-          EibleUtilities::getMaxExcelColumns()))
+      excelColNames_(
+          utilities::generateExcelColumnNames(utilities::getMaxExcelColumns()))
 {
 }
 
@@ -368,9 +368,8 @@ ImportXlsx::retrieveRowCountAndColumnTypes(const QString& sheetName)
     }
 
     std::replace_if(
-        columnTypes.begin(), columnTypes.end(),
-        [](ColumnType columnType) { return columnType == ColumnType::UNKNOWN; },
-        ColumnType::STRING);
+        columnTypes.begin(), columnTypes.end(), [](ColumnType columnType)
+        { return columnType == ColumnType::UNKNOWN; }, ColumnType::STRING);
 
     return {true, rowCounter, columnTypes};
 }
@@ -547,7 +546,7 @@ QVariant ImportXlsx::getCurrentValue(QXmlStreamReader& xmlStreamReader,
 QDate ImportXlsx::getDateFromString(const QString& dateAsString)
 {
     const int daysToAdd{static_cast<int>(dateAsString.toDouble())};
-    return EibleUtilities::getStartOfExcelWorld().addDays(daysToAdd);
+    return utilities::getStartOfExcelWorld().addDays(daysToAdd);
 }
 
 bool ImportXlsx::isDateStyle(const QString& sTagValue) const

src/EibleUtilities.cpp renamed to src/Utilities.cpp

@@ -1,6 +1,6 @@
-#include "EibleUtilities.h"
+#include "Utilities.h"
 
-namespace EibleUtilities
+namespace utilities
 {
 QDate getStartOfExcelWorld()
 {
@@ -69,4 +69,4 @@ QVariant getDefaultVariantForFormat(ColumnType format)
     return QVariant(QMetaType(QMetaType::QString));
 }
 
-}  // namespace EibleUtilities
+}  // namespace utilities

src/EibleUtilities.h renamed to src/Utilities.h

@@ -5,7 +5,7 @@
 
 #include <eible/ColumnType.h>
 
-namespace EibleUtilities
+namespace utilities
 {
 QDate getStartOfExcelWorld();
 
@@ -16,4 +16,4 @@ int getMaxExcelColumns();
 QString getXlsxTemplateName();
 
 QVariant getDefaultVariantForFormat(ColumnType format);
-}  // namespace EibleUtilities
+}  // namespace utilities