From 617a3d426f93cb5c5c6206c3c8cefb8900639639 Mon Sep 17 00:00:00 2001
From: est31 <MTest31@outlook.com>
Date: Mon, 1 Jun 2015 16:58:57 +0200
Subject: [PATCH] Make split method static
---
src/guiFormSpecMenu.cpp | 21 ++++++++++-----------
1 file changed, 10 insertions(+), 11 deletions(-)
diff --git a/src/guiFormSpecMenu.cpp b/src/guiFormSpecMenu.cpp
index d53c9b3af..ac230e425 100644
--- a/src/guiFormSpecMenu.cpp
+++ b/src/guiFormSpecMenu.cpp
@@ -236,28 +236,27 @@ GUITable* GUIFormSpecMenu::getTable(std::wstring tablename)
return 0;
}
-std::vector<std::string> split(const std::string &s, char delim) {
+static std::vector<std::string> split(const std::string &s, char delim)
+{
std::vector<std::string> tokens;
std::string current = "";
bool last_was_escape = false;
- for(unsigned int i=0; i < s.size(); i++) {
+ for (unsigned int i = 0; i < s.size(); i++) {
+ char si = s.c_str()[i];
if (last_was_escape) {
current += '\\';
- current += s.c_str()[i];
+ current += si;
last_was_escape = false;
- }
- else {
- if (s.c_str()[i] == delim) {
+ } else {
+ if (si == delim) {
tokens.push_back(current);
current = "";
last_was_escape = false;
- }
- else if (s.c_str()[i] == '\\'){
+ } else if (si == '\\') {
last_was_escape = true;
- }
- else {
- current += s.c_str()[i];
+ } else {
+ current += si;
last_was_escape = false;
}
}
--
GitLab