Rename obsolete tq methods to standard names

5 files changed, 20 insertions, 20 deletions

diff --git a/qt/PlatQt.cpp b/qt/PlatQt.cpp
index 1f09377..3b563c6 100644
--- a/qt/PlatQt.cpp
+++ b/qt/PlatQt.cpp
@@ -194,7 +194,7 @@ public:
 	void SetClip(PRectangle rc);
 	void FlushCachedState() {painter -> flush();}
 
-	void SetUnicodeMode(bool tqunicodeMode_) {tqunicodeMode = tqunicodeMode_;}
+	void SetUnicodeMode(bool unicodeMode_) {unicodeMode = unicodeMode_;}
 	void SetDBCSMode(int codePage) {}
 
 	void DrawXPM(PRectangle rc,const XPM *xpm);
@@ -207,7 +207,7 @@ private:
 	static TQColor convertTQColor(const ColourAllocated &col,
 			unsigned alpha = 0xff);
 
-	bool tqunicodeMode;
+	bool unicodeMode;
 	bool mypainter;
 	TQPainter *painter;
 };
@@ -217,7 +217,7 @@ Surface *Surface::Allocate()
 	return new SurfaceImpl;
 }
 
-SurfaceImpl::SurfaceImpl() : tqunicodeMode(false), mypainter(false), painter(0)
+SurfaceImpl::SurfaceImpl() : unicodeMode(false), mypainter(false), painter(0)
 {
 }
 
