Micro-optimizations related to std::string

* Rely on the fact that a std::string is empty by default
* Use std::string::empty() rather than comparing to ""
* Construct with std::string() rather than from ""

Reviewed-by: Bertram

4 files changed, 10 insertions, 13 deletions

diff --git a/src/chat-server/chatchannelmanager.cpp b/src/chat-server/chatchannelmanager.cpp
index 59e580f..7f7e1c4 100644
--- a/src/chat-server/chatchannelmanager.cpp
+++ b/src/chat-server/chatchannelmanager.cpp
@@ -41,11 +41,10 @@ ChatChannelManager::~ChatChannelManager()
 {
 }
 
-int
-ChatChannelManager::createNewChannel(const std::string &channelName,
-        const std::string &channelAnnouncement,
-        const std::string &channelPassword,
-        bool joinable)
+int ChatChannelManager::createNewChannel(const std::string &channelName,
+                                         const std::string &channelAnnouncement,
+                                         const std::string &channelPassword,
+                                         bool joinable)
 {
     int channelId = nextUsable();
 
@@ -83,8 +82,8 @@ bool ChatChannelManager::tryNewPublicChannel(const std::string &name)
     else
     {
         // We attempt to create a new channel
-        short id = createNewChannel(name, "", "", true);
-        return id ? true : false;
+        short id = createNewChannel(name, std::string(), std::string(), true);
+        return id != 0;
     }
 }
 
diff --git a/src/chat-server/chathandler.cpp b/src/chat-server/chathandler.cpp
index 8723ec8..f69d51f 100644
--- a/src/chat-server/chathandler.cpp
+++ b/src/chat-server/chathandler.cpp
@@ -594,7 +594,6 @@ void ChatHandler::handleListChannelsMessage(ChatClient &client, MessageIn &)
     Transaction trans;
     trans.mCharacterId = client.characterId;
     trans.mAction = TRANS_CHANNEL_LIST;
-    trans.mMessage = "";
     storage->addTransaction(trans);
 }
 
@@ -626,7 +625,6 @@ void ChatHandler::handleListChannelUsersMessage(ChatClient &client,
     Transaction trans;
     trans.mCharacterId = client.characterId;
     trans.mAction = TRANS_CHANNEL_USERLIST;
-    trans.mMessage = "";
     storage->addTransaction(trans);
 }
 
diff --git a/src/chat-server/guildhandler.cpp b/src/chat-server/guildhandler.cpp
index 7e7783d..6cc301f 100644
--- a/src/chat-server/guildhandler.cpp
+++ b/src/chat-server/guildhandler.cpp
@@ -86,8 +86,8 @@ ChatChannel *ChatHandler::joinGuildChannel(const std::string &guildName, ChatCli
     if (!channel)
     {
         // Channel doesnt exist so create it
-        int channelId = chatChannelManager->createNewChannel(guildName,
-                "Guild Channel", "", false);
+        int channelId = chatChannelManager->createNewChannel(
+                    guildName, "Guild Channel", std::string(), false);
         channel = chatChannelManager->getChannel(channelId);
     }
 
diff --git a/src/chat-server/partyhandler.cpp b/src/chat-server/partyhandler.cpp
index ba9f95f..a285ee9 100644
--- a/src/chat-server/partyhandler.cpp
+++ b/src/chat-server/partyhandler.cpp
@@ -92,12 +92,12 @@ void ChatHandler::handlePartyInvite(ChatClient &client, MessageIn &msg)
 
     out.writeString(client.characterName);
 
-    std::string invited = msg.readString();
+    const std::string invited = msg.readString();
     if (invited == client.characterName)
     {
         return;
     }
-    if (invited != "")
+    if (!invited.empty())
     {
         // Get client and send it the invite
         ChatClient *c = getClient(invited);