Browse Source

Remove additional unneeded tq method conversions

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

+ 1
- 1
ChangeLog View File

@@ -840,7 +840,7 @@ Fixed the QextScintilla::marginClicked() signature and changed it to pass the
840 840
 line number rather than the pixel position.
841 841
 Added mouse wheel support from Detlev.
842 842
 Setting the lexer no longer resets all the styles.
843
-The cursor tqshape now changes when moved across the text area and margins.
843
+The cursor shape now changes when moved across the text area and margins.
844 844
 Added ensureLineVisible(), setMarginsBackgroundColor(),
845 845
 setMarginsForegroundColor(), setMarginsFont() and the overloaded
846 846
 setMarginWidth() to QextScintilla.

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

@@ -473,7 +473,7 @@
473 473
     <a class="message" href="#SCI_GETSTYLEBITSNEEDED">SCI_GETSTYLEBITSNEEDED</a>.</p>
474 474
 
475 475
     <p><b id="TextRange">TextRange</b> and <b id="CharacterRange">CharacterRange</b><br />
476
-     These structures are defined to be exactly the same tqshape as the Win32 <code>TEXTRANGE</code>
476
+     These structures are defined to be exactly the same shape as the Win32 <code>TEXTRANGE</code>
477 477
     and <code>CHARRANGE</code>, so that older code that treats Scintilla as a RichEdit will
478 478
     work.</p>
479 479
 <pre>
