From 51c9df215139e12bb7cb3dd2de7fa688f2ceb823 Mon Sep 17 00:00:00 2001 From: Alek Rudnik Date: Wed, 6 Oct 2021 14:22:52 +0200 Subject: [PATCH] [EGD-7725] Minor clean ups and removal of dead code Minor clean ups and removal of dead code --- module-gui/gui/core/FontManager.cpp | 5 ++++- module-gui/gui/core/ImageManager.cpp | 3 +++ module-gui/gui/widgets/Text.cpp | 11 ----------- module-gui/gui/widgets/Text.hpp | 2 -- 4 files changed, 7 insertions(+), 14 deletions(-) diff --git a/module-gui/gui/core/FontManager.cpp b/module-gui/gui/core/FontManager.cpp index 0fb161f900ea68e15a7f16dac87d24a2423f8b2f..70b5ee5a1e41994b5ffbbbf2b3e43e68e7458c52 100644 --- a/module-gui/gui/core/FontManager.cpp +++ b/module-gui/gui/core/FontManager.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved. +// Copyright (c) 2017-2021, Mudita Sp. z.o.o. All rights reserved. // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md #include "FontManager.hpp" @@ -45,6 +45,9 @@ namespace gui { auto file = std::fopen(filename.c_str(), "rb"); + if (file == nullptr) { + return nullptr; + } auto fileSize = std::filesystem::file_size(filename); std::rewind(file); diff --git a/module-gui/gui/core/ImageManager.cpp b/module-gui/gui/core/ImageManager.cpp index 5b0d67f8e10fa114b32017c956c479ad4fb61457..f79774440530e0a690504d041227259e582b266f 100644 --- a/module-gui/gui/core/ImageManager.cpp +++ b/module-gui/gui/core/ImageManager.cpp @@ -75,6 +75,9 @@ namespace gui { auto file = std::fopen(filename.c_str(), "rb"); + if (file == nullptr) { + return nullptr; + } auto fileSize = std::filesystem::file_size(filename); diff --git a/module-gui/gui/widgets/Text.cpp b/module-gui/gui/widgets/Text.cpp index c84d1f80a9e397b4ef1dc03e3d765bec5ad8be3f..5cdfe80db05b266b1d95b27dab1e8d4cf910a02c 100644 --- a/module-gui/gui/widgets/Text.cpp +++ b/module-gui/gui/widgets/Text.cpp @@ -191,17 +191,6 @@ namespace gui return document->getText(); } - bool Text::saveText(UTF8 path) - { - if (auto file = std::fopen(path.c_str(), "wb")) { - auto text = getText(); - std::fwrite(text.c_str(), text.length(), text.length(), file); - std::fclose(file); - return true; - } - return false; - } - void Text::setFont(const UTF8 &fontName) { RawFont *newFont = FontManager::getInstance().getFont(fontName); diff --git a/module-gui/gui/widgets/Text.hpp b/module-gui/gui/widgets/Text.hpp index 567c278839ffcfa508c125a6d258d7488df0123b..8d39bf3c65abe8a91a8fd2a156cc57f23ff08aed 100644 --- a/module-gui/gui/widgets/Text.hpp +++ b/module-gui/gui/widgets/Text.hpp @@ -154,8 +154,6 @@ namespace gui virtual void clear(); bool isEmpty(); virtual UTF8 getText() const; - /// saves text from widget to file at specified path - virtual bool saveText(UTF8 path); void setFont(const UTF8 &fontName); void setFont(RawFont *font); void setMinimumWidthToFitText(const UTF8 &text);