1 files changed, 11 insertions, 11 deletions

diff --git a/lib/kotext/KoVariable.cpp b/lib/kotext/KoVariable.cpp
index fa1b03fe..489752f0 100644
--- a/lib/kotext/KoVariable.cpp
+++ b/lib/kotext/KoVariable.cpp
@@ -123,7 +123,7 @@ void KoVariableSettings::saveOasis( KoXmlWriter &settingsWriter ) const
     settingsWriter.addConfigItem( "displayfieldcode", m_displayFieldCode);
     // m_startingPageNumber isn't saved to OASIS. Applications must use either
     // style:page-number in the first parag of a page (see KoTextParag), or
-    // style:first-page-number in style:page-tqlayout, for spreadsheets etc.
+    // style:first-page-number in style:page-layout, for spreadsheets etc.
     if ( d->m_lastPrintingDate.isValid())
         settingsWriter.addConfigItem("lastPrintingDate", d->m_lastPrintingDate.toString(Qt::ISODate));
 
@@ -532,7 +532,7 @@ TQValueList<KoVariable *> KoVariableCollection::recalcVariables(int type)
             if ( parag )
             {
                 //kdDebug(32500) << "KoDoc::recalcVariables -> invalidating parag " << parag->paragId() << endl;
-                parag->tqinvalidate( 0 );
+                parag->invalidate( 0 );
                 parag->setChanged( true );
             }
         }
@@ -896,7 +896,7 @@ void KoVariable::recalcAndRepaint()
     if ( parag )
     {
         //kdDebug(32500) << "KoVariable::recalcAndRepaint -> invalidating parag " << parag->paragId() << endl;
-        parag->tqinvalidate( 0 );
+        parag->invalidate( 0 );
         parag->setChanged( true );
     }
     textDocument()->emitRepaintChanged();
@@ -978,7 +978,7 @@ void KoVariable::drawCustomItemHelper( TQPainter* p, int x, int y, int wpix, int
     //p->drawText( x, posY, str );
     // We can't just drawText, it wouldn't use the same kerning as the one
     // that resize() planned for [which is zoom-independent].
-    // We need to do the tqlayout using tqlayout units instead, so for simplicity
+    // We need to do the layout using layout units instead, so for simplicity
     // I just draw every char individually (whereas KoTextFormatter/KoTextParag
     // detect runs of text that can be drawn together)
     const int len = str.length();
@@ -988,9 +988,9 @@ void KoVariable::drawCustomItemHelper( TQPainter* p, int x, int y, int wpix, int
     {
         const TQChar ch = str[i];
         p->drawText( x, posY, TQString(ch) );
-        // Do like KoTextFormatter: do the tqlayout in tqlayout units.
+        // Do like KoTextFormatter: do the layout in layout units.
         xLU += KoTextZoomHandler::ptToLayoutUnitPt( fm.width( ch ) );
-        // And then compute the X position in pixels from the tqlayout unit X.
+        // And then compute the X position in pixels from the layout unit X.
         x = zh->layoutUnitToPixelX( xLU );
     }
 
@@ -1211,7 +1211,7 @@ void KoDateVariable::resize()
 void KoDateVariable::recalc()
 {
     if ( m_subtype == VST_DATE_CURRENT )
-        m_varValue = TQDateTime(TQDateTime::tqcurrentDateTime().addDays(m_correctDate));
+        m_varValue = TQDateTime(TQDateTime::currentDateTime().addDays(m_correctDate));
     else if ( m_subtype == VST_DATE_LAST_PRINTING )
         m_varValue = m_varColl->variableSetting()->lastPrintingDate();
     else if ( m_subtype == VST_DATE_CREATE_FILE )
@@ -1222,7 +1222,7 @@ void KoDateVariable::recalc()
     {
         // Only if never set before (i.e. upon insertion)
         if ( m_varValue.isNull() )
-            m_varValue = TQDateTime(TQDateTime::tqcurrentDateTime().addDays(m_correctDate));
+            m_varValue = TQDateTime(TQDateTime::currentDateTime().addDays(m_correctDate));
     }
     resize();
 }
@@ -1319,9 +1319,9 @@ void KoDateVariable::saveOasis( KoXmlWriter& writer, KoSavingContext& context )
         else if ( value.lower() == "localeshort" )
             value = KGlobal::locale()->dateFormatShort();
         else if ( value.lower() == "localedatetime" )
-            value =  TQString( "%1 %2" ).tqarg( KGlobal::locale()->dateFormat() ).tqarg( KGlobal::locale()->timeFormat() );
+            value =  TQString( "%1 %2" ).arg( KGlobal::locale()->dateFormat() ).arg( KGlobal::locale()->timeFormat() );
         else if ( value.lower() == "localedatetimeshort" )
-            value =  TQString( "%1 %2" ).tqarg( KGlobal::locale()->dateFormatShort() ).tqarg( KGlobal::locale()->timeFormat() );
+            value =  TQString( "%1 %2" ).arg( KGlobal::locale()->dateFormatShort() ).arg( KGlobal::locale()->timeFormat() );
         klocaleFormat = true;
     }
     writer.addAttribute( "style:data-style-name", KoOasisStyles::saveOasisDateStyle(context.mainStyles(), value, klocaleFormat ) );
@@ -2505,7 +2505,7 @@ void KoLinkVariable::drawCustomItem( TQPainter* p, int x, int y, int wpix, int h
 /******************************************************************/
 KoNoteVariable::KoNoteVariable( KoTextDocument *textdoc, const TQString & _note,KoVariableFormat *varFormat,KoVariableCollection *_varColl )
     : KoVariable( textdoc, varFormat,_varColl )
-    , m_createdNoteDate( TQDate::tqcurrentDate() )
+    , m_createdNoteDate( TQDate::currentDate() )
 {
     m_varValue = TQVariant( _note );
 }