From 74c05bbf9d92e43a6cf3799355b5f3598884409e Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Mon, 19 Dec 2011 11:56:05 -0600 Subject: Remove additional unneeded tq method conversions --- kooka/img_saver.cpp | 8 ++++---- kooka/imgprintdialog.cpp | 2 +- kooka/kadmosocr.cpp | 2 +- kooka/kocrkadmos.cpp | 4 ++-- kooka/kookapref.cpp | 4 ++-- kooka/kookaview.cpp | 6 +++--- kooka/ksaneocr.cpp | 4 ++-- kooka/scanpackager.cpp | 12 ++++++------ 8 files changed, 21 insertions(+), 21 deletions(-) (limited to 'kooka') diff --git a/kooka/img_saver.cpp b/kooka/img_saver.cpp index dee577b4..24cb2324 100644 --- a/kooka/img_saver.cpp +++ b/kooka/img_saver.cpp @@ -276,14 +276,14 @@ void ImgSaver::createDir( const TQString& dir ) if( KIO::mkdir( KURL(dir))) { KMessageBox::sorry(0, i18n("The folder\n%1\n does not exist and could not be created;\n" - "please check the permissions.").tqarg(dir)); + "please check the permissions.").arg(dir)); } } #if 0 if( ! fi.isWritable() ) { KMessageBox::sorry(0, i18n("The directory\n%1\n is not writeable;\nplease check the permissions.") - .tqarg(dir)); + .arg(dir)); } #endif } @@ -766,7 +766,7 @@ bool ImgSaver::renameImage( const KURL& fromUrl, KURL& toUrl, bool askExt, TQWi TQString s; s = i18n("The filename you supplied has no file extension.\nShould the correct one be added automatically? "); - s += i18n( "That would result in the new filename: %1" ).tqarg( fName); + s += i18n( "That would result in the new filename: %1" ).arg( fName); result = KMessageBox::questionYesNo(overWidget, s, i18n( "Extension Missing"), i18n("Add Extension"), i18n("Do Not Add"), @@ -863,7 +863,7 @@ bool ImgSaver::copyImage( const KURL& fromUrl, const KURL& toUrl, TQWidget *over TQString s; s = i18n("The filename you supplied has no file extension.\nShould the correct one be added automatically? "); - s += i18n( "That would result in the new filename: %1" ).tqarg( fName); + s += i18n( "That would result in the new filename: %1" ).arg( fName); result = KMessageBox::questionYesNo(overWidget, s, i18n( "Extension Missing"), i18n("Add Extension"), i18n("Do Not Add"), diff --git a/kooka/imgprintdialog.cpp b/kooka/imgprintdialog.cpp index f96a47c9..0146c1c2 100644 --- a/kooka/imgprintdialog.cpp +++ b/kooka/imgprintdialog.cpp @@ -167,7 +167,7 @@ void ImgPrintDialog::setOptions(const TQMap& opts) m_sizeH->setValue( help ); help = opts[OPT_SCREEN_RES].toInt(); - m_screenRes->setText(i18n( "Screen resolution: %1 dpi").tqarg(help)); + m_screenRes->setText(i18n( "Screen resolution: %1 dpi").arg(help)); help = opts[OPT_PSGEN_DRAFT].toInt(); m_psDraft->setChecked( help == 1 ); diff --git a/kooka/kadmosocr.cpp b/kooka/kadmosocr.cpp index 3110451f..a0ad590b 100644 --- a/kooka/kadmosocr.cpp +++ b/kooka/kadmosocr.cpp @@ -356,7 +356,7 @@ KADMOS_ERROR CRep::SetImage(TQImage *Image) m_RepData.image.width = Image->width(); m_RepData.image.height = Image->height(); m_RepData.image.bitsperpixel = Image->depth(); - m_RepData.image.tqalignment = 1; + m_RepData.image.alignment = 1; m_RepData.image.fillorder = FILLORDER_MSB2LSB; // color if( Image->depth() == 1 || (Image->numColors()==2 && Image->depth() == 8) ) diff --git a/kooka/kocrkadmos.cpp b/kooka/kocrkadmos.cpp index 59afa1a4..5e4ec654 100644 --- a/kooka/kocrkadmos.cpp +++ b/kooka/kocrkadmos.cpp @@ -422,14 +422,14 @@ bool KadmosDialog::getSelClassifier( TQString& path ) const if( res && ! fi.exists() ) { kdDebug(28000) << "Classifier file does not exist" << endl; - path = i18n("Classifier file %1 does not exist").tqarg(classifier); + path = i18n("Classifier file %1 does not exist").arg(classifier); res = false; } if( res && ! fi.isReadable() ) { kdDebug(28000) << "Classifier file could not be read" << endl; - path = i18n("Classifier file %1 is not readable").tqarg(classifier); + path = i18n("Classifier file %1 is not readable").arg(classifier); res = false; } diff --git a/kooka/kookapref.cpp b/kooka/kookapref.cpp index 45d0ee01..7444c4fe 100644 --- a/kooka/kookapref.cpp +++ b/kooka/kookapref.cpp @@ -180,13 +180,13 @@ KURLRequester* KookaPreferences::binaryCheckBox( TQWidget *parent, const TQStrin { TQHBox *hbox = new TQHBox( parent ); - (void) new TQLabel( i18n("Select the %1 binary to use:").tqarg( program ), hbox ); + (void) new TQLabel( i18n("Select the %1 binary to use:").arg( program ), hbox ); KURLRequester* urlRequester = new KURLRequester( parent ); urlRequester->setMode( KFile::File | KFile::ExistingOnly | KFile::LocalOnly ); TQToolTip::add( urlRequester, i18n( "Enter the path to %1, the optical-character-recognition " - "command line tool.").tqarg(program)); + "command line tool.").arg(program)); return urlRequester; } diff --git a/kooka/kookaview.cpp b/kooka/kookaview.cpp index e177df5c..bb115ef1 100644 --- a/kooka/kookaview.cpp +++ b/kooka/kookaview.cpp @@ -472,7 +472,7 @@ void KookaView::print() printer.setUsePrinterResolution(true); printer.addDialogPage( new ImgPrintDialog( img )); - if( printer.setup( m_mainWindow, i18n("Print %1").tqarg(img->localFileName().section('/', -1)) )) + if( printer.setup( m_mainWindow, i18n("Print %1").arg(img->localFileName().section('/', -1)) )) { KookaPrint kookaprint( &printer ); kookaprint.printImage(img); @@ -565,7 +565,7 @@ void KookaView::startOCR( KookaImage *img ) m_dockOCRText, TQT_SLOT( show() )); connect( ocrFabric, TQT_SIGNAL( repaintOCRResImage( )), - img_canvas, TQT_SLOT(tqrepaint())); + img_canvas, TQT_SLOT(repaint())); connect( ocrFabric, TQT_SIGNAL( clearOCRResultText()), m_ocrResEdit, TQT_SLOT(clear())); @@ -913,7 +913,7 @@ void KookaView::slShowThumbnails(KFileTreeViewItem *dirKfi, bool forceRedraw ) */ void KookaView::slStartLoading( const KURL& url ) { - emit( signalChangeStatusbar( i18n("Loading %1" ).tqarg( url.prettyURL() ) )); + emit( signalChangeStatusbar( i18n("Loading %1" ).arg( url.prettyURL() ) )); // if( m_stack->visibleWidget() != img_canvas ) // { diff --git a/kooka/ksaneocr.cpp b/kooka/ksaneocr.cpp index 67d0aaca..70878549 100644 --- a/kooka/ksaneocr.cpp +++ b/kooka/ksaneocr.cpp @@ -814,11 +814,11 @@ bool KSANEOCR::readORF( const TQString& fileName, TQString& errStr ) TQFileInfo fi( fileName ); if( ! fi.exists() ) { error = true; - errStr = i18n("The orf %1 does not exist.").tqarg(fileName); + errStr = i18n("The orf %1 does not exist.").arg(fileName); } if( ! error && ! fi.isReadable() ) { error = true; - errStr = i18n("Permission denied on file %1.").tqarg(fileName); + errStr = i18n("Permission denied on file %1.").arg(fileName); } diff --git a/kooka/scanpackager.cpp b/kooka/scanpackager.cpp index c553a7ae..2f5da3ca 100644 --- a/kooka/scanpackager.cpp +++ b/kooka/scanpackager.cpp @@ -245,7 +245,7 @@ void ScanPackager::slotDecorate( KFileTreeViewItem* item ) } /* set image size in pixels */ - TQString t = i18n( "%1 x %2" ).tqarg( img->width()).tqarg(img->height()); + TQString t = i18n( "%1 x %2" ).arg( img->width()).arg(img->height()); item->setText( 1, t ); kdDebug( 28000) << "Image loaded and decorated!" << endl; } @@ -600,7 +600,7 @@ void ScanPackager::loadImageForItem( KFileTreeViewItem *item ) prevItem = subImgItem; subImgItem->setPixmap( 0, loader->loadIcon( "editcopy", KIcon::Small )); - subImgItem->setText( 0, i18n("Sub-image %1").tqarg( i ) ); + subImgItem->setText( 0, i18n("Sub-image %1").arg( i ) ); KookaImage *subImgImg = new KookaImage( i, img ); subImgImg->setFileItem( newKfi ); newKfi->setExtraData( (void*) this, (void*) subImgImg ); @@ -853,7 +853,7 @@ void ScanPackager::slAddImage( TQImage *img, KookaImageMeta* ) m_nextUrlToShow = lurl; TQString s; - /* Count amount of tqchildren of the father */ + /* Count amount of children of the father */ TQListViewItem *paps = curr->parent(); if( curr->isDir() ) /* take only father if the is no directory */ paps = curr; @@ -861,7 +861,7 @@ void ScanPackager::slAddImage( TQImage *img, KookaImageMeta* ) if( paps ) { int childcount = paps->childCount(); - s = i18n("%1 images").tqarg(childcount); + s = i18n("%1 images").arg(childcount); paps->setText( 1, s); setOpen( paps, true ); } @@ -1136,7 +1136,7 @@ void ScanPackager::slotDeleteItems( ) s = i18n("Do you really want to delete this image?\nIt cannot be restored!" ); if( item->isDir() ) { - s = i18n("Do you really want to delete the folder %1\nand all the images inside?").tqarg(""); + s = i18n("Do you really want to delete the folder %1\nand all the images inside?").arg(""); } result = KMessageBox::warningContinueCancel(this, s, i18n( "Delete Collection Item"), KStdGuiItem::del(), "AskForDeleteFiles" ); @@ -1214,7 +1214,7 @@ TQString ScanPackager::getImgName( TQString name_on_disk ) TQString s; (void) name_on_disk; - s = i18n("image %1").tqarg(img_counter++); + s = i18n("image %1").arg(img_counter++); return( s ); } -- cgit v1.2.1