Remove additional unneeded tq method conversions

1 files changed, 53 insertions, 53 deletions

diff --git a/kpresenter/KPrView.cpp b/kpresenter/KPrView.cpp
index 13e912f1..a2781ca1 100644
--- a/kpresenter/KPrView.cpp
+++ b/kpresenter/KPrView.cpp
@@ -579,7 +579,7 @@ void KPrView::print( KPrinter &prt )
         m_pKPresenterDoc->recalcVariables( VT_ALL );
     }
 
-    m_canvas->tqrepaint();
+    m_canvas->repaint();
     kdDebug(33001) << "KPrView::print zoom&res reset" << endl;
     m_pKPresenterDoc->getVariableCollection()->variableSetting()->setLastPrintingDate(TQDateTime::currentDateTime());
     m_pKPresenterDoc->recalcVariables( VT_DATE );
@@ -846,7 +846,7 @@ void KPrView::savePicture( const TQString& oldName, KoPicture& picture)
                             if ( !KIO::NetAccess::upload( tempFile.name(), url, this ) )
                             {
                                 KMessageBox::sorry( this, i18n(
-                                   "Unable to save the file to '%1'. %2.").tqarg( url.prettyURL() ).tqarg( KIO::NetAccess::lastErrorString() ),
+                                   "Unable to save the file to '%1'. %2.").arg( url.prettyURL() ).arg( KIO::NetAccess::lastErrorString() ),
                                    i18n("Save Failed") );
                             }
                         }
@@ -857,7 +857,7 @@ void KPrView::savePicture( const TQString& oldName, KoPicture& picture)
                     }
                     else
                         KMessageBox::sorry( this, i18n(
-                            "Error during saving: could not create temporary file: %1.").tqarg( strerror( tempFile.status() ) ),
+                            "Error during saving: could not create temporary file: %1.").arg( strerror( tempFile.status() ) ),
                             i18n("Save Picture") );
                 }
             }
@@ -1580,7 +1580,7 @@ void KPrView::startScreenPres( int pgNum /*1-based*/ )
         if ( !kPresenterDoc()->spManualSwitch() )
         {
              m_autoPresStop = false;
-             m_pKPresenterDoc->tqrepaint( false );
+             m_pKPresenterDoc->repaint( false );
 
              if ( ! m_autoPresTimerConnected ) {
                  connect( &m_autoPresTimer, TQT_SIGNAL( timeout() ), TQT_SLOT( doAutomaticScreenPres() ) );
@@ -2414,7 +2414,7 @@ void KPrView::setupActions()
     actionToolsZoom->setExclusiveGroup( "tools" );
 
     actionToolsShapePopup = new KActionMenu( i18n( "&Shape" ), "rectangle",
-                                             actionCollection(), "tools_tqshapepopup" );
+                                             actionCollection(), "tools_shapepopup" );
     actionToolsShapePopup->setDelayed(true);
     connect(actionToolsShapePopup, TQT_SIGNAL(activated()), TQT_TQOBJECT(this), TQT_SLOT(toolsShapePopup()));
 
@@ -2597,7 +2597,7 @@ void KPrView::setupActions()
         // This approach allows to edit toolbars and extract separate actions from this menu
         KToggleAction* act = new KToggleAction( styleIt.current()->name(), /*TODO icon,*/
                                                 0, TQT_TQOBJECT(this), TQT_SLOT( slotCounterStyleSelected() ),
-                                                actionCollection(), TQString("counterstyle_%1").tqarg( styleIt.current()->style() ).latin1() );
+                                                actionCollection(), TQString("counterstyle_%1").arg( styleIt.current()->style() ).latin1() );
         act->setExclusiveGroup( "counterstyle" );
         // Add to the right menu: both for "none", bullet for bullets, numbers otherwise
         if ( styleIt.current()->style() == KoParagCounter::STYLE_NONE ) {
@@ -3096,19 +3096,19 @@ void KPrView::setupActions()
     actionAlignVerticalTop = new KToggleAction( i18n( "Align Top" ), 0,
                                                 TQT_TQOBJECT(this), TQT_SLOT( alignVerticalTop() ),
                                                 actionCollection(), "align_top" );
-    actionAlignVerticalTop->setExclusiveGroup( "vertical_tqalignment" );
+    actionAlignVerticalTop->setExclusiveGroup( "vertical_alignment" );
     actionAlignVerticalTop->setChecked( true );
 
 
     actionAlignVerticalBottom = new KToggleAction( i18n( "Align Bottom" ), 0,
                                                    TQT_TQOBJECT(this), TQT_SLOT( alignVerticalBottom() ),
                                                    actionCollection(), "align_bottom" );
-    actionAlignVerticalBottom->setExclusiveGroup( "vertical_tqalignment" );
+    actionAlignVerticalBottom->setExclusiveGroup( "vertical_alignment" );
 
     actionAlignVerticalCenter = new KToggleAction( i18n( "Align Middle" ), 0,
                                                    TQT_TQOBJECT(this), TQT_SLOT( alignVerticalCenter() ),
                                                    actionCollection(), "align_center" );
-    actionAlignVerticalCenter->setExclusiveGroup( "vertical_tqalignment" );
+    actionAlignVerticalCenter->setExclusiveGroup( "vertical_alignment" );
 
 
     actionSavePicture= new KAction( i18n("Save Picture..."), 0,
@@ -3717,7 +3717,7 @@ void KPrView::setupPopupMenus()
     actionToolsLinePopup->insert(actionToolsCubicBezierCurve);
     actionToolsLinePopup->insert(actionToolsQuadricBezierCurve);
 
-    // create insert-tqshape popup
+    // create insert-shape popup
     actionToolsShapePopup->insert(actionToolsRectangle);
     actionToolsShapePopup->insert(actionToolsCircleOrEllipse);
     actionToolsShapePopup->insert(actionToolsPie);
@@ -3847,7 +3847,7 @@ void KPrView::skipToPage( int num )
     //(Laurent) deselect object when we change page.
     //otherwise you can change object properties on other page
     deSelectAllObjects();
-    m_pKPresenterDoc->tqrepaint( FALSE );
+    m_pKPresenterDoc->repaint( FALSE );
 
     m_pKPresenterDoc->displayActivePage( page );
 }
@@ -4102,7 +4102,7 @@ void KPrView::updatePageInfo()
 {
     if (m_sbPageLabel)
         m_sbPageLabel->setText( TQString(" ") +
-                                i18n("Slide %1/%2").tqarg(getCurrPgNum()).tqarg(m_pKPresenterDoc->getPageNums())+
+                                i18n("Slide %1/%2").arg(getCurrPgNum()).arg(m_pKPresenterDoc->getPageNums())+
                                 TQString(" ") );
 }
 
@@ -4120,13 +4120,13 @@ void KPrView::updateObjectStatusBarItem()
             KPrObject * obj = m_canvas->getSelectedObj();
             KoSize size = obj->getSize();
             m_sbObjectLabel->setText( ' ' + i18n( "Statusbar info", "%1: %2, %3 - %4, %5 (width: %6, height: %7)" )
-                    .tqarg( /*frame->frameSet()->name()*/obj->getObjectName() )
-                    .tqarg( KoUnit::toUserStringValue( obj->getOrig().x(), unit ) )
-                    .tqarg( KoUnit::toUserStringValue( obj->getOrig().y() , unit) )
-                    .tqarg( KoUnit::toUserStringValue( obj->getOrig().x() + size.width(), unit ) )
-                    .tqarg( KoUnit::toUserStringValue( obj->getOrig().y() + size.height(), unit ) )
-                    .tqarg( KoUnit::toUserStringValue( size.width(), unit ) )
-                    .tqarg( KoUnit::toUserStringValue( size.height(), unit ) ) );
+                    .arg( /*frame->frameSet()->name()*/obj->getObjectName() )
+                    .arg( KoUnit::toUserStringValue( obj->getOrig().x(), unit ) )
+                    .arg( KoUnit::toUserStringValue( obj->getOrig().y() , unit) )
+                    .arg( KoUnit::toUserStringValue( obj->getOrig().x() + size.width(), unit ) )
+                    .arg( KoUnit::toUserStringValue( obj->getOrig().y() + size.height(), unit ) )
+                    .arg( KoUnit::toUserStringValue( size.width(), unit ) )
+                    .arg( KoUnit::toUserStringValue( size.height(), unit ) ) );
         }
         else
             m_sbObjectLabel->setText( i18n("1 object selected", "%n objects selected", nbSelected) );
@@ -4206,7 +4206,7 @@ void KPrView::setEditMaster( bool editMaster )
         if ( sidebar )
             sidebar->setViewMasterPage( m_editMaster );
         updateNoteBarText();
-        m_canvas->tqrepaint( false );
+        m_canvas->repaint( false );
     }
 }
 
@@ -4675,7 +4675,7 @@ void KPrView::spellCheckerMisspelling( const TQString &old, int pos )
 
     kdDebug() << "KWView::spellCheckerMisspelling parag=" << parag->paragId() << " pos=" << pos << " length=" << old.length() << endl;
 
-    textdoc->textObject()->highlightPortion( parag, pos, old.length(), m_canvas,true/*tqrepaint*/ );
+    textdoc->textObject()->highlightPortion( parag, pos, old.length(), m_canvas,true/*repaint*/ );
 }
 
 void KPrView::spellCheckerCorrected( const TQString &old, int pos, const TQString &corr )
@@ -4694,7 +4694,7 @@ void KPrView::spellCheckerCorrected( const TQString &old, int pos, const TQStrin
     if ( !textdoc )
         return;
     pos += m_spell.kospell->currentStartIndex();
-    textdoc->textObject()->highlightPortion( parag, pos, old.length(), m_canvas,true/*tqrepaint*/ );
+    textdoc->textObject()->highlightPortion( parag, pos, old.length(), m_canvas,true/*repaint*/ );
 
     KoTextCursor cursor( textdoc );
     cursor.setParag( parag );
@@ -4881,7 +4881,7 @@ void KPrView::refreshCustomMenu()
             if ( !lst.contains( varName) )
             {
                 lst.append( varName );
-                TQCString name = TQString("custom-action_%1").tqarg(i).latin1();
+                TQCString name = TQString("custom-action_%1").arg(i).latin1();
                 act = new KAction( varName, shortCuts[varName], TQT_TQOBJECT(this),
                                    TQT_SLOT( insertCustomVariable() ), actionCollection(), name );
 
@@ -4896,7 +4896,7 @@ void KPrView::refreshCustomMenu()
         actionInsertCustom->popupMenu()->insertSeparator();
 
     act = new KAction( i18n("New..."), 0, TQT_TQOBJECT(this), TQT_SLOT( insertNewCustomVariable() ), actionCollection(),
-                       TQString("custom-action_%1").tqarg(i).latin1() );
+                       TQString("custom-action_%1").arg(i).latin1() );
     act->setGroup( "custom-variable-action" );
     actionInsertCustom->insert( act );
 
@@ -5067,7 +5067,7 @@ void KPrView::slotUpdateRuler()
                 if( getHRuler()->flags()!= flags )
                 {
                     getHRuler()->changeFlags(flags);
-                    getHRuler()->tqrepaint();
+                    getHRuler()->repaint();
                 }
             }
             if( getVRuler())
@@ -5075,7 +5075,7 @@ void KPrView::slotUpdateRuler()
                 if( getVRuler()->flags() != 0 )
                 {
                     getVRuler()->changeFlags(0);
-                    getVRuler()->tqrepaint();
+                    getVRuler()->repaint();
                 }
             }
         }
@@ -5244,22 +5244,22 @@ void KPrView::changeZoomMenu( int zoom )
         qHeapSort( list );
 
         for (TQValueList<int>::Iterator it = list.begin() ; it != list.end() ; ++it)
-            lst.append( i18n("%1%").tqarg(*it) );
+            lst.append( i18n("%1%").arg(*it) );
     }
     else
     {
-        lst << i18n("%1%").tqarg("33");
-        lst << i18n("%1%").tqarg("50");
-        lst << i18n("%1%").tqarg("75");
-        lst << i18n("%1%").tqarg("100");
-        lst << i18n("%1%").tqarg("125");
-        lst << i18n("%1%").tqarg("150");
-        lst << i18n("%1%").tqarg("200");
-        lst << i18n("%1%").tqarg("250");
-        lst << i18n("%1%").tqarg("350");
-        lst << i18n("%1%").tqarg("400");
-        lst << i18n("%1%").tqarg("450");
-        lst << i18n("%1%").tqarg("500");
+        lst << i18n("%1%").arg("33");
+        lst << i18n("%1%").arg("50");
+        lst << i18n("%1%").arg("75");
+        lst << i18n("%1%").arg("100");
+        lst << i18n("%1%").arg("125");
+        lst << i18n("%1%").arg("150");
+        lst << i18n("%1%").arg("200");
+        lst << i18n("%1%").arg("250");
+        lst << i18n("%1%").arg("350");
+        lst << i18n("%1%").arg("400");
+        lst << i18n("%1%").arg("450");
+        lst << i18n("%1%").arg("500");
     }
     actionViewZoom->setItems( lst );
 }
@@ -5267,7 +5267,7 @@ void KPrView::changeZoomMenu( int zoom )
 void KPrView::showZoom( int zoom )
 {
     TQStringList list = actionViewZoom->items();
-    TQString zoomStr( i18n("%1%").tqarg( zoom ) );
+    TQString zoomStr( i18n("%1%").arg( zoom ) );
     int pos = list.findIndex(zoomStr);
     if( pos == -1)
     {
@@ -5315,7 +5315,7 @@ void KPrView::viewZoom( const TQString &s )
     }
 
     m_canvas->setFocus();
-    m_canvas->tqrepaint();
+    m_canvas->repaint();
 }
 
 void KPrView::setZoomRect( const KoRect & rect )
@@ -5331,7 +5331,7 @@ void KPrView::setZoomRect( const KoRect & rect )
     m_canvas->setToolEditMode( TEM_MOUSE );
     m_canvas->scrollTopLeftPoint( zoomHandler()->zoomPoint( rect.topLeft() ) );
     m_canvas->setUpdatesEnabled( true );
-    m_canvas->tqrepaint();
+    m_canvas->repaint();
 }
 
 void KPrView::setZoom( int zoom, bool updateViews )
@@ -5361,7 +5361,7 @@ void KPrView::slotViewFormattingChars()
 {
     m_pKPresenterDoc->setViewFormattingChars(actionViewFormattingChars->isChecked());
     m_pKPresenterDoc->tqlayout(); // Due to the different formatting when this option is activated
-    m_pKPresenterDoc->tqrepaint(false);
+    m_pKPresenterDoc->repaint(false);
 }
 
 void KPrView::setPageDuration( int _pgNum )
@@ -5647,7 +5647,7 @@ void KPrView::viewGuideLines()
     m_pKPresenterDoc->updateGuideLineButton();
     deSelectAllObjects();
     refreshRuler( state );
-    m_pKPresenterDoc->tqrepaint(false);
+    m_pKPresenterDoc->repaint(false);
 }
 
 
@@ -5656,7 +5656,7 @@ void KPrView::viewGrid()
     m_pKPresenterDoc->setShowGrid( actionViewShowGrid->isChecked() );
     m_pKPresenterDoc->setModified( true );
     m_pKPresenterDoc->updateGridButton();
-    m_pKPresenterDoc->tqrepaint(false);
+    m_pKPresenterDoc->repaint(false);
 }
 
 
@@ -5681,7 +5681,7 @@ void KPrView::refreshRuler( bool state )
         if ( !m_pKPresenterDoc->isReadWrite())
         {
             getHRuler()->changeFlags(KoRuler::F_NORESIZE);
-            getHRuler()->tqrepaint();
+            getHRuler()->repaint();
         }
         else
         {
@@ -5690,7 +5690,7 @@ void KPrView::refreshRuler( bool state )
                 if( getHRuler()->flags() != KoRuler::F_HELPLINES )
                 {
                     getHRuler()->changeFlags(KoRuler::F_HELPLINES);
-                    getHRuler()->tqrepaint();
+                    getHRuler()->repaint();
                 }
             }
             else
@@ -5698,7 +5698,7 @@ void KPrView::refreshRuler( bool state )
                 if( getHRuler()->flags() != 0 )
                 {
                     getHRuler()->changeFlags( 0 );
-                    getHRuler()->tqrepaint();
+                    getHRuler()->repaint();
                 }
             }
         }
@@ -5709,7 +5709,7 @@ void KPrView::refreshRuler( bool state )
         if ( !m_pKPresenterDoc->isReadWrite())
         {
             getVRuler()->changeFlags(KoRuler::F_NORESIZE);
-            getVRuler()->tqrepaint();
+            getVRuler()->repaint();
         }
         else
         {
@@ -5718,7 +5718,7 @@ void KPrView::refreshRuler( bool state )
                 if( getVRuler()->flags() != KoRuler::F_HELPLINES )
                 {
                     getVRuler()->changeFlags(KoRuler::F_HELPLINES);
-                    getVRuler()->tqrepaint();
+                    getVRuler()->repaint();
                 }
             }
             else
@@ -5726,7 +5726,7 @@ void KPrView::refreshRuler( bool state )
                 if( getVRuler()->flags()!= 0)
                 {
                     getVRuler()->changeFlags(0);
-                    getVRuler()->tqrepaint();
+                    getVRuler()->repaint();
                 }
             }
         }
@@ -5889,7 +5889,7 @@ void KPrView::slotObjectEditChanged()
         KoParagCounter counter;
         if(paragLayout->counter)
             counter = *(paragLayout->counter);
-        int align = paragLayout->tqalignment;
+        int align = paragLayout->alignment;
         if ( align == TQt::AlignAuto )
             align = TQt::AlignLeft; // ## seems hard to detect RTL here
         alignChanged( align );
@@ -6224,7 +6224,7 @@ void KPrView::updateRulerInProtectContentMode()
             getHRuler()->changeFlags(KoRuler::F_INDENTS | KoRuler::F_TABS);
         else
             getHRuler()->changeFlags(0);
-        getHRuler()->tqrepaint();
+        getHRuler()->repaint();
     }
 }