General code cleanups

* Use default member initializers
* Use range-based loops
* Don't use 'else' after 'return'
* Removed some unused includes
* Construct empty strings with std::string() instead of ""
* Clear strings with .clear() instead of assigning ""
* Check whether strings are empty with .empty() instead of comparing to ""
* Removed redundant initializations

1 files changed, 4 insertions, 4 deletions

diff --git a/src/gui/npcdialog.cpp b/src/gui/npcdialog.cpp
index 13e1ac0d..0ad9e959 100644
--- a/src/gui/npcdialog.cpp
+++ b/src/gui/npcdialog.cpp
@@ -106,7 +106,7 @@ NpcDialog::NpcDialog(int npcId)
     mItemList->setVisible(true);
 
     // Setup string input box
-    mTextField = new TextField("");
+    mTextField = new TextField(std::string());
     mTextField->setVisible(true);
 
     // Setup int input box
@@ -211,7 +211,7 @@ void NpcDialog::action(const gcn::ActionEvent &event)
         }
         else if (mActionState == NPC_ACTION_INPUT)
         {
-            std::string printText = "";  // Text that will get printed in the textbox
+            std::string printText;  // Text that will get printed in the textbox
 
             if (mInputState == NPC_INPUT_LIST)
             {
@@ -243,7 +243,7 @@ void NpcDialog::action(const gcn::ActionEvent &event)
         }
 
         if (!mLogInteraction)
-            setText("");
+            setText(std::string());
     }
     else if (event.getId() == "reset")
     {
@@ -569,7 +569,7 @@ void NpcEventListener::event(Event::Channel channel,
         }
         catch (BadEvent)
         {
-            dialog->textRequest("");
+            dialog->textRequest(std::string());
         }
     }
     else if (event.getType() == Event::Next)