From 1aef904f94a86fecbc71888bc94a790ff36f0403 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Mon, 19 Dec 2011 11:42:29 -0600 Subject: [PATCH] Remove additional unneeded tq method conversions --- ChangeLog | 2 +- doc/Scintilla/ScintillaDoc.html | 8 ++++---- doc/Scintilla/ScintillaHistory.html | 2 +- doc/html/classQextScintilla-members.html | 2 +- doc/html/classQextScintilla.html | 8 ++++---- example/application.cpp | 4 ++-- include/Scintilla.h | 2 +- include/Scintilla.iface | 2 +- qt/PlatQt.cpp | 2 +- qt/ScintillaQt.cpp | 2 +- qt/qextscintilla.cpp | 10 +++++----- qt/qextscintilla.h | 4 ++-- qt/qextscintillalexer.cpp | 8 ++++---- qt/qextscintillalexerhtml.cpp | 2 +- qt/qextscintillalexeridl.cpp | 2 +- qt/qextscintillalexertex.cpp | 2 +- src/CallTip.cpp | 2 +- src/CallTip.h | 2 +- src/Editor.cpp | 6 +++--- src/LineMarker.cpp | 2 +- 20 files changed, 37 insertions(+), 37 deletions(-) diff --git a/ChangeLog b/ChangeLog index faa8354..d801b7e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -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. diff --git a/doc/Scintilla/ScintillaDoc.html b/doc/Scintilla/ScintillaDoc.html index 4d0b584..34af1a5 100755 --- a/doc/Scintilla/ScintillaDoc.html +++ b/doc/Scintilla/ScintillaDoc.html @@ -473,7 +473,7 @@ SCI_GETSTYLEBITSNEEDED.

TextRange and CharacterRange
- These structures are defined to be exactly the same tqshape as the Win32 TEXTRANGE + These structures are defined to be exactly the same shape as the Win32 TEXTRANGE and CHARRANGE, so that older code that treats Scintilla as a RichEdit will work.

@@ -677,7 +677,7 @@ struct TextRange {
     href="#SCI_SEARCHINTARGET">SCI_SEARCHINTARGET

 
     
TextToFind

-     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
     FINDTEXTEX for old code that treated Scintilla as a RichEdit control.

 
 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.

+    line of small 'T' shapes, a line of diagonal hatching, a strike-out or a rectangle around the text.

 
     
The indicators are set using SCI_STARTSTYLING with a INDICS_MASK mask
@@ -2947,7 +2947,7 @@ struct TextToFind {
 
           2
 
-          A line of small T tqshapes.
+          A line of small T shapes.
         
 
         
diff --git a/doc/Scintilla/ScintillaHistory.html b/doc/Scintilla/ScintillaHistory.html
index 916b219..c10e86e 100755
--- a/doc/Scintilla/ScintillaHistory.html
+++ b/doc/Scintilla/ScintillaHistory.html
@@ -4795,7 +4795,7 @@
         Caret policy determines how closely caret is tracked by visible area.
       
       
  • 
-        New marker tqshapes: arrow pointing down, plus and minus.
+        New marker shapes: arrow pointing down, plus and minus.
       
    • 
       
  • 
         Optionally display full path in title rather than just file name.
diff --git a/doc/html/classQextScintilla-members.html b/doc/html/classQextScintilla-members.html
index acc90ba..90ed520 100644
--- a/doc/html/classQextScintilla-members.html
+++ b/doc/html/classQextScintilla-members.html
@@ -98,7 +98,7 @@
   focusInEvent(TQFocusEvent *)QextScintillaBase [protected, virtual]
   focusNextPrevChild(bool)QextScintillaBase [protected, virtual]
   focusOutEvent(TQFocusEvent *)QextScintillaBase [protected, virtual]
-  foldAll(bool tqchildren=FALSE)QextScintilla [virtual, slot]
+  foldAll(bool children=FALSE)QextScintilla [virtual, slot]
   folding() const QextScintilla [inline]
   foldLine(int line)QextScintilla [virtual, slot]
   FoldStyle enum nameQextScintilla
diff --git a/doc/html/classQextScintilla.html b/doc/html/classQextScintilla.html
index 04c98c8..1bca3d7 100644
--- a/doc/html/classQextScintilla.html
+++ b/doc/html/classQextScintilla.html
@@ -172,7 +172,7 @@ Inherits QextScintillaBase.
 
  • virtual void cut ()
 
  • virtual void ensureCursorVisible ()
 
  • virtual void ensureLineVisible (int line)
-
  • virtual void foldAll (bool tqchildren=FALSE)
+
  • virtual void foldAll (bool children=FALSE)
 
  • virtual void foldLine (int line)
 
  • virtual void indent (int line)
 
  • virtual void insert (const TQString &text)
@@ -3231,7 +3231,7 @@ Ensures that the line number line is visible.
 
 
 
    
-
+
 
    
 
    
       
@@ -3239,7 +3239,7 @@ Ensures that the line number line is visible.
           
-          
+          
@@ -3248,7 +3248,7 @@ Ensures that the line number line is visible.
 
    
 
 
    
-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 tqchildren 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 children is not set (the default) then only the top level fold points are affected, otherwise the state of all fold points are changed. 
 
    
 
diff --git a/example/application.cpp b/example/application.cpp
index fbc03be..bd351ba 100644
--- a/example/application.cpp
+++ b/example/application.cpp
@@ -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 );
 }
 
 
diff --git a/include/Scintilla.h b/include/Scintilla.h
index 326831d..ffb1ffa 100755
--- a/include/Scintilla.h
+++ b/include/Scintilla.h
@@ -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.
 
diff --git a/include/Scintilla.iface b/include/Scintilla.iface
index 3df40c3..aff26d8 100755
--- a/include/Scintilla.iface
+++ b/include/Scintilla.iface
@@ -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?
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 "
diff --git a/src/CallTip.cpp b/src/CallTip.cpp
index 2de8eae..f4bc5f8 100755
--- a/src/CallTip.cpp
+++ b/src/CallTip.cpp
@@ -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
diff --git a/src/CallTip.h b/src/CallTip.h
index 1fd38c3..9848a10 100755
--- a/src/CallTip.h
+++ b/src/CallTip.h
@@ -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
 
diff --git a/src/Editor.cpp b/src/Editor.cpp
index 045e384..db27cb0 100755
--- a/src/Editor.cpp
+++ b/src/Editor.cpp
@@ -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);
diff --git a/src/LineMarker.cpp b/src/LineMarker.cpp
index 2af78b5..6ded13c 100755
--- a/src/LineMarker.cpp
+++ b/src/LineMarker.cpp
@@ -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--;

    virtual void QextScintilla::foldAll           
           (
           bool  tqchildren = FALSE           children = FALSE          
            ) 
            [virtual, slot]