Browse Source

Rename obsolete tq methods to standard names

tags/r14.0.0
Timothy Pearson 7 years ago
parent
commit
b3566a6c67

+ 1
- 1
ChangeLog View File

@@ -96,7 +96,7 @@ Possibly fixed a possible problem with double clicking under Windows.
96 96
 2006/07/02 14:27:26  phil
97 97
 Added setWrapVisualFlags(), WrapMode::WrapCharacter, WrapVisualFlag to
98 98
 QextScintilla.
99
-The tqlayout cache is now set according to the wrap mode.
99
+The layout cache is now set according to the wrap mode.
100 100
 Setting a wrap mode now disables the horizontal scrollbar.
101 101
 
102 102
 

+ 4
- 4
doc/Scintilla/ScintillaDoc.html View File

@@ -2886,7 +2886,7 @@ struct TextToFind {
2886 2886
 	Use <a class="message" href="#SCI_GETENDSTYLED"><code>SCI_GETENDSTYLED</code></a>
2887 2887
 	to retrieve the current "styled to" position and
2888 2888
 	<a class="message" href="#SCI_STARTSTYLING"><code>SCI_STARTSTYLING</code></a>
2889
-	to reset the styling position and mask (<code>0x1f </code> in the default tqlayout of 5 style bits and 3 indicator bits)
2889
+	to reset the styling position and mask (<code>0x1f </code> in the default layout of 5 style bits and 3 indicator bits)
2890 2890
 	when you are done.</p>
2891 2891
 
2892 2892
     <p>The number of bits used for styles can be altered with <a class="message"
@@ -4110,10 +4110,10 @@ sptr_t CallScintilla(unsigned int iMessage, uptr_t wParam, sptr_t lParam){
4110 4110
 	Independent from drawing a visual flag at the begin the subline can have an indention.</p>
4111 4111
 
4112 4112
     <p>Much of the time used by Scintilla is spent on laying out and drawing text. The same text
4113
-    tqlayout calculations may be performed many times even when the data used in these calculations
4114
-    does not change. To avoid these unnecessary calculations in some circumstances, the line tqlayout
4113
+    layout calculations may be performed many times even when the data used in these calculations
4114
+    does not change. To avoid these unnecessary calculations in some circumstances, the line layout
4115 4115
     cache can store the results of the calculations. The cache is invalidated whenever the
4116
-    underlying data, such as the contents or styling of the document changes. Caching the tqlayout of
4116
+    underlying data, such as the contents or styling of the document changes. Caching the layout of
4117 4117
     the whole document has the most effect, making dynamic line wrap as much as 20 times faster but
4118 4118
     this requires 7 times the memory required by the document contents plus around 80 bytes per
4119 4119
     line.</p>

+ 6
- 6
doc/Scintilla/ScintillaHistory.html View File

@@ -578,7 +578,7 @@
578 578
 	Empty ranges can no longer be dragged.
579 579
 	</li>
580 580
 	<li>
581
-	Crash fixed when calls made that use tqlayout inside the painted notification.
581
+	Crash fixed when calls made that use layout inside the painted notification.
582 582
 	</li>
583 583
 	<li>
584 584
 	Bug fixed where Scintilla created pixmap buffers that were too large leading
@@ -595,8 +595,8 @@
595 595
 	SciTE HTML exporter no longer honours monospaced font setting.
596 596
 	</li>
597 597
 	<li>
598
-	Line tqlayout cache in page mode caches the line of the caret. An assertion is
599
-	now used to ensure that the tqlayout reentrancy problem that caused this
598
+	Line layout cache in page mode caches the line of the caret. An assertion is
599
+	now used to ensure that the layout reentrancy problem that caused this
600 600
 	is easier to find.
601 601
 	</li>
602 602
 	<li>
@@ -1285,7 +1285,7 @@
1285 1285
 	Bug fixed where SCI_LINEENDWRAP would move too far when line ends are visible.
1286 1286
 	</li>
1287 1287
 	<li>
1288
-	Bugs fixed where calltips with tqunicode or other non-ASCII text would display
1288
+	Bugs fixed where calltips with unicode or other non-ASCII text would display
1289 1289
 	incorrectly.
1290 1290
 	</li>
1291 1291
 	<li>
@@ -1533,7 +1533,7 @@
1533 1533
 	Bug in SciTE on Windows fixed where clipboard commands stopped working.
1534 1534
 	</li>
1535 1535
 	<li>
1536
-	Crashing bugs in display fixed in line tqlayout cache.
1536
+	Crashing bugs in display fixed in line layout cache.
1537 1537
 	</li>
1538 1538
 	<li>
1539 1539
 	Crashing bug may be fixed on AMD64 processor on GTK+.
@@ -2954,7 +2954,7 @@
2954 2954
 	Released on 15 March 2002.
2955 2955
       </li>
2956 2956
       <li>
2957
-	Line tqlayout cache implemented to improve performance by maintaining
2957
+	Line layout cache implemented to improve performance by maintaining
2958 2958
 	the positioning of characters on lines. Can be set to cache nothing,
2959 2959
 	the line with the caret, the visible page or the whole document.
2960 2960
       </li>

+ 1
- 1
doc/html/classQextScintillaPrinter.html View File

@@ -36,7 +36,7 @@
36 36
 <hr><a name="_details"></a><h2>Detailed Description</h2>
37 37
 The <a class="el" href="classQextScintillaPrinter.html">QextScintillaPrinter</a> class is a sub-class of the TQt TQPrinter class that is able to print the text of a Scintilla document. 
38 38
 <p>
39
-The class can be further sub-classed to alter to tqlayout of the text, adding headers and footers for example. 
39
+The class can be further sub-classed to alter to layout of the text, adding headers and footers for example. 
40 40
 <p>
41 41
 <hr><h2>Constructor &amp; Destructor Documentation</h2>
42 42
 <a class="anchor" name="d304f2d535a10595acc613521f92dc49"></a><!-- doxytag: member="QextScintillaPrinter::QextScintillaPrinter" ref="d304f2d535a10595acc613521f92dc49" args="(PrinterMode mode=ScreenResolution)" -->

+ 2
- 2
include/Platform.h View File

@@ -354,7 +354,7 @@ public:
354 354
 	virtual void SetClip(PRectangle rc)=0;
355 355
 	virtual void FlushCachedState()=0;
356 356
 
357
-	virtual void SetUnicodeMode(bool tqunicodeMode_)=0;
357
+	virtual void SetUnicodeMode(bool unicodeMode_)=0;
358 358
 	virtual void SetDBCSMode(int codePage)=0;
359 359
 
360 360
 #if defined(PLAT_QT)
@@ -412,7 +412,7 @@ public:
412 412
 	static ListBox *Allocate();
413 413
 
414 414
 	virtual void SetFont(Font &font)=0;
415
-	virtual void Create(Window &parent, int ctrlID, Point location, int lineHeight_, bool tqunicodeMode_)=0;
415
+	virtual void Create(Window &parent, int ctrlID, Point location, int lineHeight_, bool unicodeMode_)=0;
416 416
 	virtual void SetAverageCharWidth(int width)=0;
417 417
 	virtual void SetVisibleRows(int rows)=0;
418 418
 	virtual int GetVisibleRows() const=0;

+ 2
- 2
include/Scintilla.iface View File

@@ -1075,10 +1075,10 @@ val SC_CACHE_CARET=1
1075 1075
 val SC_CACHE_PAGE=2
1076 1076
 val SC_CACHE_DOCUMENT=3
1077 1077
 
1078
-# Sets the degree of caching of tqlayout information.
1078
+# Sets the degree of caching of layout information.
1079 1079
 set void SetLayoutCache=2272(int mode,)
1080 1080
 
1081
-# Retrieve the degree of caching of tqlayout information.
1081
+# Retrieve the degree of caching of layout information.
1082 1082
 get int GetLayoutCache=2273(,)
1083 1083
 
1084 1084
 # Sets the document width assumed for scrolling.

+ 5
- 5
qt/PlatQt.cpp View File

@@ -194,7 +194,7 @@ public:
194 194
 	void SetClip(PRectangle rc);
195 195
 	void FlushCachedState() {painter -> flush();}
196 196
 
197
-	void SetUnicodeMode(bool tqunicodeMode_) {tqunicodeMode = tqunicodeMode_;}
197
+	void SetUnicodeMode(bool unicodeMode_) {unicodeMode = unicodeMode_;}
198 198
 	void SetDBCSMode(int codePage) {}
199 199
 
200 200
 	void DrawXPM(PRectangle rc,const XPM *xpm);
@@ -207,7 +207,7 @@ private:
207 207
 	static TQColor convertTQColor(const ColourAllocated &col,
208 208
 			unsigned alpha = 0xff);
209 209
 
210
-	bool tqunicodeMode;
210
+	bool unicodeMode;
211 211
 	bool mypainter;
212 212
 	TQPainter *painter;
213 213
 };
@@ -217,7 +217,7 @@ Surface *Surface::Allocate()
217 217
 	return new SurfaceImpl;
218 218
 }
