Introduced the class Position

Using QPoint with x,y is very confusing on the scripting level,
where the mental picture is line and columns rather than y,x

Change-Id: I4d9353afa26879d9aa44436d56841f55a50723bd
Reviewed-by: Nicolas Arnaud-Cormos <nicolas@kdab.com>

3 files changed, 9 insertions, 5 deletions

diff --git a/objects/mark.cpp b/objects/mark.cpp
index b6755fb..222b90c 100644
--- a/objects/mark.cpp
+++ b/objects/mark.cpp
@@ -1,6 +1,8 @@
 #include "mark.h"
 #include "basetexteditor.h"
 #include <texteditor/basetexteditor.h>
+#include "utils/position.h"
+
 namespace Scripting {
 namespace Internal {
 
@@ -33,12 +35,12 @@ QString Mark::fileName() const
 
 int Mark::line() const
 {
-    return m_editor->convertPosition(m_pos).y();
+    return m_editor->convertPosition(m_pos).line();
 }
 
 int Mark::column() const
 {
-    return m_editor->convertPosition(m_pos).x();
+    return m_editor->convertPosition(m_pos).column();
 }
 
 void Mark::update(int from, int charsRemoved, int charsAdded)
diff --git a/objects/texteditor.cpp b/objects/texteditor.cpp
index 3557476..068a876 100644
--- a/objects/texteditor.cpp
+++ b/objects/texteditor.cpp
@@ -1,4 +1,5 @@
 #include "texteditor.h"
+#include "utils/position.h"
 
 namespace Scripting {
 namespace Internal {
@@ -13,11 +14,11 @@ int TextEditor::position(Enums::PositionOperation posOp, int at) const
     return editor()->position( static_cast< ::TextEditor::ITextEditor::PositionOperation>(posOp), at);
 }
 
-QPoint TextEditor::convertPosition(int pos) const
+Position TextEditor::convertPosition(int pos) const
 {
     int line, column;
     editor()->convertPosition(pos,&line,&column);
-    return QPoint(column,line);
+    return Position(line,column);
 }
 
 QRect TextEditor::cursorRect(int pos) const
diff --git a/objects/texteditor.h b/objects/texteditor.h
index faea155..6187d8e 100644
--- a/objects/texteditor.h
+++ b/objects/texteditor.h
@@ -4,6 +4,7 @@
 #include "editor.h"
 #include <texteditor/itexteditor.h>
 #include "enums.h"
+#include "utils/position.h"
 
 namespace Scripting {
 namespace Internal {
@@ -17,7 +18,7 @@ public:
 
 public slots:
     int position(Enums::PositionOperation posOp = Enums::Current, int at = -1) const;
-    QPoint convertPosition(int pos) const;
+    Position convertPosition(int pos) const;
     QRect cursorRect(int pos = -1) const;
     int columnCount() const;
     int rowCount() const;