diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2017-12-05 21:14:29 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-12-05 21:14:29 +0100 |
| commit | 9a96a2a06e2daacdcd90469c33e8f5f6dafa6958 (patch) | |
| tree | 4069a4c5cee9ec31f9d2f5e888b2c31479921e73 /core | |
| parent | 1587f45c2551a43db2808f2c5938095e19f060d2 (diff) | |
| parent | fd1b94e307fadcb5a28d067e2bfac90fb8d55328 (diff) | |
Merge pull request #14000 from mhilbrunner/issue-13950
Improve slang, especially in user-visible parts. Closes #13950.
Diffstat (limited to 'core')
| -rw-r--r-- | core/error_list.h | 2 | ||||
| -rw-r--r-- | core/global_constants.cpp | 1 | ||||
| -rw-r--r-- | core/ustring.cpp | 2 |
3 files changed, 0 insertions, 5 deletions
diff --git a/core/error_list.h b/core/error_list.h index 50d248b3d0..9a36b27aab 100644 --- a/core/error_list.h +++ b/core/error_list.h @@ -87,8 +87,6 @@ enum Error { ERR_HELP, ///< user requested help!! ERR_BUG, ///< a bug in the software certainly happened, due to a double check failing or unexpected behavior. ERR_PRINTER_ON_FIRE, /// the parallel port printer is engulfed in flames - ERR_OMFG_THIS_IS_VERY_VERY_BAD, ///< shit happens, has never been used, though - ERR_WTF = ERR_OMFG_THIS_IS_VERY_VERY_BAD ///< short version of the above }; #endif diff --git a/core/global_constants.cpp b/core/global_constants.cpp index 48101c8cf1..fb432b85db 100644 --- a/core/global_constants.cpp +++ b/core/global_constants.cpp @@ -491,7 +491,6 @@ void register_global_constants() { BIND_GLOBAL_ENUM_CONSTANT(ERR_BUSY); BIND_GLOBAL_ENUM_CONSTANT(ERR_HELP); ///< user requested help!! BIND_GLOBAL_ENUM_CONSTANT(ERR_BUG); ///< a bug in the software certainly happened ), due to a double check failing or unexpected behavior. - BIND_GLOBAL_ENUM_CONSTANT(ERR_WTF); BIND_GLOBAL_ENUM_CONSTANT(PROPERTY_HINT_NONE); BIND_GLOBAL_ENUM_CONSTANT(PROPERTY_HINT_RANGE); diff --git a/core/ustring.cpp b/core/ustring.cpp index a86fb46c8a..3a0708851e 100644 --- a/core/ustring.cpp +++ b/core/ustring.cpp @@ -3380,8 +3380,6 @@ bool String::is_valid_float() const { from++; } - //this was pulled out of my ass, i wonder if it's correct... - bool exponent_found = false; bool period_found = false; bool sign_found = false; |