Remove additional unneeded tq method conversions

1 files changed, 19 insertions, 19 deletions

diff --git a/filters/kword/rtf/import/rtfimport.cpp b/filters/kword/rtf/import/rtfimport.cpp
index 5bfadbcbb..465a74784 100644
--- a/filters/kword/rtf/import/rtfimport.cpp
+++ b/filters/kword/rtf/import/rtfimport.cpp
@@ -202,11 +202,11 @@ static RTFProperty propertyTable[] =
 	PROP(	0L,		"plain",	setPlainFormatting,	0L, 0 ),
 	PROP(	"@pict",	"pmmetafile",	setPictureType,	        0L, RTFPicture::WMF ),
 	PROP(	"@pict",	"pngblip",	setPictureType,	        0L, RTFPicture::PNG ),
-	MEMBER(	0L,		"qc",		setEnumProperty,	state.tqlayout.tqalignment, RTFLayout::Centered ),
-	MEMBER(	0L,		"qj",		setEnumProperty,	state.tqlayout.tqalignment, RTFLayout::Justified ),
-	MEMBER(	0L,		"ql",		setEnumProperty,	state.tqlayout.tqalignment, RTFLayout::Left ),
+	MEMBER(	0L,		"qc",		setEnumProperty,	state.tqlayout.alignment, RTFLayout::Centered ),
+	MEMBER(	0L,		"qj",		setEnumProperty,	state.tqlayout.alignment, RTFLayout::Justified ),
+	MEMBER(	0L,		"ql",		setEnumProperty,	state.tqlayout.alignment, RTFLayout::Left ),
 	PROP(	0L,		"qmspace",	insertSymbol,		0L, 0x2004 ),
-	MEMBER(	0L,		"qr",		setEnumProperty,	state.tqlayout.tqalignment, RTFLayout::Right ),
+	MEMBER(	0L,		"qr",		setEnumProperty,	state.tqlayout.alignment, RTFLayout::Right ),
 	PROP(	0L,		"rdblquote",	insertSymbol,		0L, 0x201d ),
 	MEMBER(	"@colortbl",	"red",		setNumericProperty,	red, 0 ),
 	MEMBER(	0L,		"ri",		setNumericProperty,	state.tqlayout.rightIndent, 0 ),
@@ -237,9 +237,9 @@ static RTFProperty propertyTable[] =
 	MEMBER(	0L,		"tqr",		setEnumProperty,	state.tqlayout.tab.type, RTFTab::FlushRight ),
 	MEMBER(	0L,		"trleft",	setNumericProperty,	state.tableRow.left, 0 ),
 	MEMBER(	0L,		"trowd",	setTableRowDefaults,	state.tableRow, 0 ),
-	MEMBER(	0L,		"trqc",		setEnumProperty,	state.tableRow.tqalignment, RTFLayout::Centered ),
-	MEMBER(	0L,		"trql",		setEnumProperty,	state.tableRow.tqalignment, RTFLayout::Left ),
-	MEMBER(	0L,		"trqr",		setEnumProperty,	state.tableRow.tqalignment, RTFLayout::Right ),
+	MEMBER(	0L,		"trqc",		setEnumProperty,	state.tableRow.alignment, RTFLayout::Centered ),
+	MEMBER(	0L,		"trql",		setEnumProperty,	state.tableRow.alignment, RTFLayout::Left ),
+	MEMBER(	0L,		"trqr",		setEnumProperty,	state.tableRow.alignment, RTFLayout::Right ),
 	MEMBER(	0L,		"trrh",		setNumericProperty,	state.tableRow.height, 0 ),
 	PROP(	0L,		"tx",		insertTabDef,		0L, 0 ),
 	MEMBER(	0L,		"u",		insertUnicodeSymbol,	state.format.uc, 0 ),
