Browse Source

Rename old tq methods that no longer need a unique name

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

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

@@ -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
@@ -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

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

@@ -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>

+ 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/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
include/Scintilla.iface View File

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

+ 1
- 1
qt/PlatQt.cpp View File

@@ -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();

+ 3
- 3
qt/qextscintillabase.cpp View File

@@ -73,7 +73,7 @@ QextScintillaBase::QextScintillaBase(TQWidget *parent,const char *name,WFlags f)
73 73
 	TQGridLayout *tqlayout = 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);
@@ -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
 }

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

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

Loading…
Cancel
Save