diff --git a/client/ui/controllers/importController.cpp b/client/ui/controllers/importController.cpp index 3200d0e8..28bbc9f6 100644 --- a/client/ui/controllers/importController.cpp +++ b/client/ui/controllers/importController.cpp @@ -78,7 +78,7 @@ ImportController::ImportController(const QSharedPointer &serversMo bool ImportController::extractConfigFromFile(const QString &fileName) { QString data; - if (!SystemController::readFile(fileName, &data)) { + if (!SystemController::readFile(fileName, data)) { emit importErrorOccurred(ErrorCode::ImportOpenConfigError, false); return false; } diff --git a/client/ui/controllers/settingsController.cpp b/client/ui/controllers/settingsController.cpp index e20f4d3b..6d777bd8 100644 --- a/client/ui/controllers/settingsController.cpp +++ b/client/ui/controllers/settingsController.cpp @@ -132,7 +132,7 @@ void SettingsController::backupAppConfig(const QString &fileName) void SettingsController::restoreAppConfig(const QString &fileName) { QByteArray data; - SystemController::readFile(fileName, &data); + SystemController::readFile(fileName, data); restoreAppConfigFromData(data); } diff --git a/client/ui/controllers/sitesController.cpp b/client/ui/controllers/sitesController.cpp index d94a9b6f..24ae035f 100644 --- a/client/ui/controllers/sitesController.cpp +++ b/client/ui/controllers/sitesController.cpp @@ -83,7 +83,7 @@ void SitesController::removeSite(int index) void SitesController::importSites(const QString &fileName, bool replaceExisting) { QByteArray jsonData; - if (!SystemController::readFile(fileName, &jsonData)) { + if (!SystemController::readFile(fileName, jsonData)) { emit errorOccurred(tr("Can't open file: %1").arg(fileName)); return; } diff --git a/client/ui/controllers/systemController.cpp b/client/ui/controllers/systemController.cpp index 3463d5f9..52ca1294 100644 --- a/client/ui/controllers/systemController.cpp +++ b/client/ui/controllers/systemController.cpp @@ -62,28 +62,28 @@ void SystemController::saveFile(const QString &fileName, const QString &data) #endif } -bool SystemController::readFile(const QString &fileName, QByteArray *data) +bool SystemController::readFile(const QString &fileName, QByteArray &data) { #ifdef Q_OS_ANDROID int fd = AndroidController::instance()->getFd(fileName); if (fd == -1) return false; QFile file; if(!file.open(fd, QIODevice::ReadOnly)) return false; - data->assign(file.readAll()); + data = file.readAll(); AndroidController::instance()->closeFd(); #else QFile file(fileName); if (!file.open(QIODevice::ReadOnly)) return false; - data->assign(file.readAll()); + data = file.readAll(); #endif return true; } -bool SystemController::readFile(const QString &fileName, QString *data) +bool SystemController::readFile(const QString &fileName, QString &data) { QByteArray byteArray; - if(!readFile(fileName, &byteArray)) return false; - data->assign(byteArray); + if(!readFile(fileName, byteArray)) return false; + data = byteArray; return true; } diff --git a/client/ui/controllers/systemController.h b/client/ui/controllers/systemController.h index f80d2fdb..8cb3a0d1 100644 --- a/client/ui/controllers/systemController.h +++ b/client/ui/controllers/systemController.h @@ -12,8 +12,8 @@ public: explicit SystemController(const std::shared_ptr &setting, QObject *parent = nullptr); static void saveFile(const QString &fileName, const QString &data); - static bool readFile(const QString &fileName, QByteArray *data); - static bool readFile(const QString &fileName, QString *data); + static bool readFile(const QString &fileName, QByteArray &data); + static bool readFile(const QString &fileName, QString &data); public slots: QString getFileName(const QString &acceptLabel, const QString &nameFilter, const QString &selectedFile = "",