asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #1545 from okamstudio/revert-1401-inspectorupdate

Browse source 
Revert "Camelcased script variables will now capitalize in the inspector...
This commit is contained in:
Juan Linietsky 2015-03-22 19:06:24 -03:00
commit 95c18c2fad
2 changed files with 3 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
core/ustring.cpp
View file

@ -482,7 +482,7 @@ void String::erase(int p_pos, int p_chars) {
String String::capitalize() const {
String aux=this->camelcase_to_underscore().replace("_"," ").to_lower();
String aux=this->replace("_"," ").to_lower();
String cap;
for (int i=0;i<aux.get_slice_count(" ");i++) {
@ -498,29 +498,6 @@ String String::capitalize() const {
return cap;
}
String String::camelcase_to_underscore() const {
const CharType * cstr = c_str();
String newString;
const char A = 'A', Z = 'Z';
int startIndex = 0;
for ( int i = 1; i < this->size()-1; i++ ) {
bool isCapital = cstr[i] >= A && cstr[i] <= Z;
if ( isCapital ) {
newString += "_" + this->substr(startIndex, i-startIndex);
startIndex = i;
}
}
newString += "_" + this->substr(startIndex, this->size()-startIndex);
return newString;
}
int String::get_slice_count(String p_splitter) const{
if (empty())

3
core/ustring.h
View file

@ -149,7 +149,6 @@ public:
static double to_double(const CharType* p_str, const CharType **r_end=NULL);
static int64_t to_int(const CharType* p_str,int p_len=-1);
String capitalize() const;
String camelcase_to_underscore() const;
int get_slice_count(String p_splitter) const;
String get_slice(String p_splitter,int p_slice) const;
@ -226,6 +225,8 @@ public:
String(const char *p_str);
String(const CharType *p_str,int p_clip_to_len=-1);
String(const StrRange& p_range);
};