Browse Source

Remove additional unneeded tq method conversions

tags/r14.0.0
Timothy Pearson 8 years ago
parent
commit
1aef904f94
20 changed files with 37 additions and 37 deletions
  1. +1
    -1
      ChangeLog
  2. +4
    -4
      doc/Scintilla/ScintillaDoc.html
  3. +1
    -1
      doc/Scintilla/ScintillaHistory.html
  4. +1
    -1
      doc/html/classQextScintilla-members.html
  5. +4
    -4
      doc/html/classQextScintilla.html
  6. +2
    -2
      example/application.cpp
  7. +1
    -1
      include/Scintilla.h
  8. +1
    -1
      include/Scintilla.iface
  9. +1
    -1
      qt/PlatQt.cpp
  10. +1
    -1
      qt/ScintillaQt.cpp
  11. +5
    -5
      qt/qextscintilla.cpp
  12. +2
    -2
      qt/qextscintilla.h
  13. +4
    -4
      qt/qextscintillalexer.cpp
  14. +1
    -1
      qt/qextscintillalexerhtml.cpp
  15. +1
    -1
      qt/qextscintillalexeridl.cpp
  16. +1
    -1
      qt/qextscintillalexertex.cpp
  17. +1
    -1
      src/CallTip.cpp
  18. +1
    -1
      src/CallTip.h
  19. +3
    -3
      src/Editor.cpp
  20. +1
    -1
      src/LineMarker.cpp

+ 1
- 1
ChangeLog View File

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


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

@@ -473,7 +473,7 @@
<a class="message" href="#SCI_GETSTYLEBITSNEEDED">SCI_GETSTYLEBITSNEEDED</a>.</p>

