Revert "Rename a number of old tq methods that are no longer tq specific"

This reverts commit 5e3fc3a36b58c4e1cb48e31a350f76b7a81b3170.

7 files changed, 18 insertions, 18 deletions

diff --git a/src/AutoComplete.cpp b/src/AutoComplete.cpp
index 753adca..daa5fbb 100755
--- a/src/AutoComplete.cpp
+++ b/src/AutoComplete.cpp
@@ -45,11 +45,11 @@ bool AutoComplete::Active() {
 
 void AutoComplete::Start(Window &parent, int ctrlID, 
 	int position, Point location, int startLen_, 
-	int lineHeight, bool unicodeMode) {
+	int lineHeight, bool tqunicodeMode) {
 	if (active) {
 		Cancel();
 	}
-	lb->Create(parent, ctrlID, location, lineHeight, unicodeMode);
+	lb->Create(parent, ctrlID, location, lineHeight, tqunicodeMode);
 	lb->Clear();
 	active = true;
 	startLen = startLen_;
diff --git a/src/AutoComplete.h b/src/AutoComplete.h
index 10577ca..8fd84c8 100755
--- a/src/AutoComplete.h
+++ b/src/AutoComplete.h
@@ -36,7 +36,7 @@ public:
 
 	/// Display the auto completion list positioned to be near a character position
 	void Start(Window &parent, int ctrlID, int position, Point location,
-		int startLen_, int lineHeight, bool unicodeMode);
+		int startLen_, int lineHeight, bool tqunicodeMode);
 
 	/// The stop chars are characters which, when typed, cause the auto completion list to disappear
 	void SetStopChars(const char *stopChars_);
diff --git a/src/CallTip.cpp b/src/CallTip.cpp
index f4bc5f8..2de8eae 100755
--- a/src/CallTip.cpp
+++ b/src/CallTip.cpp
@@ -214,7 +214,7 @@ void CallTip::PaintCT(Surface *surfaceWindow) {
 
 	surfaceWindow->FillRectangle(rcClient, colourBG.allocated);
 
-	offsetMain = insetX;    // initial alignment assuming no arrows
+	offsetMain = insetX;    // initial tqalignment assuming no arrows
 	PaintContents(surfaceWindow, true);
 
 	// Draw a raised border around the edges of the window
diff --git a/src/CallTip.h b/src/CallTip.h
index 9848a10..1fd38c3 100755
--- a/src/CallTip.h
+++ b/src/CallTip.h
@@ -18,7 +18,7 @@ class CallTip {
 	PRectangle rectUp;      // rectangle of last up angle in the tip
 	PRectangle rectDown;    // rectangle of last down arrow in the tip
 	int lineHeight;         // vertical line spacing
-	int offsetMain;         // The alignment point of the call tip
+	int offsetMain;         // The tqalignment point of the call tip
 	int tabSize;            // Tab size in pixels, <=0 no TAB expand
 	bool useStyleCallTip;   // if true, STYLE_CALLTIP should be used
 
diff --git a/src/Editor.cpp b/src/Editor.cpp
index 055f5dc..1abb78a 100755
--- a/src/Editor.cpp
+++ b/src/Editor.cpp
@@ -346,7 +346,7 @@ Editor::Editor() {
 	hasFocus = false;
 	hideSelection = false;
 	inOverstrike = false;
-	errorStatus = 0;
+	errortqStatus = 0;
 	mouseDownCaptures = true;
 
 	bufferedDraw = true;
@@ -1949,7 +1949,7 @@ void Editor::LayoutLine(int line, Surface *surface, ViewStyle &vstyle, LineLayou
 			// See if chars, styles, indicators, are all the same
 			bool allSame = true;
 			const int styleMask = pdoc->stylingBitsMask;
-			// Check base line layout
+			// Check base line tqlayout
 			char styleByte = 0;
 			int numCharsInLine = 0;
 			while (numCharsInLine < lineLength) {
@@ -1997,7 +1997,7 @@ void Editor::LayoutLine(int line, Surface *surface, ViewStyle &vstyle, LineLayou
 		char styleByte = 0;
 		int styleMask = pdoc->stylingBitsMask;
 		ll->styleBitsSet = 0;
-		// Fill base line layout
+		// Fill base line tqlayout
 		for (int charInDoc = posLineStart; charInDoc < posLineEnd; charInDoc++) {
 			char chDoc = pdoc->CharAt(charInDoc);
 			styleByte = pdoc->StyleAt(charInDoc);
@@ -2815,7 +2815,7 @@ void Editor::Paint(Surface *surfaceWindow, PRectangle rcArea) {
 		startLineToWrap = -1;
 	if (WrapLines(false, startLineToWrap)) {
 		// The wrapping process has changed the height of some lines so
-		// abandon this paint for a complete repaint.
+		// abandon this paint for a complete tqrepaint.
 		if (AbandonPaint()) {
 			return;
 		}
@@ -2892,7 +2892,7 @@ void Editor::Paint(Surface *surfaceWindow, PRectangle rcArea) {
 			//ElapsedTime et;
 			if (lineDoc != lineDocPrevious) {
 				ll.Set(0);
-				// For rectangular selection this accesses the layout cache so should be after layout returned.
+				// For rectangular selection this accesses the tqlayout cache so should be after tqlayout returned.
 				lineIterator.SetAt(lineDoc);
 				ll.Set(RetrieveLineLayout(lineDoc));
 				LayoutLine(lineDoc, surface, vs, ll, wrapWidth);
@@ -2930,7 +2930,7 @@ void Editor::Paint(Surface *surfaceWindow, PRectangle rcArea) {
 				DrawLine(surface, vs, lineDoc, visibleLine, xStart, rcLine, ll, subLine);
 				//durPaint += et.Duration(true);
 
-				// Restore the previous styles for the brace highlights in case layout is in cache.
+				// Restore the previous styles for the brace highlights in case tqlayout is in cache.
 				ll->RestoreBracesHighlight(rangeLine, braces);
 
 				bool expanded = cs.GetExpanded(lineDoc);
@@ -3372,7 +3372,7 @@ void Editor::AddCharUTF(char *s, unsigned int len, bool treatAsDBCS) {
 			// characters representing themselves.
 		} else {
 			// Unroll 1 to 3 byte UTF-8 sequences.  See reference data at:
-			// http://www.cl.cam.ac.uk/~mgk25/unicode.html
+			// http://www.cl.cam.ac.uk/~mgk25/tqunicode.html
 			// http://www.cl.cam.ac.uk/~mgk25/ucs/examples/UTF-8-test.txt
 			if (byte < 0xE0) {
 				int byte2 = static_cast<unsigned char>(s[1]);
@@ -3809,7 +3809,7 @@ void Editor::NotifyModified(Document*, DocModification mh, void *) {
 			}
 
 			//Platform::DebugPrintf("** %x Doc Changed\n", this);
-			// TODO: could invalidate from mh.startModification to end of screen
+			// TODO: could tqinvalidate from mh.startModification to end of screen
 			//InvalidateRange(mh.position, mh.position + mh.length);
 			if (paintState == notPainting && !CanDeferToLastStep(mh)) {
 				Redraw();
@@ -5217,7 +5217,7 @@ void Editor::SetHotSpotRange(Point *pt) {
 		int hsStart_ = pdoc->ExtendStyleRange(pos, -1, vs.hotspotSingleLine);
 		int hsEnd_ = pdoc->ExtendStyleRange(pos, 1, vs.hotspotSingleLine);
 
-		// Only invalidate the range if the hotspot range has changed...
+		// Only tqinvalidate the range if the hotspot range has changed...
 		if (hsStart_ != hsStart || hsEnd_ != hsEnd) {
 			if (hsStart != -1) {
 				InvalidateRange(hsStart, hsEnd);
@@ -7210,11 +7210,11 @@ sptr_t Editor::WndProc(unsigned int iMessage, uptr_t wParam, sptr_t lParam) {
 		return hasFocus;
 
 	case SCI_SETSTATUS:
-		errorStatus = wParam;
+		errortqStatus = wParam;
 		break;
 
 	case SCI_GETSTATUS:
-		return errorStatus;
+		return errortqStatus;
 
 	case SCI_SETMOUSEDOWNCAPTURES:
 		mouseDownCaptures = wParam != 0;
diff --git a/src/Editor.h b/src/Editor.h
index 2ce166d..7dca342 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
diff --git a/src/LineMarker.cpp b/src/LineMarker.cpp
index 6ded13c..2af78b5 100755
--- a/src/LineMarker.cpp
+++ b/src/LineMarker.cpp
@@ -68,7 +68,7 @@ void LineMarker::Draw(Surface *surface, PRectangle &rcWhole, Font &fontForCharac
 		pxpm->Draw(surface, rcWhole);
 		return;
 	}
-	// Restrict most shapes a bit
+	// Restrict most tqshapes a bit
 	PRectangle rc = rcWhole;
 	rc.top++;
 	rc.bottom--;