diff options
| -rw-r--r-- | mana.cbp | 44 | ||||
| -rw-r--r-- | mana.files | 50 | ||||
| -rw-r--r-- | src/CMakeLists.txt | 44 | ||||
| -rw-r--r-- | src/chatlogger.cpp (renamed from src/chatlog.cpp) | 6 | ||||
| -rw-r--r-- | src/chatlogger.h (renamed from src/chatlog.h) | 0 | ||||
| -rw-r--r-- | src/client.cpp | 6 | ||||
| -rw-r--r-- | src/configuration.cpp | 4 | ||||
| -rw-r--r-- | src/game.cpp | 8 | ||||
| -rw-r--r-- | src/gui/buydialog.cpp (renamed from src/gui/buy.cpp) | 2 | ||||
| -rw-r--r-- | src/gui/buydialog.h (renamed from src/gui/buy.h) | 0 | ||||
| -rw-r--r-- | src/gui/buyselldialog.cpp (renamed from src/gui/buysell.cpp) | 2 | ||||
| -rw-r--r-- | src/gui/buyselldialog.h (renamed from src/gui/buysell.h) | 0 | ||||
| -rw-r--r-- | src/gui/chatwindow.cpp (renamed from src/gui/chat.cpp) | 2 | ||||
| -rw-r--r-- | src/gui/chatwindow.h (renamed from src/gui/chat.h) | 0 | ||||
| -rw-r--r-- | src/gui/helpwindow.cpp (renamed from src/gui/help.cpp) | 2 | ||||
| -rw-r--r-- | src/gui/helpwindow.h (renamed from src/gui/help.h) | 0 | ||||
| -rw-r--r-- | src/gui/inventorywindow.cpp | 2 | ||||
| -rw-r--r-- | src/gui/itemamountwindow.cpp (renamed from src/gui/itemamount.cpp) | 4 | ||||
| -rw-r--r-- | src/gui/itemamountwindow.h (renamed from src/gui/itemamount.h) | 0 | ||||
| -rw-r--r-- | src/gui/logindialog.cpp (renamed from src/gui/login.cpp) | 2 | ||||
| -rw-r--r-- | src/gui/logindialog.h (renamed from src/gui/login.h) | 0 | ||||
| -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) | 0 | ||||
| -rw-r--r-- | src/gui/outfitwindow.cpp | 2 | ||||
| -rw-r--r-- | src/gui/popupmenu.cpp | 4 | ||||
| -rw-r--r-- | src/gui/recorder.cpp | 2 | ||||
| -rw-r--r-- | src/gui/register.cpp | 2 | ||||
| -rw-r--r-- | src/gui/selldialog.cpp (renamed from src/gui/sell.cpp) | 2 | ||||
| -rw-r--r-- | src/gui/selldialog.h (renamed from src/gui/sell.h) | 0 | ||||
| -rw-r--r-- | src/gui/serverdialog.cpp | 2 | ||||
| -rw-r--r-- | src/gui/tradewindow.cpp (renamed from src/gui/trade.cpp) | 4 | ||||
| -rw-r--r-- | src/gui/tradewindow.h (renamed from src/gui/trade.h) | 0 | ||||
| -rw-r--r-- | src/gui/updaterwindow.cpp (renamed from src/gui/updatewindow.cpp) | 2 | ||||
| -rw-r--r-- | src/gui/updaterwindow.h (renamed from src/gui/updatewindow.h) | 0 | ||||
| -rw-r--r-- | src/gui/viewport.cpp | 2 | ||||
| -rw-r--r-- | src/gui/widgets/chattab.cpp | 2 | ||||
| -rw-r--r-- | src/gui/widgets/chattab.h | 2 | ||||
| -rw-r--r-- | src/gui/widgets/itemcontainer.cpp | 2 | ||||
| -rw-r--r-- | src/gui/widgets/whispertab.cpp | 2 | ||||
| -rw-r--r-- | src/net/manaserv/buysellhandler.cpp | 4 | ||||
| -rw-r--r-- | src/net/manaserv/tradehandler.cpp | 2 | ||||
| -rw-r--r-- | src/net/tmwa/buysellhandler.cpp | 6 | ||||
| -rw-r--r-- | src/net/tmwa/gui/guildtab.cpp | 2 | ||||
| -rw-r--r-- | src/net/tmwa/gui/partytab.cpp | 2 | ||||
| -rw-r--r-- | src/net/tmwa/playerhandler.cpp | 6 | ||||
| -rw-r--r-- | src/net/tmwa/tradehandler.cpp | 2 |
46 files changed, 119 insertions, 115 deletions
@@ -118,8 +118,8 @@ <Unit filename="src\channel.h" /> <Unit filename="src\channelmanager.cpp" /> <Unit filename="src\channelmanager.h" /> - <Unit filename="src\chatlog.cpp" /> - <Unit filename="src\chatlog.h" /> + <Unit filename="src\chatlogger.cpp" /> + <Unit filename="src\chatlogger.h" /> <Unit filename="src\client.cpp" /> <Unit filename="src\client.h" /> <Unit filename="src\commandhandler.cpp" /> @@ -147,10 +147,10 @@ <Unit filename="src\graphics.h" /> <Unit filename="src\gui\beingpopup.cpp" /> <Unit filename="src\gui\beingpopup.h" /> - <Unit filename="src\gui\buy.cpp" /> - <Unit filename="src\gui\buy.h" /> - <Unit filename="src\gui\buysell.cpp" /> - <Unit filename="src\gui\buysell.h" /> + <Unit filename="src\gui\buydialog.cpp" /> + <Unit filename="src\gui\buydialog.h" /> + <Unit filename="src\gui\buyselldialog.cpp" /> + <Unit filename="src\gui\buyselldialog.h" /> <Unit filename="src\gui\changeemaildialog.cpp" /> <Unit filename="src\gui\changeemaildialog.h" /> <Unit filename="src\gui\changepassworddialog.cpp" /> @@ -159,8 +159,8 @@ <Unit filename="src\gui\charcreatedialog.h" /> <Unit filename="src\gui\charselectdialog.cpp" /> <Unit filename="src\gui\charselectdialog.h" /> - <Unit filename="src\gui\chat.cpp" /> - <Unit filename="src\gui\chat.h" /> + <Unit filename="src\gui\chatwindow.cpp" /> + <Unit filename="src\gui\chatwindow.h" /> <Unit filename="src\gui\confirmdialog.cpp" /> <Unit filename="src\gui\confirmdialog.h" /> <Unit filename="src\gui\connectiondialog.cpp" /> @@ -177,20 +177,20 @@ <Unit filename="src\gui\focushandler.h" /> <Unit filename="src\gui\gui.cpp" /> <Unit filename="src\gui\gui.h" /> - <Unit filename="src\gui\help.cpp" /> - <Unit filename="src\gui\help.h" /> + <Unit filename="src\gui\helpwindow.cpp" /> + <Unit filename="src\gui\helpwindow.h" /> <Unit filename="src\gui\inventorywindow.cpp" /> <Unit filename="src\gui\inventorywindow.h" /> - <Unit filename="src\gui\itemamount.cpp" /> - <Unit filename="src\gui\itemamount.h" /> + <Unit filename="src\gui\itemamountwindow.cpp" /> + <Unit filename="src\gui\itemamountwindow.h" /> <Unit filename="src\gui\itempopup.cpp" /> <Unit filename="src\gui\itempopup.h" /> - <Unit filename="src\gui\login.cpp" /> - <Unit filename="src\gui\login.h" /> + <Unit filename="src\gui\logindialog.cpp" /> + <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" /> @@ -211,8 +211,8 @@ <Unit filename="src\gui\register.h" /> <Unit filename="src\gui\sdlinput.cpp" /> <Unit filename="src\gui\sdlinput.h" /> - <Unit filename="src\gui\sell.cpp" /> - <Unit filename="src\gui\sell.h" /> + <Unit filename="src\gui\selldialog.cpp" /> + <Unit filename="src\gui\selldialog.h" /> <Unit filename="src\gui\serverdialog.cpp" /> <Unit filename="src\gui\serverdialog.h" /> <Unit filename="src\gui\setup.cpp" /> @@ -247,14 +247,14 @@ <Unit filename="src\gui\textdialog.h" /> <Unit filename="src\gui\textpopup.cpp" /> <Unit filename="src\gui\textpopup.h" /> - <Unit filename="src\gui\trade.cpp" /> - <Unit filename="src\gui\trade.h" /> + <Unit filename="src\gui\tradewindow.cpp" /> + <Unit filename="src\gui\tradewindow.h" /> <Unit filename="src\gui\truetypefont.cpp" /> <Unit filename="src\gui\truetypefont.h" /> <Unit filename="src\gui\unregisterdialog.cpp" /> <Unit filename="src\gui\unregisterdialog.h" /> - <Unit filename="src\gui\updatewindow.cpp" /> - <Unit filename="src\gui\updatewindow.h" /> + <Unit filename="src\gui\updaterwindow.cpp" /> + <Unit filename="src\gui\updaterwindow.h" /> <Unit filename="src\gui\viewport.cpp" /> <Unit filename="src\gui\viewport.h" /> <Unit filename="src\gui\widgets\avatarlistbox.cpp" /> @@ -60,8 +60,8 @@ src/channel.cpp src/channel.h src/channelmanager.cpp src/channelmanager.h -src/chatlog.cpp -src/chatlog.h +src/chatlogger.cpp +src/chatlogger.h src/client.cpp src/client.h src/commandhandler.cpp @@ -89,10 +89,10 @@ src/graphics.cpp src/graphics.h src/gui/beingpopup.cpp src/gui/beingpopup.h -src/gui/buy.cpp -src/gui/buy.h -src/gui/buysell.cpp -src/gui/buysell.h +src/gui/buydialog.cpp +src/gui/buydialog.h +src/gui/buyselldialog.cpp +src/gui/buyselldialog.h src/gui/changeemaildialog.cpp src/gui/changeemaildialog.h src/gui/changepassworddialog.cpp @@ -101,12 +101,14 @@ src/gui/charcreatedialog.cpp src/gui/charcreatedialog.h src/gui/charselectdialog.cpp src/gui/charselectdialog.h -src/gui/chat.cpp -src/gui/chat.h +src/gui/chatwindow.cpp +src/gui/chatwindow.h src/gui/confirmdialog.cpp src/gui/confirmdialog.h src/gui/connectiondialog.cpp src/gui/connectiondialog.h +src/gui/customserverdialog.cpp +src/gui/customserverdialog.h src/gui/debugwindow.cpp src/gui/debugwindow.h src/gui/emotepopup.cpp @@ -117,20 +119,20 @@ src/gui/focushandler.cpp src/gui/focushandler.h src/gui/gui.cpp src/gui/gui.h -src/gui/help.cpp -src/gui/help.h +src/gui/helpwindow.cpp +src/gui/helpwindow.h src/gui/inventorywindow.cpp src/gui/inventorywindow.h -src/gui/itemamount.cpp -src/gui/itemamount.h +src/gui/itemamountwindow.cpp +src/gui/itemamountwindow.h src/gui/itempopup.cpp src/gui/itempopup.h -src/gui/login.cpp -src/gui/login.h +src/gui/logindialog.cpp +src/gui/logindialog.h src/gui/minimap.cpp src/gui/minimap.h -src/gui/ministatus.cpp -src/gui/ministatus.h +src/gui/ministatuswindow.cpp +src/gui/ministatuswindow.h src/gui/npcdialog.cpp src/gui/npcdialog.h src/gui/npcpostdialog.cpp @@ -151,8 +153,8 @@ src/gui/register.cpp src/gui/register.h src/gui/sdlinput.cpp src/gui/sdlinput.h -src/gui/sell.cpp -src/gui/sell.h +src/gui/selldialog.cpp +src/gui/selldialog.h src/gui/serverdialog.cpp src/gui/serverdialog.h src/gui/setup.cpp @@ -161,6 +163,8 @@ src/gui/setup_audio.cpp src/gui/setup_audio.h src/gui/setup_colors.cpp src/gui/setup_colors.h +src/gui/setup_interface.cpp +src/gui/setup_interface.h src/gui/setup_joystick.cpp src/gui/setup_joystick.h src/gui/setup_keyboard.cpp @@ -185,14 +189,14 @@ src/gui/textdialog.cpp src/gui/textdialog.h src/gui/textpopup.cpp src/gui/textpopup.h -src/gui/trade.cpp -src/gui/trade.h +src/gui/tradewindow.cpp +src/gui/tradewindow.h src/gui/truetypefont.cpp src/gui/truetypefont.h src/gui/unregisterdialog.cpp src/gui/unregisterdialog.h -src/gui/updatewindow.cpp -src/gui/updatewindow.h +src/gui/updaterwindow.cpp +src/gui/updaterwindow.h src/gui/viewport.cpp src/gui/viewport.h src/gui/widgets/avatarlistbox.cpp @@ -262,6 +266,8 @@ src/gui/widgets/shortcutcontainer.cpp src/gui/widgets/shortcutcontainer.h src/gui/widgets/slider.cpp src/gui/widgets/slider.h +src/gui/widgets/spacer.cpp +src/gui/widgets/spacer.h src/gui/widgets/tab.cpp src/gui/widgets/tab.h src/gui/widgets/tabbedarea.cpp diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 42279239..0e2f1567 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -215,10 +215,10 @@ SET(SRCS gui/widgets/windowcontainer.h gui/beingpopup.cpp gui/beingpopup.h - gui/buy.cpp - gui/buy.h - gui/buysell.cpp - gui/buysell.h + gui/buydialog.cpp + gui/buydialog.h + gui/buyselldialog.cpp + gui/buyselldialog.h gui/changeemaildialog.cpp gui/changeemaildialog.h gui/changepassworddialog.cpp @@ -227,8 +227,8 @@ SET(SRCS gui/charselectdialog.h gui/charcreatedialog.cpp gui/charcreatedialog.h - gui/chat.cpp - gui/chat.h + gui/chatwindow.cpp + gui/chatwindow.h gui/confirmdialog.cpp gui/confirmdialog.h gui/connectiondialog.cpp @@ -245,20 +245,20 @@ SET(SRCS gui/focushandler.h gui/gui.cpp gui/gui.h - gui/help.cpp - gui/help.h + gui/helpwindow.cpp + gui/helpwindow.h gui/inventorywindow.cpp gui/inventorywindow.h gui/itempopup.cpp gui/itempopup.h - gui/itemamount.cpp - gui/itemamount.h - gui/login.cpp - gui/login.h + gui/itemamountwindow.cpp + gui/itemamountwindow.h + gui/logindialog.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 @@ -279,8 +279,8 @@ SET(SRCS gui/register.h gui/sdlinput.cpp gui/sdlinput.h - gui/sell.cpp - gui/sell.h + gui/selldialog.cpp + gui/selldialog.h gui/serverdialog.cpp gui/serverdialog.h gui/setup.cpp @@ -315,14 +315,14 @@ SET(SRCS gui/textdialog.h gui/textpopup.cpp gui/textpopup.h - gui/trade.cpp - gui/trade.h + gui/tradewindow.cpp + gui/tradewindow.h gui/truetypefont.cpp gui/truetypefont.h gui/unregisterdialog.cpp gui/unregisterdialog.h - gui/updatewindow.cpp - gui/updatewindow.h + gui/updaterwindow.cpp + gui/updaterwindow.h gui/viewport.cpp gui/viewport.h gui/windowmenu.cpp @@ -437,8 +437,8 @@ SET(SRCS avatar.h being.cpp being.h - chatlog.cpp - chatlog.h + chatlogger.cpp + chatlogger.h client.cpp client.h channel.cpp diff --git a/src/chatlog.cpp b/src/chatlogger.cpp index 011fa3aa..f78d7a94 100644 --- a/src/chatlog.cpp +++ b/src/chatlogger.cpp @@ -19,7 +19,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include "chatlog.h" +#include "chatlogger.h" #include <iostream> #include <sstream> @@ -148,14 +148,14 @@ void ChatLogger::writeTo(std::ofstream &file, const std::string &str) const void ChatLogger::setServerName(const std::string &serverName) { mServerName = serverName; - if (mServerName == "") + if (mServerName.empty()) mServerName = config.getStringValue("MostUsedServerName0"); if (mLogFile.is_open()) mLogFile.close(); secureName(mServerName); - if (mLogDir != "") + if (!mLogDir.empty()) { DIR *dir = opendir((mLogDir + "/" + mServerName).c_str()); if (!dir) diff --git a/src/chatlog.h b/src/chatlogger.h index df0af800..df0af800 100644 --- a/src/chatlog.h +++ b/src/chatlogger.h diff --git a/src/client.cpp b/src/client.cpp index aa3991c0..0c41c7cc 100644 --- a/src/client.cpp +++ b/src/client.cpp @@ -22,7 +22,7 @@ #include "client.h" #include "main.h" -#include "chatlog.h" +#include "chatlogger.h" #include "configuration.h" #include "emoteshortcut.h" #include "event.h" @@ -42,7 +42,7 @@ #include "gui/charselectdialog.h" #include "gui/connectiondialog.h" #include "gui/gui.h" -#include "gui/login.h" +#include "gui/logindialog.h" #include "gui/okdialog.h" #include "gui/quitdialog.h" #include "gui/register.h" @@ -50,7 +50,7 @@ #include "gui/serverdialog.h" #include "gui/setup.h" #include "gui/unregisterdialog.h" -#include "gui/updatewindow.h" +#include "gui/updaterwindow.h" #include "gui/worldselectdialog.h" #include "gui/widgets/button.h" diff --git a/src/configuration.cpp b/src/configuration.cpp index 44621eb3..848c8cc9 100644 --- a/src/configuration.cpp +++ b/src/configuration.cpp @@ -105,10 +105,8 @@ void Configuration::cleanDefaults() for (DefaultsData::const_iterator iter = mDefaultsData->begin(); iter != mDefaultsData->end(); iter++) { - if (iter->second) - delete(iter->second); + delete iter->second; } - mDefaultsData->clear(); delete mDefaultsData; mDefaultsData = 0; } diff --git a/src/game.cpp b/src/game.cpp index 7501d343..77ccfc44 100644 --- a/src/game.cpp +++ b/src/game.cpp @@ -41,16 +41,16 @@ #include "playerrelations.h" #include "sound.h" -#include "gui/chat.h" +#include "gui/chatwindow.h" #include "gui/confirmdialog.h" #include "gui/debugwindow.h" #include "gui/equipmentwindow.h" #include "gui/gui.h" -#include "gui/help.h" +#include "gui/helpwindow.h" #include "gui/inventorywindow.h" #include "gui/shortcutwindow.h" #include "gui/minimap.h" -#include "gui/ministatus.h" +#include "gui/ministatuswindow.h" #include "gui/npcdialog.h" #include "gui/okdialog.h" #include "gui/outfitwindow.h" @@ -62,7 +62,7 @@ #include "gui/skilldialog.h" #include "gui/statuswindow.h" #include "gui/textdialog.h" -#include "gui/trade.h" +#include "gui/tradewindow.h" #include "gui/viewport.h" #include "gui/widgets/chattab.h" diff --git a/src/gui/buy.cpp b/src/gui/buydialog.cpp index 0ef187be..1f9781c4 100644 --- a/src/gui/buy.cpp +++ b/src/gui/buydialog.cpp @@ -19,7 +19,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "gui/buy.h" +#include "gui/buydialog.h" #include "client.h" #include "playerinfo.h" diff --git a/src/gui/buy.h b/src/gui/buydialog.h index 2ecf89e1..2ecf89e1 100644 --- a/src/gui/buy.h +++ b/src/gui/buydialog.h diff --git a/src/gui/buysell.cpp b/src/gui/buyselldialog.cpp index 4419ffcc..a0248650 100644 --- a/src/gui/buysell.cpp +++ b/src/gui/buyselldialog.cpp @@ -19,7 +19,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "buysell.h" +#include "buyselldialog.h" #include "playerinfo.h" diff --git a/src/gui/buysell.h b/src/gui/buyselldialog.h index 3408821a..3408821a 100644 --- a/src/gui/buysell.h +++ b/src/gui/buyselldialog.h diff --git a/src/gui/chat.cpp b/src/gui/chatwindow.cpp index 92386e76..95323387 100644 --- a/src/gui/chat.cpp +++ b/src/gui/chatwindow.cpp @@ -19,7 +19,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "chat.h" +#include "chatwindow.h" #include "actorspritemanager.h" #include "channel.h" diff --git a/src/gui/chat.h b/src/gui/chatwindow.h index c6acf532..c6acf532 100644 --- a/src/gui/chat.h +++ b/src/gui/chatwindow.h diff --git a/src/gui/help.cpp b/src/gui/helpwindow.cpp index aca036c1..e059daaf 100644 --- a/src/gui/help.cpp +++ b/src/gui/helpwindow.cpp @@ -19,7 +19,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "gui/help.h" +#include "gui/helpwindow.h" #include "gui/setup.h" diff --git a/src/gui/help.h b/src/gui/helpwindow.h index add49ced..add49ced 100644 --- a/src/gui/help.h +++ b/src/gui/helpwindow.h diff --git a/src/gui/inventorywindow.cpp b/src/gui/inventorywindow.cpp index 0bf2b313..73b59d95 100644 --- a/src/gui/inventorywindow.cpp +++ b/src/gui/inventorywindow.cpp @@ -28,7 +28,7 @@ #include "keyboardconfig.h" #include "playerinfo.h" -#include "gui/itemamount.h" +#include "gui/itemamountwindow.h" #include "gui/setup.h" #include "gui/sdlinput.h" #include "gui/viewport.h" diff --git a/src/gui/itemamount.cpp b/src/gui/itemamountwindow.cpp index 43cdf1cf..58197092 100644 --- a/src/gui/itemamount.cpp +++ b/src/gui/itemamountwindow.cpp @@ -19,12 +19,12 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "gui/itemamount.h" +#include "gui/itemamountwindow.h" #include "item.h" #include "keyboardconfig.h" -#include "gui/trade.h" +#include "gui/tradewindow.h" #include "gui/itempopup.h" #include "gui/viewport.h" diff --git a/src/gui/itemamount.h b/src/gui/itemamountwindow.h index 81243444..81243444 100644 --- a/src/gui/itemamount.h +++ b/src/gui/itemamountwindow.h diff --git a/src/gui/login.cpp b/src/gui/logindialog.cpp index b12e6a5d..abb5cff2 100644 --- a/src/gui/login.cpp +++ b/src/gui/logindialog.cpp @@ -19,7 +19,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "gui/login.h" +#include "gui/logindialog.h" #include "client.h" #include "configuration.h" diff --git a/src/gui/login.h b/src/gui/logindialog.h index 38e858f6..38e858f6 100644 --- a/src/gui/login.h +++ b/src/gui/logindialog.h diff --git a/src/gui/ministatus.cpp b/src/gui/ministatuswindow.cpp index 2bdf79b4..c4400656 100644 --- a/src/gui/ministatus.cpp +++ b/src/gui/ministatuswindow.cpp @@ -19,7 +19,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 38025202..38025202 100644 --- a/src/gui/ministatus.h +++ b/src/gui/ministatuswindow.h diff --git a/src/gui/outfitwindow.cpp b/src/gui/outfitwindow.cpp index 053c6659..3cb3e9d9 100644 --- a/src/gui/outfitwindow.cpp +++ b/src/gui/outfitwindow.cpp @@ -29,7 +29,7 @@ #include "log.h" #include "playerinfo.h" -#include "gui/chat.h" +#include "gui/chatwindow.h" #include "gui/widgets/button.h" #include "gui/widgets/checkbox.h" diff --git a/src/gui/popupmenu.cpp b/src/gui/popupmenu.cpp index 742d480d..4e994dc3 100644 --- a/src/gui/popupmenu.cpp +++ b/src/gui/popupmenu.cpp @@ -31,10 +31,10 @@ #include "playerinfo.h" #include "playerrelations.h" -#include "gui/chat.h" +#include "gui/chatwindow.h" #include "gui/equipmentwindow.h" #include "gui/inventorywindow.h" -#include "gui/itemamount.h" +#include "gui/itemamountwindow.h" #include "gui/widgets/browserbox.h" diff --git a/src/gui/recorder.cpp b/src/gui/recorder.cpp index 2345369e..da2ee80f 100644 --- a/src/gui/recorder.cpp +++ b/src/gui/recorder.cpp @@ -23,7 +23,7 @@ #include "client.h" #include "event.h" -#include "gui/chat.h" +#include "gui/chatwindow.h" #include "gui/widgets/button.h" #include "gui/widgets/layout.h" diff --git a/src/gui/register.cpp b/src/gui/register.cpp index 9fbd8cc8..2b3dd1cc 100644 --- a/src/gui/register.cpp +++ b/src/gui/register.cpp @@ -25,7 +25,7 @@ #include "configuration.h" #include "log.h" -#include "gui/login.h" +#include "gui/logindialog.h" #include "gui/okdialog.h" #include "gui/widgets/button.h" diff --git a/src/gui/sell.cpp b/src/gui/selldialog.cpp index 46bef092..f8b497ea 100644 --- a/src/gui/sell.cpp +++ b/src/gui/selldialog.cpp @@ -19,7 +19,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "gui/sell.h" +#include "gui/selldialog.h" #include "client.h" #include "playerinfo.h" diff --git a/src/gui/sell.h b/src/gui/selldialog.h index e28b0744..e28b0744 100644 --- a/src/gui/sell.h +++ b/src/gui/selldialog.h diff --git a/src/gui/serverdialog.cpp b/src/gui/serverdialog.cpp index 2bb0e0dc..78a86d24 100644 --- a/src/gui/serverdialog.cpp +++ b/src/gui/serverdialog.cpp @@ -21,7 +21,7 @@ #include "gui/serverdialog.h" -#include "chatlog.h" +#include "chatlogger.h" #include "client.h" #include "configuration.h" #include "gui.h" diff --git a/src/gui/trade.cpp b/src/gui/tradewindow.cpp index 37662bef..16b66c1d 100644 --- a/src/gui/trade.cpp +++ b/src/gui/tradewindow.cpp @@ -19,7 +19,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "gui/trade.h" +#include "gui/tradewindow.h" #include "event.h" #include "inventory.h" @@ -29,7 +29,7 @@ #include "units.h" #include "gui/inventorywindow.h" -#include "gui/itemamount.h" +#include "gui/itemamountwindow.h" #include "gui/setup.h" #include "gui/widgets/button.h" diff --git a/src/gui/trade.h b/src/gui/tradewindow.h index f854d698..f854d698 100644 --- a/src/gui/trade.h +++ b/src/gui/tradewindow.h diff --git a/src/gui/updatewindow.cpp b/src/gui/updaterwindow.cpp index 23d23b5e..54373f05 100644 --- a/src/gui/updatewindow.cpp +++ b/src/gui/updaterwindow.cpp @@ -19,7 +19,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "gui/updatewindow.h" +#include "gui/updaterwindow.h" #include "client.h" #include "configuration.h" diff --git a/src/gui/updatewindow.h b/src/gui/updaterwindow.h index a4dbf674..a4dbf674 100644 --- a/src/gui/updatewindow.h +++ b/src/gui/updaterwindow.h diff --git a/src/gui/viewport.cpp b/src/gui/viewport.cpp index 453f615e..e6115805 100644 --- a/src/gui/viewport.cpp +++ b/src/gui/viewport.cpp @@ -32,7 +32,7 @@ #include "textmanager.h" #include "gui/gui.h" -#include "gui/ministatus.h" +#include "gui/ministatuswindow.h" #include "gui/popupmenu.h" #include "gui/beingpopup.h" diff --git a/src/gui/widgets/chattab.cpp b/src/gui/widgets/chattab.cpp index 20aadfb7..ce9ee878 100644 --- a/src/gui/widgets/chattab.cpp +++ b/src/gui/widgets/chattab.cpp @@ -22,7 +22,7 @@ #include "gui/widgets/chattab.h" #include "actorspritemanager.h" -#include "chatlog.h" +#include "chatlogger.h" #include "commandhandler.h" #include "configuration.h" #include "localplayer.h" diff --git a/src/gui/widgets/chattab.h b/src/gui/widgets/chattab.h index 1b666da1..93636b8f 100644 --- a/src/gui/widgets/chattab.h +++ b/src/gui/widgets/chattab.h @@ -22,7 +22,7 @@ #ifndef CHATTAB_H #define CHATTAB_H -#include "gui/chat.h" +#include "gui/chatwindow.h" #include "gui/widgets/tab.h" #include "gui/widgets/textfield.h" diff --git a/src/gui/widgets/itemcontainer.cpp b/src/gui/widgets/itemcontainer.cpp index d88a5747..27f952c4 100644 --- a/src/gui/widgets/itemcontainer.cpp +++ b/src/gui/widgets/itemcontainer.cpp @@ -27,7 +27,7 @@ #include "itemshortcut.h" #include "log.h" -#include "gui/chat.h" +#include "gui/chatwindow.h" #include "gui/itempopup.h" #include "gui/outfitwindow.h" #include "gui/palette.h" diff --git a/src/gui/widgets/whispertab.cpp b/src/gui/widgets/whispertab.cpp index c3674c54..6da9461d 100644 --- a/src/gui/widgets/whispertab.cpp +++ b/src/gui/widgets/whispertab.cpp @@ -21,7 +21,7 @@ #include "whispertab.h" -#include "chatlog.h" +#include "chatlogger.h" #include "commandhandler.h" #include "localplayer.h" diff --git a/src/net/manaserv/buysellhandler.cpp b/src/net/manaserv/buysellhandler.cpp index c375ed75..329c17f0 100644 --- a/src/net/manaserv/buysellhandler.cpp +++ b/src/net/manaserv/buysellhandler.cpp @@ -25,8 +25,8 @@ #include "item.h" #include "playerinfo.h" -#include "gui/buy.h" -#include "gui/sell.h" +#include "gui/buydialog.h" +#include "gui/selldialog.h" #include "net/messagein.h" diff --git a/src/net/manaserv/tradehandler.cpp b/src/net/manaserv/tradehandler.cpp index 6e205e24..aba76c1c 100644 --- a/src/net/manaserv/tradehandler.cpp +++ b/src/net/manaserv/tradehandler.cpp @@ -28,7 +28,7 @@ #include "playerinfo.h" #include "gui/confirmdialog.h" -#include "gui/trade.h" +#include "gui/tradewindow.h" #include "net/net.h" diff --git a/src/net/tmwa/buysellhandler.cpp b/src/net/tmwa/buysellhandler.cpp index 8daebdec..1646d77f 100644 --- a/src/net/tmwa/buysellhandler.cpp +++ b/src/net/tmwa/buysellhandler.cpp @@ -28,9 +28,9 @@ #include "localplayer.h" #include "playerinfo.h" -#include "gui/buy.h" -#include "gui/buysell.h" -#include "gui/sell.h" +#include "gui/buydialog.h" +#include "gui/buyselldialog.h" +#include "gui/selldialog.h" #include "net/messagein.h" diff --git a/src/net/tmwa/gui/guildtab.cpp b/src/net/tmwa/gui/guildtab.cpp index ca922e55..d9ed1729 100644 --- a/src/net/tmwa/gui/guildtab.cpp +++ b/src/net/tmwa/gui/guildtab.cpp @@ -21,7 +21,7 @@ #include "net/tmwa/gui/guildtab.h" -#include "chatlog.h" +#include "chatlogger.h" #include "commandhandler.h" #include "guild.h" #include "localplayer.h" diff --git a/src/net/tmwa/gui/partytab.cpp b/src/net/tmwa/gui/partytab.cpp index 660a0a59..80ad4f59 100644 --- a/src/net/tmwa/gui/partytab.cpp +++ b/src/net/tmwa/gui/partytab.cpp @@ -21,7 +21,7 @@ #include "net/tmwa/gui/partytab.h" -#include "chatlog.h" +#include "chatlogger.h" #include "commandhandler.h" #include "localplayer.h" #include "party.h" diff --git a/src/net/tmwa/playerhandler.cpp b/src/net/tmwa/playerhandler.cpp index ad27a868..f91d8573 100644 --- a/src/net/tmwa/playerhandler.cpp +++ b/src/net/tmwa/playerhandler.cpp @@ -30,11 +30,11 @@ #include "playerinfo.h" #include "units.h" -#include "gui/buy.h" -#include "gui/buysell.h" +#include "gui/buydialog.h" +#include "gui/buyselldialog.h" #include "gui/gui.h" #include "gui/okdialog.h" -#include "gui/sell.h" +#include "gui/selldialog.h" #include "gui/statuswindow.h" #include "gui/viewport.h" diff --git a/src/net/tmwa/tradehandler.cpp b/src/net/tmwa/tradehandler.cpp index 69ba24af..0200b2a9 100644 --- a/src/net/tmwa/tradehandler.cpp +++ b/src/net/tmwa/tradehandler.cpp @@ -29,7 +29,7 @@ #include "playerrelations.h" #include "gui/confirmdialog.h" -#include "gui/trade.h" +#include "gui/tradewindow.h" #include "net/inventoryhandler.h" #include "net/messagein.h" |