Browse Source

Rename old tq methods that no longer need a unique name

tags/r14.0.0
Timothy Pearson 8 years ago
parent
commit
c03d5480ab
13 changed files with 23 additions and 23 deletions
  1. +2
    -2
      doc/Scintilla/ScintillaHistory.html
  2. +1
    -1
      doc/html/classQextScintilla-members.html
  3. +1
    -1
      doc/html/classQextScintillaBase-members.html
  4. +3
    -3
      doc/html/classQextScintillaBase.html
  5. +1
    -1
      doc/html/functions_0x73.html
  6. +1
    -1
      doc/html/functions_func_0x73.html
  7. +3
    -3
      include/Scintilla.iface
  8. +1
    -1
      qt/PlatQt.cpp
  9. +2
    -2
      qt/SciListBox.cpp
  10. +3
    -3
      qt/qextscintillabase.cpp
  11. +1
    -1
      qt/qextscintillabase.h
  12. +3
    -3
      src/Editor.cpp
  13. +1
    -1
      src/Editor.h

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

@@ -4592,7 +4592,7 @@
Tool bar.
</li>
<li>
tqStatus bar now on Windows as well as GTK+.
Status bar now on Windows as well as GTK+.
</li>
<li>
Input fields in Find and Replace dialogs now have history on both Windows and
@@ -4879,7 +4879,7 @@
Borland compatible makefile.
</li>
<li>
tqStatus bar showing caret position in GTK+ version of SciTE.
Status bar showing caret position in GTK+ version of SciTE.
</li>
<li>
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 @@
<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>
<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>
<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>
<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>
<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>
<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>
<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>
<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 @@
<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>
<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>
<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>
<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>
<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>
<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>
<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>
<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)
long <b>SendScintilla</b> (unsigned int msg, unsigned long wParam, TQPainter *hdc, const TQRect &amp;rc, long cpMin, long cpMax)
<li><a class="anchor" name="10a88dc5c6aa9d423eeea62b21843264"></a><!-- doxytag: member="QextScintillaBase::SendScintilla" ref="10a88dc5c6aa9d423eeea62b21843264" args="(unsigned int msg, unsigned long wParam, const TQPixmap *lParam)" -->
long <b>SendScintilla</b> (unsigned int msg, unsigned long wParam, const TQPixmap *lParam)
<li>virtual TQSize <a class="el" href="classQextScintillaBase.html#171ce27ddcfabf024cc5539181f253dd">tqsizeHint</a> () const
<li>virtual TQSize <a class="el" href="classQextScintillaBase.html#171ce27ddcfabf024cc5539181f253dd">sizeHint</a> () const
<li>TQWidget * <a class="el" href="classQextScintillaBase.html#7c7723d64865b462ecfbf4152d836cae">viewport</a> () const
</ul>
<h2>Static Public Member Functions</h2>
@@ -2938,12 +2938,12 @@ Returns a pointer to a <a class="el" href="classQextScintillaBase.html">QextScin
Send the Scintilla message <em>msg</em> with the optional parameters <em>wParam</em> and <em>lParam</em>.
</div>
</div><p>
<a class="anchor" name="171ce27ddcfabf024cc5539181f253dd"></a><!-- doxytag: member="QextScintillaBase::tqsizeHint" ref="171ce27ddcfabf024cc5539181f253dd" args="() const " -->
<a class="anchor" name="171ce27ddcfabf024cc5539181f253dd"></a><!-- doxytag: member="QextScintillaBase::sizeHint" ref="171ce27ddcfabf024cc5539181f253dd" args="() const " -->
<div class="memitem">
<div class="memproto">
<table class="memname">
<tr>
<td class="memname">virtual TQSize QextScintillaBase::tqsizeHint </td>
<td class="memname">virtual TQSize QextScintillaBase::sizeHint </td>
<td>(</td>
<td class="paramname"> </td>
<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
: <a class="el" href="classQextScintillaLexerHTML.html#fa7eeca9e9d6989991ea3dc3386fb8c261be7257f0b33af5eebee59e5daefdff">QextScintillaLexerHTML</a><li>showUserList()
: <a class="el" href="classQextScintilla.html#74a4da1e86eda7f62262cea8a4a9b26a">QextScintilla</a><li>SingleQuotedHereDocument
: <a class="el" href="classQextScintillaLexerPerl.html#3adbc396a8aceddb3e327505860b1fbdb84f237d13384cb47bcf579f29a77eab">QextScintillaLexerPerl</a>, <a class="el" href="classQextScintillaLexerBash.html#a161d468183d486788d727114d801f11ed5c6c7c814c87b3995bc1d0e129cdf6">QextScintillaLexerBash</a><li>SingleQuotedString
: <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()
: <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()
: <a class="el" href="classQextScintillaBase.html#171ce27ddcfabf024cc5539181f253dd">QextScintillaBase</a><li>SloppyBraceMatch
: <a class="el" href="classQextScintilla.html#c9490bc31746441fa4f228f44679b06b0663484a90fdee0162e2e2e267c2da8a">QextScintilla</a><li>SmallRectangle
: <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 @@
: <a class="el" href="classQextScintilla.html#811888818870dd0d9cd74d297f711bc8">QextScintilla</a><li>setWrapMode()
: <a class="el" href="classQextScintillaPrinter.html#f4904d6ba001f4c7145983f9814f00c1">QextScintillaPrinter</a>, <a class="el" href="classQextScintilla.html#945affc0b0f8f25f58138f923d5a270d">QextScintilla</a><li>setWrapVisualFlags()
: <a class="el" href="classQextScintilla.html#11ef30c49b7c6fb96988a94059efa687">QextScintilla</a><li>showUserList()
: <a class="el" href="classQextScintilla.html#74a4da1e86eda7f62262cea8a4a9b26a">QextScintilla</a><li>tqsizeHint()
: <a class="el" href="classQextScintilla.html#74a4da1e86eda7f62262cea8a4a9b26a">QextScintilla</a><li>sizeHint()
: <a class="el" href="classQextScintillaBase.html#171ce27ddcfabf024cc5539181f253dd">QextScintillaBase</a><li>standardCommands()
: <a class="el" href="classQextScintilla.html#ea83bb0bc19af4a776b68ee3eda10c61">QextScintilla</a><li>startDrag()
: <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,)
get bool GetFocus=2381(,)

