Browse Source

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

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

+ 2
- 2
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
 
@@ -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.

+ 8
- 8
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
@@ -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"
@@ -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>
@@ -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>

+ 9
- 9
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>
@@ -4592,7 +4592,7 @@
4592 4592
         Tool bar.
4593 4593
       </li>
4594 4594
       <li>
4595
-        tqStatus bar now on Windows as well as GTK+.
4595
+        Status bar now on Windows as well as GTK+.
4596 4596
       </li>
4597 4597
       <li>
4598 4598
         Input fields in Find and Replace dialogs now have history on both Windows and
@@ -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.
@@ -4879,7 +4879,7 @@
4879 4879
         Borland compatible makefile.
4880 4880
       </li>
4881 4881
       <li>
4882
-        tqStatus bar showing caret position in GTK+ version of SciTE.
4882
+        Status bar showing caret position in GTK+ version of SciTE.
4883 4883
       </li>
4884 4884
       <li>
4885 4885
         Bug fixes to selection drawing when part of selection outside window, mouse release over

+ 2
- 2
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>
@@ -956,7 +956,7 @@
956 956
   <tr class="memlist"><td><a class="el" href="classQextScintilla.html#945affc0b0f8f25f58138f923d5a270d">setWrapMode</a>(WrapMode mode)</td><td><a class="el" href="classQextScintilla.html">QextScintilla</a></td><td><code> [virtual, slot]</code></td></tr>
957 957
   <tr class="memlist"><td><a class="el" href="classQextScintilla.html#11ef30c49b7c6fb96988a94059efa687">setWrapVisualFlags</a>(WrapVisualFlag eflag, WrapVisualFlag sflag=WrapFlagNone, int sindent=0)</td><td><a class="el" href="classQextScintilla.html">QextScintilla</a></td><td></td></tr>
958 958
   <tr class="memlist"><td><a class="el" href="classQextScintilla.html#74a4da1e86eda7f62262cea8a4a9b26a">showUserList</a>(int id, const TQStringList &amp;list)</td><td><a class="el" href="classQextScintilla.html">QextScintilla</a></td><td></td></tr>
959
-  <tr class="memlist"><td><a class="el" href="classQextScintillaBase.html#171ce27ddcfabf024cc5539181f253dd">tqsizeHint</a>() const </td><td><a class="el" href="classQextScintillaBase.html">QextScintillaBase</a></td><td><code> [virtual]</code></td></tr>
959
+  <tr class="memlist"><td><a class="el" href="classQextScintillaBase.html#171ce27ddcfabf024cc5539181f253dd">sizeHint</a>() const </td><td><a class="el" href="classQextScintillaBase.html">QextScintillaBase</a></td><td><code> [virtual]</code></td></tr>
960 960
   <tr class="memlist"><td><a class="el" href="classQextScintilla.html#c9490bc31746441fa4f228f44679b06b0663484a90fdee0162e2e2e267c2da8a">SloppyBraceMatch</a> enum value</td><td><a class="el" href="classQextScintilla.html">QextScintilla</a></td><td></td></tr>
961 961
   <tr class="memlist"><td><a class="el" href="classQextScintilla.html#1cefba8e6020a5b760511f83aa4ca72ee7978b23c827aa996489af72541c670a">SmallRectangle</a> enum value</td><td><a class="el" href="classQextScintilla.html">QextScintilla</a></td><td></td></tr>
962 962
   <tr class="memlist"><td><a class="el" href="classQextScintilla.html#ea83bb0bc19af4a776b68ee3eda10c61">standardCommands</a>() const </td><td><a class="el" href="classQextScintilla.html">QextScintilla</a></td><td><code> [inline]</code></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)" -->

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

