From e7a3f059aafb643238d95de8d34554747d7e74f2 Mon Sep 17 00:00:00 2001
From: "artemutin@yandex.ru" <artemutin@yandex.ru>
Date: Wed, 7 Oct 2015 12:39:19 +1000
Subject: [PATCH 1/2] Implemented line and col calculations in scriptsubview

---
 apps/opencs/view/world/scriptsubview.cpp | 46 +++++++++++++++---------
 1 file changed, 29 insertions(+), 17 deletions(-)

diff --git a/apps/opencs/view/world/scriptsubview.cpp b/apps/opencs/view/world/scriptsubview.cpp
index d99f789b3..35b9ccf0c 100644
--- a/apps/opencs/view/world/scriptsubview.cpp
+++ b/apps/opencs/view/world/scriptsubview.cpp
@@ -198,26 +198,38 @@ void CSVWorld::ScriptSubView::useHint (const std::string& hint)
     if (hint.empty())
         return;
 
-    if (hint[0]=='l')
-    {
-        std::istringstream stream (hint.c_str()+1);
-
-        char ignore;
-        int line;
-        int column;
-
-        if (stream >> ignore >> line >> column)
+    size_t line = 0, column = 0;
+    std::istringstream stream (hint.c_str()+2);
+    switch(hint[0]){
+        case 'R':
+        case 'r':
         {
-            QTextCursor cursor = mEditor->textCursor();
-
-            cursor.movePosition (QTextCursor::Start);
-            if (cursor.movePosition (QTextCursor::Down, QTextCursor::MoveAnchor, line))
-                cursor.movePosition (QTextCursor::Right, QTextCursor::MoveAnchor, column);
-
-            mEditor->setFocus();
-            mEditor->setTextCursor (cursor);
+            QModelIndex index = mModel->getModelIndex (getUniversalId().getId(), mColumn);
+            QString source = mModel->data (index).toString();
+            size_t pos;
+            stream >> pos >> pos;
+
+            for (size_t i = 0; i <= pos; ++i){
+                if (source[(unsigned) i] == '\n'){
+                    ++line;
+                    column = i;
+                }
+            }
+            column = pos - column - (line > 0 ? 1 : 0);
+            break;
         }
+        case 'l':
+            stream >> line >> column;
     }
+
+    QTextCursor cursor = mEditor->textCursor();
+
+    cursor.movePosition (QTextCursor::Start);
+    if (cursor.movePosition (QTextCursor::Down, QTextCursor::MoveAnchor, line))
+        cursor.movePosition (QTextCursor::Right, QTextCursor::MoveAnchor, column);
+
+    mEditor->setFocus();
+    mEditor->setTextCursor (cursor);
 }
 
 void CSVWorld::ScriptSubView::textChanged()

From 4ca7b2660932efb06535f148a643a7e814f3a72d Mon Sep 17 00:00:00 2001
From: "artemutin@yandex.ru" <artemutin@yandex.ru>
Date: Fri, 9 Oct 2015 21:52:12 +1000
Subject: [PATCH 2/2] Stream error handling, and other minor changes.

---
 apps/opencs/view/world/scriptsubview.cpp | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/apps/opencs/view/world/scriptsubview.cpp b/apps/opencs/view/world/scriptsubview.cpp
index 35b9ccf0c..eb0c70656 100644
--- a/apps/opencs/view/world/scriptsubview.cpp
+++ b/apps/opencs/view/world/scriptsubview.cpp
@@ -198,28 +198,31 @@ void CSVWorld::ScriptSubView::useHint (const std::string& hint)
     if (hint.empty())
         return;
 
-    size_t line = 0, column = 0;
-    std::istringstream stream (hint.c_str()+2);
+    unsigned line = 0, column = 0;
+    char c;
+    std::istringstream stream (hint.c_str()+1);
     switch(hint[0]){
         case 'R':
         case 'r':
         {
             QModelIndex index = mModel->getModelIndex (getUniversalId().getId(), mColumn);
             QString source = mModel->data (index).toString();
-            size_t pos;
-            stream >> pos >> pos;
+            unsigned pos, dummy;
+            if (!(stream >> c >> dummy >> pos) )
+                return;
 
-            for (size_t i = 0; i <= pos; ++i){
-                if (source[(unsigned) i] == '\n'){
+            for (unsigned i = 0; i <= pos; ++i){
+                if (source[i] == '\n'){
                     ++line;
-                    column = i;
+                    column = i+1;
                 }
             }
-            column = pos - column - (line > 0 ? 1 : 0);
+            column = pos - column;
             break;
         }
         case 'l':
-            stream >> line >> column;
+            if (!(stream >> c >> line >> column))
+                    return;
     }
 
     QTextCursor cursor = mEditor->textCursor();