diff options
author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-12-19 11:56:05 -0600 |
---|---|---|
committer | Slávek Banko <slavek.banko@axis.cz> | 2012-06-03 19:30:03 +0200 |
commit | 5027dfec5092217f70492dd6712059e46b21d003 (patch) | |
tree | 7e5874391acf3098475adda80fe2b068a00e304c /kghostview | |
parent | a84302cc767bcabbf01b8c76f61419f4a2ab4ff0 (diff) | |
download | tdegraphics-5027dfec5092217f70492dd6712059e46b21d003.tar.gz tdegraphics-5027dfec5092217f70492dd6712059e46b21d003.zip |
Remove additional unneeded tq method conversions
(cherry picked from commit 74c05bbf9d92e43a6cf3799355b5f3598884409e)
Diffstat (limited to 'kghostview')
-rw-r--r-- | kghostview/displayoptions.cpp | 8 | ||||
-rw-r--r-- | kghostview/gssettingswidget.ui.h | 2 | ||||
-rw-r--r-- | kghostview/kdscerrordialog.cpp | 2 | ||||
-rw-r--r-- | kghostview/kgv_miniwidget.cpp | 12 | ||||
-rw-r--r-- | kghostview/kgv_view.cpp | 8 | ||||
-rw-r--r-- | kghostview/kgvconfigdialog.cpp | 4 | ||||
-rw-r--r-- | kghostview/kgvdocument.cpp | 36 | ||||
-rw-r--r-- | kghostview/kgvshell.cpp | 4 | ||||
-rw-r--r-- | kghostview/kpswidget.cpp | 6 | ||||
-rw-r--r-- | kghostview/scrollbox.cpp | 6 |
10 files changed, 44 insertions, 44 deletions
diff --git a/kghostview/displayoptions.cpp b/kghostview/displayoptions.cpp index 84cae19a..f2e0fa4b 100644 --- a/kghostview/displayoptions.cpp +++ b/kghostview/displayoptions.cpp @@ -68,10 +68,10 @@ namespace { TQString DisplayOptions::toString( const DisplayOptions& options ) { return TQString( qformat ) - .tqarg( options.page() ) - .tqarg( options.magnification() ) - .tqarg( options.overrideOrientation() ) - .tqarg( options.overridePageMedia().utf8().data() ); + .arg( options.page() ) + .arg( options.magnification() ) + .arg( options.overrideOrientation() ) + .arg( options.overridePageMedia().utf8().data() ); } bool DisplayOptions::fromString( DisplayOptions& out, const TQString& in ) diff --git a/kghostview/gssettingswidget.ui.h b/kghostview/gssettingswidget.ui.h index 11f4bf63..371d6712 100644 --- a/kghostview/gssettingswidget.ui.h +++ b/kghostview/gssettingswidget.ui.h @@ -9,6 +9,6 @@ void GSSettingsWidget::setDetectedVersion( TQString v) { - mDetectedVersion->setText(mDetectedVersion->text().tqarg( v )); + mDetectedVersion->setText(mDetectedVersion->text().arg( v )); } diff --git a/kghostview/kdscerrordialog.cpp b/kghostview/kdscerrordialog.cpp index e831cbcd..61245ed5 100644 --- a/kghostview/kdscerrordialog.cpp +++ b/kghostview/kdscerrordialog.cpp @@ -97,7 +97,7 @@ KDSCErrorHandler::Response KDSCErrorDialog::error( const KDSCError& err ) break; } - _lineNumberLabel->setText( i18n( "On line %1:" ).tqarg( err.lineNumber() ) ); + _lineNumberLabel->setText( i18n( "On line %1:" ).arg( err.lineNumber() ) ); _lineLabel->setText( err.line() ); _descriptionLabel->setText( description( err.type() ) ); diff --git a/kghostview/kgv_miniwidget.cpp b/kghostview/kgv_miniwidget.cpp index 9a650063..8b557d64 100644 --- a/kghostview/kgv_miniwidget.cpp +++ b/kghostview/kgv_miniwidget.cpp @@ -441,7 +441,7 @@ void KGVMiniWidget::showPage( int pagenumber ) /* KNotifyClient::userEvent (i18n("KGhostview cannot load the document, \"%1\".\n" - "It appears to be broken.").tqarg( _fileName ), + "It appears to be broken.").arg( _fileName ), KNotifyClient::Messagebox); _psWidget->disableInterpreter(); _psFile=0; @@ -486,13 +486,13 @@ void KGVMiniWidget::updateStatusBarText( int pageNumber ) else if( !_usePageLabels || document()->format() == KGVDocument::PDF ) text = i18n( "Page %1 of %2" ) - .tqarg( pageNumber + 1 ) - .tqarg( dsc()->page_count() ); + .arg( pageNumber + 1 ) + .arg( dsc()->page_count() ); else text = i18n( "Page %1 (%2 of %3)" ) - .tqarg( dsc()->page()[ _options.page() ].label ) - .tqarg( pageNumber + 1 ) - .tqarg( dsc()->page_count() ); + .arg( dsc()->page()[ _options.page() ].label ) + .arg( pageNumber + 1 ) + .arg( dsc()->page_count() ); emit setStatusBarText( text ); } diff --git a/kghostview/kgv_view.cpp b/kghostview/kgv_view.cpp index e8edace1..68d1c425 100644 --- a/kghostview/kgv_view.cpp +++ b/kghostview/kgv_view.cpp @@ -264,7 +264,7 @@ KGVPart::KGVPart( TQWidget* parentWidget, const char*, for ( TQValueList<double>::iterator first = mags.begin(), last = mags.end(); first != last; ++first ) { - TQString str = TQString( "%1%" ).tqarg( KGlobal::locale()->formatNumber( *first * 100.0, 2 )); + TQString str = TQString( "%1%" ).arg( KGlobal::locale()->formatNumber( *first * 100.0, 2 )); str.remove( KGlobal::locale()->decimalSymbol() + "00" ); zooms << str; if ( *first == 1.0 ) idx = cur; @@ -600,7 +600,7 @@ void KGVPart::updateZoomActions() } // Show percentage that isn't predefined - TQString str = TQString( "%1%" ).tqarg( KGlobal::locale()->formatNumber( zoom, 2 )); + TQString str = TQString( "%1%" ).arg( KGlobal::locale()->formatNumber( zoom, 2 )); str.remove( KGlobal::locale()->decimalSymbol() + "00" ); items.insert( items.at(idx), 1, str ); _zoomTo->setItems( items ); @@ -750,8 +750,8 @@ void KGVPart::slotGhostscriptError( const TQString& error ) "Below are any error messages which were received from Ghostscript " "(<nobr><strong>%2</strong></nobr>) " "which may help you.</qt>" ) - .tqarg( error ) - .tqarg( Configuration::interpreter() ), + .arg( error ) + .arg( Configuration::interpreter() ), true ); // The true above makes it show a "configure gs" option, but maybe we // should trigger an auto-redetection? diff --git a/kghostview/kgvconfigdialog.cpp b/kghostview/kgvconfigdialog.cpp index 2f0c8593..3fb7e1b4 100644 --- a/kghostview/kgvconfigdialog.cpp +++ b/kghostview/kgvconfigdialog.cpp @@ -114,8 +114,8 @@ namespace { "which are impossible to resolve. Please upgrade to a newer version.\n" "KGhostView will try to work with it, but it may not display any files at all.\n" "Version %2 seems to be appropriate on your system, although newer versions will work as well." ) - .tqarg( version ) - .tqarg( recommended ) ); + .arg( version ) + .arg( recommended ) ); } if ( version < TQString::number( 7.00 ) ) { diff --git a/kghostview/kgvdocument.cpp b/kghostview/kgvdocument.cpp index 89cd7948..bcfc4d2e 100644 --- a/kghostview/kgvdocument.cpp +++ b/kghostview/kgvdocument.cpp @@ -98,7 +98,7 @@ void KGVDocument::doOpenFile() KMessageBox::sorry( _part->widget(), i18n( "<qt>Could not open <nobr><strong>%1</strong></nobr>: " "File does not exist.</qt>" ) - .tqarg( _fileName ) ); + .arg( _fileName ) ); emit canceled( TQString() ); return; } @@ -107,7 +107,7 @@ void KGVDocument::doOpenFile() KMessageBox::sorry( _part->widget(), i18n( "<qt>Could not open <nobr><strong>%1</strong></nobr>: " "Permission denied.</qt>" ) - .tqarg( _fileName ) ); + .arg( _fileName ) ); emit canceled( TQString() ); return; } @@ -132,7 +132,7 @@ void KGVDocument::doOpenFile() if( _tmpDSC->status() != 0 ) { KMessageBox::error( _part->widget(), i18n( "Could not create temporary file: %1" ) - .tqarg( strerror( _tmpDSC->status() ) ) ); + .arg( strerror( _tmpDSC->status() ) ) ); emit canceled( TQString() ); return; } @@ -159,8 +159,8 @@ void KGVDocument::doOpenFile() "which has type <strong>%2</strong>. KGhostview can " "only load PostScript (.ps, .eps) and Portable " "Document Format (.pdf) files.</qt>" ) - .tqarg( _fileName ) - .tqarg( _mimetype ) ); + .arg( _fileName ) + .arg( _mimetype ) ); emit canceled( TQString() ); return; } @@ -190,7 +190,7 @@ bool KGVDocument::uncompressFile() { KMessageBox::error( _part->widget(), i18n( "<qt>Could not uncompress <nobr><strong>%1</strong></nobr>.</qt>" ) - .tqarg( _fileName ) ); + .arg( _fileName ) ); emit canceled( TQString() ); return false; } @@ -201,7 +201,7 @@ bool KGVDocument::uncompressFile() { KMessageBox::error( _part->widget(), i18n( "Could not create temporary file: %2" ) - .tqarg( strerror( _tmpUnzipped->status() ) ) ); + .arg( strerror( _tmpUnzipped->status() ) ) ); emit canceled( TQString() ); return false; } @@ -221,7 +221,7 @@ bool KGVDocument::uncompressFile() { KMessageBox::error( _part->widget(), i18n( "<qt>Could not uncompress <nobr><strong>%1</strong></nobr>.</qt>" ) - .tqarg( _fileName ) ); + .arg( _fileName ) ); emit canceled( TQString() ); return false; } @@ -239,7 +239,7 @@ void KGVDocument::openPDFFileContinue( bool pdf2dscResult ) { KMessageBox::error( _part->widget(), i18n( "<qt>Could not open file <nobr><strong>%1</strong></nobr>.</qt>" ) - .tqarg( _part->url().url() ) ); + .arg( _part->url().url() ) ); emit canceled( TQString() ); return; } @@ -260,8 +260,8 @@ void KGVDocument::openPSFile(const TQString &file) { KMessageBox::error( _part->widget(), i18n( "<qt>Error opening file <nobr><strong>%1</strong></nobr>: %2</qt>" ) - .tqarg( _part->url().url() ) - .tqarg( strerror( errno ) ) ); + .arg( _part->url().url() ) + .arg( strerror( errno ) ) ); emit canceled( "" ); return; } @@ -497,7 +497,7 @@ TQString KGVDocument::pageListToRange( const PageList& pageList ) if( bss == ess ) range += TQString::number( *ess ); else - range += TQString( "%1-%2" ).tqarg( *bss ).tqarg( *ess ); + range += TQString( "%1-%2" ).arg( *bss ).arg( *ess ); bss = it; } @@ -521,7 +521,7 @@ void KGVDocument::print() printer.setOption( "kde-range", pageListToRange( _part->markList()->markList() ) ); - if( printer.setup( _part->widget(), i18n("Print %1").tqarg(_part->url().fileName()) ) ) + if( printer.setup( _part->widget(), i18n("Print %1").arg(_part->url().fileName()) ) ) { KTempFile tf( TQString(), ".ps" ); if( tf.status() == 0 ) @@ -548,7 +548,7 @@ void KGVDocument::print() { printer.setPageSelection( KPrinter::SystemSide ); - if( printer.setup( _part->widget(), i18n("Print %1").tqarg(_part->url().fileName()) ) ) + if( printer.setup( _part->widget(), i18n("Print %1").arg(_part->url().fileName()) ) ) printer.printFiles( _fileName ); } } @@ -775,13 +775,13 @@ void KGVDocument::runPdf2ps( const TQString& pdfName, process << _interpreterPath << "-dNODISPLAY" << "-dTQUIET" - << TQString( "-sPDFname=%1" ).tqarg( pdfName ) + << TQString( "-sPDFname=%1" ).arg( pdfName ) << TQString( "-sDSCnamale locale( "kghostview" ); _fallBackPageMedia = pageSizeToString( static_cast< TQPrinter::PageSize >( locale.pageSize() ) ); _usePageLabels = false; -e=%1" ).tqarg( dscName ) +e=%1" ).arg( dscName ) << "pdf2dsc.ps" << "-c" << "quit"; @@ -823,8 +823,8 @@ void Pdf2dsc::run( const TQString& pdfName, const TQString& dscName ) << "-dDELAYSAFER" << "-dNODISPLAY" << "-dTQUIET" - << TQString( "-sPDFname=%1" ).tqarg( pdfName ) - << TQString( "-sDSCname=%1" ).tqarg( dscName ) + << TQString( "-sPDFname=%1" ).arg( pdfName ) + << TQString( "-sDSCname=%1" ).arg( dscName ) << "-c" << "<< /PermitFileReading [ PDFname ] /PermitFileWriting [ DSCname ] /PermitFileControl [] >> setuserparams .locksafe" << "-f" diff --git a/kghostview/kgvshell.cpp b/kghostview/kgvshell.cpp index fe99bb7e..ad21adc7 100644 --- a/kghostview/kgvshell.cpp +++ b/kghostview/kgvshell.cpp @@ -252,7 +252,7 @@ KGVShell::openStdin() if( _tmpFile->status() != 0 ) { KMessageBox::error( this, i18n( "Could not create temporary file: %1" ) - .tqarg( strerror( _tmpFile->status() ) ) ); + .arg( strerror( _tmpFile->status() ) ) ); return; } @@ -269,7 +269,7 @@ KGVShell::openStdin() if( read != 0 ) { KMessageBox::error( this, i18n( "Could not open standard input stream: %1" ) - .tqarg( strerror( errno ) ) ); + .arg( strerror( errno ) ) ); return; } diff --git a/kghostview/kpswidget.cpp b/kghostview/kpswidget.cpp index c6d5d972..b5234ac6 100644 --- a/kghostview/kpswidget.cpp +++ b/kghostview/kpswidget.cpp @@ -333,7 +333,7 @@ void KPSWidget::setupWidget() // Make sure the properties are updated immediately. XSync( x11Display(), false ); - tqrepaint(); + repaint(); _widgetDirty = false; } @@ -343,7 +343,7 @@ bool KPSWidget::startInterpreter() setupWidget(); _process = new KProcess; - if ( _doubleBuffer ) _process->setEnvironment( "GHOSTVIEW", TQString( "%1 %2" ).tqarg( winId() ).tqarg( _backgroundPixmap.handle() ) ); + if ( _doubleBuffer ) _process->setEnvironment( "GHOSTVIEW", TQString( "%1 %2" ).arg( winId() ).arg( _backgroundPixmap.handle() ) ); else _process->setEnvironment( "GHOSTVIEW", TQString::number( winId() ) ); *_process << _ghostscriptPath.local8Bit(); @@ -420,7 +420,7 @@ void KPSWidget::slotProcessExited( KProcess* process ) { kdDebug( 4500 ) << "KPSWidget::slotProcessExited(): looks like it was not a clean exit." << endl; if ( process->normalExit() ) { - emit ghostscriptError( TQString( i18n( "Exited with error code %1." ).tqarg( process->exitStatus() ) ) ); + emit ghostscriptError( TQString( i18n( "Exited with error code %1." ).arg( process->exitStatus() ) ) ); } else { emit ghostscriptError( TQString( i18n( "Process killed or crashed." ) ) ); } diff --git a/kghostview/scrollbox.cpp b/kghostview/scrollbox.cpp index 0246e893..87d68418 100644 --- a/kghostview/scrollbox.cpp +++ b/kghostview/scrollbox.cpp @@ -99,19 +99,19 @@ void ScrollBox::setPageSize( const TQSize& s ) { pagesize = s; setFixedHeight( s.height() * width() / s.width() ); - tqrepaint(); + repaint(); } void ScrollBox::setViewSize( const TQSize& s ) { viewsize = s; - tqrepaint(); + repaint(); } void ScrollBox::setViewPos( const TQPoint& pos ) { viewpos = pos; - tqrepaint(); + repaint(); } void ScrollBox::setThumbnail( TQPixmap img ) |