@@ -677,7 +677,7 @@ struct TextRange {
677 677
     href="#SCI_SEARCHINTARGET">SCI_SEARCHINTARGET</a></code></p>
678 678
 
679 679
     <p><b id="TextToFind">TextToFind</b><br />
680
-     This structure is defined to have exactly the same tqshape as the Win32 structure
680
+     This structure is defined to have exactly the same shape as the Win32 structure
681 681
     <code>FINDTEXTEX</code> for old code that treated Scintilla as a RichEdit control.</p>
682 682
 <pre>
683 683
 struct TextToFind {
@@ -2873,7 +2873,7 @@ struct TextToFind {
2873 2873
     style information (for 32 styles) and 3 bits of indicator information for 3 independent
2874 2874
     indicators so that, for example, syntax errors, deprecated names and bad indentation could all
2875 2875
     be displayed at once. Indicators may be displayed as simple underlines, squiggly underlines, a
2876
-    line of small 'T' tqshapes, a line of diagonal hatching, a strike-out or a rectangle around the text.</p>
2876
+    line of small 'T' shapes, a line of diagonal hatching, a strike-out or a rectangle around the text.</p>
2877 2877
 
2878 2878
     <p>The indicators are set using <a class="message"
2879 2879
     href="#SCI_STARTSTYLING"><code>SCI_STARTSTYLING</code></a> with a <code>INDICS_MASK</code> mask
@@ -2947,7 +2947,7 @@ struct TextToFind {
2947 2947
 
2948 2948
           <td align="center">2</td>
2949 2949
 
2950
-          <td>A line of small T tqshapes.</td>
2950
+          <td>A line of small T shapes.</td>
2951 2951
         </tr>
2952 2952
 
2953 2953
         <tr>

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

@@ -4795,7 +4795,7 @@
4795 4795
         Caret policy determines how closely caret is tracked by visible area.
4796 4796
       </li>
4797 4797
       <li>
4798
-        New marker tqshapes: arrow pointing down, plus and minus.
4798
+        New marker shapes: arrow pointing down, plus and minus.
4799 4799
       </li>
4800 4800
       <li>
4801 4801
         Optionally display full path in title rather than just file name.

+ 1
- 1
doc/html/classQextScintilla-members.html View File

@@ -98,7 +98,7 @@
98 98
   <tr class="memlist"><td><a class="el" href="classQextScintillaBase.html#85e6877f9aad613a869fe5b7d97f9035">focusInEvent</a>(TQFocusEvent *)</td><td><a class="el" href="classQextScintillaBase.html">QextScintillaBase</a></td><td><code> [protected, virtual]</code></td></tr>
99 99
   <tr class="memlist"><td><a class="el" href="classQextScintillaBase.html#9516bc2125ea51a8de4c21f6af42a4b1">focusNextPrevChild</a>(bool)</td><td><a class="el" href="classQextScintillaBase.html">QextScintillaBase</a></td><td><code> [protected, virtual]</code></td></tr>
100 100
   <tr class="memlist"><td><a class="el" href="classQextScintillaBase.html#f87a97050d71a323d47d666fe4a5547b">focusOutEvent</a>(TQFocusEvent *)</td><td><a class="el" href="classQextScintillaBase.html">QextScintillaBase</a></td><td><code> [protected, virtual]</code></td></tr>
101
-  <tr class="memlist"><td><a class="el" href="classQextScintilla.html#5b289640689062f4fa5479c7212107c0">foldAll</a>(bool tqchildren=FALSE)</td><td><a class="el" href="classQextScintilla.html">QextScintilla</a></td><td><code> [virtual, slot]</code></td></tr>
101
+  <tr class="memlist"><td><a class="el" href="classQextScintilla.html#5b289640689062f4fa5479c7212107c0">foldAll</a>(bool children=FALSE)</td><td><a class="el" href="classQextScintilla.html">QextScintilla</a></td><td><code> [virtual, slot]</code></td></tr>
102 102
   <tr class="memlist"><td><a class="el" href="classQextScintilla.html#86418f82fe35ff366f4ef023c470f0a1">folding</a>() const </td><td><a class="el" href="classQextScintilla.html">QextScintilla</a></td><td><code> [inline]</code></td></tr>
103 103
   <tr class="memlist"><td><a class="el" href="classQextScintilla.html#f81c922d74d8746d9cbc8d576c440dd4">foldLine</a>(int line)</td><td><a class="el" href="classQextScintilla.html">QextScintilla</a></td><td><code> [virtual, slot]</code></td></tr>
104 104
   <tr class="memlist"><td><a class="el" href="classQextScintilla.html#34af4ea7604b156b69f31b5412db93cf">FoldStyle</a> enum name</td><td><a class="el" href="classQextScintilla.html">QextScintilla</a></td><td></td></tr>

+ 4
- 4
doc/html/classQextScintilla.html View File

@@ -172,7 +172,7 @@ Inherits <a class="el" href="classQextScintillaBase.html">QextScintillaBase</a>.
172 172
 <li>virtual void <a class="el" href="classQextScintilla.html#d5d5178610285dda5004ccc5c5c6c306">cut</a> ()
173 173
 <li>virtual void <a class="el" href="classQextScintilla.html#dd5100eebb1241b90da9b77cfca26c8d">ensureCursorVisible</a> ()
174 174
 <li>virtual void <a class="el" href="classQextScintilla.html#8c5a39688b5ca5995f8060941a8065d4">ensureLineVisible</a> (int line)
175
-<li>virtual void <a class="el" href="classQextScintilla.html#5b289640689062f4fa5479c7212107c0">foldAll</a> (bool tqchildren=FALSE)
175
+<li>virtual void <a class="el" href="classQextScintilla.html#5b289640689062f4fa5479c7212107c0">foldAll</a> (bool children=FALSE)
176 176
 <li>virtual void <a class="el" href="classQextScintilla.html#f81c922d74d8746d9cbc8d576c440dd4">foldLine</a> (int line)
177 177
 <li>virtual void <a class="el" href="classQextScintilla.html#0017b86a4fff9d1228b204deda1e9d57">indent</a> (int line)
178 178
 <li>virtual void <a class="el" href="classQextScintilla.html#bd158556a8565eb1bf92f2dd8fa9b66f">insert</a> (const TQString &amp;text)
@@ -3231,7 +3231,7 @@ Ensures that the line number <em>line</em> is visible.
3231 3231
 
3232 3232
 </div>
3233 3233
 </div><p>
3234
-<a class="anchor" name="5b289640689062f4fa5479c7212107c0"></a><!-- doxytag: member="QextScintilla::foldAll" ref="5b289640689062f4fa5479c7212107c0" args="(bool tqchildren=FALSE)" -->
3234
+<a class="anchor" name="5b289640689062f4fa5479c7212107c0"></a><!-- doxytag: member="QextScintilla::foldAll" ref="5b289640689062f4fa5479c7212107c0" args="(bool children=FALSE)" -->
3235 3235
 <div class="memitem">
3236 3236
 <div class="memproto">
3237 3237
       <table class="memname">
@@ -3239,7 +3239,7 @@ Ensures that the line number <em>line</em> is visible.
3239 3239
           <td class="memname">virtual void QextScintilla::foldAll           </td>
3240 3240
           <td>(</td>
3241 3241
           <td class="paramtype">bool&nbsp;</td>
3242
-          <td class="paramname"> <em>tqchildren</em> = <code>FALSE</code>          </td>
3242
+          <td class="paramname"> <em>children</em> = <code>FALSE</code>          </td>
3243 3243
           <td>&nbsp;)&nbsp;</td>
3244 3244
           <td width="100%"><code> [virtual, slot]</code></td>
3245 3245
         </tr>
@@ -3248,7 +3248,7 @@ Ensures that the line number <em>line</em> is visible.
3248 3248
 <div class="memdoc">
3249 3249
 
3250 3250
 <p>
3251
-If any lines are currently folded then they are all unfolded. Otherwise all lines are folded. This has the same effect as clicking in the fold margin with the shift and control keys pressed. If <em>tqchildren</em> is not set (the default) then only the top level fold points are affected, otherwise the state of all fold points are changed. 
3251
+If any lines are currently folded then they are all unfolded. Otherwise all lines are folded. This has the same effect as clicking in the fold margin with the shift and control keys pressed. If <em>children</em> is not set (the default) then only the top level fold points are affected, otherwise the state of all fold points are changed. 
3252 3252
 </div>
3253 3253
 </div><p>
3254 3254
 <a class="anchor" name="f81c922d74d8746d9cbc8d576c440dd4"></a><!-- doxytag: member="QextScintilla::foldLine" ref="f81c922d74d8746d9cbc8d576c440dd4" args="(int line)" -->

+ 2
- 2
example/application.cpp View File

@@ -185,7 +185,7 @@ void ApplicationWindow::save()
185 185
     TQString text = e->text();
186 186
     TQFile f( filename );
187 187
     if ( !f.open( IO_WriteOnly ) ) {
188
-	statusBar()->message( TQString("Could not write to %1").tqarg(filename),
188
+	statusBar()->message( TQString("Could not write to %1").arg(filename),
189 189
 			      2000 );
190 190
 	return;
191 191
     }
@@ -198,7 +198,7 @@ void ApplicationWindow::save()
198 198
 
199 199
     setCaption( filename );
200 200
 
201
-    statusBar()->message( TQString( "File %1 saved" ).tqarg( filename ), 2000 );
201
+    statusBar()->message( TQString( "File %1 saved" ).arg( filename ), 2000 );
202 202
 }
203 203
 
204 204
 

+ 1
- 1
include/Scintilla.h View File

@@ -696,7 +696,7 @@ typedef sptr_t (*SciFnDirect)(sptr_t ptr, unsigned int iMessage, uptr_t wParam,
696 696
 #define SCN_AUTOCSELECTION 2022
697 697
 //--Autogenerated -- end of section automatically generated from Scintilla.iface
698 698
 
699
-// These structures are defined to be exactly the same tqshape as the Win32
699
+// These structures are defined to be exactly the same shape as the Win32
700 700
 // CHARRANGE, TEXTRANGE, FINDTEXTEX, FORMATRANGE, and NMHDR structs.
701 701
 // So older code that treats Scintilla as a RichEdit will work.
702 702
 

+ 1
- 1
include/Scintilla.iface View File

@@ -977,7 +977,7 @@ fun void HideLines=2227(int lineStart, int lineEnd)
977 977
 # Is a line visible?
978 978
 get bool GetLineVisible=2228(int line,)
979 979
 
980
-# Show the tqchildren of a header line.
980
+# Show the children of a header line.
981 981
 set void SetFoldExpanded=2229(int line, bool expanded)
982 982
 
983 983
 # Is a header line expanded?

+ 1
- 1
qt/PlatQt.cpp View File

@@ -594,7 +594,7 @@ PRectangle Window::GetPosition()
594 594
 
595 595
 	if (w)
596 596
 	{
597
-		const TQRect &r = w -> tqgeometry();
597
+		const TQRect &r = w -> geometry();
598 598
 
599 599
 		rc.left = r.left();
600 600
 		rc.top = r.top();

+ 1
- 1
qt/ScintillaQt.cpp View File

@@ -683,7 +683,7 @@ void ScintillaTQt::paintEvent(TQPaintEvent *pe)
683 683
 		delete sw;
684 684
 
685 685
 		// If the painting area was insufficient to cover the new style
686
-		// or brace highlight positions then tqrepaint the whole thing.
686
+		// or brace highlight positions then repaint the whole thing.
687 687
 		if (paintState == paintAbandoned)
688 688
 			PWindow(wMain) -> update();
689 689
 	}

+ 5
- 5
qt/qextscintilla.cpp View File

@@ -1036,7 +1036,7 @@ void QextScintilla::foldClick(int lineClick,int bstate)
1036 1036
     {
1037 1037
         if (bstate & ShiftButton)
1038 1038
         {
1039
-            // Ensure all tqchildren are visible.
1039
+            // Ensure all children are visible.
1040 1040
             SendScintilla(SCI_SETFOLDEXPANDED,lineClick,1);
1041 1041
             foldExpand(lineClick,TRUE,TRUE,100,levelClick);
1042 1042
         }
@@ -1044,13 +1044,13 @@ void QextScintilla::foldClick(int lineClick,int bstate)
1044 1044
         {
1045 1045
             if (SendScintilla(SCI_GETFOLDEXPANDED,lineClick))
1046 1046
             {
1047
-                // Contract this line and all its tqchildren.
1047
+                // Contract this line and all its children.
1048 1048
                 SendScintilla(SCI_SETFOLDEXPANDED,lineClick,0L);
1049 1049
                 foldExpand(lineClick,FALSE,TRUE,0,levelClick);
1050 1050
             }
1051 1051
             else
1052 1052
             {
1053
-                // Expand this line and all its tqchildren.
1053
+                // Expand this line and all its children.
1054 1054
                 SendScintilla(SCI_SETFOLDEXPANDED,lineClick,1);
1055 1055
                 foldExpand(lineClick,TRUE,TRUE,100,levelClick);
1056 1056
             }
@@ -1119,7 +1119,7 @@ void QextScintilla::foldExpand(int &line,bool doExpand,bool force,
1119 1119
 
1120 1120
 // Fully expand (if there is any line currently folded) all text.  Otherwise,
1121 1121
 // fold all text.  This is mostly taken from SciTE.
1122
-void QextScintilla::foldAll(bool tqchildren)
1122
+void QextScintilla::foldAll(bool children)
1123 1123
 {
1124 1124
     recolor();
1125 1125
 
@@ -1142,7 +1142,7 @@ void QextScintilla::foldAll(bool tqchildren)
1142 1142
         if (!(level & SC_FOLDLEVELHEADERFLAG))
1143 1143
             continue;
1144 1144
 
1145
-        if (tqchildren ||
1145
+        if (children ||
1146 1146
             (SC_FOLDLEVELBASE == (level & SC_FOLDLEVELNUMBERMASK)))
1147 1147
         {
1148 1148
             if (expanding)

+ 2
- 2
qt/qextscintilla.h View File

@@ -920,10 +920,10 @@ public slots:
920 920
 	//! If any lines are currently folded then they are all unfolded.
921 921
 	//! Otherwise all lines are folded.  This has the same effect as
922 922
 	//! clicking in the fold margin with the shift and control keys
923
-	//! pressed.  If \a tqchildren is not set (the default) then only the top
923
+	//! pressed.  If \a children is not set (the default) then only the top
924 924
 	//! level fold points are affected, otherwise the state of all fold
925 925
 	//! points are changed.
926
-	virtual void foldAll(bool tqchildren = FALSE);
926
+	virtual void foldAll(bool children = FALSE);
927 927
 
928 928
 	//! If the line \a line is folded then it is unfolded.  Otherwise it is
929 929
 	//! folded.  This has the same effect as clicking in the fold margin.

+ 4
- 4
qt/qextscintillalexer.cpp View File

@@ -339,12 +339,12 @@ bool QextScintillaLexer::writeSettings(TQSettings &qs,const char *prefix) const
339 339
         f = font(i);
340 340
 
341 341
         fdesc += f.family();
342
-        fdesc += fmt.tqarg(f.pointSize());
342
+        fdesc += fmt.arg(f.pointSize());
343 343
 
344 344
         // The casts are for Borland.
345
-        fdesc += fmt.tqarg((int)f.bold());
346
-        fdesc += fmt.tqarg((int)f.italic());
347
-        fdesc += fmt.tqarg((int)f.underline());
345
+        fdesc += fmt.arg((int)f.bold());
346
+        fdesc += fmt.arg((int)f.italic());
347
+        fdesc += fmt.arg((int)f.underline());
348 348
 
349 349
         if (!qs.writeEntry(key + "font",fdesc,','))
350 350
             rc = FALSE;

+ 1
- 1
qt/qextscintillalexerhtml.cpp View File

@@ -474,7 +474,7 @@ const char *QextScintillaLexerHTML::keywords(int set) const
474 474
 			"onselect onsubmit onunload "
475 475
 			"profile prompt "
476 476
 			"readonly rel rev rows rowspan rules "
477
-			"scheme scope selected tqshape size span src standby "
477
+			"scheme scope selected shape size span src standby "
478 478
 			"start style summary "
479 479
 			"tabindex target text title topmargin type "
480 480
 			"usemap "

+ 1
- 1
qt/qextscintillalexeridl.cpp View File

@@ -84,7 +84,7 @@ const char *QextScintillaLexerIDL::keywords(int set) const
84 84
 	       "object odl oleautomation optimize optional out out_of_line "
85 85
 	       "pipe pointer_default pragma properties propget propput "
86 86
 	       "propputref ptr public range readonly ref represent_as "
87
-	       "requestedit restricted retval tqshape short signed size_is "
87
+	       "requestedit restricted retval shape short signed size_is "
88 88
 	       "small source strict_context_handle string struct switch "
89 89
 	       "switch_is switch_type transmit_as typedef uidefault union "
90 90
 	       "unique unsigned user_marshal usesgetlasterror uuid v1_enum "

+ 1
- 1
qt/qextscintillalexertex.cpp View File

@@ -137,7 +137,7 @@ const char *QextScintillaLexerTeX::keywords(int set) const
137 137
 			"overwithdelims pagedepth pagefilllstretch "
138 138
 			"pagefillstretch pagefilstretch pagegoal pageshrink "
139 139
 			"pagestretch pagetotal par parfillskip parindent "
140
-			"partqshape parskip patterns pausing penalty "
140
+			"parshape parskip patterns pausing penalty "
141 141
 			"postdisplaypenalty predisplaypenalty predisplaysize "
142 142
 			"pretolerance prevdepth prevgraf radical raise read "
143 143
 			"relax relpenalty right righthyphenmin rightskip "

+ 1
- 1
src/CallTip.cpp View File

@@ -214,7 +214,7 @@ void CallTip::PaintCT(Surface *surfaceWindow) {
214 214
 
215 215
 	surfaceWindow->FillRectangle(rcClient, colourBG.allocated);
216 216
 
217
-	offsetMain = insetX;    // initial tqalignment assuming no arrows
217
+	offsetMain = insetX;    // initial alignment assuming no arrows
218 218
 	PaintContents(surfaceWindow, true);
219 219
 
220 220
 	// Draw a raised border around the edges of the window

+ 1
- 1
src/CallTip.h View File

@@ -18,7 +18,7 @@ class CallTip {
18 18
 	PRectangle rectUp;      // rectangle of last up angle in the tip
19 19
 	PRectangle rectDown;    // rectangle of last down arrow in the tip
20 20
 	int lineHeight;         // vertical line spacing
21
-	int offsetMain;         // The tqalignment point of the call tip
21
+	int offsetMain;         // The alignment point of the call tip
22 22
 	int tabSize;            // Tab size in pixels, <=0 no TAB expand
23 23
 	bool useStyleCallTip;   // if true, STYLE_CALLTIP should be used
24 24
 

+ 3
- 3
src/Editor.cpp View File

@@ -2815,7 +2815,7 @@ void Editor::Paint(Surface *surfaceWindow, PRectangle rcArea) {
2815 2815
 		startLineToWrap = -1;
2816 2816
 	if (WrapLines(false, startLineToWrap)) {
2817 2817
 		// The wrapping process has changed the height of some lines so
2818
-		// abandon this paint for a complete tqrepaint.
2818
+		// abandon this paint for a complete repaint.
2819 2819
 		if (AbandonPaint()) {
2820 2820
 			return;
2821 2821
 		}
@@ -3809,7 +3809,7 @@ void Editor::NotifyModified(Document*, DocModification mh, void *) {
3809 3809
 			}
3810 3810
 
3811 3811
 			//Platform::DebugPrintf("** %x Doc Changed\n", this);
3812
-			// TODO: could tqinvalidate from mh.startModification to end of screen
3812
+			// TODO: could invalidate from mh.startModification to end of screen
3813 3813
 			//InvalidateRange(mh.position, mh.position + mh.length);
3814 3814
 			if (paintState == notPainting && !CanDeferToLastStep(mh)) {
3815 3815
 				Redraw();
@@ -5217,7 +5217,7 @@ void Editor::SetHotSpotRange(Point *pt) {
5217 5217
 		int hsStart_ = pdoc->ExtendStyleRange(pos, -1, vs.hotspotSingleLine);
5218 5218
 		int hsEnd_ = pdoc->ExtendStyleRange(pos, 1, vs.hotspotSingleLine);
5219 5219
 
5220
-		// Only tqinvalidate the range if the hotspot range has changed...
5220
+		// Only invalidate the range if the hotspot range has changed...
5221 5221
 		if (hsStart_ != hsStart || hsEnd_ != hsEnd) {
5222 5222
 			if (hsStart != -1) {
5223 5223
 				InvalidateRange(hsStart, hsEnd);

+ 1
- 1
src/LineMarker.cpp View File

@@ -68,7 +68,7 @@ void LineMarker::Draw(Surface *surface, PRectangle &rcWhole, Font &fontForCharac
68 68
 		pxpm->Draw(surface, rcWhole);
69 69
 		return;
70 70
 	}
71
-	// Restrict most tqshapes a bit
71
+	// Restrict most shapes a bit
72 72
 	PRectangle rc = rcWhole;
73 73
 	rc.top++;
74 74
 	rc.bottom--;

Loading…
Cancel
Save