@@ -747,7 +747,7 @@
747 747
   <tr bgcolor="#f0f0f0"><td><b>SendScintilla</b>(unsigned int msg, const TQColor &amp;col) (defined in <a class="el" href="classQextScintillaBase.html">QextScintillaBase</a>)</td><td><a class="el" href="classQextScintillaBase.html">QextScintillaBase</a></td><td></td></tr>
748 748
   <tr bgcolor="#f0f0f0"><td><b>SendScintilla</b>(unsigned int msg, unsigned long wParam, TQPainter *hdc, const TQRect &amp;rc, long cpMin, long cpMax) (defined in <a class="el" href="classQextScintillaBase.html">QextScintillaBase</a>)</td><td><a class="el" href="classQextScintillaBase.html">QextScintillaBase</a></td><td></td></tr>
749 749
   <tr bgcolor="#f0f0f0"><td><b>SendScintilla</b>(unsigned int msg, unsigned long wParam, const TQPixmap *lParam) (defined in <a class="el" href="classQextScintillaBase.html">QextScintillaBase</a>)</td><td><a class="el" href="classQextScintillaBase.html">QextScintillaBase</a></td><td><code> [inline]</code></td></tr>
750
-  <tr class="memlist"><td><a class="el" href="classQextScintillaBase.html#171ce27ddcfabf024cc5539181f253dd">tqsizeHint</a>() const </td><td><a class="el" href="classQextScintillaBase.html">QextScintillaBase</a></td><td><code> [virtual]</code></td></tr>
750
+  <tr class="memlist"><td><a class="el" href="classQextScintillaBase.html#171ce27ddcfabf024cc5539181f253dd">sizeHint</a>() const </td><td><a class="el" href="classQextScintillaBase.html">QextScintillaBase</a></td><td><code> [virtual]</code></td></tr>
751 751
   <tr class="memlist"><td><a class="el" href="classQextScintillaBase.html#7c1be000329c8f9e328999cbc03ba9a7">startDrag</a>()</td><td><a class="el" href="classQextScintillaBase.html">QextScintillaBase</a></td><td><code> [protected, virtual]</code></td></tr>
752 752
   <tr bgcolor="#f0f0f0"><td><b>STYLE_BRACEBAD</b> enum value (defined in <a class="el" href="classQextScintillaBase.html">QextScintillaBase</a>)</td><td><a class="el" href="classQextScintillaBase.html">QextScintillaBase</a></td><td></td></tr>
753 753
   <tr bgcolor="#f0f0f0"><td><b>STYLE_BRACELIGHT</b> enum value (defined in <a class="el" href="classQextScintillaBase.html">QextScintillaBase</a>)</td><td><a class="el" href="classQextScintillaBase.html">QextScintillaBase</a></td><td></td></tr>

+ 3
- 3
doc/html/classQextScintillaBase.html View File

@@ -2306,7 +2306,7 @@ long <b>SendScintilla</b> (unsigned int msg, const TQColor &amp;col)
2306 2306
 long <b>SendScintilla</b> (unsigned int msg, unsigned long wParam, TQPainter *hdc, const TQRect &amp;rc, long cpMin, long cpMax)
2307 2307
 <li><a class="anchor" name="10a88dc5c6aa9d423eeea62b21843264"></a><!-- doxytag: member="QextScintillaBase::SendScintilla" ref="10a88dc5c6aa9d423eeea62b21843264" args="(unsigned int msg, unsigned long wParam, const TQPixmap *lParam)" -->
2308 2308
 long <b>SendScintilla</b> (unsigned int msg, unsigned long wParam, const TQPixmap *lParam)
2309
-<li>virtual TQSize <a class="el" href="classQextScintillaBase.html#171ce27ddcfabf024cc5539181f253dd">tqsizeHint</a> () const 
2309
+<li>virtual TQSize <a class="el" href="classQextScintillaBase.html#171ce27ddcfabf024cc5539181f253dd">sizeHint</a> () const 
2310 2310
 <li>TQWidget * <a class="el" href="classQextScintillaBase.html#7c7723d64865b462ecfbf4152d836cae">viewport</a> () const 
