diff options
author | jak1 <jak1@themanaworld.org> | 2024-02-16 14:50:14 -0300 |
---|---|---|
committer | Fedja Beader <fedja@protonmail.ch> | 2025-03-05 22:32:06 +0000 |
commit | 94c26b2353f9d43067e28b30068120a2c5328cab (patch) | |
tree | c807fb26ef577ea28d0a8a410278d9aabb15648b | |
parent | 1c12748f7a37e0282d09d02c790df810252e0012 (diff) | |
download | mv-94c26b2353f9d43067e28b30068120a2c5328cab.tar.gz mv-94c26b2353f9d43067e28b30068120a2c5328cab.tar.bz2 mv-94c26b2353f9d43067e28b30068120a2c5328cab.tar.xz mv-94c26b2353f9d43067e28b30068120a2c5328cab.zip |
Rename manaplus source directories and headers to manaverse
Split off from mana/plus!45: "Rename the program from ManaPlus to ManaVerse."
+POTFILES.in CI fix
****
mana/plus!132
Co-authored-by: Fedja Beader <fedja@protonmail.ch>
-rw-r--r-- | Android.mk | 6 | ||||
-rw-r--r-- | packaging/switch/CMakeLists.txt.switch | 2 | ||||
-rw-r--r-- | po/POTFILES.in | 14 | ||||
-rw-r--r-- | src/CMakeLists.txt | 26 | ||||
-rw-r--r-- | src/Makefile.am | 26 | ||||
-rw-r--r-- | src/client.h | 4 | ||||
-rw-r--r-- | src/gui/viewport.h | 4 | ||||
-rw-r--r-- | src/progs/manaverse/actions/actions.cpp (renamed from src/progs/manaplus/actions/actions.cpp) | 0 | ||||
-rw-r--r-- | src/progs/manaverse/actions/chat.cpp (renamed from src/progs/manaplus/actions/chat.cpp) | 0 | ||||
-rw-r--r-- | src/progs/manaverse/actions/commands.cpp (renamed from src/progs/manaplus/actions/commands.cpp) | 0 | ||||
-rw-r--r-- | src/progs/manaverse/actions/move.cpp (renamed from src/progs/manaplus/actions/move.cpp) | 0 | ||||
-rw-r--r-- | src/progs/manaverse/actions/pets.cpp (renamed from src/progs/manaplus/actions/pets.cpp) | 0 | ||||
-rw-r--r-- | src/progs/manaverse/actions/statusbar.cpp (renamed from src/progs/manaplus/actions/statusbar.cpp) | 0 | ||||
-rw-r--r-- | src/progs/manaverse/actions/tabs.cpp (renamed from src/progs/manaplus/actions/tabs.cpp) | 0 | ||||
-rw-r--r-- | src/progs/manaverse/actions/target.cpp (renamed from src/progs/manaplus/actions/target.cpp) | 0 | ||||
-rw-r--r-- | src/progs/manaverse/actions/windows.cpp (renamed from src/progs/manaplus/actions/windows.cpp) | 0 | ||||
-rw-r--r-- | src/progs/manaverse/client.cpp (renamed from src/progs/manaplus/client.cpp) | 2 | ||||
-rw-r--r-- | src/progs/manaverse/client.h (renamed from src/progs/manaplus/client.h) | 6 | ||||
-rw-r--r-- | src/progs/manaverse/gui/viewport.cpp (renamed from src/progs/manaplus/gui/viewport.cpp) | 2 | ||||
-rw-r--r-- | src/progs/manaverse/gui/viewport.h (renamed from src/progs/manaplus/gui/viewport.h) | 6 |
20 files changed, 49 insertions, 49 deletions
diff --git a/Android.mk b/Android.mk index 1c11b8fa0..640b9260b 100644 --- a/Android.mk +++ b/Android.mk @@ -48,9 +48,9 @@ LOCAL_SRC_FILES := $(SDL_PATH)/src/main/android/SDL_android_main.c \ $(wildcard $(LOCAL_PATH)/src/const/gui/*.cpp) \ $(wildcard $(LOCAL_PATH)/src/const/net/*.cpp) \ $(wildcard $(LOCAL_PATH)/src/progs/*.cpp) \ - $(wildcard $(LOCAL_PATH)/src/progs/manaplus/*.cpp) \ - $(wildcard $(LOCAL_PATH)/src/progs/manaplus/gui/*.cpp) \ - $(wildcard $(LOCAL_PATH)/src/progs/manaplus/actions/*.cpp) \ + $(wildcard $(LOCAL_PATH)/src/progs/manaverse/*.cpp) \ + $(wildcard $(LOCAL_PATH)/src/progs/manaverse/gui/*.cpp) \ + $(wildcard $(LOCAL_PATH)/src/progs/manaverse/actions/*.cpp) \ $(wildcard $(LOCAL_PATH)/src/resources/*.cpp) \ $(wildcard $(LOCAL_PATH)/src/resources/image/*.cpp) \ $(wildcard $(LOCAL_PATH)/src/resources/animation/*.cpp) \ diff --git a/packaging/switch/CMakeLists.txt.switch b/packaging/switch/CMakeLists.txt.switch index 3895c9b0f..4520122ec 100644 --- a/packaging/switch/CMakeLists.txt.switch +++ b/packaging/switch/CMakeLists.txt.switch @@ -29,7 +29,7 @@ project(ManaPlus) file(GLOB SOURCES src/*.cpp) set(SOURCES_DIRS src/being src/enums/being src/fs src/gui src/input - src/listeners src/net src/particle src/progs/manaplus src/render + src/listeners src/net src/particle src/progs/manaverse src/render src/resources src/sdl2gfx src/test src/utils) foreach (DIR ${SOURCES_DIRS}) diff --git a/po/POTFILES.in b/po/POTFILES.in index ab55fb4fe..5bcdeb29e 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -173,13 +173,13 @@ src/net/tmwa/skillrecv.cpp src/pincodemanager.cpp src/progs/dyecmd/client.cpp src/progs/dyecmd/dyemain.cpp -src/progs/manaplus/actions/actions.cpp -src/progs/manaplus/actions/chat.cpp -src/progs/manaplus/actions/commands.cpp -src/progs/manaplus/actions/pets.cpp -src/progs/manaplus/actions/statusbar.cpp -src/progs/manaplus/actions/windows.cpp -src/progs/manaplus/client.cpp +src/progs/manaverse/actions/actions.cpp +src/progs/manaverse/actions/chat.cpp +src/progs/manaverse/actions/commands.cpp +src/progs/manaverse/actions/pets.cpp +src/progs/manaverse/actions/statusbar.cpp +src/progs/manaverse/actions/windows.cpp +src/progs/manaverse/client.cpp src/render/rendererslistsdl.h src/render/rendererslistsdl2.h src/resources/beinginfo.cpp diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 25d1e9be9..9f5a22e0f 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -579,8 +579,8 @@ SET(SRCS gui/windows/updaterwindow.h gui/userpalette.cpp gui/userpalette.h - progs/manaplus/gui/viewport.cpp - progs/manaplus/gui/viewport.h + progs/manaverse/gui/viewport.cpp + progs/manaverse/gui/viewport.h gui/viewport.h gui/windowmanager.cpp gui/windowmanager.h @@ -1052,23 +1052,23 @@ SET(SRCS test/testmain.h actions/actiondef.h actions/actionfuncptr.h - progs/manaplus/actions/actions.cpp + progs/manaverse/actions/actions.cpp actions/actions.h - progs/manaplus/actions/chat.cpp + progs/manaverse/actions/chat.cpp actions/chat.h - progs/manaplus/actions/commands.cpp + progs/manaverse/actions/commands.cpp actions/commands.h - progs/manaplus/actions/move.cpp + progs/manaverse/actions/move.cpp actions/move.h - progs/manaplus/actions/pets.cpp + progs/manaverse/actions/pets.cpp actions/pets.h - progs/manaplus/actions/statusbar.cpp + progs/manaverse/actions/statusbar.cpp actions/statusbar.h - progs/manaplus/actions/tabs.cpp + progs/manaverse/actions/tabs.cpp actions/tabs.h - progs/manaplus/actions/target.cpp + progs/manaverse/actions/target.cpp actions/target.h - progs/manaplus/actions/windows.cpp + progs/manaverse/actions/windows.cpp actions/windows.h being/actor.cpp being/actor.h @@ -1120,8 +1120,8 @@ SET(SRCS spellmanager.h chatlogger.cpp chatlogger.h - progs/manaplus/client.cpp - progs/manaplus/client.h + progs/manaverse/client.cpp + progs/manaverse/client.h client.h commandline.cpp commandline.h diff --git a/src/Makefile.am b/src/Makefile.am index 8f8b47699..faac18665 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1702,19 +1702,19 @@ SRC = ${BASE_SRC} \ net/ea/tradehandler.h \ net/ea/traderecv.cpp \ net/ea/traderecv.h \ - progs/manaplus/actions/actions.cpp \ - progs/manaplus/actions/chat.cpp \ - progs/manaplus/actions/commands.cpp \ - progs/manaplus/actions/move.cpp \ - progs/manaplus/actions/pets.cpp \ - progs/manaplus/actions/statusbar.cpp \ - progs/manaplus/actions/tabs.cpp \ - progs/manaplus/actions/target.cpp \ - progs/manaplus/actions/windows.cpp \ - progs/manaplus/client.cpp \ - progs/manaplus/client.h \ - progs/manaplus/gui/viewport.cpp \ - progs/manaplus/gui/viewport.h + progs/manaverse/actions/actions.cpp \ + progs/manaverse/actions/chat.cpp \ + progs/manaverse/actions/commands.cpp \ + progs/manaverse/actions/move.cpp \ + progs/manaverse/actions/pets.cpp \ + progs/manaverse/actions/statusbar.cpp \ + progs/manaverse/actions/tabs.cpp \ + progs/manaverse/actions/target.cpp \ + progs/manaverse/actions/windows.cpp \ + progs/manaverse/client.cpp \ + progs/manaverse/client.h \ + progs/manaverse/gui/viewport.cpp \ + progs/manaverse/gui/viewport.h if ENABLE_TMWA manaplus_CXXFLAGS += -DTMWA_SUPPORT diff --git a/src/client.h b/src/client.h index b714ad660..6dbda3801 100644 --- a/src/client.h +++ b/src/client.h @@ -26,7 +26,7 @@ #include "progs/dyecmd/client.h" PROGS_DYECMD_CLIENT_H #else // DYECMD -#include "progs/manaplus/client.h" -PROGS_MANAPLUS_CLIENT_H +#include "progs/manaverse/client.h" +PROGS_MANAVERSE_CLIENT_H #endif // DYECMD #endif // CLIENT_H diff --git a/src/gui/viewport.h b/src/gui/viewport.h index 9d13a9f24..80327a3f1 100644 --- a/src/gui/viewport.h +++ b/src/gui/viewport.h @@ -26,8 +26,8 @@ #include "progs/dyecmd/gui/viewport.h" PROGS_DYECMD_GUI_VIEWPORT_H #else -#include "progs/manaplus/gui/viewport.h" -PROGS_MANAPLUS_GUI_VIEWPORT_H +#include "progs/manaverse/gui/viewport.h" +PROGS_MANAVERSE_GUI_VIEWPORT_H #endif // DYECMD #endif // GUI_VIEWPORT_H diff --git a/src/progs/manaplus/actions/actions.cpp b/src/progs/manaverse/actions/actions.cpp index 8e997cb2a..8e997cb2a 100644 --- a/src/progs/manaplus/actions/actions.cpp +++ b/src/progs/manaverse/actions/actions.cpp diff --git a/src/progs/manaplus/actions/chat.cpp b/src/progs/manaverse/actions/chat.cpp index 27963a75f..27963a75f 100644 --- a/src/progs/manaplus/actions/chat.cpp +++ b/src/progs/manaverse/actions/chat.cpp diff --git a/src/progs/manaplus/actions/commands.cpp b/src/progs/manaverse/actions/commands.cpp index 087b96491..087b96491 100644 --- a/src/progs/manaplus/actions/commands.cpp +++ b/src/progs/manaverse/actions/commands.cpp diff --git a/src/progs/manaplus/actions/move.cpp b/src/progs/manaverse/actions/move.cpp index 38eff9403..38eff9403 100644 --- a/src/progs/manaplus/actions/move.cpp +++ b/src/progs/manaverse/actions/move.cpp diff --git a/src/progs/manaplus/actions/pets.cpp b/src/progs/manaverse/actions/pets.cpp index f4c3823a3..f4c3823a3 100644 --- a/src/progs/manaplus/actions/pets.cpp +++ b/src/progs/manaverse/actions/pets.cpp diff --git a/src/progs/manaplus/actions/statusbar.cpp b/src/progs/manaverse/actions/statusbar.cpp index 062d42a53..062d42a53 100644 --- a/src/progs/manaplus/actions/statusbar.cpp +++ b/src/progs/manaverse/actions/statusbar.cpp diff --git a/src/progs/manaplus/actions/tabs.cpp b/src/progs/manaverse/actions/tabs.cpp index b5140a2e9..b5140a2e9 100644 --- a/src/progs/manaplus/actions/tabs.cpp +++ b/src/progs/manaverse/actions/tabs.cpp diff --git a/src/progs/manaplus/actions/target.cpp b/src/progs/manaverse/actions/target.cpp index 9b97cf576..9b97cf576 100644 --- a/src/progs/manaplus/actions/target.cpp +++ b/src/progs/manaverse/actions/target.cpp diff --git a/src/progs/manaplus/actions/windows.cpp b/src/progs/manaverse/actions/windows.cpp index 9f8a68faa..9f8a68faa 100644 --- a/src/progs/manaplus/actions/windows.cpp +++ b/src/progs/manaverse/actions/windows.cpp diff --git a/src/progs/manaplus/client.cpp b/src/progs/manaverse/client.cpp index ff9c32564..ad61670d7 100644 --- a/src/progs/manaplus/client.cpp +++ b/src/progs/manaverse/client.cpp @@ -21,7 +21,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "progs/manaplus/client.h" +#include "progs/manaverse/client.h" #include "chatlogger.h" #include "configmanager.h" diff --git a/src/progs/manaplus/client.h b/src/progs/manaverse/client.h index 99f314fc7..e74b179d2 100644 --- a/src/progs/manaplus/client.h +++ b/src/progs/manaverse/client.h @@ -21,8 +21,8 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef PROGS_MANAPLUS_CLIENT_H -#define PROGS_MANAPLUS_CLIENT_H +#ifndef PROGS_MANAVERSE_CLIENT_H +#define PROGS_MANAVERSE_CLIENT_H #include "enums/state.h" @@ -169,4 +169,4 @@ extern Client *client; extern unsigned int mLastHost; extern unsigned long mSearchHash; -#endif // PROGS_MANAPLUS_CLIENT_H +#endif // PROGS_MANAVERSE_CLIENT_H diff --git a/src/progs/manaplus/gui/viewport.cpp b/src/progs/manaverse/gui/viewport.cpp index f5a9a2155..623378f5e 100644 --- a/src/progs/manaplus/gui/viewport.cpp +++ b/src/progs/manaverse/gui/viewport.cpp @@ -21,7 +21,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "progs/manaplus/gui/viewport.h" +#include "progs/manaverse/gui/viewport.h" #include "actormanager.h" #include "configuration.h" diff --git a/src/progs/manaplus/gui/viewport.h b/src/progs/manaverse/gui/viewport.h index 67c4c870a..781f4255f 100644 --- a/src/progs/manaplus/gui/viewport.h +++ b/src/progs/manaverse/gui/viewport.h @@ -21,8 +21,8 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef PROGS_MANAPLUS_GUI_VIEWPORT_H -#define PROGS_MANAPLUS_GUI_VIEWPORT_H +#ifndef PROGS_MANAVERSE_GUI_VIEWPORT_H +#define PROGS_MANAVERSE_GUI_VIEWPORT_H #include "position.h" @@ -247,4 +247,4 @@ class Viewport final : public WindowContainer, extern Viewport *viewport; /**< The viewport. */ -#endif // PROGS_MANAPLUS_GUI_VIEWPORT_H +#endif // PROGS_MANAVERSE_GUI_VIEWPORT_H |