@@ -384,7 +384,7 @@ KoFilter::ConversionStatus RTFImport::convert( const TQCString& from, const TQCS
             if ( !m_batch )
             {
                 force = ( KMessageBox::warningYesNo( 0L,
-                    i18n("The RTF (Rich Text Format) document has an unexpected version number: %1. Continuing might result in an erroneous conversion. Do you want to continue?").tqarg( token.value ),
+                    i18n("The RTF (Rich Text Format) document has an unexpected version number: %1. Continuing might result in an erroneous conversion. Do you want to continue?").arg( token.value ),
                     i18n("KWord's RTF Import Filter") ) == KMessageBox::Yes );
             }
             if ( !force )
@@ -403,7 +403,7 @@ KoFilter::ConversionStatus RTFImport::convert( const TQCString& from, const TQCS
             if ( !m_batch )
             {
                 force = ( KMessageBox::warningYesNo( 0L,
-                    i18n("The PWD (PocketWord's Rich Text Format) document has an unexpected version number: %1. Continuing might result in an erroneous conversion. Do you want to continue?").tqarg( token.value ),
+                    i18n("The PWD (PocketWord's Rich Text Format) document has an unexpected version number: %1. Continuing might result in an erroneous conversion. Do you want to continue?").arg( token.value ),
                     i18n("KWord's RTF Import Filter") ) == KMessageBox::Yes );
             }
             if ( !force )
@@ -422,7 +422,7 @@ KoFilter::ConversionStatus RTFImport::convert( const TQCString& from, const TQCS
             if ( !m_batch )
             {
                 force = ( KMessageBox::warningYesNo( 0L,
-                    i18n("The URTF (\"Unicode Rich Text Format\") document has an unexpected version number: %1. Continuing might result in an erroneous conversion. Do you want to continue?").tqarg( token.value ),
+                    i18n("The URTF (\"Unicode Rich Text Format\") document has an unexpected version number: %1. Continuing might result in an erroneous conversion. Do you want to continue?").arg( token.value ),
                     i18n("KWord's RTF Import Filter") ) == KMessageBox::Yes );
             }
             if ( !force )
@@ -439,7 +439,7 @@ KoFilter::ConversionStatus RTFImport::convert( const TQCString& from, const TQCS
         if ( !m_batch )
         {
             KMessageBox::error( 0L,
-                i18n("The RTF document cannot be loaded, as it has an unexpected first keyword: \\%1.").tqarg( token.text ),
+                i18n("The RTF document cannot be loaded, as it has an unexpected first keyword: \\%1.").arg( token.text ),
                 i18n("KWord's RTF Import Filter"), 0 );
         }
         return KoFilter::WrongFormat;
@@ -793,7 +793,7 @@ KoFilter::ConversionStatus RTFImport::convert( const TQCString& from, const TQCS
 
     for (TQMap<TQString,int>::ConstIterator it=debugUnknownKeywords.begin();
         it!=debugUnknownKeywords.end();it++)
-        kdDebug(30515) << "Unknown keyword: " << TQString( "%1" ).tqarg( it.data(), 4 )  << " * " << it.key() << endl;
+        kdDebug(30515) << "Unknown keyword: " << TQString( "%1" ).arg( it.data(), 4 )  << " * " << it.key() << endl;
 
     return KoFilter::OK;
 }
@@ -1029,7 +1029,7 @@ void RTFImport::setParagraphDefaults( RTFProperty * )
     tqlayout.spaceBetween	= 0;
     tqlayout.spaceBetweenMultiple = false;
     tqlayout.style	= 0;
-    tqlayout.tqalignment	= RTFLayout::Left;
+    tqlayout.alignment	= RTFLayout::Left;
     tqlayout.border	= 0L;
     tqlayout.inTable	= false;
     tqlayout.keep		= false;
@@ -1054,7 +1054,7 @@ void RTFImport::setTableRowDefaults( RTFProperty * )
 
     tableRow.height	= 0;
     tableRow.left	= 0;
-    tableRow.tqalignment	= RTFLayout::Left;
+    tableRow.alignment	= RTFLayout::Left;
     tableRow.cells.clear();
     tableCell.bgcolor	= -1;
 
@@ -1130,12 +1130,12 @@ void RTFImport::insertTableRow( RTFProperty * )
 	{
 	    char buf[64];
 	    sprintf( buf, "Table %d", textState->table );
-	    RTFLayout::Alignment align = row.tqalignment;
+	    RTFLayout::Alignment align = row.alignment;
 
 	    // Store the current state on the stack
 	    stateStack.push( state );
 	    resetState();
-	    state.tqlayout.tqalignment = align;	// table tqalignment
+	    state.tqlayout.alignment = align;	// table alignment
 
 	    // Add anchor for new table (default tqlayout)
 	    addAnchor( buf );
@@ -2055,7 +2055,7 @@ void RTFImport::addFormat( DomNode &node, const KWFormat& format, const RTFForma
     int vertAlign0 = ~vertAlign;
     int fontSize0  = ~fontSize;
 
-    // Adjust vertical tqalignment and font size if (\dn, \up) are used
+    // Adjust vertical alignment and font size if (\dn, \up) are used
     if (format.fmt.vertAlign == RTFFormat::Normal && format.fmt.baseline)
     {
 	if (format.fmt.baseline < 0)
@@ -2263,12 +2263,12 @@ void RTFImport::addFormat( DomNode &node, const KWFormat& format, const RTFForma
 
 void RTFImport::addLayout( DomNode &node, const TQString &name, const RTFLayout &tqlayout, bool frameBreak )
 {
-    // Style name and tqalignment
+    // Style name and alignment
     node.addNode( "NAME" );
       node.setAttribute( "value", CheckAndEscapeXmlText(name) );
     node.closeNode( "NAME" );
     node.addNode( "FLOW" );
-      node.setAttribute( "align", alignN[tqlayout.tqalignment] );
+      node.setAttribute( "align", alignN[tqlayout.alignment] );
     node.closeNode( "FLOW" );
 
     // Indents