2311 2311
 </ul>
2312 2312
 <h2>Static Public Member Functions</h2>
@@ -2938,12 +2938,12 @@ Returns a pointer to a <a class="el" href="classQextScintillaBase.html">QextScin
2938 2938
 Send the Scintilla message <em>msg</em> with the optional parameters <em>wParam</em> and <em>lParam</em>. 
2939 2939
 </div>
2940 2940
 </div><p>
2941
-<a class="anchor" name="171ce27ddcfabf024cc5539181f253dd"></a><!-- doxytag: member="QextScintillaBase::tqsizeHint" ref="171ce27ddcfabf024cc5539181f253dd" args="() const " -->
2941
+<a class="anchor" name="171ce27ddcfabf024cc5539181f253dd"></a><!-- doxytag: member="QextScintillaBase::sizeHint" ref="171ce27ddcfabf024cc5539181f253dd" args="() const " -->
2942 2942
 <div class="memitem">
2943 2943
 <div class="memproto">
2944 2944
       <table class="memname">
2945 2945
         <tr>
2946
-          <td class="memname">virtual TQSize QextScintillaBase::tqsizeHint           </td>
2946
+          <td class="memname">virtual TQSize QextScintillaBase::sizeHint           </td>
2947 2947
           <td>(</td>
2948 2948
           <td class="paramname">          </td>
2949 2949
           <td>&nbsp;)&nbsp;</td>

+ 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)" -->

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

@@ -334,7 +334,7 @@ Here is a list of all documented class members with links to the class documenta
334 334
 : <a class="el" href="classQextScintillaLexerHTML.html#fa7eeca9e9d6989991ea3dc3386fb8c261be7257f0b33af5eebee59e5daefdff">QextScintillaLexerHTML</a><li>showUserList()
335 335
 : <a class="el" href="classQextScintilla.html#74a4da1e86eda7f62262cea8a4a9b26a">QextScintilla</a><li>SingleQuotedHereDocument
336 336
 : <a class="el" href="classQextScintillaLexerPerl.html#3adbc396a8aceddb3e327505860b1fbdb84f237d13384cb47bcf579f29a77eab">QextScintillaLexerPerl</a>, <a class="el" href="classQextScintillaLexerBash.html#a161d468183d486788d727114d801f11ed5c6c7c814c87b3995bc1d0e129cdf6">QextScintillaLexerBash</a><li>SingleQuotedString
