string_view by simple value

nullptr protection in a function
eteran · Dec 7, 2017 · 83ffc49 · 83ffc49
1 parent cf5c94e
commit 83ffc49
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 6 deletions.
diff --git a/source/MainWindow.cpp b/source/MainWindow.cpp
@@ -5796,7 +5796,11 @@ void MainWindow::action_Detach_Document_Dialog(DocumentWidget *document) {
  * @return
  */
 MainWindow *MainWindow::fromDocument(const DocumentWidget *document) {
-    return qobject_cast<MainWindow *>(document->window());
+    if(document) {
+        return qobject_cast<MainWindow *>(document->window());
+    }
+
+    return nullptr;
 }
 
 /*

diff --git a/source/interpret.cpp b/source/interpret.cpp
@@ -766,7 +766,7 @@ NString AllocNStringCpyEx(const QString &s) {
     return string;
 }
 
-NString AllocNStringCpyEx(const view::string_view s) {
+NString AllocNStringCpyEx(view::string_view s) {
     size_t length = s.size();
 
     NString string = AllocNStringEx(length + 1);

diff --git a/source/interpret.h b/source/interpret.h
@@ -217,7 +217,7 @@ void PreemptMacro();
 
 char *AllocStringCpyEx(const std::string &s);
 NString AllocNStringCpyEx(const QString &s);
-NString AllocNStringCpyEx(const view::string_view s);
+NString AllocNStringCpyEx(view::string_view s);
 void GarbageCollectStrings();
 Symbol *PromoteToGlobal(Symbol *sym);
 void FreeProgram(Program *prog);
@@ -268,7 +268,7 @@ inline DataValue to_value(bool n) {
     return DV;
 }
 
-inline DataValue to_value(const view::string_view str) {
+inline DataValue to_value(view::string_view str) {
     DataValue DV;
     DV.tag     = STRING_TAG;
     DV.val.str = AllocNStringCpyEx(str);

diff --git a/source/tags.cpp b/source/tags.cpp
@@ -1238,7 +1238,7 @@ static bool searchLine(const std::string &line, const std::string &regex) {
 }
 
 // Check if a line has non-ws characters 
-static bool lineEmpty(const view::string_view line) {
+static bool lineEmpty(view::string_view line) {
 
     for(char ch : line) {
         if(ch == '\n') {

diff --git a/util/algorithm.h b/util/algorithm.h
@@ -28,7 +28,7 @@ void moveItem(Cont &cont, int from, int to) {
 // string_view algorithms
 
 template <class Ch, class Tr>
-constexpr view::basic_string_view<Ch, Tr> substr(const view::basic_string_view<Ch, Tr> &str, typename view::basic_string_view<Ch, Tr>::size_type pos, typename view::basic_string_view<Ch, Tr>::size_type count = view::basic_string_view<Ch, Tr>::npos) {
+constexpr view::basic_string_view<Ch, Tr> substr(view::basic_string_view<Ch, Tr> str, typename view::basic_string_view<Ch, Tr>::size_type pos, typename view::basic_string_view<Ch, Tr>::size_type count = view::basic_string_view<Ch, Tr>::npos) {
     return str.substr(pos, count);
 }