diff options
author | Timothy Pearson <[email protected]> | 2011-12-19 11:38:41 -0600 |
---|---|---|
committer | Timothy Pearson <[email protected]> | 2011-12-19 11:38:41 -0600 |
commit | f0de9e167e289ab7dc33e57f077c1f04ec7c68c8 (patch) | |
tree | 1fc538e179833e62caec21956bfe47a252be5a72 /kword/KWView.cpp | |
parent | 11191ef0b9908604d1d7aaca382b011ef22c454c (diff) | |
download | koffice-f0de9e167e289ab7dc33e57f077c1f04ec7c68c8.tar.gz koffice-f0de9e167e289ab7dc33e57f077c1f04ec7c68c8.zip |
Remove additional unneeded tq method conversions
Diffstat (limited to 'kword/KWView.cpp')
-rw-r--r-- | kword/KWView.cpp | 80 |
1 files changed, 40 insertions, 40 deletions
diff --git a/kword/KWView.cpp b/kword/KWView.cpp index d8d36c66..b39cac7f 100644 --- a/kword/KWView.cpp +++ b/kword/KWView.cpp @@ -404,7 +404,7 @@ KWView::KWView( const TQString& viewMode, TQWidget *parent, const char *name, KW // Determine initial scroll position // We do this delayed, so that the GUI has been fully constructed - // (and e.g. the statusbar can tqrepaint). + // (and e.g. the statusbar can repaint). TQTimer::singleShot( 0, TQT_TQOBJECT(this), TQT_SLOT( slotSetInitialPosition() ) ); TQTimer::singleShot( 0, TQT_TQOBJECT(this), TQT_SLOT( updateZoom() ) ); } @@ -1000,7 +1000,7 @@ void KWView::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 ) { @@ -1491,7 +1491,7 @@ void KWView::createExpressionActions( KActionMenu * parentMenu,const TQString& f TQString text = i18n( e2.namedItem( "Text" ).toElement().text().utf8() ); KAction * act = new KAction( text, 0, TQT_TQOBJECT(this), TQT_SLOT( insertExpression() ), actionCollection(), - TQString("expression-action_%1").tqarg(i).latin1() ); + TQString("expression-action_%1").arg(i).latin1() ); if ( personalShortCut.contains(text) ) act->setShortcut( personalShortCut[text] ); i++; @@ -1542,7 +1542,7 @@ void KWView::addVariableActions( int type, const TQStringList & texts, KAction * act = new KAction( (*it), 0, TQT_TQOBJECT(this), TQT_SLOT( insertVariable() ), actionCollection(), actionName ); // Mainly for KEditToolbar - act->setToolTip( i18n( "Insert variable \"%1\" into the text" ).tqarg( *it ) ); + act->setToolTip( i18n( "Insert variable \"%1\" into the text" ).arg( *it ) ); m_variableDefMap.insert( act, v ); parentMenu->insert( act ); } @@ -1583,7 +1583,7 @@ void KWView::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 ); act->setGroup( "custom-variable-action" ); m_actionInsertCustom->insert( act ); @@ -1595,7 +1595,7 @@ void KWView::refreshCustomMenu() if(state) m_actionInsertCustom->popupMenu()->insertSeparator(); - act = new KAction( i18n("New..."), 0, TQT_TQOBJECT(this), TQT_SLOT( insertNewCustomVariable() ), actionCollection(),TQString("custom-action_%1").tqarg(i).latin1()); + act = new KAction( i18n("New..."), 0, TQT_TQOBJECT(this), TQT_SLOT( insertNewCustomVariable() ), actionCollection(),TQString("custom-action_%1").arg(i).latin1()); act->setGroup( "custom-variable-action" ); @@ -1653,15 +1653,15 @@ void KWView::updatePageInfo() TQString oldText = m_sbPageLabel->text(); TQString newText; if ( viewMode()->hasPages() ) - newText = ' ' + i18n( "Page %1 of %2" ).tqarg(m_currentPage->pageNumber()) - .tqarg(m_doc->pageCount()) + ' '; + newText = ' ' + i18n( "Page %1 of %2" ).arg(m_currentPage->pageNumber()) + .arg(m_doc->pageCount()) + ' '; if ( newText != oldText ) { m_sbPageLabel->setText( newText ); - // Need to tqrepaint immediately. Otherwise when deleting 100 pages + // Need to repaint immediately. Otherwise when deleting 100 pages // at once, there's no feedback. - m_sbPageLabel->tqrepaint(); + m_sbPageLabel->repaint(); } } slotUpdateRuler(); @@ -1688,16 +1688,16 @@ void KWView::updateFrameStatusBarItem() TQString unitName = m_doc->unitName(); KWFrame * frame = frameViewManager()->selectedFrames()[0]->frame(); m_sbFramesLabel->setText( ' ' + i18n( "Statusbar info", "%1: %2, %3 - %4, %5 (width: %6, height: %7)" ) - .tqarg( frame->frameSet()->name() ) - .tqarg( KoUnit::toUserStringValue( frame->left(), unit ) ) - .tqarg( KoUnit::toUserStringValue( frame->top() - m_doc->pageManager()->topOfPage( + .arg( frame->frameSet()->name() ) + .arg( KoUnit::toUserStringValue( frame->left(), unit ) ) + .arg( KoUnit::toUserStringValue( frame->top() - m_doc->pageManager()->topOfPage( m_doc->pageManager()->pageNumber(frame->rect()) ), unit) ) - .tqarg( KoUnit::toUserStringValue( frame->right(), unit ) ) - .tqarg( KoUnit::toUserStringValue( frame->bottom(), unit ) ) - .tqarg( KoUnit::toUserStringValue( frame->width(), unit ) ) - .tqarg( KoUnit::toUserStringValue( frame->height(), unit ) ) ); + .arg( KoUnit::toUserStringValue( frame->right(), unit ) ) + .arg( KoUnit::toUserStringValue( frame->bottom(), unit ) ) + .arg( KoUnit::toUserStringValue( frame->width(), unit ) ) + .arg( KoUnit::toUserStringValue( frame->height(), unit ) ) ); } else - m_sbFramesLabel->setText( ' ' + i18n( "%1 frames selected" ).tqarg( nbFrame ) ); + m_sbFramesLabel->setText( ' ' + i18n( "%1 frames selected" ).arg( nbFrame ) ); } else if ( sb && m_sbFramesLabel ) m_sbFramesLabel->setText( TQString() ); @@ -1789,7 +1789,7 @@ void KWView::print( KPrinter &prt ) m_doc->recalcVariables( VT_ALL ); } -// Don't tqrepaint behind the print dialog until we're done zooming/unzooming the doc +// Don't repaint behind the print dialog until we're done zooming/unzooming the doc m_gui->canvasWidget()->setUpdatesEnabled(false); m_gui->canvasWidget()->viewport()->setCursor( waitCursor ); @@ -2784,7 +2784,7 @@ void KWView::deleteFrame( bool warning ) "Frameset '%1'. " "The contents of this Frameset will not appear " "anymore!\n" - "Are you sure you want to do that?").tqarg(fs->name()), + "Are you sure you want to do that?").arg(fs->name()), i18n("Delete Frame"), KStdGuiItem::del()); if (result != KMessageBox::Continue) @@ -3074,22 +3074,22 @@ void KWView::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"); } m_actionViewZoom->setItems( lst ); } @@ -3097,7 +3097,7 @@ void KWView::changeZoomMenu( int zoom ) void KWView::showZoom( int zoom ) { TQStringList list = m_actionViewZoom->items(); - TQString zoomStr( i18n("%1%").tqarg( zoom ) ); + TQString zoomStr( i18n("%1%").arg( zoom ) ); m_actionViewZoom->setCurrentItem( list.findIndex(zoomStr) ); } @@ -5947,7 +5947,7 @@ void KWView::frameSelectedChanged() if(paragLayout->counter) counter = *(paragLayout->counter); showCounter( counter ); - int align = paragLayout->tqalignment; + int align = paragLayout->alignment; if ( align == TQt::AlignAuto ) align = TQt::AlignLeft; // ## seems hard to detect RTL here showAlign( align ); @@ -6038,7 +6038,7 @@ TQWidget* KWView::canvas() const { // used to be ->viewport(), but this makes no sense. // active embedded objects must be positioned relative to the real view, - // to scroll around with it, instead of being tqchildren of the fixed viewport. + // to scroll around with it, instead of being children of the fixed viewport. return m_gui->canvasWidget(); } @@ -6144,7 +6144,7 @@ void KWView::savePicture() 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") ); } } @@ -6155,12 +6155,12 @@ void KWView::savePicture() } 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") ); } } else - KMessageBox::sorry( this, i18n("URL %1 is invalid.").tqarg( url.prettyURL() ), i18n("Save Picture") ); + KMessageBox::sorry( this, i18n("URL %1 is invalid.").arg( url.prettyURL() ), i18n("Save Picture") ); } } } @@ -7167,7 +7167,7 @@ void KWView::updateRulerInProtectContentMode() hRuler->changeFlags(KoRuler::F_INDENTS | KoRuler::F_TABS); else hRuler->changeFlags(0); - hRuler->tqrepaint(); + hRuler->repaint(); } } |