summaryrefslogtreecommitdiff
path: root/src/actions
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2014-09-26 23:25:32 +0300
committerAndrei Karas <akaras@inbox.ru>2014-09-26 23:25:32 +0300
commit3ed2e647a7ec634a91a32e7ac493c9f2b6d693b0 (patch)
treed7f1400583c5bc6916129e05fc5e0907d1081ca9 /src/actions
parent6112e911a5b702fa1a9fca7bb6300f0195cbe685 (diff)
downloadmanaplus-3ed2e647a7ec634a91a32e7ac493c9f2b6d693b0.tar.gz
manaplus-3ed2e647a7ec634a91a32e7ac493c9f2b6d693b0.tar.bz2
manaplus-3ed2e647a7ec634a91a32e7ac493c9f2b6d693b0.tar.xz
manaplus-3ed2e647a7ec634a91a32e7ac493c9f2b6d693b0.zip
Fix code style.
Diffstat (limited to 'src/actions')
-rw-r--r--src/actions/actions.cpp1
-rw-r--r--src/actions/chat.cpp12
-rw-r--r--src/actions/commands.cpp1
-rw-r--r--src/actions/move.cpp1
4 files changed, 7 insertions, 8 deletions
diff --git a/src/actions/actions.cpp b/src/actions/actions.cpp
index f1c62441d..b2a455a8d 100644
--- a/src/actions/actions.cpp
+++ b/src/actions/actions.cpp
@@ -67,7 +67,6 @@
#include "net/gamehandler.h"
#include "net/ipc.h"
#include "net/mercenaryhandler.h"
-#include "net/net.h"
#include "net/pethandler.h"
#include "net/playerhandler.h"
#include "net/uploadcharinfo.h"
diff --git a/src/actions/chat.cpp b/src/actions/chat.cpp
index 8e210a155..122dd7dbe 100644
--- a/src/actions/chat.cpp
+++ b/src/actions/chat.cpp
@@ -35,12 +35,11 @@
#include "net/chathandler.h"
#include "net/guildhandler.h"
-#include "net/net.h"
#include "net/partyhandler.h"
#include "net/serverfeatures.h"
#include "utils/booleanoptions.h"
-#include "utils/gettext.h"
+#include "utils/stringutils.h"
#include "debug.h"
@@ -261,7 +260,8 @@ impHandler(createParty)
if (event.args.empty())
{
// TRANSLATORS: create party message
- event.tab->chatLog(_("Party name is missing."), ChatMsgType::BY_SERVER);
+ event.tab->chatLog(_("Party name is missing."),
+ ChatMsgType::BY_SERVER);
}
else
{
@@ -278,7 +278,8 @@ impHandler(createGuild)
if (event.args.empty())
{
// TRANSLATORS: create guild message
- event.tab->chatLog(_("Guild name is missing."), ChatMsgType::BY_SERVER);
+ event.tab->chatLog(_("Guild name is missing."),
+ ChatMsgType::BY_SERVER);
}
else
{
@@ -299,7 +300,8 @@ impHandler(party)
else
{
// TRANSLATORS: party invite message
- event.tab->chatLog(_("Please specify a name."), ChatMsgType::BY_SERVER);
+ event.tab->chatLog(_("Please specify a name."),
+ ChatMsgType::BY_SERVER);
}
return true;
}
diff --git a/src/actions/commands.cpp b/src/actions/commands.cpp
index 5b3e4c69a..4f3e05f86 100644
--- a/src/actions/commands.cpp
+++ b/src/actions/commands.cpp
@@ -41,7 +41,6 @@
#include "net/chathandler.h"
#include "net/guildhandler.h"
#include "net/homunculushandler.h"
-#include "net/net.h"
#include "net/pethandler.h"
#include "net/serverfeatures.h"
diff --git a/src/actions/move.cpp b/src/actions/move.cpp
index cc4c27b6c..0fa4d4897 100644
--- a/src/actions/move.cpp
+++ b/src/actions/move.cpp
@@ -30,7 +30,6 @@
#include "gui/windows/npcdialog.h"
#include "gui/windows/outfitwindow.h"
-#include "net/net.h"
#include "net/playerhandler.h"
#include "debug.h"