From c2637a0da6d9a1c8626ca39f8451ab3b7cda487a Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Thu, 15 Dec 2011 15:47:59 -0600 Subject: Rename a number of old tq methods that are no longer tq specific --- kooka/CHANGES | 2 +- kooka/img_saver.cpp | 22 +++++++++++----------- kooka/imgnamecombo.cpp | 6 +++--- kooka/imgprintdialog.cpp | 18 +++++++++--------- kooka/kadmosocr.cpp | 2 +- kooka/kocrbase.cpp | 10 +++++----- kooka/kocrgocr.cpp | 2 +- kooka/kocrkadmos.cpp | 6 +++--- kooka/kocrocrad.cpp | 6 +++--- kooka/kooka.cpp | 2 +- kooka/kookapref.cpp | 18 +++++++++--------- kooka/kookaview.cpp | 14 +++++++------- kooka/kookaview.h | 2 +- kooka/ksaneocr.cpp | 6 +++--- kooka/ocrresedit.cpp | 2 +- kooka/ocrresedit.h | 2 +- kooka/scanpackager.cpp | 14 +++++++------- kooka/thumbview.cpp | 4 ++-- 18 files changed, 69 insertions(+), 69 deletions(-) (limited to 'kooka') diff --git a/kooka/CHANGES b/kooka/CHANGES index df5e72c6..9b15cab5 100644 --- a/kooka/CHANGES +++ b/kooka/CHANGES @@ -20,7 +20,7 @@ scanned with about 150 dpi. via mime mechanism of KDE (KRun). OCR-Parameter get stored via KConfig. OCR may be performed on the entire image or the selection. -* Reworked the save assistant: New tqlayout and fully KDE2-Compliant. +* Reworked the save assistant: New layout and fully KDE2-Compliant. Still no new Image format help texts. * Reworked the startup dialog: Allows to select the scan device from a diff --git a/kooka/img_saver.cpp b/kooka/img_saver.cpp index 847023d1..02fb957f 100644 --- a/kooka/img_saver.cpp +++ b/kooka/img_saver.cpp @@ -46,7 +46,7 @@ #include #include -#include +#include #include #include #include @@ -116,7 +116,7 @@ FormatDialog::FormatDialog( TQWidget *parent, const TQString&, const char *name Q_CHECK_PTR(l_help); l_help->setFrameStyle( TQFrame::Panel|TQFrame::Sunken ); l_help->setText( i18n("-No format selected-" )); - l_help->tqsetAlignment( AlignVCenter | AlignHCenter ); + l_help->setAlignment( AlignVCenter | AlignHCenter ); l_help->setMinimumWidth(230); // Insert Selbox for subformat @@ -208,11 +208,11 @@ TQCString FormatDialog::getSubFormat( ) const #include "formathelp.h" void FormatDialog::buildHelp( void ) { - format_help.insert( TQString::tqfromLatin1("BMP"), HELP_BMP ); - format_help.insert( TQString::tqfromLatin1("PNM"), HELP_PNM ); - format_help.insert( TQString::tqfromLatin1("JPEG"), HELP_JPG ); - format_help.insert( TQString::tqfromLatin1("JPG"), HELP_JPG ); - format_help.insert( TQString::tqfromLatin1("EPS"), HELP_EPS ); + format_help.insert( TQString::fromLatin1("BMP"), HELP_BMP ); + format_help.insert( TQString::fromLatin1("PNM"), HELP_PNM ); + format_help.insert( TQString::fromLatin1("JPEG"), HELP_JPG ); + format_help.insert( TQString::fromLatin1("JPG"), HELP_JPG ); + format_help.insert( TQString::fromLatin1("EPS"), HELP_EPS ); } @@ -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/imgnamecombo.cpp b/kooka/imgnamecombo.cpp index 8190d5bc..833bf422 100644 --- a/kooka/imgnamecombo.cpp +++ b/kooka/imgnamecombo.cpp @@ -25,7 +25,7 @@ * * ***************************************************************************/ -#include +#include #include #include @@ -51,7 +51,7 @@ ImageNameCombo::~ImageNameCombo() void ImageNameCombo::slotPathRemove( KFileTreeBranch *branch, const TQString& relPath ) { - TQString path = branch->name() + TQString::tqfromLatin1(" - ") + relPath; + TQString path = branch->name() + TQString::fromLatin1(" - ") + relPath; kdDebug(28000) << "ImageNameCombo: Removing " << path << endl; TQString select = currentText(); @@ -82,7 +82,7 @@ void ImageNameCombo::slotGalleryPathChanged( KFileTreeBranch* branch, const TQSt { TQString newPath; - newPath = branch->name() + TQString::tqfromLatin1(" - ") + relativPath; + newPath = branch->name() + TQString::fromLatin1(" - ") + relativPath; kdDebug( 28000) << "Inserting " << newPath << " to combobox" << endl; diff --git a/kooka/imgprintdialog.cpp b/kooka/imgprintdialog.cpp index e79c92df..b65df15c 100644 --- a/kooka/imgprintdialog.cpp +++ b/kooka/imgprintdialog.cpp @@ -31,7 +31,7 @@ #include #include -#include +#include #include #include #include @@ -53,9 +53,9 @@ ImgPrintDialog::ImgPrintDialog( KookaImage *img, TQWidget *parent, const char* n m_ignoreSignal(false) { setTitle(i18n("Image Printing")); - TQVBoxLayout *tqlayout = new TQVBoxLayout( this ); - // tqlayout->setMargin( KDialog::marginHint() ); - // tqlayout->setSpacing( KDialog::spacingHint() ); + TQVBoxLayout *layout = new TQVBoxLayout( this ); + // layout->setMargin( KDialog::marginHint() ); + // layout->setSpacing( KDialog::spacingHint() ); m_scaleRadios = new TQButtonGroup( 2, Qt::Vertical, i18n("Image Print Size"), this ); m_scaleRadios->setRadioButtonExclusive(true); @@ -84,11 +84,11 @@ ImgPrintDialog::ImgPrintDialog( KookaImage *img, TQWidget *parent, const char* n TQToolTip::add( m_rbFitPage, i18n("Printout uses maximum space on the selected pager. Aspect ratio is maintained.")); m_scaleRadios->insert( m_rbFitPage, ID_FIT_PAGE ); - tqlayout->addWidget( m_scaleRadios ); + layout->addWidget( m_scaleRadios ); TQHBoxLayout *hbox = new TQHBoxLayout( this ); - tqlayout->addLayout( hbox ); + layout->addLayout( hbox ); /** Box for Image Resolutions **/ TQVGroupBox *group1 = new TQVGroupBox( i18n("Resolutions"), this ); @@ -127,8 +127,8 @@ ImgPrintDialog::ImgPrintDialog( KookaImage *img, TQWidget *parent, const char* n TQWidget *spaceEater = new TQWidget( this ); - spaceEater->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Ignored, TQSizePolicy::Ignored )); - tqlayout->addWidget( spaceEater ); + spaceEater->setSizePolicy( TQSizePolicy( TQSizePolicy::Ignored, TQSizePolicy::Ignored )); + layout->addWidget( spaceEater ); /* Set start values */ m_rbScreen->setChecked(true); @@ -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/kocrbase.cpp b/kooka/kocrbase.cpp index 2cd5d20b..424a6fdf 100644 --- a/kooka/kocrbase.cpp +++ b/kooka/kocrbase.cpp @@ -24,7 +24,7 @@ * * ***************************************************************************/ -#include +#include #include #include #include @@ -129,7 +129,7 @@ void KOCRBase::imgIntro() m_previewPix = new TQLabel( m_imgHBox ); m_previewPix->setPixmap(TQPixmap()); m_previewPix->setFixedSize(m_previewSize); - m_previewPix->tqsetAlignment( TQt::AlignCenter ); + m_previewPix->setAlignment( TQt::AlignCenter ); m_previewPix->setFrameStyle( TQFrame::Panel | TQFrame::Sunken ); // m_previewPix->resize(m_previewSize); @@ -164,7 +164,7 @@ void KOCRBase::ocrIntro( ) hb_cap->setSpacing( KDialog::spacingHint()); TQLabel *imgLab = new TQLabel( hb_cap ); - imgLab->tqsetAlignment( TQt::AlignHCenter | TQt::AlignTop ); + imgLab->setAlignment( TQt::AlignHCenter | TQt::AlignTop ); imgLab->setPixmap( pix ); pa = hb_cap; } @@ -188,7 +188,7 @@ void KOCRBase::spellCheckIntro() KSpellConfig *sCfg = new KSpellConfig( m_gbSpellOpts, "SPELLCHK", m_spellConfig, false ); /* A space eater */ TQWidget *spaceEater = new TQWidget(m_spellchkPage); - spaceEater->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Ignored, TQSizePolicy::Ignored )); + spaceEater->setSizePolicy( TQSizePolicy( TQSizePolicy::Ignored, TQSizePolicy::Ignored )); /* connect toggle button */ connect( m_cbWantCheck, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slWantSpellcheck(bool))); @@ -285,7 +285,7 @@ void KOCRBase::introduceImage( KookaImage* img) } } TQWidget *spaceEater = new TQWidget( m_metaBox ); - spaceEater->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Ignored, TQSizePolicy::Ignored )); + spaceEater->setSizePolicy( TQSizePolicy( TQSizePolicy::Ignored, TQSizePolicy::Ignored )); m_metaBox->show(); } diff --git a/kooka/kocrgocr.cpp b/kooka/kocrgocr.cpp index ca913f1d..14134edd 100644 --- a/kooka/kocrgocr.cpp +++ b/kooka/kocrgocr.cpp @@ -26,7 +26,7 @@ /* $Id$ */ -#include +#include #include #include #include diff --git a/kooka/kocrkadmos.cpp b/kooka/kocrkadmos.cpp index 59afa1a4..1c652651 100644 --- a/kooka/kocrkadmos.cpp +++ b/kooka/kocrkadmos.cpp @@ -24,7 +24,7 @@ * * ***************************************************************************/ -#include +#include #include #include #include @@ -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/kocrocrad.cpp b/kooka/kocrocrad.cpp index b9365767..384dbe69 100644 --- a/kooka/kocrocrad.cpp +++ b/kooka/kocrocrad.cpp @@ -26,7 +26,7 @@ /* $Id$ */ -#include +#include #include #include #include @@ -129,7 +129,7 @@ EngineError ocradDialog::setupGui() else m_ocrCmd = res; - /** tqlayout detection button **/ + /** layout detection button **/ conf->setGroup( CFG_GROUP_OCRAD ); int layoutDetect = conf->readNumEntry( CFG_OCRAD_LAYOUT_DETECTION, 0 ); kdDebug(28000) << "Layout detection from config: " << layoutDetect << endl; @@ -137,7 +137,7 @@ EngineError ocradDialog::setupGui() (void) new KSeparator( KSeparator::HLine, page); TQHBox *hb1 = new TQHBox(page); hb1->setSpacing( KDialog::spacingHint() ); - (void) new TQLabel( i18n("OCRAD tqlayout analysis mode: "), hb1); + (void) new TQLabel( i18n("OCRAD layout analysis mode: "), hb1); m_layoutMode = new TQComboBox(hb1); m_layoutMode->insertItem(i18n("No Layout Detection"), 0 ); m_layoutMode->insertItem(i18n("Column Detection"), 1 ); diff --git a/kooka/kooka.cpp b/kooka/kooka.cpp index dc05a622..4750bf07 100644 --- a/kooka/kooka.cpp +++ b/kooka/kooka.cpp @@ -96,7 +96,7 @@ Kooka::Kooka( const TQCString& deviceToUse) changeCaption( i18n( "KDE Scanning" )); - setAutoSaveSettings( TQString::tqfromLatin1("General Options"), + setAutoSaveSettings( TQString::fromLatin1("General Options"), true ); } diff --git a/kooka/kookapref.cpp b/kooka/kookapref.cpp index bebd60fa..bc467bfd 100644 --- a/kooka/kookapref.cpp +++ b/kooka/kookapref.cpp @@ -36,7 +36,7 @@ #include #include -#include +#include #include #include #include @@ -149,7 +149,7 @@ void KookaPreferences::setupOCRPage() #endif top->addWidget( kgp ); TQWidget *spaceEater = new TQWidget( page ); - spaceEater->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Ignored, TQSizePolicy::Ignored )); + spaceEater->setSizePolicy( TQSizePolicy( TQSizePolicy::Ignored, TQSizePolicy::Ignored )); top->addWidget( spaceEater ); /* @@ -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; } @@ -418,8 +418,8 @@ void KookaPreferences::setupThumbnailPage() /* Frame Stuff */ int frameWidth = konf->readNumEntry( THUMB_MARGIN, 3 ); - TQColor col1 = konf->readColorEntry( MARGIN_COLOR1, &(tqcolorGroup().base())); - TQColor col2 = konf->readColorEntry( MARGIN_COLOR2, &(tqcolorGroup().foreground())); + TQColor col1 = konf->readColorEntry( MARGIN_COLOR1, &(colorGroup().base())); + TQColor col2 = konf->readColorEntry( MARGIN_COLOR2, &(colorGroup().foreground())); TQGrid *fGrid = new TQGrid( 2, hgb3 ); fGrid->setSpacing( 2 ); @@ -457,7 +457,7 @@ void KookaPreferences::slotApply( void ) /* ** startup options ** */ /** write the global one, to read from libkscan also */ - konf->setGroup(TQString::tqfromLatin1(GROUP_STARTUP)); + konf->setGroup(TQString::fromLatin1(GROUP_STARTUP)); bool cbVal = !(cbShowScannerSelection->isChecked()); kdDebug(28000) << "Writing for " << STARTUP_SKIP_ASK << ": " << cbVal << endl; konf->writeEntry( STARTUP_SKIP_ASK, cbVal, true, true ); /* global flag goes to kdeglobals */ @@ -532,8 +532,8 @@ void KookaPreferences::slotDefault( void ) m_tileSelector->setURL( KURL(bgImg) ); m_thumbWidth->setValue( 100 ); m_thumbHeight->setValue( 120 ); - TQColor col1 = TQColor( tqcolorGroup().base()); - TQColor col2 = TQColor( tqcolorGroup().foreground()); + TQColor col1 = TQColor( colorGroup().base()); + TQColor col2 = TQColor( colorGroup().foreground()); m_frameWidth->setValue( 3 ); m_colButt1->setColor( col1 ); diff --git a/kooka/kookaview.cpp b/kooka/kookaview.cpp index 5586ee43..7d6c7f67 100644 --- a/kooka/kookaview.cpp +++ b/kooka/kookaview.cpp @@ -47,7 +47,7 @@ #endif #include #include -#include +#include #include #include #include @@ -164,7 +164,7 @@ KookaView::KookaView( KParts::DockMainWindow *parent, const TQCString& deviceToU TQHBox *recentBox = new TQHBox( m_dockRecent ); recentBox->setMargin(KDialog::marginHint()); TQLabel *lab = new TQLabel( i18n("Gallery:"), recentBox ); - lab->tqsetSizePolicy( TQSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed) ); + lab->setSizePolicy( TQSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed) ); recentFolder = new ImageNameCombo( recentBox ); m_dockRecent->setWidget( recentBox ); @@ -277,7 +277,7 @@ KookaView::KookaView( KParts::DockMainWindow *parent, const TQCString& deviceToU packager->openRoots(); - /* tqStatus Bar */ + /* Status Bar */ KStatusBar *statBar = m_mainWindow->statusBar(); // statBar->insertItem(TQString("1"), SBAR_ZOOM, 0, true ); @@ -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())); @@ -842,7 +842,7 @@ void KookaView::slShowAImage( KookaImage *img ) ocrFabric->slSetImage( img ); } - /* tqStatus Bar */ + /* Status Bar */ KStatusBar *statBar = m_mainWindow->statusBar(); if( img_canvas ) statBar->changeItem( img_canvas->imageInfoString(), StatusImage ); @@ -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/kookaview.h b/kooka/kookaview.h index 76910cdc..a4fe3383 100644 --- a/kooka/kookaview.h +++ b/kooka/kookaview.h @@ -31,7 +31,7 @@ #include "kookaiface.h" #include #include -#include +#include #include #include diff --git a/kooka/ksaneocr.cpp b/kooka/ksaneocr.cpp index 67d0aaca..a73402b6 100644 --- a/kooka/ksaneocr.cpp +++ b/kooka/ksaneocr.cpp @@ -60,7 +60,7 @@ #include #include #include -#include +#include #include /* @@ -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/ocrresedit.cpp b/kooka/ocrresedit.cpp index f8e8f2c2..75ec21c8 100644 --- a/kooka/ocrresedit.cpp +++ b/kooka/ocrresedit.cpp @@ -32,7 +32,7 @@ #include #include -#include +#include /* -------------------- ocrResEdit -------------------- */ diff --git a/kooka/ocrresedit.h b/kooka/ocrresedit.h index 72517f4b..b9e7a7e0 100644 --- a/kooka/ocrresedit.h +++ b/kooka/ocrresedit.h @@ -27,7 +27,7 @@ #ifndef _OCR_RESEDIT_ #define _OCR_RESEDIT_ -#include +#include class TQString; class TQColor; diff --git a/kooka/scanpackager.cpp b/kooka/scanpackager.cpp index 9a8c9d3a..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; } @@ -463,7 +463,7 @@ void ScanPackager::slotSelectDirectory( const TQString & dirString ) { kdDebug(28000) << "Trying to decode directory string " << dirString << endl; - TQString searchFor = TQString::tqfromLatin1(" - "); + TQString searchFor = TQString::fromLatin1(" - "); int pos = dirString.find( searchFor ); if( pos > -1 ) @@ -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 ); } diff --git a/kooka/thumbview.cpp b/kooka/thumbview.cpp index a431f1ea..570459f4 100644 --- a/kooka/thumbview.cpp +++ b/kooka/thumbview.cpp @@ -91,14 +91,14 @@ bool ThumbView::readSettings() bool dirty = false; TQColor color; - color = cfg->readColorEntry( MARGIN_COLOR1, &(tqcolorGroup().base())); + color = cfg->readColorEntry( MARGIN_COLOR1, &(colorGroup().base())); if( color != m_marginColor1 ) { dirty = true; m_marginColor1 = color; } - color = cfg->readColorEntry( MARGIN_COLOR2, &(tqcolorGroup().foreground())); + color = cfg->readColorEntry( MARGIN_COLOR2, &(colorGroup().foreground())); if( color != m_marginColor2 ) { dirty = true; -- cgit v1.2.3