diff options
Diffstat (limited to 'qt')
| -rw-r--r-- | qt/PlatQt.cpp | 2 | ||||
| -rw-r--r-- | qt/ScintillaQt.cpp | 2 | ||||
| -rw-r--r-- | qt/qextscintilla.cpp | 10 | ||||
| -rw-r--r-- | qt/qextscintilla.h | 4 | ||||
| -rw-r--r-- | qt/qextscintillalexer.cpp | 8 | ||||
| -rw-r--r-- | qt/qextscintillalexerhtml.cpp | 2 | ||||
| -rw-r--r-- | qt/qextscintillalexeridl.cpp | 2 | ||||
| -rw-r--r-- | qt/qextscintillalexertex.cpp | 2 |
8 files changed, 16 insertions, 16 deletions
diff --git a/qt/PlatQt.cpp b/qt/PlatQt.cpp index 9f31d0d..1f09377 100644 --- a/qt/PlatQt.cpp +++ b/qt/PlatQt.cpp @@ -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(); diff --git a/qt/ScintillaQt.cpp b/qt/ScintillaQt.cpp index 322f300..355c245 100644 --- a/qt/ScintillaQt.cpp +++ b/qt/ScintillaQt.cpp @@ -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(); } diff --git a/qt/qextscintilla.cpp b/qt/qextscintilla.cpp index 4b33791..d586e21 100644 --- a/qt/qextscintilla.cpp +++ b/qt/qextscintilla.cpp @@ -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) diff --git a/qt/qextscintilla.h b/qt/qextscintilla.h index c34c88d..331ebad 100644 --- a/qt/qextscintilla.h +++ b/qt/qextscintilla.h @@ -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. diff --git a/qt/qextscintillalexer.cpp b/qt/qextscintillalexer.cpp index 327206f..20a1c22 100644 --- a/qt/qextscintillalexer.cpp +++ b/qt/qextscintillalexer.cpp @@ -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; diff --git a/qt/qextscintillalexerhtml.cpp b/qt/qextscintillalexerhtml.cpp index 5013ff9..2da5f01 100644 --- a/qt/qextscintillalexerhtml.cpp +++ b/qt/qextscintillalexerhtml.cpp @@ -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 " diff --git a/qt/qextscintillalexeridl.cpp b/qt/qextscintillalexeridl.cpp index ceba60c..51c8eb7 100644 --- a/qt/qextscintillalexeridl.cpp +++ b/qt/qextscintillalexeridl.cpp @@ -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 " diff --git a/qt/qextscintillalexertex.cpp b/qt/qextscintillalexertex.cpp index aa21e80..912b2a2 100644 --- a/qt/qextscintillalexertex.cpp +++ b/qt/qextscintillalexertex.cpp @@ -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 " |