Index: sources/storage/filehandler.cpp =================================================================== diff -u -r7edcaf054062754370e0abd165f17ca9941b7d07 -r90d4b8ed818464463083ac39d28d80958bb2c1d9 --- sources/storage/filehandler.cpp (.../filehandler.cpp) (revision 7edcaf054062754370e0abd165f17ca9941b7d07) +++ sources/storage/filehandler.cpp (.../filehandler.cpp) (revision 90d4b8ed818464463083ac39d28d80958bb2c1d9) @@ -109,25 +109,6 @@ /*! * \brief FileHandler::readCSV - * \details reads the provided filename's content into the vContent variable. - * \param vFileName - Source file name - * \param vContent - The content of the file which will be written to when done. - * \return false if file can't be read - */ -bool FileHandler::readCSV(const QString &vFileName, QString &vContent) -{ - QFile file(vFileName); - if (! file.open(QFile::Text | QFile::ReadOnly)) { - errOut(QObject::tr("Can't open file for read (%1).Possible corrupted file system").arg(vFileName)); - return false; - } - QTextStream in(&file); - vContent = in.readAll(); - return true; -} - -/*! - * \brief FileHandler::readCSV * \details reads the provided filename's JSON content into the vContent variable. * \param vFileName - Source file name * \param vContent - The content of the file which will be written to when done. Index: sources/storage/filehandler.h =================================================================== diff -u -r7edcaf054062754370e0abd165f17ca9941b7d07 -r90d4b8ed818464463083ac39d28d80958bb2c1d9 --- sources/storage/filehandler.h (.../filehandler.h) (revision 7edcaf054062754370e0abd165f17ca9941b7d07) +++ sources/storage/filehandler.h (.../filehandler.h) (revision 90d4b8ed818464463083ac39d28d80958bb2c1d9) @@ -35,10 +35,9 @@ static void errOut(const QString &vMessage); public: - static bool write(const QString &vFileName, const QString &vContent, bool vAppend = true); - static bool read (const QString &vFileName, QString &vContent); - static bool readCSV(const QString &vFileName, QString &vContent); - static bool readJSON(const QString &vFileName, QJsonObject &vContent); + static bool write (const QString &vFileName, const QString &vContent, bool vAppend = true); + static bool read (const QString &vFileName, QString &vContent); + static bool readJSON (const QString &vFileName, QJsonObject &vContent); static int copyFolder (const QString &vSource, const QString &vDestination); static int removeFiles(const QStringList &vFolders, const QStringList &vNameFilter, const QDate &vDateOlderThan); Index: unittests/tst_views.cpp =================================================================== diff -u -r5387db3e9735f3bbf768906858dbcd725cf23528 -r90d4b8ed818464463083ac39d28d80958bb2c1d9 --- unittests/tst_views.cpp (.../tst_views.cpp) (revision 5387db3e9735f3bbf768906858dbcd725cf23528) +++ unittests/tst_views.cpp (.../tst_views.cpp) (revision 90d4b8ed818464463083ac39d28d80958bb2c1d9) @@ -529,11 +529,11 @@ view.saveTreatmentRangesCSV(filename); QString readCsvData; - FileHandler::readCSV(filename, readCsvData); + FileHandler::read(filename, readCsvData); QCOMPARE(csvData, readCsvData); - QVERIFY(!FileHandler::readCSV(filename + "invalid", readCsvData)); + QVERIFY(!FileHandler::read(filename + "invalid", readCsvData)); }