Kaydet (Commit) 867fcf48 authored tarafından Takeshi Abe's avatar Takeshi Abe Kaydeden (comit) Noel Grandin

starmath: Prefix members of SmCursor

Change-Id: Ib3407b5457f4d69294c95879455553dc013cc340
Reviewed-on: https://gerrit.libreoffice.org/19186Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarNoel Grandin <noelgrandin@gmail.com>
üst 8b98c8b3
...@@ -78,14 +78,14 @@ class SmDocShell; ...@@ -78,14 +78,14 @@ class SmDocShell;
class SmCursor{ class SmCursor{
public: public:
SmCursor(SmNode* tree, SmDocShell* pShell) SmCursor(SmNode* tree, SmDocShell* pShell)
: anchor(NULL) : mpAnchor(nullptr)
, position(NULL) , mpPosition(nullptr)
, pTree(tree) , mpTree(tree)
, pDocShell(pShell) , mpDocShell(pShell)
, pGraph(NULL) , mpGraph(nullptr)
, pClipboard(NULL) , mpClipboard(nullptr)
, nEditSections(0) , mnEditSections(0)
, bIsEnabledSetModifiedSmDocShell(false) , mbIsEnabledSetModifiedSmDocShell(false)
{ {
//Build graph //Build graph
BuildGraph(); BuildGraph();
...@@ -94,15 +94,15 @@ public: ...@@ -94,15 +94,15 @@ public:
~SmCursor() ~SmCursor()
{ {
SetClipboard(); SetClipboard();
delete pGraph; delete mpGraph;
pGraph = NULL; mpGraph = nullptr;
} }
/** Get position */ /** Get position */
SmCaretPos GetPosition() const { return position->CaretPos; } SmCaretPos GetPosition() const { return mpPosition->CaretPos; }
/** True, if the cursor has a selection */ /** True, if the cursor has a selection */
bool HasSelection() { return anchor != position; } bool HasSelection() { return mpAnchor != mpPosition; }
/** Move the position of this cursor */ /** Move the position of this cursor */
void Move(OutputDevice* pDev, SmMovementDirection direction, bool bMoveAnchor = true); void Move(OutputDevice* pDev, SmMovementDirection direction, bool bMoveAnchor = true);
...@@ -223,16 +223,16 @@ public: ...@@ -223,16 +223,16 @@ public:
private: private:
friend class SmDocShell; friend class SmDocShell;
SmCaretPosGraphEntry *anchor, SmCaretPosGraphEntry *mpAnchor,
*position; *mpPosition;
/** Formula tree */ /** Formula tree */
SmNode* pTree; SmNode* mpTree;
/** Owner of the formula tree */ /** Owner of the formula tree */
SmDocShell* pDocShell; SmDocShell* mpDocShell;
/** Graph over caret position in the current tree */ /** Graph over caret position in the current tree */
SmCaretPosGraph* pGraph; SmCaretPosGraph* mpGraph;
/** Clipboard holder */ /** Clipboard holder */
SmNodeList* pClipboard; SmNodeList* mpClipboard;
/** Returns a node that is selected, if any could be found */ /** Returns a node that is selected, if any could be found */
SmNode* FindSelectedNode(SmNode* pNode); SmNode* FindSelectedNode(SmNode* pNode);
...@@ -360,9 +360,9 @@ private: ...@@ -360,9 +360,9 @@ private:
/** The number of times BeginEdit have been called /** The number of times BeginEdit have been called
* Used to allow nesting of BeginEdit() and EndEdit() sections * Used to allow nesting of BeginEdit() and EndEdit() sections
*/ */
int nEditSections; int mnEditSections;
/** Holds data for BeginEdit() and EndEdit() */ /** Holds data for BeginEdit() and EndEdit() */
bool bIsEnabledSetModifiedSmDocShell; bool mbIsEnabledSetModifiedSmDocShell;
/** Begin edit section where the tree will be modified */ /** Begin edit section where the tree will be modified */
void BeginEdit(); void BeginEdit();
/** End edit section where the tree will be modified */ /** End edit section where the tree will be modified */
......
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment