1 files changed, 13 insertions, 13 deletions

diff --git a/kword/KWView.cpp b/kword/KWView.cpp
index 4ec739eb..d8d36c66 100644
--- a/kword/KWView.cpp
+++ b/kword/KWView.cpp
@@ -288,27 +288,27 @@ KWView::KWView( const TQString& viewMode, TQWidget *parent, const char *name, KW
     if ( KStatusBar* sb = statusBar() ) // No statusbar in e.g. konqueror
     {
         m_sbPageLabel = new KStatusBarLabel( TQString(), 0, sb );
-        m_sbPageLabel->tqsetAlignment( AlignLeft | AlignVCenter );
+        m_sbPageLabel->setAlignment( AlignLeft | AlignVCenter );
         addStatusBarItem( m_sbPageLabel, 0 );
 
         m_sbModifiedLabel = new KStatusBarLabel( "   ", 0, sb );
-        m_sbModifiedLabel->tqsetAlignment( AlignLeft | AlignVCenter );
+        m_sbModifiedLabel->setAlignment( AlignLeft | AlignVCenter );
         addStatusBarItem( m_sbModifiedLabel, 0 );
 
         m_sbFramesLabel = new KStatusBarLabel( TQString(), 0, sb );
-        m_sbFramesLabel->tqsetAlignment( AlignLeft | AlignVCenter );
+        m_sbFramesLabel->setAlignment( AlignLeft | AlignVCenter );
         addStatusBarItem( m_sbFramesLabel, 1 );
 
         m_sbOverwriteLabel = new KStatusBarLabel( ' ' + i18n( "INSRT" ) + ' ', 0, sb );
-        m_sbOverwriteLabel->tqsetAlignment( AlignHCenter | AlignVCenter );
+        m_sbOverwriteLabel->setAlignment( AlignHCenter | AlignVCenter );
         addStatusBarItem( m_sbOverwriteLabel, 0 );
 
         m_sbZoomLabel = new KStatusBarLabel( ' ' + TQString::number( m_doc->zoom() ) + "% ", 0, sb );
-        m_sbZoomLabel->tqsetAlignment( AlignHCenter | AlignVCenter );
+        m_sbZoomLabel->setAlignment( AlignHCenter | AlignVCenter );
         addStatusBarItem( m_sbZoomLabel, 0 );
 
         m_sbUnitLabel = new KStatusBarLabel( ' ' + KoUnit::unitDescription( m_doc->unit() ) + ' ', 0, sb );
-        m_sbUnitLabel->tqsetAlignment( AlignHCenter | AlignVCenter );
+        m_sbUnitLabel->setAlignment( AlignHCenter | AlignVCenter );
         addStatusBarItem( m_sbUnitLabel, 0 );
     }
 
@@ -1938,7 +1938,7 @@ void KWView::print( KPrinter &prt )
         m_doc->variableCollection()->recalcVariables(VT_MAILMERGE);
 
     painter.end(); // this is what triggers the printing
-    m_doc->variableCollection()->variableSetting()->setLastPrintingDate(TQDateTime::tqcurrentDateTime());
+    m_doc->variableCollection()->variableSetting()->setLastPrintingDate(TQDateTime::currentDateTime());
     m_doc->recalcVariables( VT_DATE );
 }
 
@@ -2433,7 +2433,7 @@ void KWView::pasteData( TQMimeSource* data, bool drop )
             TQCString returnedTypeMime = KoTextObject::providesOasis( data );
             if ( !returnedTypeMime.isEmpty() )
             {
-                const TQByteArray arr = data->tqencodedData( returnedTypeMime );
+                const TQByteArray arr = data->encodedData( returnedTypeMime );
                 if( !arr.isEmpty() )
                 {
                     TQBuffer buffer( arr );
@@ -2836,7 +2836,7 @@ void KWView::createLinkedFrame()
     if (selectedFrames.count() != 1)
         return; // action is disabled in such a case
     KWFrame* frame = selectedFrames[0]->frame();
-    KWFrame* newFrame = new KWFrame(0L, frame->x() + m_gui->getVertRuler()->tqminimumSizeHint().width(), frame->y() + m_gui->getHorzRuler()->tqminimumSizeHint().height(), frame->width(), frame->height() );
+    KWFrame* newFrame = new KWFrame(0L, frame->x() + m_gui->getVertRuler()->minimumSizeHint().width(), frame->y() + m_gui->getHorzRuler()->minimumSizeHint().height(), frame->width(), frame->height() );
     newFrame->setZOrder( m_doc->maxZOrder( newFrame->pageNumber(m_doc) ) + 1 ); // make sure it's on top
     newFrame->setCopy(true);
     newFrame->setNewFrameBehavior( KWFrame::Copy );
@@ -4112,7 +4112,7 @@ void KWView::insertFormula( TQMimeSource* source )
         KWFormulaFrameSet *frameset = new KWFormulaFrameSet( m_doc, TQString() );
         m_doc->addFrameSet( frameset, false ); // done first since the frame number is stored in the undo/redo
         if ( source ) {
-            TQByteArray data = source->tqencodedData( KFormula::MimeSource::selectionMimeType() );
+            TQByteArray data = source->encodedData( KFormula::MimeSource::selectionMimeType() );
             TQDomDocument formula;
             formula.setContent( data );
             TQDomElement formulaElem = formula.namedItem("math").toElement();
@@ -5021,7 +5021,7 @@ void KWView::textSpacingDouble()
 
 void KWView::slotCounterStyleSelected()
 {
-    TQString actionName = TQString::tqfromLatin1(TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender()))->name());
+    TQString actionName = TQString::fromLatin1(TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender()))->name());
     TQString styleStr = actionName.mid(13);
     //kdDebug() << "KWView::slotCounterStyleSelected styleStr=" << styleStr << endl;
     KoParagCounter::Style style = (KoParagCounter::Style)(styleStr.toInt());
@@ -7680,8 +7680,8 @@ void KWGUI::resizeEvent( TQResizeEvent *e )
 
 void KWGUI::reorganize()
 {
-    int hSpace = m_vertRuler->tqminimumSizeHint().width();
-    int vSpace = m_horRuler->tqminimumSizeHint().height();
+    int hSpace = m_vertRuler->minimumSizeHint().width();
+    int vSpace = m_horRuler->minimumSizeHint().height();
     if(m_view->kWordDocument()->showRuler())
     {
         m_vertRuler->show();