337
-: <a class="el" href="classQextScintillaLexerSQL.html#31e2976a0e42d9f90cdfe7aafd4264935022b23b5cbb05e3edfa0c9d49f866a4">QextScintillaLexerSQL</a>, <a class="el" href="classQextScintillaLexerRuby.html#c12d2ddff5d8652b10066ef4ab5df6733d453fb290fba122980aa29757cc7839">QextScintillaLexerRuby</a>, <a class="el" href="classQextScintillaLexerPython.html#99004ac9e2112951a73f2dfc7724a5a7f299751dbcf5d3dc7645fbb54a89cdc3">QextScintillaLexerPython</a>, <a class="el" href="classQextScintillaLexerPerl.html#3adbc396a8aceddb3e327505860b1fbd7b9ff96a73c4d75e880eb0977e18a24f">QextScintillaLexerPerl</a>, <a class="el" href="classQextScintillaLexerCSS.html#c8ee4747b06e3739126a3ae64f9cb46e4a6cf494de949384a8205d4dc6f320f3">QextScintillaLexerCSS</a>, <a class="el" href="classQextScintillaLexerCPP.html#542bd72841348de065bad4c9d8a39e51f7648858efb30abf136bf9f82a516296">QextScintillaLexerCPP</a>, <a class="el" href="classQextScintillaLexerBash.html#a161d468183d486788d727114d801f1177f2cc65d0990de81d205c6672206da0">QextScintillaLexerBash</a><li>tqsizeHint()
337
+: <a class="el" href="classQextScintillaLexerSQL.html#31e2976a0e42d9f90cdfe7aafd4264935022b23b5cbb05e3edfa0c9d49f866a4">QextScintillaLexerSQL</a>, <a class="el" href="classQextScintillaLexerRuby.html#c12d2ddff5d8652b10066ef4ab5df6733d453fb290fba122980aa29757cc7839">QextScintillaLexerRuby</a>, <a class="el" href="classQextScintillaLexerPython.html#99004ac9e2112951a73f2dfc7724a5a7f299751dbcf5d3dc7645fbb54a89cdc3">QextScintillaLexerPython</a>, <a class="el" href="classQextScintillaLexerPerl.html#3adbc396a8aceddb3e327505860b1fbd7b9ff96a73c4d75e880eb0977e18a24f">QextScintillaLexerPerl</a>, <a class="el" href="classQextScintillaLexerCSS.html#c8ee4747b06e3739126a3ae64f9cb46e4a6cf494de949384a8205d4dc6f320f3">QextScintillaLexerCSS</a>, <a class="el" href="classQextScintillaLexerCPP.html#542bd72841348de065bad4c9d8a39e51f7648858efb30abf136bf9f82a516296">QextScintillaLexerCPP</a>, <a class="el" href="classQextScintillaLexerBash.html#a161d468183d486788d727114d801f1177f2cc65d0990de81d205c6672206da0">QextScintillaLexerBash</a><li>sizeHint()
338 338
 : <a class="el" href="classQextScintillaBase.html#171ce27ddcfabf024cc5539181f253dd">QextScintillaBase</a><li>SloppyBraceMatch
339 339
 : <a class="el" href="classQextScintilla.html#c9490bc31746441fa4f228f44679b06b0663484a90fdee0162e2e2e267c2da8a">QextScintilla</a><li>SmallRectangle
340 340
 : <a class="el" href="classQextScintilla.html#1cefba8e6020a5b760511f83aa4ca72ee7978b23c827aa996489af72541c670a">QextScintilla</a><li>Spaces

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

@@ -159,7 +159,7 @@
159 159
 : <a class="el" href="classQextScintilla.html#811888818870dd0d9cd74d297f711bc8">QextScintilla</a><li>setWrapMode()
160 160
 : <a class="el" href="classQextScintillaPrinter.html#f4904d6ba001f4c7145983f9814f00c1">QextScintillaPrinter</a>, <a class="el" href="classQextScintilla.html#945affc0b0f8f25f58138f923d5a270d">QextScintilla</a><li>setWrapVisualFlags()
161 161
 : <a class="el" href="classQextScintilla.html#11ef30c49b7c6fb96988a94059efa687">QextScintilla</a><li>showUserList()
162
-: <a class="el" href="classQextScintilla.html#74a4da1e86eda7f62262cea8a4a9b26a">QextScintilla</a><li>tqsizeHint()
162
+: <a class="el" href="classQextScintilla.html#74a4da1e86eda7f62262cea8a4a9b26a">QextScintilla</a><li>sizeHint()
163 163
 : <a class="el" href="classQextScintillaBase.html#171ce27ddcfabf024cc5539181f253dd">QextScintillaBase</a><li>standardCommands()
164 164
 : <a class="el" href="classQextScintilla.html#ea83bb0bc19af4a776b68ee3eda10c61">QextScintilla</a><li>startDrag()
165 165
 : <a class="el" href="classQextScintillaBase.html#7c1be000329c8f9e328999cbc03ba9a7">QextScintillaBase</a><li>startRecording()

+ 3
- 3
example/application.cpp View File

@@ -23,7 +23,7 @@
23 23
 #include <tqprinter.h>
24 24
 #include <tqapplication.h>
25 25
 #include <tqaccel.h>