<p><b id="TextRange">TextRange</b> and <b id="CharacterRange">CharacterRange</b><br />
These structures are defined to be exactly the same tqshape as the Win32 <code>TEXTRANGE</code>
These structures are defined to be exactly the same shape as the Win32 <code>TEXTRANGE</code>
and <code>CHARRANGE</code>, so that older code that treats Scintilla as a RichEdit will
work.</p>
<pre>
@@ -677,7 +677,7 @@ struct TextRange {
href="#SCI_SEARCHINTARGET">SCI_SEARCHINTARGET</a></code></p>

<p><b id="TextToFind">TextToFind</b><br />
This structure is defined to have exactly the same tqshape as the Win32 structure
This structure is defined to have exactly the same shape as the Win32 structure
<code>FINDTEXTEX</code> for old code that treated Scintilla as a RichEdit control.</p>
<pre>
struct TextToFind {
@@ -2873,7 +2873,7 @@ struct TextToFind {
style information (for 32 styles) and 3 bits of indicator information for 3 independent
indicators so that, for example, syntax errors, deprecated names and bad indentation could all
be displayed at once. Indicators may be displayed as simple underlines, squiggly underlines, a
line of small 'T' tqshapes, a line of diagonal hatching, a strike-out or a rectangle around the text.</p>
line of small 'T' shapes, a line of diagonal hatching, a strike-out or a rectangle around the text.</p>

<p>The indicators are set using <a class="message"
href="#SCI_STARTSTYLING"><code>SCI_STARTSTYLING</code></a> with a <code>INDICS_MASK</code> mask
@@ -2947,7 +2947,7 @@ struct TextToFind {

<td align="center">2</td>

<td>A line of small T tqshapes.</td>
<td>A line of small T shapes.</td>
</tr>

<tr>


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

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


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

@@ -98,7 +98,7 @@
<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>
<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>
<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>
<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>
<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>
<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>
<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>
<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>.
<li>virtual void <a class="el" href="classQextScintilla.html#d5d5178610285dda5004ccc5c5c6c306">cut</a> ()
<li>virtual void <a class="el" href="classQextScintilla.html#dd5100eebb1241b90da9b77cfca26c8d">ensureCursorVisible</a> ()
<li>virtual void <a class="el" href="classQextScintilla.html#8c5a39688b5ca5995f8060941a8065d4">ensureLineVisible</a> (int line)
<li>virtual void <a class="el" href="classQextScintilla.html#5b289640689062f4fa5479c7212107c0">foldAll</a> (bool tqchildren=FALSE)
<li>virtual void <a class="el" href="classQextScintilla.html#5b289640689062f4fa5479c7212107c0">foldAll</a> (bool children=FALSE)
<li>virtual void <a class="el" href="classQextScintilla.html#f81c922d74d8746d9cbc8d576c440dd4">foldLine</a> (int line)
<li>virtual void <a class="el" href="classQextScintilla.html#0017b86a4fff9d1228b204deda1e9d57">indent</a> (int line)
<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.

</div>
</div><p>
<a class="anchor" name="5b289640689062f4fa5479c7212107c0"></a><!-- doxytag: member="QextScintilla::foldAll" ref="5b289640689062f4fa5479c7212107c0" args="(bool tqchildren=FALSE)" -->
<a class="anchor" name="5b289640689062f4fa5479c7212107c0"></a><!-- doxytag: member="QextScintilla::foldAll" ref="5b289640689062f4fa5479c7212107c0" args="(bool children=FALSE)" -->
<div class="memitem">
<div class="memproto">
<table class="memname">
@@ -3239,7 +3239,7 @@ Ensures that the line number <em>line</em> is visible.
<td class="memname">virtual void QextScintilla::foldAll </td>
<td>(</td>
<td class="paramtype">bool&nbsp;</td>
<td class="paramname"> <em>tqchildren</em> = <code>FALSE</code> </td>
<td class="paramname"> <em>children</em> = <code>FALSE</code> </td>
<td>&nbsp;)&nbsp;</td>
<td width="100%"><code> [virtual, slot]</code></td>
</tr>
@@ -3248,7 +3248,7 @@ Ensures that the line number <em>line</em> is visible.
<div class="memdoc">

<p>
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.
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.
</div>
</div><p>
<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()
TQString text = e->text();
TQFile f( filename );
if ( !f.open( IO_WriteOnly ) ) {
statusBar()->message( TQString("Could not write to %1").tqarg(filename),
statusBar()->message( TQString("Could not write to %1").arg(filename),
2000 );
return;
}
@@ -198,7 +198,7 @@ void ApplicationWindow::save()

setCaption( filename );

statusBar()->message( TQString( "File %1 saved" ).tqarg( filename ), 2000 );
statusBar()->message( TQString( "File %1 saved" ).arg( filename ), 2000 );
}




+ 1
- 1
include/Scintilla.h View File

@@ -696,7 +696,7 @@ typedef sptr_t (*SciFnDirect)(sptr_t ptr, unsigned int iMessage, uptr_t wParam,
#define SCN_AUTOCSELECTION 2022
//--Autogenerated -- end of section automatically generated from Scintilla.iface

// These structures are defined to be exactly the same tqshape as the Win32
// These structures are defined to be exactly the same shape as the Win32
// CHARRANGE, TEXTRANGE, FINDTEXTEX, FORMATRANGE, and NMHDR structs.
// So older code that treats Scintilla as a RichEdit will work.



+ 1
- 1
include/Scintilla.iface View File

@@ -977,7 +977,7 @@ fun void HideLines=2227(int lineStart, int lineEnd)
# Is a line visible?
get bool GetLineVisible=2228(int line,)

# Show the tqchildren of a header line.
# Show the children of a header line.
set void SetFoldExpanded=2229(int line, bool expanded)

# Is a header line expanded?


+ 1
- 1
qt/PlatQt.cpp View File

@@ -594,7 +594,7 @@ PRectangle Window::GetPosition()

if (w)
{
const TQRect &r = w -> tqgeometry();
const TQRect &r = w -> geometry();

rc.left = r.left();
rc.top = r.top();


+ 1
- 1
qt/ScintillaQt.cpp View File

@@ -683,7 +683,7 @@ void ScintillaTQt::paintEvent(TQPaintEvent *pe)
delete sw;

// If the painting area was insufficient to cover the new style
// or brace highlight positions then tqrepaint the whole thing.
// or brace highlight positions then repaint the whole thing.
if (paintState == paintAbandoned)
PWindow(wMain) -> update();
}


+ 5
- 5
qt/qextscintilla.cpp View File

@@ -1036,7 +1036,7 @@ void QextScintilla::foldClick(int lineClick,int bstate)
{
if (bstate & ShiftButton)
{
// Ensure all tqchildren are visible.
// Ensure all children are visible.
SendScintilla(SCI_SETFOLDEXPANDED,lineClick,1);
foldExpand(lineClick,TRUE,TRUE,100,levelClick);
}
@@ -1044,13 +1044,13 @@ void QextScintilla::foldClick(int lineClick,int bstate)
{
if (SendScintilla(SCI_GETFOLDEXPANDED,lineClick))
{
// Contract this line and all its tqchildren.
// Contract this line and all its children.
SendScintilla(SCI_SETFOLDEXPANDED,lineClick,0L);
foldExpand(lineClick,FALSE,TRUE,0,levelClick);
}
else
{
// Expand this line and all its tqchildren.
// Expand this line and all its children.
SendScintilla(SCI_SETFOLDEXPANDED,lineClick,1);
foldExpand(lineClick,TRUE,TRUE,100,levelClick);
}
@@ -1119,7 +1119,7 @@ void QextScintilla::foldExpand(int &line,bool doExpand,bool force,

// Fully expand (if there is any line currently folded) all text. Otherwise,
// fold all text. This is mostly taken from SciTE.
void QextScintilla::foldAll(bool tqchildren)
void QextScintilla::foldAll(bool children)
{
recolor();

@@ -1142,7 +1142,7 @@ void QextScintilla::foldAll(bool tqchildren)
if (!(level & SC_FOLDLEVELHEADERFLAG))
continue;

if (tqchildren ||
if (children ||
(SC_FOLDLEVELBASE == (level & SC_FOLDLEVELNUMBERMASK)))
{
if (expanding)


+ 2
- 2
qt/qextscintilla.h View File

@@ -920,10 +920,10 @@ public slots:
//! 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 \a tqchildren is not set (the default) then only the top
//! pressed. If \a children is not set (the default) then only the top
//! level fold points are affected, otherwise the state of all fold
//! points are changed.
virtual void foldAll(bool tqchildren = FALSE);
virtual void foldAll(bool children = FALSE);

//! If the line \a line is folded then it is unfolded. Otherwise it is
//! 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
f = font(i);

fdesc += f.family();
fdesc += fmt.tqarg(f.pointSize());
fdesc += fmt.arg(f.pointSize());

// The casts are for Borland.
fdesc += fmt.tqarg((int)f.bold());
fdesc += fmt.tqarg((int)f.italic());
fdesc += fmt.tqarg((int)f.underline());
fdesc += fmt.arg((int)f.bold());
fdesc += fmt.arg((int)f.italic());
fdesc += fmt.arg((int)f.underline());

if (!qs.writeEntry(key + "font",fdesc,','))
rc = FALSE;


+ 1
- 1
qt/qextscintillalexerhtml.cpp View File

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


+ 1
- 1
qt/qextscintillalexeridl.cpp View File

@@ -84,7 +84,7 @@ const char *QextScintillaLexerIDL::keywords(int set) const
"object odl oleautomation optimize optional out out_of_line "
"pipe pointer_default pragma properties propget propput "
"propputref ptr public range readonly ref represent_as "
"requestedit restricted retval tqshape short signed size_is "
"requestedit restricted retval shape short signed size_is "
"small source strict_context_handle string struct switch "
"switch_is switch_type transmit_as typedef uidefault union "
"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
"overwithdelims pagedepth pagefilllstretch "
"pagefillstretch pagefilstretch pagegoal pageshrink "
"pagestretch pagetotal par parfillskip parindent "
"partqshape parskip patterns pausing penalty "
"parshape parskip patterns pausing penalty "
"postdisplaypenalty predisplaypenalty predisplaysize "
"pretolerance prevdepth prevgraf radical raise read "
"relax relpenalty right righthyphenmin rightskip "


+ 1
- 1
src/CallTip.cpp View File

@@ -214,7 +214,7 @@ void CallTip::PaintCT(Surface *surfaceWindow) {

surfaceWindow->FillRectangle(rcClient, colourBG.allocated);

offsetMain = insetX; // initial tqalignment assuming no arrows
offsetMain = insetX; // initial alignment assuming no arrows
PaintContents(surfaceWindow, true);

// Draw a raised border around the edges of the window


+ 1
- 1
src/CallTip.h View File

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



+ 3
- 3
src/Editor.cpp View File

@@ -2815,7 +2815,7 @@ void Editor::Paint(Surface *surfaceWindow, PRectangle rcArea) {
startLineToWrap = -1;
if (WrapLines(false, startLineToWrap)) {
// The wrapping process has changed the height of some lines so
// abandon this paint for a complete tqrepaint.
// abandon this paint for a complete repaint.
if (AbandonPaint()) {
return;
}
@@ -3809,7 +3809,7 @@ void Editor::NotifyModified(Document*, DocModification mh, void *) {
}

//Platform::DebugPrintf("** %x Doc Changed\n", this);
// TODO: could tqinvalidate from mh.startModification to end of screen
// TODO: could invalidate from mh.startModification to end of screen
//InvalidateRange(mh.position, mh.position + mh.length);
if (paintState == notPainting && !CanDeferToLastStep(mh)) {
Redraw();
@@ -5217,7 +5217,7 @@ void Editor::SetHotSpotRange(Point *pt) {
int hsStart_ = pdoc->ExtendStyleRange(pos, -1, vs.hotspotSingleLine);
int hsEnd_ = pdoc->ExtendStyleRange(pos, 1, vs.hotspotSingleLine);

// Only tqinvalidate the range if the hotspot range has changed...
// Only invalidate the range if the hotspot range has changed...
if (hsStart_ != hsStart || hsEnd_ != hsEnd) {
if (hsStart != -1) {
InvalidateRange(hsStart, hsEnd);


+ 1
- 1
src/LineMarker.cpp View File

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


Loading…
Cancel
Save