Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Pass arguments by reference
  • Loading branch information
Selat authored and ShadowNinja committed Mar 12, 2014
1 parent 2bc2ce3 commit 7cac34c
Show file tree
Hide file tree
Showing 14 changed files with 49 additions and 49 deletions.
4 changes: 2 additions & 2 deletions src/client.cpp
Expand Up @@ -2072,8 +2072,8 @@ void Client::sendChatMessage(const std::wstring &message)
Send(0, data, true);
}

void Client::sendChangePassword(const std::wstring oldpassword,
const std::wstring newpassword)
void Client::sendChangePassword(const std::wstring &oldpassword,
const std::wstring &newpassword)
{
Player *player = m_env.getLocalPlayer();
if(player == NULL)
Expand Down
4 changes: 2 additions & 2 deletions src/client.h
Expand Up @@ -349,8 +349,8 @@ class Client : public con::PeerHandler, public InventoryManager, public IGameDef
const std::map<std::string, std::string> &fields);
void sendInventoryAction(InventoryAction *a);
void sendChatMessage(const std::wstring &message);
void sendChangePassword(const std::wstring oldpassword,
const std::wstring newpassword);
void sendChangePassword(const std::wstring &oldpassword,
const std::wstring &newpassword);
void sendDamage(u8 damage);
void sendBreath(u16 breath);
void sendRespawn();
Expand Down
4 changes: 2 additions & 2 deletions src/connection.cpp
Expand Up @@ -1170,7 +1170,7 @@ void UDPPeer::RunCommandQueues(
channels[i].queued_commands.push_front(c);
}
}
catch (ItemNotFoundException e) {
catch (ItemNotFoundException &e) {
// intentionally empty
}
}
Expand Down Expand Up @@ -2067,7 +2067,7 @@ void ConnectionReceiveThread::receive()
m_connection->putEvent(e);
}
}
catch(ProcessedSilentlyException e) {
catch(ProcessedSilentlyException &e) {
/* try reading again */
}
}
Expand Down
4 changes: 2 additions & 2 deletions src/content_sao.cpp
Expand Up @@ -191,7 +191,7 @@ class ItemSAO : public ServerActiveObject
}

ItemSAO(ServerEnvironment *env, v3f pos,
const std::string itemstring):
const std::string &itemstring):
ServerActiveObject(env, pos),
m_itemstring(itemstring),
m_itemstring_changed(false),
Expand Down Expand Up @@ -350,7 +350,7 @@ class ItemSAO : public ServerActiveObject
ItemSAO proto_ItemSAO(NULL, v3f(0,0,0), "");

ServerActiveObject* createItemSAO(ServerEnvironment *env, v3f pos,
const std::string itemstring)
const std::string &itemstring)
{
return new ItemSAO(env, pos, itemstring);
}
Expand Down
4 changes: 2 additions & 2 deletions src/content_sao.h
Expand Up @@ -27,7 +27,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#include "object_properties.h"

ServerActiveObject* createItemSAO(ServerEnvironment *env, v3f pos,
const std::string itemstring);
const std::string &itemstring);

