Rename a number of old tq methods that are no longer tq specific

1 files changed, 13 insertions, 13 deletions

diff --git a/lib/kotext/KoRichText.cpp b/lib/kotext/KoRichText.cpp
index 42e8d2b0..cfce5f31 100644
--- a/lib/kotext/KoRichText.cpp
+++ b/lib/kotext/KoRichText.cpp
@@ -47,7 +47,7 @@
 #include <tdeversion.h>
 #include <kglobal.h>
 #include <klocale.h>
-#include <tqtextengine_p.h>
+#include <textengine_p.h>
 
 //#define DEBUG_COLLECTION
 //#define DEBUG_TABLE_RENDERING
@@ -310,7 +310,7 @@ KoTextCursor *KoTextAlignmentCommand::execute( KoTextCursor *c )
     if ( !p )
 	return c;
     while ( p ) {
-	p->tqsetAlignment( newAlign );
+	p->setAlignment( newAlign );
 	if ( p->paragId() == lastParag )
 	    break;
 	p = p->next();
@@ -326,7 +326,7 @@ KoTextCursor *KoTextAlignmentCommand::unexecute( KoTextCursor *c )
     int i = 0;
     while ( p ) {
 	if ( i < (int)oldAligns.size() )
-	    p->tqsetAlignment( oldAligns.at( i ) );
+	    p->setAlignment( oldAligns.at( i ) );
 	if ( p->paragId() == lastParag )
 	    break;
 	p = p->next();
@@ -375,7 +375,7 @@ bool KoTextCursor::operator==( const KoTextCursor &c ) const
 
 void KoTextCursor::insert( const TQString &str, bool checkNewLine, TQMemArray<KoTextStringChar> *formatting )
 {
-    string->tqinvalidate( idx );
+    string->invalidate( idx );
     tmpIndex = -1;
     bool justInsert = TRUE;
     TQString s( str );
@@ -420,7 +420,7 @@ void KoTextCursor::insert( const TQString &str, bool checkNewLine, TQMemArray<Ko
 	    if ( !s.isEmpty() )
 		string->insert( idx, s );
             else
-                string->tqinvalidate( 0 );
+                string->invalidate( 0 );
 
 	    if ( formatting ) {
 		int len = s.length();
@@ -448,7 +448,7 @@ void KoTextCursor::insert( const TQString &str, bool checkNewLine, TQMemArray<Ko
 	while ( p ) {
 	    p->setParagId( p->prev()->paragId() + 1 );
 	    //p->move( dy );
-	    p->tqinvalidate( 0 );
+	    p->invalidate( 0 );
 	    p = p->next();
 	}
     }
@@ -963,7 +963,7 @@ bool KoTextCursor::remove()
 	    KoTextParag *p = string->next();
 	    delete string;
 	    string = p;
-	    string->tqinvalidate( 0 );
+	    string->invalidate( 0 );
             //// kotext
             string->invalidateCounters();
             ////
@@ -1332,7 +1332,7 @@ TQString KoTextString::toString( const TQMemArray<KoTextStringChar> &data )
     int l = data.size();
     s.setUnicode( 0, l );
     KoTextStringChar *c = data.data();
-    TQChar *uc = (TQChar *)s.tqunicode();
+    TQChar *uc = (TQChar *)s.unicode();
     while ( l-- ) {
 	*uc = c->c;
 	uc++;
@@ -1348,7 +1348,7 @@ TQString KoTextString::toReverseString() const
     int l = length();
     s.setUnicode(0, l);
     KoTextStringChar *c = data.data() + (l-1);
-    TQChar *uc = (TQChar *)s.tqunicode();
+    TQChar *uc = (TQChar *)s.unicode();
     while ( l-- ) {
 	*uc = c->c;
 	uc++;
@@ -1505,7 +1505,7 @@ KoTextParagLineStart *KoTextFormatterBase::bidiReorderLine( KoTextParag * /*para
     str.setUnicode( 0, last - start + 1 );
     // fill string with logically ordered chars.
     KoTextStringChar *ch = startChar;
-    TQChar *qch = (TQChar *)str.tqunicode();
+    TQChar *qch = (TQChar *)str.unicode();
     while ( ch <= lastChar ) {
 	*qch = ch->c;
 	qch++;
@@ -1520,7 +1520,7 @@ KoTextParagLineStart *KoTextFormatterBase::bidiReorderLine( KoTextParag * /*para
     // now construct the reordered string out of the runs...
 
     int numSpaces = 0;
-    // set the correct tqalignment. This is a bit messy....
+    // set the correct alignment. This is a bit messy....
     if( align == TQt::AlignAuto ) {
 	// align according to directionality of the paragraph...
 	if ( text->isRightToLeft() )
@@ -1562,7 +1562,7 @@ KoTextParagLineStart *KoTextFormatterBase::bidiReorderLine( KoTextParag * /*para
 		c->rightToLeft = TRUE;
 		c->startOfRun = FALSE;
 		int ww = 0;
-		if ( c->c.tqunicode() >= 32 || c->c == '\t' || c->c == '\n' || c->isCustom() ) {
+		if ( c->c.unicode() >= 32 || c->c == '\t' || c->c == '\n' || c->isCustom() ) {
 		    ww = c->width;
 		} else {
 		    ww = c->format()->width( ' ' );
@@ -1589,7 +1589,7 @@ KoTextParagLineStart *KoTextFormatterBase::bidiReorderLine( KoTextParag * /*para
 		c->rightToLeft = FALSE;
 		c->startOfRun = FALSE;
 		int ww = 0;
-		if ( c->c.tqunicode() >= 32 || c->c == '\t' || c->isCustom() ) {
+		if ( c->c.unicode() >= 32 || c->c == '\t' || c->isCustom() ) {
 		    ww = c->width;
 		} else {
 		    ww = c->format()->width( ' ' );