-rw-r--r-- | noncore/apps/tinykate/libkate/document/katetextline.h | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/noncore/apps/tinykate/libkate/document/katetextline.h b/noncore/apps/tinykate/libkate/document/katetextline.h index c2968cc..3518900 100644 --- a/noncore/apps/tinykate/libkate/document/katetextline.h +++ b/noncore/apps/tinykate/libkate/document/katetextline.h @@ -52,60 +52,60 @@ class FastValueList : public QValueList<T> { public: typedef QValueListIterator<T> Iterator; typedef QValueListConstIterator<T> ConstIterator; protected: FVPrivate<T> *fvp; Iterator fastat( uint i ) { - uint num=count(); - if (i>=num) {return end();} - if (fvp->curpos<0) { fvp->curpos=0; fvp->curit=begin(); } + uint num=this->count(); + if (i>=num) {return this->end();} + if (fvp->curpos<0) { fvp->curpos=0; fvp->curit=this->begin(); } uint curpos=(uint) fvp->curpos; Iterator curit(fvp->curit.node); if (curpos==i) return curit; int diff=i-curpos; bool forward; if (diff<0) diff=-diff; if (((uint)diff < i) && ((uint)diff < num-i)) { // start from current node forward=i > (uint)curpos; } else if (i < num - i) { // start from first node - curit=begin(); diff=i; forward=TRUE; + curit=this->begin(); diff=i; forward=TRUE; } else { // start from last node - curit=fromLast(); diff=num - i - 1; + curit=this->fromLast(); diff=num - i - 1; if (diff<0) diff=0; forward=FALSE; } if (forward) { while(diff--) curit++; } else { while(diff--) curit--; } fvp->curpos=i; fvp->curit=curit; return curit; } ConstIterator fastat( uint i ) const { - uint num=count(); - if (i>=num) {return end();} - if (fvp->curpos<0) { fvp->curpos=0; fvp->curit=begin(); } + uint num=this->count(); + if (i>=num) {return this->end();} + if (fvp->curpos<0) { fvp->curpos=0; fvp->curit=this->begin(); } uint curpos=(uint) fvp->curpos; ConstIterator curit=fvp->curit; if (curpos==i) return curit; int diff=i-curpos; bool forward; if (diff<0) diff=-diff; if (((uint)diff < i) && ((uint)diff < num-i)) { // start from current node forward=i > (uint)curpos; } else if (i < num - i) { // start from first node - curit=begin(); diff=i; forward=TRUE; + curit=this->begin(); diff=i; forward=TRUE; } else { // start from last node - curit=fromLast(); diff=num - i - 1; + curit=this->fromLast(); diff=num - i - 1; if (diff<0) diff=0; forward=FALSE; } if (forward) { while(diff--) curit++; } else { while(diff--) curit--; } @@ -133,19 +133,19 @@ public: Iterator remove( Iterator it ) { fvp->curpos=-1; return QValueList<T>::remove( it ); } void remove( const T& x ) { fvp->curpos=-1; QValueList<T>::remove( x ); } - T& operator[] ( uint i ) { detach(); return fastat(i); } + T& operator[] ( uint i ) { this->detach(); return fastat(i); } const T& operator[] ( uint i ) const { return *fastat(i); } - Iterator at( uint i ) { detach(); return fastat(i); } + Iterator at( uint i ) { this->detach(); return fastat(i); } ConstIterator at( uint i ) const { return ConstIterator( fastat(i) ); } }; /** The TextLine represents a line of text. A text line that contains the text, an attribute for each character, an attribute for the free space behind the last character and a context number for the syntax highlight. |