26
-#include <tqtextstream.h>
26
+#include <textstream.h>
27 27
 #include <tqpainter.h>
28 28
 #include <tqpaintdevicemetrics.h>
29 29
 #include <tqwhatsthis.h>
@@ -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
 

+ 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;

+ 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
 

+ 6
- 6
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?
@@ -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.
@@ -1407,16 +1407,16 @@ set void SetFocus=2380(bool focus,)
1407 1407
 get bool GetFocus=2381(,)
1408 1408
 
1409 1409
 # Change error status - 0 = OK.
1410
-set void SettqStatus=2382(int statusCode,)
1410
+set void SetStatus=2382(int statusCode,)
1411 1411
 # Get error status.
1412
-get int GettqStatus=2383(,)
1412
+get int GetStatus=2383(,)
1413 1413
 
1414 1414
 # Set whether the mouse is captured when its button is pressed.
1415 1415
 set void SetMouseDownCaptures=2384(bool captures,)
1416 1416
 # Get whether mouse gets captured.
1417 1417
 get bool GetMouseDownCaptures=2385(,)
1418 1418
 
1419
-enu tqCursorShape=SC_CURSOR
1419
+enu CursorShape=SC_CURSOR
1420 1420
 val SC_CURSORNORMAL=-1
1421 1421
 val SC_CURSORWAIT=4
1422 1422
 # Sets the cursor to one of the SC_CURSOR* values.

+ 7
- 7
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;
@@ -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();
@@ -661,7 +661,7 @@ void Window::SetFont(Font &font)
661 661
 
662 662
 void Window::SetCursor(Cursor curs)
663 663
 {
664
-	TQt::tqCursorShape qc;
664
+	TQt::CursorShape qc;
665 665
 
666 666
 	switch (curs)
667 667
 	{

+ 2
- 2
qt/SciListBox.cpp View File

@@ -98,7 +98,7 @@ void ListBoxX::Create(Window &parent,int,Point,int,bool)
98 98
 
99 99
 void ListBoxX::SetAverageCharWidth(int)
100 100
 {
101
-	// We rely on TQListBox::tqsizeHint() for the size of the list box rather
101
+	// We rely on TQListBox::sizeHint() for the size of the list box rather
102 102
 	// than make calculations based on the average character width and the
103 103
 	// number of visible rows.
104 104
 }
@@ -121,7 +121,7 @@ PRectangle ListBoxX::GetDesiredRect()
121 121
 
122 122
 	if (slb)
123 123
 	{
124
-		TQSize sh = slb -> tqsizeHint();
124
+		TQSize sh = slb -> sizeHint();
125 125
 
126 126
 		rc.right = sh.width();
127 127
 		rc.bottom = sh.height();

+ 5
- 5
qt/ScintillaQt.cpp View File

@@ -25,7 +25,7 @@
25 25
 #include <tqpopupmenu.h>
26 26
 #include <tqstring.h>
27 27
 #include <tqtimer.h>
28
-#include <tqclipboard.h>
28
+#include <clipboard.h>
29 29
 #include <tqdragobject.h>
30 30
 #include <tqpainter.h>
31 31
 
@@ -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.
@@ -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.

+ 13
- 13
qt/qextscintillabase.cpp View File

@@ -21,9 +21,9 @@
21 21
 
22 22
 
23 23
 #include <tqapplication.h>
24
-#include <tqclipboard.h>
24
+#include <clipboard.h>
25 25
 #include <tqscrollbar.h>
26
-#include <tqlayout.h>
26
+#include <layout.h>
27 27
 #include <tqcolor.h>
28 28
 #include <tqevent.h>
29 29
 #include <tqdragobject.h>
@@ -70,22 +70,22 @@ 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
-	txtarea -> tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Expanding,TQSizePolicy::Expanding));
76
+	txtarea -> setSizePolicy(TQSizePolicy(TQSizePolicy::Expanding,TQSizePolicy::Expanding));
77 77
 	txtarea -> setMouseTracking(TRUE);
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
@@ -563,12 +563,12 @@ void QextScintillaBase::handleHSb(int val)
563 563
 
564 564
 
565 565
 // Return the current prefered size.
566
-TQSize QextScintillaBase::tqsizeHint() const
566
+TQSize QextScintillaBase::sizeHint() const
567 567
 {
568 568
 	int height = sci -> vs.lineHeight * sci -> pdoc -> LinesTotal();
569 569
 
570 570
 	if (sci -> horizontalScrollBarVisible)
571
-		height += hsb -> tqsizeHint().height();
571
+		height += hsb -> sizeHint().height();
572 572
 
573 573
 	return TQSize(sci -> scrollWidth,height);
574 574
 }
@@ -577,6 +577,6 @@ TQSize QextScintillaBase::tqsizeHint() 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
 }

