summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2011-08-12 04:03:26 +0300
committerAndrei Karas <akaras@inbox.ru>2011-08-12 04:03:26 +0300
commitb2c9a0fa784997232141336dca358295bd57a75f (patch)
treed1a40f4fd12e2780138460348ace7622aca044a8
parenta15b0fd17f1f79074743c530a5f7afd3e83367a5 (diff)
downloadManaVerse-b2c9a0fa784997232141336dca358295bd57a75f.tar.gz
ManaVerse-b2c9a0fa784997232141336dca358295bd57a75f.tar.bz2
ManaVerse-b2c9a0fa784997232141336dca358295bd57a75f.tar.xz
ManaVerse-b2c9a0fa784997232141336dca358295bd57a75f.zip
Rename file name ministatus to correct ministatuswindow.
-rw-r--r--manaplus.cbp4
-rw-r--r--src/CMakeLists.txt4
-rw-r--r--src/Makefile.am4
-rw-r--r--src/game.cpp2
-rw-r--r--src/gui/ministatuswindow.cpp (renamed from src/gui/ministatus.cpp)2
-rw-r--r--src/gui/ministatuswindow.h (renamed from src/gui/ministatus.h)4
-rw-r--r--src/gui/popupmenu.cpp2
-rw-r--r--src/gui/viewport.cpp2
-rw-r--r--src/localplayer.cpp2
-rw-r--r--src/net/ea/inventoryhandler.cpp2
10 files changed, 14 insertions, 14 deletions
diff --git a/manaplus.cbp b/manaplus.cbp
index de71b2947..0083d9c8b 100644
--- a/manaplus.cbp
+++ b/manaplus.cbp
@@ -196,8 +196,8 @@
<Unit filename="src\gui\logindialog.h" />
<Unit filename="src\gui\minimap.cpp" />
<Unit filename="src\gui\minimap.h" />
- <Unit filename="src\gui\ministatus.cpp" />
- <Unit filename="src\gui\ministatus.h" />
+ <Unit filename="src\gui\ministatuswindow.cpp" />
+ <Unit filename="src\gui\ministatuswindow.h" />
<Unit filename="src\gui\npcdialog.cpp" />
<Unit filename="src\gui\npcdialog.h" />
<Unit filename="src\gui\npcpostdialog.cpp" />
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 8a0135790..655d4896c 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -267,8 +267,8 @@ SET(SRCS
gui/logindialog.h
gui/minimap.cpp
gui/minimap.h
- gui/ministatus.cpp
- gui/ministatus.h
+ gui/ministatuswindow.cpp
+ gui/ministatuswindow.h
gui/npcdialog.cpp
gui/npcdialog.h
gui/npcpostdialog.cpp
diff --git a/src/Makefile.am b/src/Makefile.am
index e6d84e016..8bacf6803 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -270,8 +270,8 @@ manaplus_SOURCES += gui/widgets/avatarlistbox.cpp \
gui/logindialog.h \
gui/minimap.cpp \
gui/minimap.h \
- gui/ministatus.cpp \
- gui/ministatus.h \
+ gui/ministatuswindow.cpp \
+ gui/ministatuswindow.h \
gui/npcdialog.cpp \
gui/npcdialog.h \
gui/npcpostdialog.cpp \
diff --git a/src/game.cpp b/src/game.cpp
index 4967231b0..4e7345340 100644
--- a/src/game.cpp
+++ b/src/game.cpp
@@ -60,7 +60,7 @@
#include "gui/inventorywindow.h"
#include "gui/killstats.h"
#include "gui/minimap.h"
-#include "gui/ministatus.h"
+#include "gui/ministatuswindow.h"
#include "gui/npcpostdialog.h"
#include "gui/okdialog.h"
#include "gui/outfitwindow.h"
diff --git a/src/gui/ministatus.cpp b/src/gui/ministatuswindow.cpp
index 817cd74a5..08e3d0053 100644
--- a/src/gui/ministatus.cpp
+++ b/src/gui/ministatuswindow.cpp
@@ -20,7 +20,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "gui/ministatus.h"
+#include "gui/ministatuswindow.h"
#include "animatedsprite.h"
#include "configuration.h"
diff --git a/src/gui/ministatus.h b/src/gui/ministatuswindow.h
index f19055305..19517326b 100644
--- a/src/gui/ministatus.h
+++ b/src/gui/ministatuswindow.h
@@ -20,8 +20,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef MINISTATUS_H
-#define MINISTATUS_H
+#ifndef MINISTATUSWINDOW_H
+#define MINISTATUSWINDOW_H
#include "inventory.h"
#include "listener.h"
diff --git a/src/gui/popupmenu.cpp b/src/gui/popupmenu.cpp
index 86ddfda53..c95864396 100644
--- a/src/gui/popupmenu.cpp
+++ b/src/gui/popupmenu.cpp
@@ -44,7 +44,7 @@
#include "gui/equipmentwindow.h"
#include "gui/inventorywindow.h"
#include "gui/itemamountwindow.h"
-#include "gui/ministatus.h"
+#include "gui/ministatuswindow.h"
#include "gui/outfitwindow.h"
#include "gui/selldialog.h"
#include "gui/socialwindow.h"
diff --git a/src/gui/viewport.cpp b/src/gui/viewport.cpp
index 2ca59f524..70d02b016 100644
--- a/src/gui/viewport.cpp
+++ b/src/gui/viewport.cpp
@@ -36,7 +36,7 @@
#include "gui/beingpopup.h"
#include "gui/chatwindow.h"
#include "gui/gui.h"
-#include "gui/ministatus.h"
+#include "gui/ministatuswindow.h"
#include "gui/popupmenu.h"
#include "gui/statuspopup.h"
#include "gui/textpopup.h"
diff --git a/src/localplayer.cpp b/src/localplayer.cpp
index a9e9d1f21..9f0a7c5f3 100644
--- a/src/localplayer.cpp
+++ b/src/localplayer.cpp
@@ -46,7 +46,7 @@
#include "gui/gui.h"
#include "gui/inventorywindow.h"
#include "gui/killstats.h"
-#include "gui/ministatus.h"
+#include "gui/ministatuswindow.h"
#include "gui/okdialog.h"
#include "gui/outfitwindow.h"
#include "gui/palette.h"
diff --git a/src/net/ea/inventoryhandler.cpp b/src/net/ea/inventoryhandler.cpp
index d921b5e2a..01000f8f1 100644
--- a/src/net/ea/inventoryhandler.cpp
+++ b/src/net/ea/inventoryhandler.cpp
@@ -26,7 +26,7 @@
#include "localplayer.h"
#include "logger.h"
-#include "gui/ministatus.h"
+#include "gui/ministatuswindow.h"
#include "net/messagein.h"