# Change error status - 0 = OK.
set void SettqStatus=2382(int statusCode,)
set void SetStatus=2382(int statusCode,)
# Get error status.
get int GettqStatus=2383(,)
get int GetStatus=2383(,)

# Set whether the mouse is captured when its button is pressed.
set void SetMouseDownCaptures=2384(bool captures,)
# Get whether mouse gets captured.
get bool GetMouseDownCaptures=2385(,)

enu tqCursorShape=SC_CURSOR
enu CursorShape=SC_CURSOR
val SC_CURSORNORMAL=-1
val SC_CURSORWAIT=4
# 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)

void Window::SetCursor(Cursor curs)
{
TQt::tqCursorShape qc;
TQt::CursorShape qc;

switch (curs)
{

+ 2
- 2
qt/SciListBox.cpp View File

@@ -98,7 +98,7 @@ void ListBoxX::Create(Window &parent,int,Point,int,bool)

void ListBoxX::SetAverageCharWidth(int)
{
// We rely on TQListBox::tqsizeHint() for the size of the list box rather
// We rely on TQListBox::sizeHint() for the size of the list box rather
// than make calculations based on the average character width and the
// number of visible rows.
}
@@ -121,7 +121,7 @@ PRectangle ListBoxX::GetDesiredRect()

if (slb)
{
TQSize sh = slb -> tqsizeHint();
TQSize sh = slb -> sizeHint();

rc.right = sh.width();
rc.bottom = sh.height();

+ 3
- 3
qt/qextscintillabase.cpp View File

@@ -73,7 +73,7 @@ QextScintillaBase::QextScintillaBase(TQWidget *parent,const char *name,WFlags f)
TQGridLayout *tqlayout = new TQGridLayout(this,2,2);

txtarea = new TQWidget(this,0,WRepaintNoErase|WResizeNoErase);
txtarea -> tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Expanding,TQSizePolicy::Expanding));
txtarea -> setSizePolicy(TQSizePolicy(TQSizePolicy::Expanding,TQSizePolicy::Expanding));
txtarea -> setMouseTracking(TRUE);
txtarea -> setAcceptDrops(TRUE);
txtarea -> setFocusPolicy(WheelFocus);
@@ -563,12 +563,12 @@ void QextScintillaBase::handleHSb(int val)


// Return the current prefered size.
TQSize QextScintillaBase::tqsizeHint() const
TQSize QextScintillaBase::sizeHint() const
{
int height = sci -> vs.lineHeight * sci -> pdoc -> LinesTotal();

if (sci -> horizontalScrollBarVisible)
height += hsb -> tqsizeHint().height();
height += hsb -> sizeHint().height();

return TQSize(sci -> scrollWidth,height);
}

+ 1
- 1
qt/qextscintillabase.h View File

@@ -2243,7 +2243,7 @@ public:
}

//! Returns the recommended size of the widget.
virtual TQSize tqsizeHint() const;
virtual TQSize sizeHint() const;

//! Returns the viewport widget. This is the widget that actually
//! contains the text.

+ 3
- 3
src/Editor.cpp View File

@@ -346,7 +346,7 @@ Editor::Editor() {
hasFocus = false;
hideSelection = false;
inOverstrike = false;
errortqStatus = 0;
errorStatus = 0;
mouseDownCaptures = true;

bufferedDraw = true;
@@ -7210,11 +7210,11 @@ sptr_t Editor::WndProc(unsigned int iMessage, uptr_t wParam, sptr_t lParam) {
return hasFocus;

case SCI_SETSTATUS:
errortqStatus = wParam;
errorStatus = wParam;
break;

case SCI_GETSTATUS:
return errortqStatus;
return errorStatus;

case SCI_SETMOUSEDOWNCAPTURES:
mouseDownCaptures = wParam != 0;

+ 1
- 1
src/Editor.h View File

@@ -204,7 +204,7 @@ protected: // ScintillaBase subclass needs access to much of Editor
bool hasFocus;
bool hideSelection;
bool inOverstrike;
int errortqStatus;
int errorStatus;
bool mouseDownCaptures;

/** In bufferedDraw mode, graphics operations are drawn to a pixmap and then copied to

Loading…
Cancel
Save