summaryrefslogtreecommitdiff
path: root/src/net
diff options
context:
space:
mode:
authorBjørn Lindeijer <bjorn@lindeijer.nl>2009-03-25 23:42:57 +0100
committerBjørn Lindeijer <bjorn@lindeijer.nl>2009-03-25 23:42:57 +0100
commitcd20fb3432498b8871401bdd65a143197e2a6538 (patch)
tree1edd3e20e3501de5315fa5bfc46b8673ad40d5dd /src/net
parent4ba8c80791c15c144d66e6a9b23e878d3313fa26 (diff)
downloadmana-cd20fb3432498b8871401bdd65a143197e2a6538.tar.gz
mana-cd20fb3432498b8871401bdd65a143197e2a6538.tar.bz2
mana-cd20fb3432498b8871401bdd65a143197e2a6538.tar.xz
mana-cd20fb3432498b8871401bdd65a143197e2a6538.zip
A host of code style fixes
Mostly putting & and * in the right place and making some getters const.
Diffstat (limited to 'src/net')
-rw-r--r--src/net/ea/network.cpp2
-rw-r--r--src/net/ea/network.h4
-rw-r--r--src/net/tmwserv/logouthandler.cpp2
3 files changed, 4 insertions, 4 deletions
diff --git a/src/net/ea/network.cpp b/src/net/ea/network.cpp
index 199e94da..c6ea1074 100644
--- a/src/net/ea/network.cpp
+++ b/src/net/ea/network.cpp
@@ -419,7 +419,7 @@ void Network::receive()
SDLNet_FreeSocketSet(set);
}
-void Network::setError(const std::string& error)
+void Network::setError(const std::string &error)
{
logger->log("Network error: %s", error.c_str());
mError = error;
diff --git a/src/net/ea/network.h b/src/net/ea/network.h
index 02fe7538..039006f8 100644
--- a/src/net/ea/network.h
+++ b/src/net/ea/network.h
@@ -60,7 +60,7 @@ class Network
int getState() const { return mState; }
- const std::string& getError() const { return mError; }
+ const std::string &getError() const { return mError; }
bool isConnected() const { return mState == CONNECTED; }
@@ -86,7 +86,7 @@ class Network
};
protected:
- void setError(const std::string& error);
+ void setError(const std::string &error);
Uint16 readWord(int pos);
diff --git a/src/net/tmwserv/logouthandler.cpp b/src/net/tmwserv/logouthandler.cpp
index a7a1eb2e..81c21e4b 100644
--- a/src/net/tmwserv/logouthandler.cpp
+++ b/src/net/tmwserv/logouthandler.cpp
@@ -198,7 +198,7 @@ void LogoutHandler::handleMessage(MessageIn &msg)
}
void
-LogoutHandler::setScenario(unsigned short scenario, std::string* passToken)
+LogoutHandler::setScenario(unsigned short scenario, std::string *passToken)
{
mScenario = scenario;
mPassToken = passToken;