From defd76beec6c8345c2099ee602996a19f078f2da Mon Sep 17 00:00:00 2001
From: jak1 <jak1@themanaworld.org>
Date: Sun, 8 Jan 2023 21:35:54 +0100
Subject: some more renaming

---
 src/gui/windowmanager.cpp         |  2 +-
 src/gui/windows/updaterwindow.cpp | 22 +++++++++++-----------
 src/gui/windows/updaterwindow.h   |  4 ++--
 3 files changed, 14 insertions(+), 14 deletions(-)

(limited to 'src/gui')

diff --git a/src/gui/windowmanager.cpp b/src/gui/windowmanager.cpp
index 58fb88268..352f06155 100644
--- a/src/gui/windowmanager.cpp
+++ b/src/gui/windowmanager.cpp
@@ -418,7 +418,7 @@ void WindowManager::newChatMessage()
 void WindowManager::setIcon()
 {
 #if !defined(ANDROID) && !defined(__SWITCH__)
-    std::string iconFile = branding.getValue("appIcon", "icons/manaplus");
+    std::string iconFile = branding.getValue("appIcon", "icons/manaverse");
 #ifdef WIN32
     iconFile.append(".ico");
 #else  // WIN32
diff --git a/src/gui/windows/updaterwindow.cpp b/src/gui/windows/updaterwindow.cpp
index a402967d7..040085b4b 100644
--- a/src/gui/windows/updaterwindow.cpp
+++ b/src/gui/windows/updaterwindow.cpp
@@ -461,7 +461,7 @@ void UpdaterWindow::loadPatch()
             if (line != nullptr)
             {
                 mBrowserBox->addRow(strprintf("##9 Latest client version: "
-                    "##6ManaPlus %s##0", line), true);
+                    "##6ManaVerse %s##0", line), true);
             }
         }
         if (version > CHECK_VERSION)
@@ -483,11 +483,11 @@ void UpdaterWindow::loadPatch()
                 branding.getStringValue(url)).append("|").append(
                 branding.getStringValue(text)).append("@@]"), true);
             mBrowserBox->addRow("##1You can download it from", true);
-            mBrowserBox->addRow("##1ManaPlus updated.", true);
+            mBrowserBox->addRow("##1ManaVerse updated.", true);
         }
         else
         {
-            mBrowserBox->addRow("You have latest client version.", true);
+            mBrowserBox->addRow("You have the latest client version.", true);
         }
     }
 
@@ -681,7 +681,7 @@ void UpdaterWindow::loadUpdates()
             file.name,
             Append_false);
     }
-    loadManaPlusUpdates(mUpdatesDir);
+    loadManaVerseUpdates(mUpdatesDir);
     loadMods(mUpdatesDir, mUpdateFiles);
 }
 
@@ -714,7 +714,7 @@ void UpdaterWindow::loadLocalUpdates(const std::string &dir)
             file.name,
             Append_false);
     }
-    loadManaPlusUpdates(dir);
+    loadManaVerseUpdates(dir);
     loadMods(dir, updateFiles);
 }
 
@@ -740,10 +740,10 @@ void UpdaterWindow::unloadUpdates(const std::string &dir)
             fixPath,
             updateFiles[updateIndex].name);
     }
-    unloadManaPlusUpdates(dir);
+    unloadManaVerseUpdates(dir);
 }
 
-void UpdaterWindow::loadManaPlusUpdates(const std::string &dir)
+void UpdaterWindow::loadManaVerseUpdates(const std::string &dir)
 {
     std::string fixPath = dir + "/fix";
     STD_VECTOR<UpdateFile> updateFiles = loadXMLFile(
@@ -759,7 +759,7 @@ void UpdaterWindow::loadManaPlusUpdates(const std::string &dir)
         if (!file.group.empty())
             continue;
         const std::string name = file.name;
-        if (strStartWith(name, "manaplus_"))
+        if (strStartWith(name, "manaverse_"))
         {
             struct stat statbuf;
             std::string fileName = pathJoin(fixPath,
@@ -773,7 +773,7 @@ void UpdaterWindow::loadManaPlusUpdates(const std::string &dir)
     }
 }
 
-void UpdaterWindow::unloadManaPlusUpdates(const std::string &dir)
+void UpdaterWindow::unloadManaVerseUpdates(const std::string &dir)
 {
     const std::string fixPath = dir + "/fix";
     const STD_VECTOR<UpdateFile> updateFiles = loadXMLFile(
@@ -786,7 +786,7 @@ void UpdaterWindow::unloadManaPlusUpdates(const std::string &dir)
          updateIndex++)
     {
         std::string name = updateFiles[updateIndex].name;
-        if (strStartWith(name, "manaplus_"))
+        if (strStartWith(name, "manaverse_"))
         {
             struct stat statbuf;
             const std::string file = pathJoin(
@@ -1147,7 +1147,7 @@ void UpdaterWindow::loadMods(const std::string &dir,
         if (file.group.empty())
             continue;
         std::string name = file.name;
-        if (strStartWith(name, "manaplus_"))
+        if (strStartWith(name, "manaverse_"))
         {
             const std::set<std::string>::const_iterator
                 it = modsList.find(file.group);
diff --git a/src/gui/windows/updaterwindow.h b/src/gui/windows/updaterwindow.h
index 97ebc96c1..adb5fe131 100644
--- a/src/gui/windows/updaterwindow.h
+++ b/src/gui/windows/updaterwindow.h
@@ -131,9 +131,9 @@ class UpdaterWindow final : public Window,
                                      const std::string &restrict fixPath,
                                      const std::string &filerestrict);
 
-        static void loadManaPlusUpdates(const std::string &dir);
+        static void loadManaVerseUpdates(const std::string &dir);
 
-        static void unloadManaPlusUpdates(const std::string &dir);
+        static void unloadManaVerseUpdates(const std::string &dir);
 
         static unsigned long getFileHash(const std::string &filePath);
 
-- 
cgit v1.2.3-70-g09d2