@@ -448,7 +448,7 @@ void SurfaceImpl::MeasureWidths(Font &font_,const char *s,int len,
 		{
 			totalWidth += fm.width(qs[i]);
 
-			int l = (tqunicodeMode ? TQString(qs[i]).utf8().length() : 1);
+			int l = (unicodeMode ? TQString(qs[i]).utf8().length() : 1);
 
 			while (l--)
 				positions[ui++] = totalWidth;
@@ -533,7 +533,7 @@ bool SurfaceImpl::setFont(Font &font_)
 // Convert a Scintilla string to a TQt Unicode string.
 TQString SurfaceImpl::convertText(const char *s,int len)
 {
-	if (tqunicodeMode)
+	if (unicodeMode)
 		return TQString::fromUtf8(s,len);
 
 	TQString qs;
diff --git a/qt/ScintillaQt.cpp b/qt/ScintillaQt.cpp
index 355c245..e4c0559 100644
--- a/qt/ScintillaQt.cpp
+++ b/qt/ScintillaQt.cpp
@@ -446,7 +446,7 @@ TQString ScintillaTQt::textRange(const SelectionText *text)
 // Copy the selected text to the clipboard.
 void ScintillaTQt::CopyToClipboard(const SelectionText &selectedText)
 {
-	TQApplication::tqclipboard() -> setText(textRange(&selectedText));
+	TQApplication::clipboard() -> setText(textRange(&selectedText));
 }
 
 
@@ -466,7 +466,7 @@ void ScintillaTQt::Copy()
 // Implement paste.
 void ScintillaTQt::Paste()
 {
-	TQString str = TQApplication::tqclipboard() -> text();
+	TQString str = TQApplication::clipboard() -> text();
 
 	if (str.isEmpty())
 		return;
@@ -607,7 +607,7 @@ void ScintillaTQt::ClaimSelection()
 
 	if (isSel)
 	{
-		TQClipboard *cb = TQApplication::tqclipboard();
+		TQClipboard *cb = TQApplication::clipboard();
 
 		// If we support X11 style selection then make it available
 		// now.
diff --git a/qt/qextscintillabase.cpp b/qt/qextscintillabase.cpp
index 2131ab6..5aaa7b1 100644
--- a/qt/qextscintillabase.cpp
+++ b/qt/qextscintillabase.cpp
@@ -70,7 +70,7 @@ QextScintillaBase::QextScintillaBase(TQWidget *parent,const char *name,WFlags f)
 {
 	sci = 0;
 
-	TQGridLayout *tqlayout = new TQGridLayout(this,2,2);
+	TQGridLayout *layout = new TQGridLayout(this,2,2);
 
 	txtarea = new TQWidget(this,0,WRepaintNoErase|WResizeNoErase);
 	txtarea -> setSizePolicy(TQSizePolicy(TQSizePolicy::Expanding,TQSizePolicy::Expanding));
@@ -78,14 +78,14 @@ QextScintillaBase::QextScintillaBase(TQWidget *parent,const char *name,WFlags f)
 	txtarea -> setAcceptDrops(TRUE);
 	txtarea -> setFocusPolicy(WheelFocus);
 	txtarea -> setFocusProxy(this);
-	tqlayout -> addWidget(txtarea,0,0);
+	layout -> addWidget(txtarea,0,0);
 
 	vsb = new TQScrollBar(Qt::Vertical,this);
-	tqlayout -> addWidget(vsb,0,1);
+	layout -> addWidget(vsb,0,1);
 	connect(vsb,TQT_SIGNAL(valueChanged(int)),TQT_SLOT(handleVSb(int)));
 
 	hsb = new TQScrollBar(Qt::Horizontal,this);
-	tqlayout -> addWidget(hsb,1,0);
+	layout -> addWidget(hsb,1,0);
 	connect(hsb,TQT_SIGNAL(valueChanged(int)),TQT_SLOT(handleHSb(int)));
 
 	txtarea -> installEventFilter(this);
@@ -104,7 +104,7 @@ QextScintillaBase::QextScintillaBase(TQWidget *parent,const char *name,WFlags f)
 		lexersLinked = TRUE;
 	}
 
-	TQClipboard *cb = TQApplication::tqclipboard();
+	TQClipboard *cb = TQApplication::clipboard();
 
 	if (cb -> supportsSelection())
 		connect(cb,TQT_SIGNAL(selectionChanged()),TQT_SLOT(handleSelection()));
@@ -329,7 +329,7 @@ void QextScintillaBase::mousePress(TQMouseEvent *me)
 
 	case MidButton:
 		{
-			TQClipboard *cb = TQApplication::tqclipboard();
+			TQClipboard *cb = TQApplication::clipboard();
 
 			if (cb -> supportsSelection())
 			{
@@ -488,7 +488,7 @@ void QextScintillaBase::keyPressEvent(TQKeyEvent *ke)
 			// key.
 			if (ke -> text().length() == 1)
 			{
-				if ((key = ke -> text()[0].tqunicode()) >= 0x80)
+				if ((key = ke -> text()[0].unicode()) >= 0x80)
 					key = 0;
 			}
 			else
@@ -577,6 +577,6 @@ TQSize QextScintillaBase::sizeHint() const
 // Handle the selection changing.
 void QextScintillaBase::handleSelection()
 {
-	if (!TQApplication::tqclipboard() -> ownsSelection())
+	if (!TQApplication::clipboard() -> ownsSelection())
 		sci -> UnclaimSelection();
 }
diff --git a/qt/qextscintillalexercss.cpp b/qt/qextscintillalexercss.cpp
index ff15caa..6983202 100644
--- a/qt/qextscintillalexercss.cpp
+++ b/qt/qextscintillalexercss.cpp
@@ -199,16 +199,16 @@ const char *QextScintillaLexerCSS::keywords(int set) const
 			"border-top-style border-right-style "
 			"border-bottom-style border-left-style border-style "
 			"top right bottom left position z-index direction "
-			"tqunicode-bidi min-width max-width min-height "
+			"unicode-bidi min-width max-width min-height "
 			"max-height overflow clip visibility content quotes "
 			"counter-reset counter-increment marker-offset size "
 			"marks page-break-before page-break-after "
 			"page-break-inside page orphans widows font-stretch "
-			"font-size-adjust tqunicode-range units-per-em src "
+			"font-size-adjust unicode-range units-per-em src "
 			"panose-1 stemv stemh slope cap-height x-height "
 			"ascent descent widths bbox definition-src baseline "
 			"centerline mathline topline text-shadow "
-			"caption-side table-tqlayout border-collapse "
+			"caption-side table-layout border-collapse "
 			"border-spacing empty-cells speak-header cursor "
 			"outline outline-width outline-style outline-color "
 			"volume speak pause-before pause-after pause "
diff --git a/qt/qextscintillaprinter.h b/qt/qextscintillaprinter.h
index 3478b91..a938c1a 100644
--- a/qt/qextscintillaprinter.h
+++ b/qt/qextscintillaprinter.h
@@ -38,7 +38,7 @@ class QextScintillaBase;
 //! \brief The QextScintillaPrinter class is a sub-class of the TQt TQPrinter
 //! class that is able to print the text of a Scintilla document.
 //!
-//! The class can be further sub-classed to alter to tqlayout of the text, adding
+//! The class can be further sub-classed to alter to layout of the text, adding
 //! headers and footers for example.
 class TQEXTSCINTILLA_EXPORT QextScintillaPrinter : public TQPrinter
 {