summaryrefslogtreecommitdiffstats
path: root/src/Editor.h
diff options
context:
space:
mode:
authorTimothy Pearson <[email protected]>2011-11-30 12:33:18 -0600
committerTimothy Pearson <[email protected]>2011-11-30 12:33:18 -0600
commit03bc485016127d419bbbbc3cfb09e21e8754b383 (patch)
treecad8234bcf26063239ac7a565298b897ffdeef57 /src/Editor.h
parent664e37abfe5c796c1279b8295fb030f126b0a7d8 (diff)
downloadtqscintilla-03bc485016127d419bbbbc3cfb09e21e8754b383.tar.gz
tqscintilla-03bc485016127d419bbbbc3cfb09e21e8754b383.zip
Initial automated TQt conversion
Diffstat (limited to 'src/Editor.h')
-rwxr-xr-xsrc/Editor.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/Editor.h b/src/Editor.h
index fe7be26..d5abdbd 100755
--- a/src/Editor.h
+++ b/src/Editor.h
@@ -204,7 +204,7 @@ protected: // ScintillaBase subclass needs access to much of Editor
bool hasFocus;
bool hideSelection;
bool inOverstrike;
- int errorStatus;
+ int errortqStatus;
bool mouseDownCaptures;
/** In bufferedDraw mode, graphics operations are drawn to a pixmap and then copied to
@@ -214,7 +214,7 @@ protected: // ScintillaBase subclass needs access to much of Editor
* and then the foreground. This avoids chopping off characters that overlap the next run. */
bool twoPhaseDraw;
- int xOffset; ///< Horizontal scrolled amount in pixels
+ int xOffset; ///<Qt::Horizontal scrolled amount in pixels
int xCaretMargin; ///< Ensure this many pixels visible on both sides of caret
bool horizontalScrollBarVisible;
int scrollWidth;
@@ -368,7 +368,7 @@ protected: // ScintillaBase subclass needs access to much of Editor
void ScrollTo(int line, bool moveThumb=true);
virtual void ScrollText(int linesToMove);
- void HorizontalScrollTo(int xPos);
+ voidQt::HorizontalScrollTo(int xPos);
void MoveCaretInsideView(bool ensureVisible=true);
int DisplayFromPosition(int pos);
void EnsureCaretVisible(bool useMargin=true, bool vert=true, bool horiz=true);