diff options
| author | Andrei Karas <akaras@inbox.ru> | 2011-09-10 15:48:22 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2011-09-10 15:48:22 +0300 |
| commit | 13670eefeb4b256c20b603a845eb89f5221a32e5 (patch) | |
| tree | 7a49048dd2693284789a23dd2a97aaa593b0ae5c /src/gui | |
| parent | 99c02724d193dbd6219c4ce036c43795d6562047 (diff) | |
| download | manaplus-13670eefeb4b256c20b603a845eb89f5221a32e5.tar.gz manaplus-13670eefeb4b256c20b603a845eb89f5221a32e5.tar.bz2 manaplus-13670eefeb4b256c20b603a845eb89f5221a32e5.tar.xz manaplus-13670eefeb4b256c20b603a845eb89f5221a32e5.zip | |
Change empty strings initializations.
Diffstat (limited to 'src/gui')
| -rw-r--r-- | src/gui/chatwindow.cpp | 2 | ||||
| -rw-r--r-- | src/gui/logindialog.cpp | 4 | ||||
| -rw-r--r-- | src/gui/minimap.cpp | 2 | ||||
| -rw-r--r-- | src/gui/npcdialog.cpp | 4 | ||||
| -rw-r--r-- | src/gui/setup_video.cpp | 2 | ||||
| -rw-r--r-- | src/gui/widgets/chattab.cpp | 2 |
6 files changed, 8 insertions, 8 deletions
diff --git a/src/gui/chatwindow.cpp b/src/gui/chatwindow.cpp index f3e4b88b8..2bada256c 100644 --- a/src/gui/chatwindow.cpp +++ b/src/gui/chatwindow.cpp @@ -1074,7 +1074,7 @@ std::string ChatWindow::addColors(std::string &msg) return msg; } - std::string newMsg = ""; + std::string newMsg(""); int cMap[] = {1, 4, 5, 2, 3, 6, 7, 9, 0, 8}; // rainbow diff --git a/src/gui/logindialog.cpp b/src/gui/logindialog.cpp index adf499f75..26248059c 100644 --- a/src/gui/logindialog.cpp +++ b/src/gui/logindialog.cpp @@ -50,8 +50,8 @@ static const int LOGIN_DIALOG_WIDTH = 300; static const int LOGIN_DIALOG_HEIGHT = 140; static const int FIELD_WIDTH = LOGIN_DIALOG_WIDTH - 70; -std::string LoginDialog::savedPassword = ""; -std::string LoginDialog::savedPasswordKey = ""; +std::string LoginDialog::savedPassword(""); +std::string LoginDialog::savedPasswordKey(""); const char *UPDATE_TYPE_TEXT[3] = diff --git a/src/gui/minimap.cpp b/src/gui/minimap.cpp index a16da2b65..70bbc1dad 100644 --- a/src/gui/minimap.cpp +++ b/src/gui/minimap.cpp @@ -89,7 +89,7 @@ Minimap::~Minimap() void Minimap::setMap(Map *map) { - std::string caption = ""; + std::string caption(""); std::string minimapName; if (map) diff --git a/src/gui/npcdialog.cpp b/src/gui/npcdialog.cpp index d941153b7..3956b47ac 100644 --- a/src/gui/npcdialog.cpp +++ b/src/gui/npcdialog.cpp @@ -228,8 +228,8 @@ 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) { diff --git a/src/gui/setup_video.cpp b/src/gui/setup_video.cpp index e9811a920..d3c1163dc 100644 --- a/src/gui/setup_video.cpp +++ b/src/gui/setup_video.cpp @@ -179,7 +179,7 @@ void ModeListModel::addCustomMode(std::string mode) int ModeListModel::getIndexOf(const std::string &widthXHeightMode) { - std::string currentMode = ""; + std::string currentMode(""); for (int i = 0; i < getNumberOfElements(); i++) { currentMode = getElementAt(i); diff --git a/src/gui/widgets/chattab.cpp b/src/gui/widgets/chattab.cpp index 4f358c8e7..485e96e74 100644 --- a/src/gui/widgets/chattab.cpp +++ b/src/gui/widgets/chattab.cpp @@ -337,7 +337,7 @@ void ChatTab::chatInput(const std::string &message) start = msg.find('[', start + 1); } - std::string temp = ""; + std::string temp(""); if (start + 1 < msg.length() && end < msg.length() && end > start + 1) { |