From 7cac34c807b6f38eaca3bc8296566493c8874e03 Mon Sep 17 00:00:00 2001 From: Selat Date: Thu, 27 Feb 2014 23:12:59 +0300 Subject: [PATCH] Pass arguments by reference --- src/client.cpp | 4 ++-- src/client.h | 4 ++-- src/connection.cpp | 4 ++-- src/content_sao.cpp | 4 ++-- src/content_sao.h | 4 ++-- src/convert_json.cpp | 4 ++-- src/convert_json.h | 4 ++-- src/exceptions.h | 34 +++++++++++++++++----------------- src/guiFormSpecMenu.h | 4 ++-- src/mods.h | 2 +- src/script/cpp_api/s_base.cpp | 2 +- src/server.cpp | 16 ++++++++-------- src/server.h | 10 +++++----- src/sound_openal.cpp | 2 +- 14 files changed, 49 insertions(+), 49 deletions(-) diff --git a/src/client.cpp b/src/client.cpp index 4d6c0cb99..654052ac0 100644 --- a/src/client.cpp +++ b/src/client.cpp @@ -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) diff --git a/src/client.h b/src/client.h index 01cd3a01c..f2e1b86d7 100644 --- a/src/client.h +++ b/src/client.h @@ -349,8 +349,8 @@ public: const std::map &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(); diff --git a/src/connection.cpp b/src/connection.cpp index f8c68ed2e..8a23f67c3 100644 --- a/src/connection.cpp +++ b/src/connection.cpp @@ -1170,7 +1170,7 @@ void UDPPeer::RunCommandQueues( channels[i].queued_commands.push_front(c); } } - catch (ItemNotFoundException e) { + catch (ItemNotFoundException &e) { // intentionally empty } } @@ -2067,7 +2067,7 @@ void ConnectionReceiveThread::receive() m_connection->putEvent(e); } } - catch(ProcessedSilentlyException e) { + catch(ProcessedSilentlyException &e) { /* try reading again */ } } diff --git a/src/content_sao.cpp b/src/content_sao.cpp index 52b741365..095c6b5bf 100644 --- a/src/content_sao.cpp +++ b/src/content_sao.cpp @@ -191,7 +191,7 @@ public: } ItemSAO(ServerEnvironment *env, v3f pos, - const std::string itemstring): + const std::string &itemstring): ServerActiveObject(env, pos), m_itemstring(itemstring), m_itemstring_changed(false), @@ -350,7 +350,7 @@ private: 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); } diff --git a/src/content_sao.h b/src/content_sao.h index 1be620f29..63e8ef460 100644 --- a/src/content_sao.h +++ b/src/content_sao.h @@ -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. @@ -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; } diff --git a/src/convert_json.cpp b/src/convert_json.cpp index c8e57aaf7..6f227e796 100644 --- a/src/convert_json.cpp +++ b/src/convert_json.cpp @@ -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; diff --git a/src/convert_json.h b/src/convert_json.h index 3fa9903b1..ea9bafb79 100644 --- a/src/convert_json.h +++ b/src/convert_json.h @@ -28,7 +28,7 @@ struct ModStoreModDetails; std::vector 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 diff --git a/src/exceptions.h b/src/exceptions.h index 6fb97f3ed..970c68e40 100644 --- a/src/exceptions.h +++ b/src/exceptions.h @@ -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; } @@ -42,78 +42,78 @@ protected: 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) {} }; /* @@ -126,7 +126,7 @@ public: InvalidPositionException(): BaseException("Somebody tried to get/set something in a nonexistent position.") {} - InvalidPositionException(std::string s): + InvalidPositionException(const std::string &s): BaseException(s) {} }; diff --git a/src/guiFormSpecMenu.h b/src/guiFormSpecMenu.h index 858894e5c..3fc1b5746 100644 --- a/src/guiFormSpecMenu.h +++ b/src/guiFormSpecMenu.h @@ -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), diff --git a/src/mods.h b/src/mods.h index dedcc9897..f11401a15 100644 --- a/src/mods.h +++ b/src/mods.h @@ -66,7 +66,7 @@ struct ModSpec bool is_modpack; // if modpack: std::map 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(), diff --git a/src/script/cpp_api/s_base.cpp b/src/script/cpp_api/s_base.cpp index 898271743..e28a34eee 100644 --- a/src/script/cpp_api/s_base.cpp +++ b/src/script/cpp_api/s_base.cpp @@ -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 diff --git a/src/server.cpp b/src/server.cpp index 7eb78f3ef..ba7ac1ece 100644 --- a/src/server.cpp +++ b/src/server.cpp @@ -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); @@ -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_) {} @@ -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_) @@ -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) @@ -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); } diff --git a/src/server.h b/src/server.h index 7ad9bcafb..7813eabbd 100644 --- a/src/server.h +++ b/src/server.h @@ -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_) { @@ -229,8 +229,8 @@ public: 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, @@ -357,7 +357,7 @@ private: 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); diff --git a/src/sound_openal.cpp b/src/sound_openal.cpp index 0cfbc2798..d27526b55 100644 --- a/src/sound_openal.cpp +++ b/src/sound_openal.cpp @@ -391,7 +391,7 @@ public: } /* 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)