219 219
 
220
-SurfaceImpl::SurfaceImpl() : tqunicodeMode(false), mypainter(false), painter(0)
220
+SurfaceImpl::SurfaceImpl() : unicodeMode(false), mypainter(false), painter(0)
221 221
 {
222 222
 }
223 223
 
@@ -448,7 +448,7 @@ void SurfaceImpl::MeasureWidths(Font &font_,const char *s,int len,
448 448
 		{
449 449
 			totalWidth += fm.width(qs[i]);
450 450
 
451
-			int l = (tqunicodeMode ? TQString(qs[i]).utf8().length() : 1);
451
+			int l = (unicodeMode ? TQString(qs[i]).utf8().length() : 1);
452 452
 
453 453
 			while (l--)
454 454
 				positions[ui++] = totalWidth;
@@ -533,7 +533,7 @@ bool SurfaceImpl::setFont(Font &font_)
533 533
 // Convert a Scintilla string to a TQt Unicode string.
534 534
 TQString SurfaceImpl::convertText(const char *s,int len)
535 535
 {
536
-	if (tqunicodeMode)
536
+	if (unicodeMode)
537 537
 		return TQString::fromUtf8(s,len);
538 538
 
539 539
 	TQString qs;

+ 3
- 3
qt/ScintillaQt.cpp View File

@@ -446,7 +446,7 @@ TQString ScintillaTQt::textRange(const SelectionText *text)
446 446
 // Copy the selected text to the clipboard.
447 447
 void ScintillaTQt::CopyToClipboard(const SelectionText &selectedText)
448 448
 {
449
-	TQApplication::tqclipboard() -> setText(textRange(&selectedText));
449
+	TQApplication::clipboard() -> setText(textRange(&selectedText));
450 450
 }
451 451
 
452 452
 
@@ -466,7 +466,7 @@ void ScintillaTQt::Copy()
466 466
 // Implement paste.
467 467
 void ScintillaTQt::Paste()
468 468
 {
469
-	TQString str = TQApplication::tqclipboard() -> text();
469
+	TQString str = TQApplication::clipboard() -> text();
470 470
 
471 471
 	if (str.isEmpty())
472 472
 		return;
@@ -607,7 +607,7 @@ void ScintillaTQt::ClaimSelection()
607 607
 
608 608
 	if (isSel)
609 609
 	{
610
-		TQClipboard *cb = TQApplication::tqclipboard();
610
+		TQClipboard *cb = TQApplication::clipboard();
611 611
 
612 612
 		// If we support X11 style selection then make it available
613 613
 		// now.

+ 8
- 8
qt/qextscintillabase.cpp View File

@@ -70,7 +70,7 @@ QextScintillaBase::QextScintillaBase(TQWidget *parent,const char *name,WFlags f)
70 70
 {
71 71
 	sci = 0;
72 72
 
73
-	TQGridLayout *tqlayout = new TQGridLayout(this,2,2);
73
+	TQGridLayout *layout = new TQGridLayout(this,2,2);
74 74
 
75 75
 	txtarea = new TQWidget(this,0,WRepaintNoErase|WResizeNoErase);
76 76
 	txtarea -> setSizePolicy(TQSizePolicy(TQSizePolicy::Expanding,TQSizePolicy::Expanding));
@@ -78,14 +78,14 @@ QextScintillaBase::QextScintillaBase(TQWidget *parent,const char *name,WFlags f)
78 78
 	txtarea -> setAcceptDrops(TRUE);
79 79
 	txtarea -> setFocusPolicy(WheelFocus);
80 80
 	txtarea -> setFocusProxy(this);
81
-	tqlayout -> addWidget(txtarea,0,0);
81
+	layout -> addWidget(txtarea,0,0);
82 82
 
83 83
 	vsb = new TQScrollBar(Qt::Vertical,this);
84
-	tqlayout -> addWidget(vsb,0,1);
84
+	layout -> addWidget(vsb,0,1);
85 85
 	connect(vsb,TQT_SIGNAL(valueChanged(int)),TQT_SLOT(handleVSb(int)));
86 86
 
87 87
 	hsb = new TQScrollBar(Qt::Horizontal,this);
88
-	tqlayout -> addWidget(hsb,1,0);
88
+	layout -> addWidget(hsb,1,0);
89 89
 	connect(hsb,TQT_SIGNAL(valueChanged(int)),TQT_SLOT(handleHSb(int)));
90 90
 
91 91
 	txtarea -> installEventFilter(this);
@@ -104,7 +104,7 @@ QextScintillaBase::QextScintillaBase(TQWidget *parent,const char *name,WFlags f)
104 104
 		lexersLinked = TRUE;
105 105
 	}
106 106
 
107
-	TQClipboard *cb = TQApplication::tqclipboard();
107
+	TQClipboard *cb = TQApplication::clipboard();
108 108
 
109 109
 	if (cb -> supportsSelection())
110 110
 		connect(cb,TQT_SIGNAL(selectionChanged()),TQT_SLOT(handleSelection()));
@@ -329,7 +329,7 @@ void QextScintillaBase::mousePress(TQMouseEvent *me)
329 329
 
330 330
 	case MidButton:
331 331
 		{
332
-			TQClipboard *cb = TQApplication::tqclipboard();
332
+			TQClipboard *cb = TQApplication::clipboard();
333 333
 
334 334
 			if (cb -> supportsSelection())
335 335
 			{
@@ -488,7 +488,7 @@ void QextScintillaBase::keyPressEvent(TQKeyEvent *ke)
488 488
 			// key.
489 489
 			if (ke -> text().length() == 1)
490 490
 			{
491
-				if ((key = ke -> text()[0].tqunicode()) >= 0x80)
491
+				if ((key = ke -> text()[0].unicode()) >= 0x80)
492 492
 					key = 0;
493 493
 			}
494 494
 			else
@@ -577,6 +577,6 @@ TQSize QextScintillaBase::sizeHint() const
577 577
 // Handle the selection changing.
578 578
 void QextScintillaBase::handleSelection()
579 579
 {
580
-	if (!TQApplication::tqclipboard() -> ownsSelection())
580
+	if (!TQApplication::clipboard() -> ownsSelection())
581 581
 		sci -> UnclaimSelection();
582 582
 }

+ 3
- 3
qt/qextscintillalexercss.cpp View File

@@ -199,16 +199,16 @@ const char *QextScintillaLexerCSS::keywords(int set) const
199 199
 			"border-top-style border-right-style "
200 200
 			"border-bottom-style border-left-style border-style "
201 201
 			"top right bottom left position z-index direction "
202
-			"tqunicode-bidi min-width max-width min-height "
202
+			"unicode-bidi min-width max-width min-height "
203 203
 			"max-height overflow clip visibility content quotes "
204 204
 			"counter-reset counter-increment marker-offset size "
205 205
 			"marks page-break-before page-break-after "
206 206
 			"page-break-inside page orphans widows font-stretch "
207
-			"font-size-adjust tqunicode-range units-per-em src "
207
+			"font-size-adjust unicode-range units-per-em src "
208 208
 			"panose-1 stemv stemh slope cap-height x-height "
209 209
 			"ascent descent widths bbox definition-src baseline "
210 210
 			"centerline mathline topline text-shadow "
211
-			"caption-side table-tqlayout border-collapse "
211
+			"caption-side table-layout border-collapse "
212 212
 			"border-spacing empty-cells speak-header cursor "
213 213
 			"outline outline-width outline-style outline-color "
214 214
 			"volume speak pause-before pause-after pause "

+ 1
- 1
qt/qextscintillaprinter.h View File

@@ -38,7 +38,7 @@ class QextScintillaBase;
38 38
 //! \brief The QextScintillaPrinter class is a sub-class of the TQt TQPrinter
39 39
 //! class that is able to print the text of a Scintilla document.
40 40
 //!
41
-//! The class can be further sub-classed to alter to tqlayout of the text, adding
41
+//! The class can be further sub-classed to alter to layout of the text, adding
42 42
 //! headers and footers for example.
43 43
 class TQEXTSCINTILLA_EXPORT QextScintillaPrinter : public TQPrinter
44 44
 {

+ 2
- 2
src/AutoComplete.cpp View File

@@ -45,11 +45,11 @@ bool AutoComplete::Active() {
45 45
 
46 46
 void AutoComplete::Start(Window &parent, int ctrlID, 
47 47
 	int position, Point location, int startLen_, 
48
-	int lineHeight, bool tqunicodeMode) {
48
+	int lineHeight, bool unicodeMode) {
49 49
 	if (active) {
50 50
 		Cancel();
51 51
 	}
52
-	lb->Create(parent, ctrlID, location, lineHeight, tqunicodeMode);
52
+	lb->Create(parent, ctrlID, location, lineHeight, unicodeMode);
53 53
 	lb->Clear();
54 54
 	active = true;
55 55
 	startLen = startLen_;

+ 1
- 1
src/AutoComplete.h View File

@@ -36,7 +36,7 @@ public:
36 36
 
37 37
 	/// Display the auto completion list positioned to be near a character position
38 38
 	void Start(Window &parent, int ctrlID, int position, Point location,
39
-		int startLen_, int lineHeight, bool tqunicodeMode);
39
+		int startLen_, int lineHeight, bool unicodeMode);
40 40
 
41 41
 	/// The stop chars are characters which, when typed, cause the auto completion list to disappear
42 42
 	void SetStopChars(const char *stopChars_);

+ 4
- 4
src/Editor.cpp View File

@@ -1949,7 +1949,7 @@ void Editor::LayoutLine(int line, Surface *surface, ViewStyle &vstyle, LineLayou
1949 1949
 			// See if chars, styles, indicators, are all the same
1950 1950
 			bool allSame = true;
1951 1951
 			const int styleMask = pdoc->stylingBitsMask;
1952
-			// Check base line tqlayout
1952
+			// Check base line layout
1953 1953
 			char styleByte = 0;
1954 1954
 			int numCharsInLine = 0;
1955 1955
 			while (numCharsInLine < lineLength) {
@@ -1997,7 +1997,7 @@ void Editor::LayoutLine(int line, Surface *surface, ViewStyle &vstyle, LineLayou
1997 1997
 		char styleByte = 0;
1998 1998
 		int styleMask = pdoc->stylingBitsMask;
1999 1999
 		ll->styleBitsSet = 0;
2000
-		// Fill base line tqlayout
2000
+		// Fill base line layout
2001 2001
 		for (int charInDoc = posLineStart; charInDoc < posLineEnd; charInDoc++) {
2002 2002
 			char chDoc = pdoc->CharAt(charInDoc);
2003 2003
 			styleByte = pdoc->StyleAt(charInDoc);
@@ -2892,7 +2892,7 @@ void Editor::Paint(Surface *surfaceWindow, PRectangle rcArea) {
2892 2892
 			//ElapsedTime et;
2893 2893
 			if (lineDoc != lineDocPrevious) {
2894 2894
 				ll.Set(0);
2895
-				// For rectangular selection this accesses the tqlayout cache so should be after tqlayout returned.
2895
+				// For rectangular selection this accesses the layout cache so should be after layout returned.
2896 2896
 				lineIterator.SetAt(lineDoc);
2897 2897
 				ll.Set(RetrieveLineLayout(lineDoc));
2898 2898
 				LayoutLine(lineDoc, surface, vs, ll, wrapWidth);
@@ -2930,7 +2930,7 @@ void Editor::Paint(Surface *surfaceWindow, PRectangle rcArea) {
2930 2930
 				DrawLine(surface, vs, lineDoc, visibleLine, xStart, rcLine, ll, subLine);
2931 2931
 				//durPaint += et.Duration(true);
2932 2932
 
2933
-				// Restore the previous styles for the brace highlights in case tqlayout is in cache.
2933
+				// Restore the previous styles for the brace highlights in case layout is in cache.
2934 2934
 				ll->RestoreBracesHighlight(rangeLine, braces);
2935 2935
 
2936 2936
 				bool expanded = cs.GetExpanded(lineDoc);

Loading…
Cancel
Save