+ 1
- 1
qt/qextscintillabase.h View File

@@ -2243,7 +2243,7 @@ public:
2243 2243
 	}
2244 2244
 
2245 2245
 	//! Returns the recommended size of the widget.
2246
-	virtual TQSize tqsizeHint() const;
2246
+	virtual TQSize sizeHint() const;
2247 2247
 
2248 2248
 	//! Returns the viewport widget.  This is the widget that actually
2249 2249
 	//! contains the text.

+ 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;

+ 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/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
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_);

+ 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
 

+ 11
- 11
src/Editor.cpp View File

@@ -346,7 +346,7 @@ Editor::Editor() {
346 346
 	hasFocus = false;
347 347
 	hideSelection = false;
348 348
 	inOverstrike = false;
349
-	errortqStatus = 0;
349
+	errorStatus = 0;
350 350
 	mouseDownCaptures = true;
351 351
 
352 352
 	bufferedDraw = true;
@@ -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);
@@ -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
 		}
@@ -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);
@@ -3372,7 +3372,7 @@ void Editor::AddCharUTF(char *s, unsigned int len, bool treatAsDBCS) {
3372 3372
 			// characters representing themselves.
3373 3373
 		} else {
3374 3374
 			// Unroll 1 to 3 byte UTF-8 sequences.  See reference data at:
3375
-			// http://www.cl.cam.ac.uk/~mgk25/tqunicode.html
3375
+			// http://www.cl.cam.ac.uk/~mgk25/unicode.html
3376 3376
 			// http://www.cl.cam.ac.uk/~mgk25/ucs/examples/UTF-8-test.txt
3377 3377
 			if (byte < 0xE0) {
3378 3378
 				int byte2 = static_cast<unsigned char>(s[1]);
@@ -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);
@@ -7210,11 +7210,11 @@ sptr_t Editor::WndProc(unsigned int iMessage, uptr_t wParam, sptr_t lParam) {
7210 7210
 		return hasFocus;
7211 7211
 
7212 7212
 	case SCI_SETSTATUS:
7213
-		errortqStatus = wParam;
7213
+		errorStatus = wParam;
7214 7214
 		break;
7215 7215
 
7216 7216
 	case SCI_GETSTATUS:
7217
-		return errortqStatus;
7217
+		return errorStatus;
7218 7218
 
7219 7219
 	case SCI_SETMOUSEDOWNCAPTURES:
7220 7220
 		mouseDownCaptures = wParam != 0;

+ 1
- 1
src/Editor.h View File

@@ -204,7 +204,7 @@ protected:	// ScintillaBase subclass needs access to much of Editor
204 204
 	bool hasFocus;
205 205
 	bool hideSelection;
206 206
 	bool inOverstrike;
207
-	int errortqStatus;
207
+	int errorStatus;
208 208
 	bool mouseDownCaptures;
209 209
 
210 210
 	/** In bufferedDraw mode, graphics operations are drawn to a pixmap and then copied to

+ 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