/*
LuaEntitySAO needs some internals exposed.
Expand All @@ -37,7 +37,7 @@ class LuaEntitySAO : public ServerActiveObject
{
public:
LuaEntitySAO(ServerEnvironment *env, v3f pos,
const std::string &name, const std::string &state);
const std::string &name, const std::string &state);
~LuaEntitySAO();
u8 getType() const
{ return ACTIVEOBJECT_TYPE_LUAENTITY; }
Expand Down
4 changes: 2 additions & 2 deletions src/convert_json.cpp
Expand Up @@ -31,8 +31,8 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#include "httpfetch.h"
#include "porting.h"

Json::Value fetchJsonValue(const std::string url,
struct curl_slist *chunk) {
Json::Value fetchJsonValue(const std::string &url,
struct curl_slist *chunk) {
#if USE_CURL

HTTPFetchRequest fetchrequest;
Expand Down
4 changes: 2 additions & 2 deletions src/convert_json.h
Expand Up @@ -28,7 +28,7 @@ struct ModStoreModDetails;
std::vector<ModStoreMod> readModStoreList(Json::Value& modlist);
ModStoreModDetails readModStoreModDetails(Json::Value& details);

Json::Value fetchJsonValue(const std::string url,
struct curl_slist *chunk);
Json::Value fetchJsonValue(const std::string &url,
struct curl_slist *chunk);

#endif
34 changes: 17 additions & 17 deletions src/exceptions.h
Expand Up @@ -27,7 +27,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
class BaseException : public std::exception
{
public:
BaseException(const std::string s) throw()
BaseException(const std::string &s) throw()
{
m_s = s;
}
Expand All @@ -42,78 +42,78 @@ class BaseException : public std::exception

class AsyncQueuedException : public BaseException {
public:
AsyncQueuedException(std::string s): BaseException(s) {}
AsyncQueuedException(const std::string &s): BaseException(s) {}
};

class NotImplementedException : public BaseException {
public:
NotImplementedException(std::string s): BaseException(s) {}
NotImplementedException(const std::string &s): BaseException(s) {}
};

class AlreadyExistsException : public BaseException {
public:
AlreadyExistsException(std::string s): BaseException(s) {}
AlreadyExistsException(const std::string &s): BaseException(s) {}
};

class VersionMismatchException : public BaseException {
public:
VersionMismatchException(std::string s): BaseException(s) {}
VersionMismatchException(const std::string &s): BaseException(s) {}
};

class FileNotGoodException : public BaseException {
public:
FileNotGoodException(std::string s): BaseException(s) {}
FileNotGoodException(const std::string &s): BaseException(s) {}
};

class SerializationError : public BaseException {
public:
SerializationError(std::string s): BaseException(s) {}
SerializationError(const std::string &s): BaseException(s) {}
};

class LoadError : public BaseException {
public:
LoadError(std::string s): BaseException(s) {}
LoadError(const std::string &s): BaseException(s) {}
};

class ContainerFullException : public BaseException {
public:
ContainerFullException(std::string s): BaseException(s) {}
ContainerFullException(const std::string &s): BaseException(s) {}
};

class SettingNotFoundException : public BaseException {
public:
SettingNotFoundException(std::string s): BaseException(s) {}
SettingNotFoundException(const std::string &s): BaseException(s) {}
};

class InvalidFilenameException : public BaseException {
public:
InvalidFilenameException(std::string s): BaseException(s) {}
InvalidFilenameException(const std::string &s): BaseException(s) {}
};

class ProcessingLimitException : public BaseException {
public:
ProcessingLimitException(std::string s): BaseException(s) {}
ProcessingLimitException(const std::string &s): BaseException(s) {}
};

class CommandLineError : public BaseException {
public:
CommandLineError(std::string s): BaseException(s) {}
CommandLineError(const std::string &s): BaseException(s) {}
};

class ItemNotFoundException : public BaseException {
public:
ItemNotFoundException(std::string s): BaseException(s) {}
ItemNotFoundException(const std::string &s): BaseException(s) {}
};

class ServerError : public BaseException {
public:
ServerError(std::string s): BaseException(s) {}
ServerError(const std::string &s): BaseException(s) {}
};

// Only used on Windows (SEH)
class FatalSystemException : public BaseException {
public:
FatalSystemException(std::string s): BaseException(s) {}
FatalSystemException(const std::string &s): BaseException(s) {}
};

/*
Expand All @@ -126,7 +126,7 @@ class InvalidPositionException : public BaseException
InvalidPositionException():
BaseException("Somebody tried to get/set something in a nonexistent position.")
{}
InvalidPositionException(std::string s):
InvalidPositionException(const std::string &s):
BaseException(s)
{}
};
Expand Down
4 changes: 2 additions & 2 deletions src/guiFormSpecMenu.h
Expand Up @@ -149,8 +149,8 @@ class GUIFormSpecMenu : public GUIModalMenu
FieldSpec()
{
}
FieldSpec(const std::wstring name, const std::wstring label,
const std::wstring fdeflt, int id) :
FieldSpec(const std::wstring &name, const std::wstring &label,
const std::wstring &fdeflt, int id) :
fname(name),
flabel(label),
fdefault(fdeflt),
Expand Down
2 changes: 1 addition & 1 deletion src/mods.h
Expand Up @@ -66,7 +66,7 @@ struct ModSpec
bool is_modpack;
// if modpack:
std::map<std::string,ModSpec> modpack_content;
ModSpec(const std::string name_="", const std::string path_=""):
ModSpec(const std::string &name_="", const std::string &path_=""):
name(name_),
path(path_),
depends(),
Expand Down
2 changes: 1 addition & 1 deletion src/script/cpp_api/s_base.cpp
Expand Up @@ -43,7 +43,7 @@ class ModNameStorer
private:
lua_State *L;
public:
ModNameStorer(lua_State *L_, const std::string modname):
ModNameStorer(lua_State *L_, const std::string &modname):
L(L_)
{
// Store current modname in registry
Expand Down
16 changes: 8 additions & 8 deletions src/server.cpp
Expand Up @@ -3046,8 +3046,8 @@ void Server::SendChatMessage(u16 peer_id, const std::wstring &message)
}
}

void Server::SendShowFormspecMessage(u16 peer_id, const std::string formspec,
const std::string formname)
void Server::SendShowFormspecMessage(u16 peer_id, const std::string &formspec,
const std::string &formname)
{
DSTACK(__FUNCTION_NAME);

Expand Down Expand Up @@ -3871,8 +3871,8 @@ struct SendableMediaAnnouncement
std::string name;
std::string sha1_digest;

SendableMediaAnnouncement(const std::string name_="",
const std::string sha1_digest_=""):
SendableMediaAnnouncement(const std::string &name_="",
const std::string &sha1_digest_=""):
name(name_),
sha1_digest(sha1_digest_)
{}
Expand Down Expand Up @@ -3933,8 +3933,8 @@ struct SendableMedia
std::string path;
std::string data;

SendableMedia(const std::string &name_="", const std::string path_="",
const std::string &data_=""):
SendableMedia(const std::string &name_="", const std::string &path_="",
const std::string &data_=""):
name(name_),
path(path_),
data(data_)
Expand Down Expand Up @@ -4385,7 +4385,7 @@ std::string Server::getBanDescription(const std::string &ip_or_name)
return m_banmanager->getBanDescription(ip_or_name);
}

void Server::notifyPlayer(const char *name, const std::wstring msg)
void Server::notifyPlayer(const char *name, const std::wstring &msg)
{
Player *player = m_env->getPlayer(name);
if(!player)
Expand Down Expand Up @@ -4498,7 +4498,7 @@ bool Server::overrideDayNightRatio(Player *player, bool do_override,
return true;
}

void Server::notifyPlayers(const std::wstring msg)
void Server::notifyPlayers(const std::wstring &msg)
{
SendChatMessage(PEER_ID_INEXISTENT,msg);
}
Expand Down
10 changes: 5 additions & 5 deletions src/server.h
Expand Up @@ -122,8 +122,8 @@ struct MediaInfo
std::string path;
std::string sha1_digest;

MediaInfo(const std::string path_="",
const std::string sha1_digest_=""):
MediaInfo(const std::string &path_="",
const std::string &sha1_digest_=""):
path(path_),
sha1_digest(sha1_digest_)
{
Expand Down Expand Up @@ -229,8 +229,8 @@ class Server : public con::PeerHandler, public MapEventReceiver,
void unsetIpBanned(const std::string &ip_or_name);
std::string getBanDescription(const std::string &ip_or_name);

void notifyPlayer(const char *name, const std::wstring msg);
void notifyPlayers(const std::wstring msg);
void notifyPlayer(const char *name, const std::wstring &msg);
void notifyPlayers(const std::wstring &msg);
void spawnParticle(const char *playername,
v3f pos, v3f velocity, v3f acceleration,
float expirationtime, float size,
Expand Down Expand Up @@ -357,7 +357,7 @@ class Server : public con::PeerHandler, public MapEventReceiver,
void SendMovePlayer(u16 peer_id);
void SendPlayerPrivileges(u16 peer_id);
void SendPlayerInventoryFormspec(u16 peer_id);
void SendShowFormspecMessage(u16 peer_id, const std::string formspec, const std::string formname);
void SendShowFormspecMessage(u16 peer_id, const std::string &formspec, const std::string &formname);
void SendHUDAdd(u16 peer_id, u32 id, HudElement *form);
void SendHUDRemove(u16 peer_id, u32 id);
void SendHUDChange(u16 peer_id, u32 id, HudElementStat stat, void *value);
Expand Down
2 changes: 1 addition & 1 deletion src/sound_openal.cpp
Expand Up @@ -391,7 +391,7 @@ class OpenALSoundManager: public ISoundManager
}

/* If buffer does not exist, consult the fetcher */
SoundBuffer* getFetchBuffer(const std::string name)
SoundBuffer* getFetchBuffer(const std::string &name)
{
SoundBuffer *buf = getBuffer(name);
if(buf)
Expand Down

0 comments on commit 7cac34c

Please sign in to comment.