Return status + error msg

Mudlet · Aug 6, 2019 · 766acc5 · 766acc5
1 parent 05a79b3
commit 766acc5
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 10 deletions.
diff --git a/src/Host.cpp b/src/Host.cpp
@@ -528,18 +528,18 @@ QString Host::getMmpMapLocation() const
     return mpMap->getMmpMapLocation();
 }
 
-bool Host::setDisplayFont(const QFont& font)
+std::pair<bool, QString> Host::setDisplayFont(const QFont& font)
 {
     const QFontMetrics metrics(font);
     if (metrics.averageCharWidth() == 0) {
-        return false;
+        return std::make_pair(false, QStringLiteral("specified font is invalid (its letters have 0 width)"));
     }
 
     mDisplayFont = font;
-    return true;
+    return std::make_pair(true, QString());
 }
 
-bool Host::setDisplayFont(const QString& fontName)
+std::pair<bool, QString> Host::setDisplayFont(const QString& fontName)
 {
     return setDisplayFont(QFont(fontName));
 }

diff --git a/src/Host.h b/src/Host.h
@@ -229,8 +229,8 @@ class Host : public QObject
     void setMmpMapLocation(const QString& data);
     QString getMmpMapLocation() const;
     const QFont& getDisplayFont() const { return mDisplayFont; }
-    bool setDisplayFont(const QFont& font);
-    bool setDisplayFont(const QString& fontName);
+    std::pair<bool, QString> setDisplayFont(const QFont& font);
+    std::pair<bool, QString> setDisplayFont(const QString& fontName);
     void setDisplayFontSize(int size);
     void setDisplayFontSpacing(const qreal spacing);
     void setDisplayFontStyle(QFont::StyleStrategy s);

diff --git a/src/TLuaInterpreter.cpp b/src/TLuaInterpreter.cpp
@@ -2804,9 +2804,9 @@ int TLuaInterpreter::setFont(lua_State* L)
 
     if (windowName.isEmpty() || windowName.compare(QStringLiteral("main"), Qt::CaseSensitive) == 0) {
         if (mudlet::self()->mConsoleMap.contains(pHost)) {
-            if (!pHost->setDisplayFont(font)) {
+            if (auto [setNewFont, errorMessage] = pHost->setDisplayFont(font); !setNewFont) {
                 lua_pushnil(L);
-                lua_pushstring(L, "specified font is invalid (average character width is 0)");
+                lua_pushstring(L, errorMessage.toUtf8().constData());
                 return 2;
             }
 

diff --git a/src/XMLimport.cpp b/src/XMLimport.cpp
@@ -994,7 +994,7 @@ void XMLimport::readHostPackage(Host* pHost)
                 pHost->mLightWhite.setNamedColor(readElementText());
             } else if (name() == "mDisplayFont") {
                 const auto oldDisplayFont = pHost->getDisplayFont();
-                if (!pHost->setDisplayFont(readElementText())) {
+                if (auto [setNewFont, errorMessage] = pHost->setDisplayFont(readElementText()); !setNewFont) {
                     pHost->setDisplayFont(oldDisplayFont);
                 }
                 QFont::insertSubstitution(pHost->mDisplayFont.family(), QStringLiteral("Noto Color Emoji"));

diff --git a/src/dlgProfilePreferences.cpp b/src/dlgProfilePreferences.cpp
@@ -1503,7 +1503,7 @@ void dlgProfilePreferences::setDisplayFont()
     }
     QFont font = fontComboBox->currentFont();
     font.setPointSize(mFontSize);
-    if (pHost->getDisplayFont() != font && pHost->setDisplayFont(font)) {
+    if (auto [setNewFont, errorMessage] = pHost->setDisplayFont(font); pHost->getDisplayFont() != font && setNewFont) {
         QFont::insertSubstitution(pHost->mDisplayFont.family(), QStringLiteral("Noto Color Emoji"));
         if (mudlet::self()->mConsoleMap.contains(pHost)) {
             mudlet::self()->mConsoleMap[pHost]->changeColors();