From f176190ca6b0706ec1217d0da075c9513af80c0b Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Mon, 19 Dec 2011 11:43:35 -0600 Subject: Remove additional unneeded tq method conversions --- kipi-plugins/acquireimages/acquireimagedialog.cpp | 16 ++++----- .../batchprocessimagesdialog.cpp | 8 ++--- .../batchprocessimages/batchprocessimagesdialog.h | 2 +- .../batchprocessimages/batchprocessimagesitem.cpp | 8 ++--- .../batchprocessimages/batchprocessimagesitem.h | 2 +- kipi-plugins/batchprocessimages/imagepreview.cpp | 4 +-- .../batchprocessimages/renameimagesbase.ui | 2 +- kipi-plugins/calendar/caleventsbase.ui | 4 +-- kipi-plugins/calendar/caltemplate.cpp | 2 +- kipi-plugins/calendar/calwizard.cpp | 10 +++--- kipi-plugins/cdarchiving/cdarchiving.cpp | 26 +++++++-------- kipi-plugins/cdarchiving/cdarchivingdialog.cpp | 4 +-- kipi-plugins/cdarchiving/plugin_cdarchiving.cpp | 14 ++++---- kipi-plugins/findimages/displaycompare.cpp | 20 ++++++------ kipi-plugins/findimages/plugin_findimages.cpp | 18 +++++----- kipi-plugins/flickrexport/flickrtalker.cpp | 2 +- kipi-plugins/flickrexport/flickrwindow.cpp | 6 ++-- kipi-plugins/galleryexport/galleries.cpp | 20 ++++++------ kipi-plugins/galleryexport/gallerympform.cpp | 2 +- kipi-plugins/galleryexport/gallerywindow.cpp | 24 +++++++------- kipi-plugins/gpssync/gpseditdialog.cpp | 2 +- kipi-plugins/gpssync/gpslistviewitem.cpp | 16 ++++----- kipi-plugins/gpssync/gpslistviewitem.h | 2 +- kipi-plugins/gpssync/gpssyncdialog.cpp | 10 +++--- kipi-plugins/gpssync/kmlexport.cpp | 38 +++++++++++----------- kipi-plugins/gpssync/kmlexportconfig.cpp | 2 +- kipi-plugins/gpssync/kmlgpsdataparser.cpp | 8 ++--- kipi-plugins/gpssync/plugin_gpssync.cpp | 10 +++--- kipi-plugins/htmlexport/generator.cpp | 26 +++++++-------- kipi-plugins/htmlexport/listthemeparameter.cpp | 4 +-- kipi-plugins/htmlexport/themeparameterspage.ui | 2 +- kipi-plugins/htmlexport/wizard.cpp | 8 ++--- kipi-plugins/ipodexport/ipodexportdialog.cpp | 2 +- kipi-plugins/ipodexport/ipodheader.cpp | 6 ++-- kipi-plugins/jpeglossless/convert2grayscale.cpp | 2 +- kipi-plugins/jpeglossless/imageflip.cpp | 2 +- kipi-plugins/jpeglossless/imagerotate.cpp | 2 +- kipi-plugins/jpeglossless/plugin_jpeglossless.cpp | 10 +++--- kipi-plugins/jpeglossless/utils.cpp | 2 +- kipi-plugins/kameraklient/cameraiconitem.cpp | 2 +- kipi-plugins/kameraklient/cameraiconview.cpp | 2 +- kipi-plugins/kameraklient/cameraui.cpp | 4 +-- kipi-plugins/kameraklient/gpcontroller.cpp | 16 ++++----- kipi-plugins/kameraklient/savefiledialog.cpp | 2 +- kipi-plugins/kameraklient/thumbitem.cpp | 10 +++--- kipi-plugins/kameraklient/thumbitem.h | 2 +- kipi-plugins/kameraklient/thumbview.cpp | 6 ++-- kipi-plugins/metadataedit/commenteditdialog.cpp | 2 +- kipi-plugins/metadataedit/commentremovedialog.cpp | 2 +- kipi-plugins/metadataedit/exifcaption.cpp | 2 +- kipi-plugins/metadataedit/exifdatetime.cpp | 2 +- kipi-plugins/metadataedit/exifeditdialog.cpp | 8 ++--- kipi-plugins/metadataedit/iptccaption.cpp | 2 +- kipi-plugins/metadataedit/iptcdatetime.cpp | 2 +- kipi-plugins/metadataedit/iptceditdialog.cpp | 8 ++--- kipi-plugins/metadataedit/iptcorigin.cpp | 2 +- kipi-plugins/metadataedit/iptcstatus.cpp | 4 +-- kipi-plugins/metadataedit/plugin_metadataedit.cpp | 12 +++---- kipi-plugins/mpegencoder/images2mpg | 4 +-- kipi-plugins/mpegencoder/kimg2mpg.cpp | 18 +++++----- kipi-plugins/mpegencoder/kimg2mpgbase.ui | 14 ++++---- kipi-plugins/picasawebexport/mpform.cpp | 4 +-- kipi-plugins/picasawebexport/picasawebtalker.cpp | 26 +++++++-------- kipi-plugins/picasawebexport/picasawebwindow.cpp | 4 +-- kipi-plugins/picasawebexport/uploadwidget.ui | 4 +-- kipi-plugins/printwizard/cropframe.cpp | 8 ++--- kipi-plugins/printwizard/frmprintwizard.cpp | 6 ++-- kipi-plugins/printwizard/frmprintwizardbase.ui | 28 ++++++++-------- kipi-plugins/rawconverter/actionthread.cpp | 14 ++++---- kipi-plugins/rawconverter/batchdialog.cpp | 4 +-- kipi-plugins/rawconverter/clistviewitem.h | 8 ++--- kipi-plugins/rawconverter/plugin_rawconverter.cpp | 2 +- kipi-plugins/rawconverter/rawdecodingiface.cpp | 6 ++-- kipi-plugins/rawconverter/singledialog.cpp | 4 +-- kipi-plugins/sendimages/plugin_sendimages.cpp | 8 ++--- kipi-plugins/sendimages/sendimages.cpp | 18 +++++----- kipi-plugins/sendimages/sendimagesdialog.cpp | 16 ++++----- .../simpleviewerexport/simpleviewerexport.cpp | 22 ++++++------- kipi-plugins/slideshow/slideshowconfig.cpp | 8 ++--- kipi-plugins/slideshow/slideshowconfigbase.ui | 2 +- kipi-plugins/sync/gallerywindow.cpp | 24 +++++++------- kipi-plugins/sync/sinks.cpp | 4 +-- kipi-plugins/sync/sinks/gallery/galleryform.cpp | 2 +- kipi-plugins/sync/sinks/gallery/gallerysink.cpp | 16 ++++----- kipi-plugins/timeadjust/timeadjustdialog.cpp | 2 +- kipi-plugins/wallpaper/plugin_wallpaper.cpp | 2 +- 86 files changed, 358 insertions(+), 358 deletions(-) diff --git a/kipi-plugins/acquireimages/acquireimagedialog.cpp b/kipi-plugins/acquireimages/acquireimagedialog.cpp index 014d88a8..2499a59e 100644 --- a/kipi-plugins/acquireimages/acquireimagedialog.cpp +++ b/kipi-plugins/acquireimages/acquireimagedialog.cpp @@ -390,10 +390,10 @@ void AcquireImageDialog::slotAlbumSelected( const KURL &url ) items.setNum((*albumIt).images().count()); } - m_AlbumComments->setText( i18n("Caption: %1").tqarg(comments) ); - m_AlbumCollection->setText( i18n("Collection: %1").tqarg(category) ); - m_AlbumDate->setText( i18n("Date: %1").tqarg(date) ); - m_AlbumItems->setText( i18n("Items: %1").tqarg( items ) ); + m_AlbumComments->setText( i18n("Caption: %1").arg(comments) ); + m_AlbumCollection->setText( i18n("Collection: %1").arg(category) ); + m_AlbumDate->setText( i18n("Date: %1").arg(date) ); + m_AlbumItems->setText( i18n("Items: %1").arg( items ) ); } void AcquireImageDialog::slotOk() @@ -432,7 +432,7 @@ void AcquireImageDialog::slotOk() { for (int idx = 1; idx < 100 ; ++idx) { - url.setFileName(TQString("%1_%2%3").tqarg(fileName).tqarg(idx).tqarg(ext)); + url.setFileName(TQString("%1_%2%3").arg(fileName).arg(idx).arg(ext)); kdDebug(51001) << "File already exist. Try to fixed target Url to: " << url.prettyURL() << endl; if (!KIO::NetAccess::exists(url, false NETACCESS_WIDGET)) @@ -471,7 +471,7 @@ void AcquireImageDialog::slotOk() if ( !ok ) { - KMessageBox::error(this, i18n("Cannot write image file \"%1\".").tqarg(imagePath)); + KMessageBox::error(this, i18n("Cannot write image file \"%1\".").arg(imagePath)); return; } @@ -480,7 +480,7 @@ void AcquireImageDialog::slotOk() { if (!KIO::NetAccess::upload(imagePath, url NETACCESS_WIDGET)) { - KMessageBox::error(this, i18n("Could not upload image to \"%1\".").tqarg(url.prettyURL())); + KMessageBox::error(this, i18n("Could not upload image to \"%1\".").arg(url.prettyURL())); return; } } @@ -491,7 +491,7 @@ void AcquireImageDialog::slotOk() if ( !ok ) { KMessageBox::error(this, i18n("Error when informing the application about the new image. " - "The error was: %1" ).tqarg( err ) ); + "The error was: %1" ).arg( err ) ); return; } diff --git a/kipi-plugins/batchprocessimages/batchprocessimagesdialog.cpp b/kipi-plugins/batchprocessimages/batchprocessimagesdialog.cpp index 72ee0f7b..c339388e 100644 --- a/kipi-plugins/batchprocessimages/batchprocessimagesdialog.cpp +++ b/kipi-plugins/batchprocessimages/batchprocessimagesdialog.cpp @@ -487,7 +487,7 @@ bool BatchProcessImagesDialog::startProcess(void) { int ValRet = KMessageBox::warningYesNoCancel(this, i18n("The destination file \"%1\" already exists;\n" - "do you want overwrite it?").tqarg(item->nameDest()), + "do you want overwrite it?").arg(item->nameDest()), i18n("Overwrite Destination Image File"), KStdGuiItem::cont()); if ( ValRet == KMessageBox::No ) @@ -690,7 +690,7 @@ void BatchProcessImagesDialog::slotProcessDone(KProcess* proc) { int code = KMessageBox::warningContinueCancel( this, i18n("Error adding image to application; error message was: " - "%1").tqarg( errmsg ), + "%1").arg( errmsg ), i18n("Error Adding Image to Application") ); if ( code == KMessageBox::Cancel ) @@ -761,7 +761,7 @@ void BatchProcessImagesDialog::slotListDoubleClicked(TQListViewItem *itemClicked i18n("Image processing error"), item->outputMess(), i18n("Image \"%1\": %2\n\nThe output messages are:\n") - .tqarg(item->nameSrc()).tqarg(item->error()) + .arg(item->nameSrc()).arg(item->error()) ); infoDialog->exec(); } @@ -880,7 +880,7 @@ void BatchProcessImagesDialog::slotPreviewProcessDone(KProcess* proc) m_previewOutput, i18n("Cannot process preview for image \"%1\"." "\nThe output messages are:\n") - .tqarg(item->nameSrc()) + .arg(item->nameSrc()) ); infoDialog->exec(); } diff --git a/kipi-plugins/batchprocessimages/batchprocessimagesdialog.h b/kipi-plugins/batchprocessimages/batchprocessimagesdialog.h index 9ad1d0df..631046e0 100644 --- a/kipi-plugins/batchprocessimages/batchprocessimagesdialog.h +++ b/kipi-plugins/batchprocessimages/batchprocessimagesdialog.h @@ -81,7 +81,7 @@ Q_OBJECT public: // Don't forget to add the 'm_Type' and 'm_labelType' implementation in the constructor of - // tqchildren dialog class. + // children dialog class. BatchProcessImagesDialog( KURL::List urlList, KIPI::Interface* interface, TQString caption, TQWidget *parent=0 ); ~BatchProcessImagesDialog(); diff --git a/kipi-plugins/batchprocessimages/batchprocessimagesitem.cpp b/kipi-plugins/batchprocessimages/batchprocessimagesitem.cpp index 6d691553..af5f2b8c 100644 --- a/kipi-plugins/batchprocessimages/batchprocessimagesitem.cpp +++ b/kipi-plugins/batchprocessimages/batchprocessimagesitem.cpp @@ -62,24 +62,24 @@ void BatchProcessImagesItem::changeError(TQString text) { _error = text; } void BatchProcessImagesItem::changeNameDest(TQString text) { _nameDest = text; setText(2, _nameDest); } void BatchProcessImagesItem::changeOutputMess(TQString text) { _outputMess.append(text); } -void BatchProcessImagesItem::paintCell (TQPainter *p, const TQColorGroup &cg, int column, int width, int tqalignment) +void BatchProcessImagesItem::paintCell (TQPainter *p, const TQColorGroup &cg, int column, int width, int alignment) { TQColorGroup _cg( cg ); if (text(3) != i18n("OK") && !text(3).isEmpty() ) { _cg.setColor( TQColorGroup::Text, TQt::red ); - KListViewItem::paintCell( p, _cg, column, width, tqalignment ); + KListViewItem::paintCell( p, _cg, column, width, alignment ); return; } if (text(3) == i18n("OK") ) { _cg.setColor( TQColorGroup::Text, TQt::darkGreen ); - KListViewItem::paintCell( p, _cg, column, width, tqalignment ); + KListViewItem::paintCell( p, _cg, column, width, alignment ); return; } - KListViewItem::paintCell( p, cg, column, width, tqalignment ); + KListViewItem::paintCell( p, cg, column, width, alignment ); } bool BatchProcessImagesItem::overWrote() diff --git a/kipi-plugins/batchprocessimages/batchprocessimagesitem.h b/kipi-plugins/batchprocessimages/batchprocessimagesitem.h index 60b12c4e..d17f9e78 100644 --- a/kipi-plugins/batchprocessimages/batchprocessimagesitem.h +++ b/kipi-plugins/batchprocessimages/batchprocessimagesitem.h @@ -61,7 +61,7 @@ public: void changeNameDest(TQString text); void changeOutputMess(TQString text); - void paintCell (TQPainter *p, const TQColorGroup &cg, int column, int width, int tqalignment); + void paintCell (TQPainter *p, const TQColorGroup &cg, int column, int width, int alignment); void setKey(const TQString& val, bool reverseSort); TQString key(int column, bool ascending) const; diff --git a/kipi-plugins/batchprocessimages/imagepreview.cpp b/kipi-plugins/batchprocessimages/imagepreview.cpp index d3248bd2..783e20c2 100644 --- a/kipi-plugins/batchprocessimages/imagepreview.cpp +++ b/kipi-plugins/batchprocessimages/imagepreview.cpp @@ -80,8 +80,8 @@ int INIT_ZOOM_FACTOR; ImagePreview::ImagePreview(const TQString &fileOrig, const TQString &fileDest, const TQString &tmpPath, bool cropActionOrig, bool cropActionDest, const TQString &EffectName, const TQString &FileName, TQWidget *parent) - : KDialogBase( parent, "PreviewDialog", true, i18n("Batch Process Preview (%1 - %2)").tqarg(EffectName) - .tqarg(FileName), Help|Ok, Ok, true) + : KDialogBase( parent, "PreviewDialog", true, i18n("Batch Process Preview (%1 - %2)").arg(EffectName) + .arg(FileName), Help|Ok, Ok, true) { // About data and help button. diff --git a/kipi-plugins/batchprocessimages/renameimagesbase.ui b/kipi-plugins/batchprocessimages/renameimagesbase.ui index 75c390f0..779fecf2 100644 --- a/kipi-plugins/batchprocessimages/renameimagesbase.ui +++ b/kipi-plugins/batchprocessimages/renameimagesbase.ui @@ -157,7 +157,7 @@ - + AlignTop|AlignHCenter diff --git a/kipi-plugins/calendar/caleventsbase.ui b/kipi-plugins/calendar/caleventsbase.ui index 80dff76c..6307181c 100644 --- a/kipi-plugins/calendar/caleventsbase.ui +++ b/kipi-plugins/calendar/caleventsbase.ui @@ -77,7 +77,7 @@ You can download a calendar for your country from http://www.icalshare.com/ or other sites. This is fully optional. All the events from this calendar will be printed red. - + WordBreak|AlignVCenter @@ -161,7 +161,7 @@ This is fully optional. All the events from this calendar will be printed red.You can create such a calendar using KOrganizer or any other calendar program. This is fully optional. All the events from this calendar will be printed green. - + WordBreak|AlignVCenter diff --git a/kipi-plugins/calendar/caltemplate.cpp b/kipi-plugins/calendar/caltemplate.cpp index 21ccf88a..dd97df99 100644 --- a/kipi-plugins/calendar/caltemplate.cpp +++ b/kipi-plugins/calendar/caltemplate.cpp @@ -153,7 +153,7 @@ CalTemplate::CalTemplate(TQWidget* parent, const char* name) htqlayout->addWidget( comboFont_ ); TQFontDatabase fontDB; - TQStringList families(fontDB.tqfamilies()); + TQStringList families(fontDB.families()); TQStringList smoothScalableFamilies; for (TQStringList::iterator it=families.begin(); it != families.end(); ++it) diff --git a/kipi-plugins/calendar/calwizard.cpp b/kipi-plugins/calendar/calwizard.cpp index 935ae871..818616f0 100644 --- a/kipi-plugins/calendar/calwizard.cpp +++ b/kipi-plugins/calendar/calwizard.cpp @@ -229,7 +229,7 @@ void CalWizard::slotPageSelected(const TQString&) "of that part of the generation of the calendar."); wPrintLabel_->setText(i18n("Click Next to start Printing

" - "Following months will be printed for year %1:").tqarg(year) + "Following months will be printed for year %1:").arg(year) + TQString("
") + printList.join(" - ") + extra + extra2); wPrintLabel_->setTextFormat(TQt::RichText); @@ -320,12 +320,12 @@ void CalWizard::slotPrintOnePage() #if KDE_IS_VERSION(3,2,0) wFinishLabel_->setText(i18n("Printing Calendar Page for %1 of %2") - .tqarg(KGlobal::locale()->calendar()->monthName(month, cSettings_->getYear(), false)) - .tqarg(yearName)); + .arg(KGlobal::locale()->calendar()->monthName(month, cSettings_->getYear(), false)) + .arg(yearName)); #else wFinishLabel_->setText(i18n("Printing Calendar Page for %1 of %2") - .tqarg(KGlobal::locale()->monthName(month)). - .tqarg(yearName)); + .arg(KGlobal::locale()->monthName(month)). + .arg(yearName)); #endif currPage_++; diff --git a/kipi-plugins/cdarchiving/cdarchiving.cpp b/kipi-plugins/cdarchiving/cdarchiving.cpp index d9519abc..ca763d10 100644 --- a/kipi-plugins/cdarchiving/cdarchiving.cpp +++ b/kipi-plugins/cdarchiving/cdarchiving.cpp @@ -464,7 +464,7 @@ void CDArchiving::slotK3bDone(KProcess*) d->action = KIPICDArchivingPlugin::Error; d->starting = false; d->success = false; - d->message = i18n("Cannot remove temporary folder '%1'.").tqarg(m_tmpFolder); + d->message = i18n("Cannot remove temporary folder '%1'.").arg(m_tmpFolder); TQApplication::sendEvent(m_parent, new TQCustomEvent(TQEvent::User, d)); usleep(1000); } @@ -494,7 +494,7 @@ bool CDArchiving::buildHTMLInterface (void) d->action = KIPICDArchivingPlugin::Error; d->starting = false; d->success = false; - d->message = i18n("Cannot remove folder '%1'.").tqarg(MainTPath); + d->message = i18n("Cannot remove folder '%1'.").arg(MainTPath); TQApplication::sendEvent(m_parent, new TQCustomEvent(TQEvent::User, d)); usleep(1000); return false; @@ -507,7 +507,7 @@ bool CDArchiving::buildHTMLInterface (void) d->action = KIPICDArchivingPlugin::Error; d->starting = false; d->success = false; - d->message = i18n("Could not create folder '%1'.").tqarg(MainTPath); + d->message = i18n("Could not create folder '%1'.").arg(MainTPath); TQApplication::sendEvent(m_parent, new TQCustomEvent(TQEvent::User, d)); usleep(1000); return false; @@ -556,7 +556,7 @@ bool CDArchiving::buildHTMLInterface (void) d->action = KIPICDArchivingPlugin::Error; d->starting = false; d->success = false; - d->message = i18n("Could not create folder '%1'.").tqarg(SubTPath); + d->message = i18n("Could not create folder '%1'.").arg(SubTPath); TQApplication::sendEvent(m_parent, new TQCustomEvent(TQEvent::User, d)); usleep(1000); return false; @@ -586,7 +586,7 @@ bool CDArchiving::buildHTMLInterface (void) d->action = KIPICDArchivingPlugin::Error; d->starting = false; d->success = false; - d->message = i18n("Cannot remove folder '%1'.").tqarg(MainTPath); + d->message = i18n("Cannot remove folder '%1'.").arg(MainTPath); TQApplication::sendEvent(m_parent, new TQCustomEvent(TQEvent::User, d)); usleep(1000); return false; @@ -623,7 +623,7 @@ bool CDArchiving::buildHTMLInterface (void) d->action = KIPICDArchivingPlugin::Error; d->starting = false; d->success = false; - d->message = i18n("Could not open file '%1'.").tqarg(MainUrl.path(+1)); + d->message = i18n("Could not open file '%1'.").arg(MainUrl.path(+1)); TQApplication::sendEvent(m_parent, new TQCustomEvent(TQEvent::User, d)); usleep(1000); return false; @@ -649,7 +649,7 @@ bool CDArchiving::createDirectory(TQDir thumb_dir, TQString imgGalleryDir, TQStr d->starting = false; d->success = false; d->message = i18n("Could not create folder '%1' in '%2'.") - .tqarg(dirName).tqarg(imgGalleryDir); + .arg(dirName).arg(imgGalleryDir); TQApplication::sendEvent(m_parent, new TQCustomEvent(TQEvent::User, d)); usleep(1000); return false; @@ -961,7 +961,7 @@ void CDArchiving::createBody(TQTextStream& stream, << "\" height=\"31\" width=\"88\" title=\"" << Temp << "\" />" << endl; Temp = i18n("Album archive created with " - "%2 on %3").tqarg(m_hostURL).tqarg(m_hostName).tqarg(today); + "%2 on %3").arg(m_hostURL).arg(m_hostName).arg(today); stream << Temp << endl; stream << "

" << endl; @@ -1001,7 +1001,7 @@ void CDArchiving::createBodyMainPage(TQTextStream& stream, KURL& url) << Temp << "\" />" << endl; Temp = i18n("Album archive created with " - "%2 on %3").tqarg(m_hostURL).tqarg(m_hostName).tqarg(today); + "%2 on %3").arg(m_hostURL).arg(m_hostName).arg(today); stream << Temp << endl; stream << "

" << endl; stream << "\n\n" << endl; @@ -1053,7 +1053,7 @@ bool CDArchiving::createHtml( const KIPI::ImageCollection& album, d->action = KIPICDArchivingPlugin::Error; d->starting = false; d->success = false; - d->message = i18n("Could not open file '%1'.").tqarg(targetURL.path(+1)); + d->message = i18n("Could not open file '%1'.").arg(targetURL.path(+1)); TQApplication::sendEvent(m_parent, new TQCustomEvent(TQEvent::User, d)); usleep(1000); return false; @@ -1245,7 +1245,7 @@ bool CDArchiving::createPage(const TQString& imgGalleryDir, << valid << "\" height=\"31\" width=\"88\" title=\"" << valid << "\" />" << endl; valid = i18n("Image gallery created with " - "%2 on %3").tqarg(m_hostURL).tqarg(m_hostName).tqarg(today); + "%2 on %3").arg(m_hostURL).arg(m_hostName).arg(today); stream << valid << "" << endl; @@ -1580,7 +1580,7 @@ bool CDArchiving::BuildK3bXMLprojectfile (TQString HTMLinterfaceFolder, TQString d->action = KIPICDArchivingPlugin::Progress; d->starting = true; d->success = false; - d->message = i18n("Adding Album '%1' into project...").tqarg( (*it).name() ); + d->message = i18n("Adding Album '%1' into project...").arg( (*it).name() ); TQApplication::sendEvent(m_parent, new TQCustomEvent(TQEvent::User, d)); usleep(1000); addCollectionToK3bXMLProjectFile( *it, &stream); @@ -1889,7 +1889,7 @@ TQString CDArchiving::EscapeSgmlText(const TQTextCodec* codec, { if (!codec->canEncode(ch)) { - strReturn += TQString("&#%1;").tqarg(ch.tqunicode()); + strReturn += TQString("&#%1;").arg(ch.tqunicode()); break; } } diff --git a/kipi-plugins/cdarchiving/cdarchivingdialog.cpp b/kipi-plugins/cdarchiving/cdarchivingdialog.cpp index 9d80807c..e94baf73 100644 --- a/kipi-plugins/cdarchiving/cdarchivingdialog.cpp +++ b/kipi-plugins/cdarchiving/cdarchivingdialog.cpp @@ -621,8 +621,8 @@ void CDArchivingDialog::ShowMediaCapacity(void) Color = ""; m_mediaSize->setText( i18n("Total size: ") + Color + - i18n("%1 / %2").tqarg(KIO::convertSizeFromKB(TargetMediaSize)) - .tqarg(KIO::convertSizeFromKB (MaxMediaSize)) ); + i18n("%1 / %2").arg(KIO::convertSizeFromKB(TargetMediaSize)) + .arg(KIO::convertSizeFromKB (MaxMediaSize)) ); } void CDArchivingDialog::slotOk() diff --git a/kipi-plugins/cdarchiving/plugin_cdarchiving.cpp b/kipi-plugins/cdarchiving/plugin_cdarchiving.cpp index 0bab4a2e..5d70cc99 100644 --- a/kipi-plugins/cdarchiving/plugin_cdarchiving.cpp +++ b/kipi-plugins/cdarchiving/plugin_cdarchiving.cpp @@ -157,7 +157,7 @@ void Plugin_CDArchiving::customEvent(TQCustomEvent *event) case(KIPICDArchivingPlugin::BuildAlbumHTMLPage): { - text = i18n("Making HTML pages for Album '%1'...").tqarg(d->albumName); + text = i18n("Making HTML pages for Album '%1'...").arg(d->albumName); break; } @@ -169,7 +169,7 @@ void Plugin_CDArchiving::customEvent(TQCustomEvent *event) case(KIPICDArchivingPlugin::ResizeImages): { - text = i18n("Creating thumbnail for '%1'...").tqarg(d->fileName); + text = i18n("Creating thumbnail for '%1'...").arg(d->fileName); break; } @@ -211,14 +211,14 @@ void Plugin_CDArchiving::customEvent(TQCustomEvent *event) case(KIPICDArchivingPlugin::BuildAlbumHTMLPage): { ++m_current; - text = i18n("HTML page creation for Album '%1' completed.").tqarg(d->albumName); + text = i18n("HTML page creation for Album '%1' completed.").arg(d->albumName); break; } case(KIPICDArchivingPlugin::ResizeImages): { ++m_current; - text = i18n("Creating thumbnail for '%1' done.").tqarg(d->fileName); + text = i18n("Creating thumbnail for '%1' done.").arg(d->fileName); break; } @@ -250,7 +250,7 @@ void Plugin_CDArchiving::customEvent(TQCustomEvent *event) { case(KIPICDArchivingPlugin::ResizeImages): { - text = i18n("Failed to create thumbnail for '%1'").tqarg(d->fileName); + text = i18n("Failed to create thumbnail for '%1'").arg(d->fileName); m_progressDlg->addedAction(text, KIPI::WarningMessage); m_progressDlg->setProgress(m_current, m_total); break; @@ -260,7 +260,7 @@ void Plugin_CDArchiving::customEvent(TQCustomEvent *event) { ++m_current; text = i18n("Failed to create HTML interface: %1") - .tqarg(d->message); + .arg(d->message); m_progressDlg->addedAction(text, KIPI::ErrorMessage); m_progressDlg->setProgress(m_current, m_total); slotCancel(); @@ -271,7 +271,7 @@ void Plugin_CDArchiving::customEvent(TQCustomEvent *event) case(KIPICDArchivingPlugin::BuildAlbumHTMLPage): { text = i18n("Failed to create HTML pages for Album '%1'") - .tqarg(d->albumName); + .arg(d->albumName); m_progressDlg->addedAction(text, KIPI::ErrorMessage); m_progressDlg->setProgress(m_current, m_total); slotCancel(); diff --git a/kipi-plugins/findimages/displaycompare.cpp b/kipi-plugins/findimages/displaycompare.cpp index a11966e9..e9661897 100644 --- a/kipi-plugins/findimages/displaycompare.cpp +++ b/kipi-plugins/findimages/displaycompare.cpp @@ -308,7 +308,7 @@ void DisplayCompare::slotDelete( void ) KURL deleteImage(item->fullpath()); if ( KIO::NetAccess::del(deleteImage) == false ) - KMessageBox::error(this, i18n("Cannot remove duplicate file:\n%1").tqarg(item->fullpath())); + KMessageBox::error(this, i18n("Cannot remove duplicate file:\n%1").arg(item->fullpath())); else m_interface->delImage( deleteImage ); @@ -329,7 +329,7 @@ void DisplayCompare::slotDelete( void ) KURL deleteImage(item->fullpath()); if ( KIO::NetAccess::del(deleteImage) == false ) - KMessageBox::error(this, i18n("Cannot remove original file:\n%1").tqarg(item->fullpath())); + KMessageBox::error(this, i18n("Cannot remove original file:\n%1").arg(item->fullpath())); item->setOn( false ); } @@ -350,14 +350,14 @@ void DisplayCompare::slotDisplayLeft(TQListViewItem * item) if ( !im.isNull() ) { OriginalNameLabel->setText(pitem->name()); - originalInfoLabel1->setText(i18n("Image size: %1x%2 pixels").tqarg(im.width()).tqarg(im.height())); + originalInfoLabel1->setText(i18n("Image size: %1x%2 pixels").arg(im.width()).arg(im.height())); originalInfoLabel2->setText(i18n("File size: 1 byte", "File size: %n bytes",TQFileInfo(pitem->fullpath()).size())); - originalInfoLabel3->setText(i18n("Modified: %1").tqarg(KLocale(NULL) + originalInfoLabel3->setText(i18n("Modified: %1").arg(KLocale(NULL) .formatDateTime(TQFileInfo(pitem->fullpath()) .lastModified()))); - originalInfoLabel4->setText(i18n("Album: %1").tqarg(pitem->album())); - originalInfoLabel5->setText(i18n("Comments: %1").tqarg(pitem->comments())); + originalInfoLabel4->setText(i18n("Album: %1").arg(pitem->album())); + originalInfoLabel5->setText(i18n("Comments: %1").arg(pitem->comments())); } preview1->clear(); @@ -427,14 +427,14 @@ void DisplayCompare::slotDisplayRight(TQListViewItem * item) if ( !im.isNull() ) { similarNameLabel->setText(pitem->name()); - similarInfoLabel1->setText(i18n("Image size: %1x%2 pixels").tqarg(im.width()).tqarg(im.height())); + similarInfoLabel1->setText(i18n("Image size: %1x%2 pixels").arg(im.width()).arg(im.height())); similarInfoLabel2->setText(i18n("File size: 1 byte", "File size: %n bytes", TQFileInfo(pitem->fullpath()).size())); - similarInfoLabel3->setText(i18n("Modified: %1").tqarg(KLocale(NULL) + similarInfoLabel3->setText(i18n("Modified: %1").arg(KLocale(NULL) .formatDateTime(TQFileInfo(pitem->fullpath()) .lastModified()))); - similarInfoLabel4->setText(i18n("Album: %1").tqarg(pitem->album())); - similarInfoLabel5->setText(i18n("Caption: %1").tqarg(pitem->comments())); + similarInfoLabel4->setText(i18n("Album: %1").arg(pitem->album())); + similarInfoLabel5->setText(i18n("Caption: %1").arg(pitem->comments())); } preview2->clear(); diff --git a/kipi-plugins/findimages/plugin_findimages.cpp b/kipi-plugins/findimages/plugin_findimages.cpp index b169a4c2..91a650a4 100644 --- a/kipi-plugins/findimages/plugin_findimages.cpp +++ b/kipi-plugins/findimages/plugin_findimages.cpp @@ -143,26 +143,26 @@ void Plugin_FindImages::customEvent(TQCustomEvent *event) { case(KIPIFindDupplicateImagesPlugin::Similar): { - text = i18n("Similar comparison for '%1'").tqarg(TQFileInfo(d->fileName).fileName() ); + text = i18n("Similar comparison for '%1'").arg(TQFileInfo(d->fileName).fileName() ); break; } case(KIPIFindDupplicateImagesPlugin::Exact): { m_total = d->total; // Needed because the total can change in this mode ! - text = i18n("Exact comparison for '%1'").tqarg(TQFileInfo(d->fileName).fileName()); + text = i18n("Exact comparison for '%1'").arg(TQFileInfo(d->fileName).fileName()); break; } case(KIPIFindDupplicateImagesPlugin::Matrix): { - text = i18n("Creating fingerprint for '%1'").tqarg(TQFileInfo(d->fileName).fileName()); + text = i18n("Creating fingerprint for '%1'").arg(TQFileInfo(d->fileName).fileName()); break; } case(KIPIFindDupplicateImagesPlugin::FastParsing): { - text = i18n("Fast parsing for '%1'").tqarg(TQFileInfo(d->fileName).fileName()); + text = i18n("Fast parsing for '%1'").arg(TQFileInfo(d->fileName).fileName()); break; } @@ -192,7 +192,7 @@ void Plugin_FindImages::customEvent(TQCustomEvent *event) case(KIPIFindDupplicateImagesPlugin::Matrix): { text = i18n("Failed to create fingerprint for '%1'") - .tqarg(TQFileInfo(d->fileName).fileName()); + .arg(TQFileInfo(d->fileName).fileName()); break; } @@ -232,28 +232,28 @@ void Plugin_FindImages::customEvent(TQCustomEvent *event) case(KIPIFindDupplicateImagesPlugin::Matrix): { text = i18n("Fingerprint created for '%1'") - .tqarg(TQFileInfo(d->fileName).fileName()); + .arg(TQFileInfo(d->fileName).fileName()); break; } case(KIPIFindDupplicateImagesPlugin::FastParsing): { text = i18n("Fast parsing completed for '%1'") - .tqarg(TQFileInfo(d->fileName).fileName()); + .arg(TQFileInfo(d->fileName).fileName()); break; } case(KIPIFindDupplicateImagesPlugin::Similar): { text = i18n("Finding similar images for '%1' completed.") - .tqarg(TQFileInfo(d->fileName).fileName()); + .arg(TQFileInfo(d->fileName).fileName()); break; } case(KIPIFindDupplicateImagesPlugin::Exact): { text = i18n("Finding exact images for '%1' completed.") - .tqarg(TQFileInfo(d->fileName).fileName()); + .arg(TQFileInfo(d->fileName).fileName()); break; } diff --git a/kipi-plugins/flickrexport/flickrtalker.cpp b/kipi-plugins/flickrexport/flickrtalker.cpp index 0a317ec6..2194bc99 100644 --- a/kipi-plugins/flickrexport/flickrtalker.cpp +++ b/kipi-plugins/flickrexport/flickrtalker.cpp @@ -542,7 +542,7 @@ void FlickrTalker::slotError(const TQString& error) }; KMessageBox::error(TQT_TQWIDGET(kapp->activeWindow()), - i18n("Error Occured: %1\n We can not proceed further").tqarg(transError)); + i18n("Error Occured: %1\n We can not proceed further").arg(transError)); // kdDebug() << "Not handling the error now will see it later" << endl; } diff --git a/kipi-plugins/flickrexport/flickrwindow.cpp b/kipi-plugins/flickrexport/flickrwindow.cpp index 8109c8ab..7b8864d9 100644 --- a/kipi-plugins/flickrexport/flickrwindow.cpp +++ b/kipi-plugins/flickrexport/flickrwindow.cpp @@ -292,7 +292,7 @@ void FlickrWindow::slotTokenObtained(const TQString& token) m_username = m_talker->getUserName(); m_userId = m_talker->getUserId(); kdDebug() << "SlotTokenObtained invoked setting user Display name to " << m_username << endl; - m_userNameDisplayLabel->setText(TQString("%1").tqarg(m_username)); + m_userNameDisplayLabel->setText(TQString("%1").arg(m_username)); m_widget->setEnabled(true); } @@ -531,7 +531,7 @@ void FlickrWindow::slotAddPhotoNext() return; } - m_progressDlg->setLabelText(i18n("Uploading file %1").tqarg(pathComments.first.filename())); + m_progressDlg->setLabelText(i18n("Uploading file %1").arg(pathComments.first.filename())); if (m_progressDlg->isHidden()) m_progressDlg->show(); @@ -550,7 +550,7 @@ void FlickrWindow::slotAddPhotoSucceeded() void FlickrWindow::slotAddPhotoFailed(const TQString& msg) { if (KMessageBox::warningContinueCancel(this, - i18n("Failed to upload photo into Flickr. %1\nDo you want to continue?").tqarg(msg)) + i18n("Failed to upload photo into Flickr. %1\nDo you want to continue?").arg(msg)) != KMessageBox::Continue) { m_uploadQueue.clear(); diff --git a/kipi-plugins/galleryexport/galleries.cpp b/kipi-plugins/galleryexport/galleries.cpp index af186be3..5accc6cc 100644 --- a/kipi-plugins/galleryexport/galleries.cpp +++ b/kipi-plugins/galleryexport/galleries.cpp @@ -157,12 +157,12 @@ void Galleries::Load() mMaxGalleryId = gallery_id; // Load the gallery with this id. - name = config.readEntry(TQString("Name%1").tqarg(gallery_id)); - url = config.readEntry(TQString("URL%1").tqarg(gallery_id)); - username = config.readEntry(TQString("Username%1").tqarg(gallery_id)); - version = config.readNumEntry(TQString("Version%1").tqarg(gallery_id)); + name = config.readEntry(TQString("Name%1").arg(gallery_id)); + url = config.readEntry(TQString("URL%1").arg(gallery_id)); + username = config.readEntry(TQString("Username%1").arg(gallery_id)); + version = config.readNumEntry(TQString("Version%1").arg(gallery_id)); if (bln_use_wallet) - mpWallet->readPassword(TQString("Password%1").tqarg(gallery_id), password); + mpWallet->readPassword(TQString("Password%1").arg(gallery_id), password); Gallery* p_gallery = new Gallery(name, url, username, password, version, gallery_id); mGalleries.append(p_gallery); @@ -217,12 +217,12 @@ void Galleries::Save() unsigned int gallery_id = p_gallery->galleryId(); gallery_ids.append(gallery_id); - config.writeEntry(TQString("Name%1").tqarg(gallery_id), p_gallery->name()); - config.writeEntry(TQString("URL%1").tqarg(gallery_id), p_gallery->url()); - config.writeEntry(TQString("Username%1").tqarg(gallery_id), p_gallery->username()); - config.writeEntry(TQString("Version%1").tqarg(gallery_id), p_gallery->version()); + config.writeEntry(TQString("Name%1").arg(gallery_id), p_gallery->name()); + config.writeEntry(TQString("URL%1").arg(gallery_id), p_gallery->url()); + config.writeEntry(TQString("Username%1").arg(gallery_id), p_gallery->username()); + config.writeEntry(TQString("Version%1").arg(gallery_id), p_gallery->version()); if (bln_use_wallet) - mpWallet->writePassword(TQString("Password%1").tqarg(gallery_id), p_gallery->password()); + mpWallet->writePassword(TQString("Password%1").arg(gallery_id), p_gallery->password()); } config.setGroup("GallerySync Settings"); diff --git a/kipi-plugins/galleryexport/gallerympform.cpp b/kipi-plugins/galleryexport/gallerympform.cpp index 5161bc25..8f603752 100644 --- a/kipi-plugins/galleryexport/gallerympform.cpp +++ b/kipi-plugins/galleryexport/gallerympform.cpp @@ -76,7 +76,7 @@ void GalleryMPForm::finish() bool GalleryMPForm::addPair(const TQString& name, const TQString& value) { if (GalleryTalker::isGallery2()) - return addPairRaw(TQString("g2_form[%1]").tqarg(name), value); + return addPairRaw(TQString("g2_form[%1]").arg(name), value); return addPairRaw(name, value); } diff --git a/kipi-plugins/galleryexport/gallerywindow.cpp b/kipi-plugins/galleryexport/gallerywindow.cpp index e58713c5..d9ac4177 100644 --- a/kipi-plugins/galleryexport/gallerywindow.cpp +++ b/kipi-plugins/galleryexport/gallerywindow.cpp @@ -346,18 +346,18 @@ void GalleryWindow::slotPhotos( const TQValueList& photoList) TQString styleSheet = TQString( "body { margin: 8px; font-size: %1px; " " color: %2; background-color: %3;}" ) - .tqarg( pxSize ) - .tqarg( colorGroup().text().name() ) - .tqarg( colorGroup().base().name() ); + .arg( pxSize ) + .arg( colorGroup().text().name() ) + .arg( colorGroup().base().name() ); styleSheet += TQString( "a { font-size: %1px; color: %2; " "text-decoration: none;}" ) - .tqarg( pxSize ) - .tqarg( colorGroup().text().name() ); + .arg( pxSize ) + .arg( colorGroup().text().name() ); styleSheet += TQString( "i { font-size: %1px; color: %2; " "text-decoration: none;}" ) - .tqarg( pxSize-2 ) - .tqarg( TQColor("steelblue").name() ); + .arg( pxSize-2 ) + .arg( TQColor("steelblue").name() ); m_photoView->begin(); m_photoView->setUserStyleSheet( styleSheet ); @@ -378,13 +378,13 @@ void GalleryWindow::slotPhotos( const TQValueList& photoList) m_photoView->write( "" + TQString("") - .tqarg(imageurl.url()) + .arg(imageurl.url()) + TQString("
") - .tqarg(thumburl.url()) + .arg(thumburl.url()) + photo.name + ( photo.caption.isEmpty() ? TQString() : TQString("
%1") - .tqarg(photo.caption) ) + .arg(photo.caption) ) + "" ); } @@ -529,7 +529,7 @@ void GalleryWindow::slotNewAlbum() if (!clean) { KMessageBox::error( this, i18n("Sorry, these characters are not allowed in album name: %1") - .tqarg("\\ / * ? \" \' & < > | . + # ( ) or spaces") ); + .arg("\\ / * ? \" \' & < > | . + # ( ) or spaces") ); return; } @@ -601,7 +601,7 @@ void GalleryWindow::slotAddPhotoNext() } m_progressDlg->setLabelText( i18n("Uploading file %1 ") - .tqarg( KURL(pathComments.first).filename() ) ); + .arg( KURL(pathComments.first).filename() ) ); if (m_progressDlg->isHidden()) m_progressDlg->show(); diff --git a/kipi-plugins/gpssync/gpseditdialog.cpp b/kipi-plugins/gpssync/gpseditdialog.cpp index 96663f73..e87f86ca 100644 --- a/kipi-plugins/gpssync/gpseditdialog.cpp +++ b/kipi-plugins/gpssync/gpseditdialog.cpp @@ -85,7 +85,7 @@ public: GPSEditDialog::GPSEditDialog(TQWidget* parent, const GPSDataContainer& gpsData, const TQString& fileName, bool hasGPSInfo) - : KDialogBase(Plain, i18n("%1 - Edit Geographical Coordinates").tqarg(fileName), + : KDialogBase(Plain, i18n("%1 - Edit Geographical Coordinates").arg(fileName), Help|Ok|Cancel, Ok, parent, 0, true, false) { diff --git a/kipi-plugins/gpssync/gpslistviewitem.cpp b/kipi-plugins/gpssync/gpslistviewitem.cpp index 03782916..0b186d0b 100644 --- a/kipi-plugins/gpssync/gpslistviewitem.cpp +++ b/kipi-plugins/gpssync/gpslistviewitem.cpp @@ -117,7 +117,7 @@ void GPSListViewItem::setGPSInfo(const GPSDataContainer& gpsData, bool dirty, bo setText(6, status); } - tqrepaint(); + repaint(); } GPSDataContainer GPSListViewItem::GPSInfo() const @@ -130,7 +130,7 @@ void GPSListViewItem::eraseGPSInfo() d->erase = true; d->dirty = true; setText(6, i18n("Deleted!")); - tqrepaint(); + repaint(); } void GPSListViewItem::setDateTime(const TQDateTime& date) @@ -197,7 +197,7 @@ void GPSListViewItem::writeGPSInfoToFile() void GPSListViewItem::setEnabled(bool e) { d->enabled = e; - tqrepaint(); + repaint(); } bool GPSListViewItem::isEnabled() @@ -210,7 +210,7 @@ bool GPSListViewItem::isDirty() return d->dirty; } -void GPSListViewItem::paintCell(TQPainter *p, const TQColorGroup &cg, int column, int width, int tqalignment) +void GPSListViewItem::paintCell(TQPainter *p, const TQColorGroup &cg, int column, int width, int alignment) { if (isEnabled()) { @@ -219,7 +219,7 @@ void GPSListViewItem::paintCell(TQPainter *p, const TQColorGroup &cg, int column TQColorGroup _cg( cg ); TQColor c = _cg.text(); _cg.setColor( TQColorGroup::Text, TQt::red ); - KListViewItem::paintCell( p, _cg, column, width, tqalignment ); + KListViewItem::paintCell( p, _cg, column, width, alignment ); _cg.setColor( TQColorGroup::Text, c ); } else if ( isDirty() && d->erase && column == 6) @@ -227,18 +227,18 @@ void GPSListViewItem::paintCell(TQPainter *p, const TQColorGroup &cg, int column TQColorGroup _cg( cg ); TQColor c = _cg.text(); _cg.setColor( TQColorGroup::Text, TQt::red ); - KListViewItem::paintCell( p, _cg, column, width, tqalignment ); + KListViewItem::paintCell( p, _cg, column, width, alignment ); _cg.setColor( TQColorGroup::Text, c ); } else - KListViewItem::paintCell(p, cg, column, width, tqalignment); + KListViewItem::paintCell(p, cg, column, width, alignment); } else { TQColorGroup _cg( cg ); TQColor c = _cg.text(); _cg.setColor( TQColorGroup::Text, TQt::gray ); - KListViewItem::paintCell( p, _cg, column, width, tqalignment ); + KListViewItem::paintCell( p, _cg, column, width, alignment ); _cg.setColor( TQColorGroup::Text, c ); } } diff --git a/kipi-plugins/gpssync/gpslistviewitem.h b/kipi-plugins/gpssync/gpslistviewitem.h index a9c05263..738b6101 100644 --- a/kipi-plugins/gpssync/gpslistviewitem.h +++ b/kipi-plugins/gpssync/gpslistviewitem.h @@ -71,7 +71,7 @@ public: protected: - void paintCell(TQPainter *p, const TQColorGroup &cg, int column, int width, int tqalignment); + void paintCell(TQPainter *p, const TQColorGroup &cg, int column, int width, int alignment); private: diff --git a/kipi-plugins/gpssync/gpssyncdialog.cpp b/kipi-plugins/gpssync/gpssyncdialog.cpp index 37799af9..cfc3ee3e 100644 --- a/kipi-plugins/gpssync/gpssyncdialog.cpp +++ b/kipi-plugins/gpssync/gpssyncdialog.cpp @@ -299,7 +299,7 @@ void GPSSyncDialog::setImages( const KURL::List& images ) void GPSSyncDialog::slotLoadGPXFile() { KURL loadGPXFile = KFileDialog::getOpenURL(KGlobalSettings::documentPath(), - i18n("%1|GPS Exchange Format").tqarg("*.gpx"), this, + i18n("%1|GPS Exchange Format").arg("*.gpx"), this, i18n("Select GPX File to Load") ); if( loadGPXFile.isEmpty() ) return; @@ -310,7 +310,7 @@ void GPSSyncDialog::slotLoadGPXFile() if (!ret) { KMessageBox::error(this, i18n("Cannot parse %1 GPX file!") - .tqarg(loadGPXFile.fileName()), i18n("GPS Sync")); + .arg(loadGPXFile.fileName()), i18n("GPS Sync")); enableButton(User1, false); return; } @@ -318,13 +318,13 @@ void GPSSyncDialog::slotLoadGPXFile() if (d->gpxParser.numPoints() <= 0) { KMessageBox::sorry(this, i18n("The %1 GPX file do not have a date-time track to use!") - .tqarg(loadGPXFile.fileName()), i18n("GPS Sync")); + .arg(loadGPXFile.fileName()), i18n("GPS Sync")); enableButton(User1, false); return; } d->gpxFileName->setText(loadGPXFile.fileName()); - d->gpxPointsLabel->setText(i18n("Points parsed: %1").tqarg(d->gpxParser.numPoints())); + d->gpxPointsLabel->setText(i18n("Points parsed: %1").arg(d->gpxParser.numPoints())); enableButton(User1, true); slotUser1(); } @@ -373,7 +373,7 @@ bool GPSSyncDialog::promptUserClose() if (KMessageBox::No == KMessageBox::warningYesNo(this, i18n("

%1\n" "Do you really want to close this window without applying changes?

") - .tqarg(msg))) + .arg(msg))) return false; } diff --git a/kipi-plugins/gpssync/kmlexport.cpp b/kipi-plugins/gpssync/kmlexport.cpp index c95b54af..c3a13376 100644 --- a/kipi-plugins/gpssync/kmlexport.cpp +++ b/kipi-plugins/gpssync/kmlexport.cpp @@ -80,7 +80,7 @@ bool kmlExport::createDir(TQDir dir) bool ok = createDir(parent); if (!ok) { - logError(i18n("Could not create '%1").tqarg(parent.path())); + logError(i18n("Could not create '%1").arg(parent.path())); return false; } return parent.mkdir(dir.dirName()); @@ -164,14 +164,14 @@ void kmlExport::generateImagesthumb(KIPI::Interface* interface, const KURL& imag TQFile imageFile(path); if (!imageFile.open(IO_ReadOnly)) { - logWarning(i18n("Could not read image '%1'").tqarg(path)); + logWarning(i18n("Could not read image '%1'").arg(path)); return; } TQString imageFormat = TQImageIO::imageFormat(TQT_TQIODEVICE(&imageFile)); if (imageFormat.isEmpty()) { - logWarning(i18n("Format of image '%1' is unknown").tqarg(path)); + logWarning(i18n("Format of image '%1' is unknown").arg(path)); return; } imageFile.close(); @@ -181,7 +181,7 @@ void kmlExport::generateImagesthumb(KIPI::Interface* interface, const KURL& imag TQImage image; if (!image.loadFromData(imageData) ) { - logWarning(i18n("Error loading image '%1'").tqarg(path)); + logWarning(i18n("Error loading image '%1'").arg(path)); return; } @@ -221,11 +221,11 @@ void kmlExport::generateImagesthumb(KIPI::Interface* interface, const KURL& imag if (!image.save(destPath, imageFormat.ascii(), 85)) { // if not able to save the image, it's pointless to create a placemark - logWarning(i18n("Could not save image '%1' to '%2'").tqarg(path).tqarg(destPath)); + logWarning(i18n("Could not save image '%1' to '%2'").arg(path).arg(destPath)); } else { - //logInfo(i18n("Creation of picture '%1'").tqarg(fullFileName)); + //logInfo(i18n("Creation of picture '%1'").arg(fullFileName)); KExiv2Iface::KExiv2 exiv2Iface; exiv2Iface.load(imageURL.path()); double alt, lat, lng; @@ -237,11 +237,11 @@ void kmlExport::generateImagesthumb(KIPI::Interface* interface, const KURL& imag if (alt) { - addKmlTextElement(kmlGeometry, "coordinates", TQString("%1,%2,%3").tqarg(lng).tqarg(lat).tqarg(alt)); + addKmlTextElement(kmlGeometry, "coordinates", TQString("%1,%2,%3").arg(lng).arg(lat).arg(alt)); } else { - addKmlTextElement(kmlGeometry, "coordinates", TQString("%1,%2").tqarg(lng).tqarg(lat)); + addKmlTextElement(kmlGeometry, "coordinates", TQString("%1,%2").arg(lng).arg(lat)); } if (m_altitudeMode == 2 ) @@ -301,18 +301,18 @@ void kmlExport::generateImagesthumb(KIPI::Interface* interface, const KURL& imag my_description += "
" + info.description() ; } addKmlTextElement(kmlPlacemark, "description", my_description); - logInfo(i18n("Creation of placemark '%1'").tqarg(fullFileName)); + logInfo(i18n("Creation of placemark '%1'").arg(fullFileName)); // Save icon TQString iconFileName = "thumb_" + baseFileName + '.' + imageFormat.lower(); TQString destPath = m_tempDestDir + m_imageDir + iconFileName; if (!icon.save(destPath, imageFormat.ascii(), 85)) { - logWarning(i18n("Could not save icon for image '%1' to '%2'").tqarg(path).tqarg(destPath)); + logWarning(i18n("Could not save icon for image '%1' to '%2'").arg(path).arg(destPath)); } else { - //logInfo(i18n("Creation of icon '%1'").tqarg(iconFileName)); + //logInfo(i18n("Creation of icon '%1'").arg(iconFileName)); // style et icon TQDomElement kmlStyle = addKmlElement(kmlPlacemark, "Style"); TQDomElement kmlIconStyle = addKmlElement(kmlStyle, "IconStyle"); @@ -347,14 +347,14 @@ void kmlExport::addTrack(TQDomElement &kmlAlbum) if (!ret) { - logError(i18n("Cannot parse %1 GPX file!").tqarg(m_GPXFile)); + logError(i18n("Cannot parse %1 GPX file!").arg(m_GPXFile)); return; } if (m_gpxParser.numPoints() <= 0) { logError(i18n("The %1 GPX file do not have a date-time track to use!") - .tqarg(m_GPXFile)); + .arg(m_GPXFile)); return; } @@ -381,12 +381,12 @@ void kmlExport::addTrack(TQDomElement &kmlAlbum) TQDomElement kmlLineStyle = addKmlElement(kmlLineTrackStyle, "LineStyle"); // the KML color is not #RRGGBB but AABBGGRR TQString KMLColorValue = TQString("%1%2%3%4") - .tqarg((int)m_GPXOpacity*256/100, 2, 16) - .tqarg((&m_GPXColor)->blue(), 2, 16) - .tqarg((&m_GPXColor)->green(), 2, 16) - .tqarg((&m_GPXColor)->red(), 2, 16); + .arg((int)m_GPXOpacity*256/100, 2, 16) + .arg((&m_GPXColor)->blue(), 2, 16) + .arg((&m_GPXColor)->green(), 2, 16) + .arg((&m_GPXColor)->red(), 2, 16); addKmlTextElement(kmlLineStyle, "color", KMLColorValue); - addKmlTextElement(kmlLineStyle, "width", TQString("%1").tqarg(m_LineWidth) ); + addKmlTextElement(kmlLineStyle, "width", TQString("%1").arg(m_LineWidth) ); m_gpxParser.CreateTrackLine(kmlAlbum, *kmlDocument, m_GPXAltitudeMode); } @@ -440,7 +440,7 @@ void kmlExport::generate() } else { - logWarning(i18n("No position data for '%1'").tqarg(info.title())); + logWarning(i18n("No position data for '%1'").arg(info.title())); defectImage++; } m_progressDialog->setProgress(pos, count); diff --git a/kipi-plugins/gpssync/kmlexportconfig.cpp b/kipi-plugins/gpssync/kmlexportconfig.cpp index 78d1b00e..f2deee8b 100644 --- a/kipi-plugins/gpssync/kmlexportconfig.cpp +++ b/kipi-plugins/gpssync/kmlexportconfig.cpp @@ -190,7 +190,7 @@ KMLExportConfig::KMLExportConfig( TQWidget* parent, const char* name) GPXTracksGroupBoxLayout->addMultiCellWidget( GPXFileLabel_, 1, 1, 0, 0); GPXFileKURLRequester_ = new KURLRequester( GPXTracksGroupBox, "GPXFileKURLRequester" ); - GPXFileKURLRequester_->setFilter(i18n("%1|GPS Exchange Format").tqarg("*.gpx")); + GPXFileKURLRequester_->setFilter(i18n("%1|GPS Exchange Format").arg("*.gpx")); GPXFileKURLRequester_->setCaption(i18n("Select GPX File to Load")); GPXTracksGroupBoxLayout->addMultiCellWidget( GPXFileKURLRequester_, 1, 1, 1, 3); diff --git a/kipi-plugins/gpssync/kmlgpsdataparser.cpp b/kipi-plugins/gpssync/kmlgpsdataparser.cpp index 1d9226de..522da15c 100644 --- a/kipi-plugins/gpssync/kmlgpsdataparser.cpp +++ b/kipi-plugins/gpssync/kmlgpsdataparser.cpp @@ -49,7 +49,7 @@ TQString KMLGPSDataParser::lineString() for (GPSDataMap::ConstIterator it = m_GPSDataMap.constBegin(); it != end; ++it ) { - line += TQString("%1,%2,%3 ").tqarg(it.data().longitude()).tqarg(it.data().latitude()).tqarg(it.data().altitude()); + line += TQString("%1,%2,%3 ").arg(it.data().longitude()).arg(it.data().latitude()).arg(it.data().altitude()); } return line; } @@ -102,7 +102,7 @@ void KIPIGPSSyncPlugin::KMLGPSDataParser::CreateTrackPoints(TQDomElement &parent it != end; ++it, i++) { TQDomElement kmlPointPlacemark = addKmlElement(kmlPointsFolder, "Placemark"); - addKmlTextElement(kmlPointPlacemark, "name", TQString("%1 %2 ").tqarg(i18n("Point")).tqarg(i)); + addKmlTextElement(kmlPointPlacemark, "name", TQString("%1 %2 ").arg(i18n("Point")).arg(i)); addKmlTextElement(kmlPointPlacemark, "styleUrl", "#track"); TQDomElement kmlTimeStamp = addKmlElement(kmlPointPlacemark, "TimeStamp"); // GPS device are sync in time by satellite using GMT time. @@ -117,11 +117,11 @@ void KIPIGPSSyncPlugin::KMLGPSDataParser::CreateTrackPoints(TQDomElement &parent if (it.data().latitude()) { addKmlTextElement(kmlGeometry, "coordinates", - TQString("%1,%2,%3").tqarg(it.data().longitude()).tqarg(it.data().latitude()).tqarg(it.data().altitude())); + TQString("%1,%2,%3").arg(it.data().longitude()).arg(it.data().latitude()).arg(it.data().altitude())); } else { - addKmlTextElement(kmlGeometry, "coordinates", TQString("%1,%2").tqarg(it.data().longitude()).tqarg(it.data().latitude())); + addKmlTextElement(kmlGeometry, "coordinates", TQString("%1,%2").arg(it.data().longitude()).arg(it.data().latitude())); } if (altitudeMode == 2 ) { diff --git a/kipi-plugins/gpssync/plugin_gpssync.cpp b/kipi-plugins/gpssync/plugin_gpssync.cpp index 2c9695a3..0adba49d 100644 --- a/kipi-plugins/gpssync/plugin_gpssync.cpp +++ b/kipi-plugins/gpssync/plugin_gpssync.cpp @@ -141,8 +141,8 @@ bool Plugin_GPSSync::checkBinaries(TQString &gpsBabelVersion) "Please install gpsbabel as a package from your distributor " "or download the source.

" "

Note: at least, gpsbabel version %2 is required by this plugin.

") - .tqarg("http://www.gpsbabel.org") - .tqarg(gpsBabelBinary.minimalVersion()), + .arg("http://www.gpsbabel.org") + .arg(gpsBabelBinary.minimalVersion()), TQString(), TQString(), KMessageBox::Notify | KMessageBox::AllowLink); @@ -160,9 +160,9 @@ bool Plugin_GPSSync::checkBinaries(TQString &gpsBabelVersion) "or download the source.

" "

Note: at least, gpsbabel version %3 is required by this " "plugin

") - .tqarg(gpsBabelVersion) - .tqarg("http://www.gpsbabel.org") - .tqarg(gpsBabelBinary.minimalVersion()), + .arg(gpsBabelVersion) + .arg("http://www.gpsbabel.org") + .arg(gpsBabelBinary.minimalVersion()), TQString(), TQString(), KMessageBox::Notify | KMessageBox::AllowLink); diff --git a/kipi-plugins/htmlexport/generator.cpp b/kipi-plugins/htmlexport/generator.cpp index 2e521619..d1bbe1ce 100644 --- a/kipi-plugins/htmlexport/generator.cpp +++ b/kipi-plugins/htmlexport/generator.cpp @@ -172,7 +172,7 @@ struct Generator::Private { bool init() { mTheme=Theme::findByInternalName(mInfo->theme()); if (!mTheme) { - logError( i18n("Could not find theme in '%1'").tqarg(mInfo->theme()) ); + logError( i18n("Could not find theme in '%1'").arg(mInfo->theme()) ); return false; } return true; @@ -200,11 +200,11 @@ struct Generator::Private { bool writeDataToFile(const TQByteArray& data, const TQString& destPath) { TQFile destFile(destPath); if (!destFile.open(IO_WriteOnly)) { - logWarning(i18n("Could not open file '%1' for writing").tqarg(destPath)); + logWarning(i18n("Could not open file '%1' for writing").arg(destPath)); return false; } if (destFile.writeBlock(data) != (TQ_LONG)data.size()) { - logWarning(i18n("Could not save image to file '%1'").tqarg(destPath)); + logWarning(i18n("Could not save image to file '%1'").arg(destPath)); return false; } return true; @@ -233,13 +233,13 @@ struct Generator::Private { TQString path=imageURL.path(); TQFile imageFile(path); if (!imageFile.open(IO_ReadOnly)) { - logWarning(i18n("Could not read image '%1'").tqarg(path)); + logWarning(i18n("Could not read image '%1'").arg(path)); return; } TQString imageFormat = TQImageIO::imageFormat(TQT_TQIODEVICE(&imageFile)); if (imageFormat.isEmpty()) { - logWarning(i18n("Format of image '%1' is unknown").tqarg(path)); + logWarning(i18n("Format of image '%1' is unknown").arg(path)); return; } imageFile.close(); @@ -248,7 +248,7 @@ struct Generator::Private { TQByteArray imageData = imageFile.readAll(); TQImage originalImage; if (!originalImage.loadFromData(imageData) ) { - logWarning(i18n("Error loading image '%1'").tqarg(path)); + logWarning(i18n("Error loading image '%1'").arg(path)); return; } @@ -284,7 +284,7 @@ struct Generator::Private { fullFileName = baseFileName + "." + mInfo->fullFormatString().lower(); TQString destPath = destDir + "/" + fullFileName; if (!fullImage.save(destPath, mInfo->fullFormatString().ascii(), mInfo->fullQuality())) { - logWarning(i18n("Could not save image '%1' to '%2'").tqarg(path).tqarg(destPath)); + logWarning(i18n("Could not save image '%1' to '%2'").arg(path).arg(destPath)); return; } } @@ -302,7 +302,7 @@ struct Generator::Private { TQString thumbnailFileName = "thumb_" + baseFileName + "." + mInfo->thumbnailFormatString().lower(); TQString destPath = destDir + "/" + thumbnailFileName; if (!thumbnail.save(destPath, mInfo->thumbnailFormatString().ascii(), mInfo->thumbnailQuality())) { - logWarning(i18n("Could not save thumbnail for image '%1' to '%2'").tqarg(path).tqarg(destPath)); + logWarning(i18n("Could not save thumbnail for image '%1' to '%2'").arg(path).arg(destPath)); return; } @@ -337,7 +337,7 @@ struct Generator::Private { TQValueList::Iterator collectionEnd=mInfo->mCollectionList.end(); for (; collectionIt!=collectionEnd; ++collectionIt) { KIPI::ImageCollection collection=*collectionIt; - logInfo( i18n("Generating files for \"%1\"").tqarg(collection.name()) ); + logInfo( i18n("Generating files for \"%1\"").arg(collection.name()) ); TQString collectionFileName = webifyFileName(collection.name()); TQString destDir = baseDestDir + "/" + collectionFileName; @@ -406,13 +406,13 @@ struct Generator::Private { CWrapper xslt= xsltParseStylesheetFile( (const xmlChar*) xsltFileName.local8Bit().data() ); if (!xslt) { - logError(i18n("Could not load XSL file '%1'").tqarg(xsltFileName)); + logError(i18n("Could not load XSL file '%1'").arg(xsltFileName)); return false; } CWrapper xmlGallery=xmlParseFile( mXMLFileName.local8Bit().data() ); if (!xmlGallery) { - logError(i18n("Could not load XML file '%1'").tqarg(mXMLFileName)); + logError(i18n("Could not load XML file '%1'").arg(mXMLFileName)); return false; } @@ -451,7 +451,7 @@ struct Generator::Private { TQString destFileName=mInfo->destKURL().path() + "/index.html"; FILE* file=fopen(destFileName.local8Bit().data(), "w"); if (!file) { - logError(i18n("Could not open '%1' for writing").tqarg(destFileName)); + logError(i18n("Could not open '%1' for writing").arg(destFileName)); return false; } xsltSaveResultToFile(file, xmlOutput, xslt); @@ -469,7 +469,7 @@ struct Generator::Private { TQString part = *it; if (!dir.exists(part)) { if (!dir.mkdir(part)) { - logError(i18n("Could not create folder '%1' in '%2'").tqarg(part).tqarg(dir.absPath())); + logError(i18n("Could not create folder '%1' in '%2'").arg(part).arg(dir.absPath())); return false; } } diff --git a/kipi-plugins/htmlexport/listthemeparameter.cpp b/kipi-plugins/htmlexport/listthemeparameter.cpp index 8bae470e..e2bb23e7 100644 --- a/kipi-plugins/htmlexport/listthemeparameter.cpp +++ b/kipi-plugins/htmlexport/listthemeparameter.cpp @@ -49,8 +49,8 @@ void ListThemeParameter::init(const TQCString& internalName, const KConfigBase* AbstractThemeParameter::init(internalName, configFile); for (int pos=0;; ++pos) { - TQString valueKey = TQString("%1%2").tqarg(ITEM_VALUE_KEY).tqarg(pos); - TQString captionKey = TQString("%1%2").tqarg(ITEM_CAPTION_KEY).tqarg(pos); + TQString valueKey = TQString("%1%2").arg(ITEM_VALUE_KEY).arg(pos); + TQString captionKey = TQString("%1%2").arg(ITEM_CAPTION_KEY).arg(pos); if (!configFile->hasKey(valueKey) || !configFile->hasKey(captionKey)) { break; } diff --git a/kipi-plugins/htmlexport/themeparameterspage.ui b/kipi-plugins/htmlexport/themeparameterspage.ui index a6bfd033..4fd5a21e 100644 --- a/kipi-plugins/htmlexport/themeparameterspage.ui +++ b/kipi-plugins/htmlexport/themeparameterspage.ui @@ -37,7 +37,7 @@ In this page, you can change some theme parameters. Depending on the theme, different parameters are available. - + WordBreak|AlignVCenter diff --git a/kipi-plugins/htmlexport/wizard.cpp b/kipi-plugins/htmlexport/wizard.cpp index 28aa1f2c..d25045f1 100644 --- a/kipi-plugins/htmlexport/wizard.cpp +++ b/kipi-plugins/htmlexport/wizard.cpp @@ -136,7 +136,7 @@ struct Wizard::Private { themeParameter->defaultValue()); TQString name = themeParameter->name(); - name = i18n("'%1' is a label for a theme parameter", "%1:").tqarg(name); + name = i18n("'%1' is a label for a theme parameter", "%1:").arg(name); TQLabel* label = new TQLabel(name, content); TQWidget* widget = themeParameter->createWidget(content, value); @@ -242,12 +242,12 @@ void Wizard::slotThemeSelectionChanged() { TQString url=theme->authorUrl(); TQString author=theme->authorName(); if (!url.isEmpty()) { - author=TQString("%2").tqarg(url).tqarg(author); + author=TQString("%2").arg(url).arg(author); } TQString txt= - TQString("%1

%2

").tqarg(theme->name(), theme->comment()) - + i18n("Author: %1").tqarg(author); + TQString("%1

%2

").arg(theme->name(), theme->comment()) + + i18n("Author: %1").arg(author); browser->setText(txt); setNextEnabled(d->mThemePage, true); diff --git a/kipi-plugins/ipodexport/ipodexportdialog.cpp b/kipi-plugins/ipodexport/ipodexportdialog.cpp index cb54703d..54f34f2a 100644 --- a/kipi-plugins/ipodexport/ipodexportdialog.cpp +++ b/kipi-plugins/ipodexport/ipodexportdialog.cpp @@ -700,7 +700,7 @@ UploadDialog::openDevice() debug() << "could not find iTunesDB on device mounted at " << m_mountPoint << endl; TQString msg = i18n( "An iPod photo database could not be found on device mounted at %1. " - "Should I try to initialize your iPod photo database?" ).tqarg( m_mountPoint ); + "Should I try to initialize your iPod photo database?" ).arg( m_mountPoint ); if( KMessageBox::warningContinueCancel( this, msg, i18n( "Initialize iPod Photo Database?" ), KGuiItem(i18n("&Initialize"), "new") ) == KMessageBox::Continue ) diff --git a/kipi-plugins/ipodexport/ipodheader.cpp b/kipi-plugins/ipodexport/ipodheader.cpp index 51b9784e..255f3e60 100644 --- a/kipi-plugins/ipodexport/ipodheader.cpp +++ b/kipi-plugins/ipodexport/ipodheader.cpp @@ -86,7 +86,7 @@ void IpodHeader::setIncompatibleIpod() { const TQString modelType = UploadDialog::instance()->ipodModel(); - m_messageLabel->setText( i18n("

Your iPod (%1) does not seem to support artwork.

" ).tqarg( modelType ) ); + m_messageLabel->setText( i18n("

Your iPod (%1) does not seem to support artwork.

" ).arg( modelType ) ); setPaletteBackgroundColor( TQColor(225,150,0) ); m_messageLabel->setPaletteBackgroundColor( TQColor(225,150,0) ); @@ -109,12 +109,12 @@ void IpodHeader::setValidIpod() if( !mountPoint.isEmpty() ) { m_messageLabel->setText( i18n("

iPod %1 detected at: %2

" ) - .tqarg( modelType, mountPoint ) ); + .arg( modelType, mountPoint ) ); } else { m_messageLabel->setText( i18n("

iPod %1 detected

" ) - .tqarg( modelType ) ); + .arg( modelType ) ); } setPaletteBackgroundColor( TQColor(0,98,0) ); m_messageLabel->setPaletteBackgroundColor( TQColor(0,98,0) ); diff --git a/kipi-plugins/jpeglossless/convert2grayscale.cpp b/kipi-plugins/jpeglossless/convert2grayscale.cpp index 95aff083..7c154f74 100644 --- a/kipi-plugins/jpeglossless/convert2grayscale.cpp +++ b/kipi-plugins/jpeglossless/convert2grayscale.cpp @@ -258,7 +258,7 @@ bool ImageGrayScale::image2GrayScaleImageMagick(const TQString& src, const TQStr } // Processing error ! - err = i18n("Cannot convert to gray scale: %1").tqarg(m_stdErr.replace('\n', ' ')); + err = i18n("Cannot convert to gray scale: %1").arg(m_stdErr.replace('\n', ' ')); return false; } diff --git a/kipi-plugins/jpeglossless/imageflip.cpp b/kipi-plugins/jpeglossless/imageflip.cpp index 5cadb2fa..55e3c975 100644 --- a/kipi-plugins/jpeglossless/imageflip.cpp +++ b/kipi-plugins/jpeglossless/imageflip.cpp @@ -213,7 +213,7 @@ bool ImageFlip::flipImageMagick(const TQString& src, const TQString& dest, FlipA } // Processing error ! - err = i18n("Cannot flip: %1").tqarg(m_stdErr.replace('\n', ' ')); + err = i18n("Cannot flip: %1").arg(m_stdErr.replace('\n', ' ')); return false; } diff --git a/kipi-plugins/jpeglossless/imagerotate.cpp b/kipi-plugins/jpeglossless/imagerotate.cpp index 31360ba0..6b030f61 100644 --- a/kipi-plugins/jpeglossless/imagerotate.cpp +++ b/kipi-plugins/jpeglossless/imagerotate.cpp @@ -237,7 +237,7 @@ bool ImageRotate::rotateImageMagick(const TQString& src, const TQString& dest, } // Processing error ! - err = i18n("Cannot rotate: %1").tqarg(m_stdErr.replace('\n', ' ')); + err = i18n("Cannot rotate: %1").arg(m_stdErr.replace('\n', ' ')); return false; } diff --git a/kipi-plugins/jpeglossless/plugin_jpeglossless.cpp b/kipi-plugins/jpeglossless/plugin_jpeglossless.cpp index 3b35e6a6..6b50023d 100644 --- a/kipi-plugins/jpeglossless/plugin_jpeglossless.cpp +++ b/kipi-plugins/jpeglossless/plugin_jpeglossless.cpp @@ -213,7 +213,7 @@ void Plugin_JPEGLossless::slotFlip() } m_progressDlg = new KIPI::BatchProgressDialog(TQT_TQWIDGET(kapp->activeWindow()), - i18n("Flip images %1").tqarg(title)); + i18n("Flip images %1").arg(title)); connect(m_progressDlg, TQT_SIGNAL(cancelClicked()), this, TQT_SLOT(slotCancel())); @@ -269,7 +269,7 @@ void Plugin_JPEGLossless::slotRotate() } m_progressDlg = new KIPI::BatchProgressDialog(TQT_TQWIDGET(kapp->activeWindow()), - i18n("Rotate images %1").tqarg(title)); + i18n("Rotate images %1").arg(title)); connect(m_progressDlg, TQT_SIGNAL(cancelClicked()), this, TQT_SLOT(slotCancel())); @@ -344,17 +344,17 @@ void Plugin_JPEGLossless::customEvent(TQCustomEvent *event) { case(KIPIJPEGLossLessPlugin::Rotate): { - text = i18n("Rotating Image \"%1\"").tqarg(d->fileName.section('/', -1)); + text = i18n("Rotating Image \"%1\"").arg(d->fileName.section('/', -1)); break; } case(KIPIJPEGLossLessPlugin::Flip): { - text = i18n("Flipping Image \"%1\"").tqarg(d->fileName.section('/', -1)); + text = i18n("Flipping Image \"%1\"").arg(d->fileName.section('/', -1)); break; } case(KIPIJPEGLossLessPlugin::GrayScale): { - text = i18n("Converting to Black & White \"%1\"").tqarg(d->fileName.section('/', -1)); + text = i18n("Converting to Black & White \"%1\"").arg(d->fileName.section('/', -1)); break; } default: diff --git a/kipi-plugins/jpeglossless/utils.cpp b/kipi-plugins/jpeglossless/utils.cpp index d96b57e3..4347c8cb 100644 --- a/kipi-plugins/jpeglossless/utils.cpp +++ b/kipi-plugins/jpeglossless/utils.cpp @@ -175,7 +175,7 @@ bool Utils::updateMetadataImageMagick(const TQString& src, TQString& err) } // Processing error ! - err = i18n("Cannot update metadata: %1").tqarg(m_stdErr.replace('\n', ' ')); + err = i18n("Cannot update metadata: %1").arg(m_stdErr.replace('\n', ' ')); return false; } diff --git a/kipi-plugins/kameraklient/cameraiconitem.cpp b/kipi-plugins/kameraklient/cameraiconitem.cpp index 717af09e..d8f03369 100644 --- a/kipi-plugins/kameraklient/cameraiconitem.cpp +++ b/kipi-plugins/kameraklient/cameraiconitem.cpp @@ -93,7 +93,7 @@ void CameraIconItem::setPixmap(const TQImage& thumb) { painter.fillRect(0, 0, size, size, TQBrush(iconView()->colorGroup().base())); painter.drawImage((size-thumb.width())/2, (size-thumb.height())/2, thumb); painter.end(); - tqrepaint(); + repaint(); } } // NameSpace KIPIKameraKlientPlugin diff --git a/kipi-plugins/kameraklient/cameraiconview.cpp b/kipi-plugins/kameraklient/cameraiconview.cpp index 8f8bacf1..123b82e6 100644 --- a/kipi-plugins/kameraklient/cameraiconview.cpp +++ b/kipi-plugins/kameraklient/cameraiconview.cpp @@ -136,7 +136,7 @@ void CameraIconView::markDownloaded(CameraIconItem* iconItem) { } GPFileItemInfo *fileInfo = const_cast(iconItem->fileInfo()); fileInfo->downloaded = 1; - iconItem->tqrepaint(); + iconItem->repaint(); } } // NameSpace KIPIKameraKlientPlugin diff --git a/kipi-plugins/kameraklient/cameraui.cpp b/kipi-plugins/kameraklient/cameraui.cpp index b4a36355..f36960a5 100644 --- a/kipi-plugins/kameraklient/cameraui.cpp +++ b/kipi-plugins/kameraklient/cameraui.cpp @@ -435,7 +435,7 @@ void CameraUI::slotCameraDownloadSelected() { TQString dir = mDownloadDirectoryEdit->text(); TQDir qdir(dir); if(!qdir.exists()) { - KMessageBox::error(this, i18n("'%1' directory does not exist.").tqarg(dir)); + KMessageBox::error(this, i18n("'%1' directory does not exist.").arg(dir)); return; } int count = 0; @@ -510,7 +510,7 @@ void CameraUI::slotCameraUpload() { } TQString uploadName = info.fileName(); while (container_->findItem(folderItem->folderPath(), uploadName)) { - TQString msg(i18n("Camera Folder '%1' contains item '%2'\n Please, enter New Name").tqarg(folderItem->folderName()).tqarg(uploadName)); + TQString msg(i18n("Camera Folder '%1' contains item '%2'\n Please, enter New Name").arg(folderItem->folderName()).arg(uploadName)); uploadName = KLineEditDlg::getText(msg,uploadName,&ok,this); if(!ok){ return; diff --git a/kipi-plugins/kameraklient/gpcontroller.cpp b/kipi-plugins/kameraklient/gpcontroller.cpp index 7f59c08d..c66c5d29 100644 --- a/kipi-plugins/kameraklient/gpcontroller.cpp +++ b/kipi-plugins/kameraklient/gpcontroller.cpp @@ -254,7 +254,7 @@ void GPController::getSubFolders(const TQString& folder) { } return; } else { - TQString msg(i18n("Failed to get subfolder names from '%1'\n").tqarg(folder)); + TQString msg(i18n("Failed to get subfolder names from '%1'\n").arg(folder)); error(msg); return; } @@ -275,7 +275,7 @@ void GPController::getItemsInfo(const TQString& folder) { if (result == GPCamera::GPSuccess) { TQApplication::postEvent(parent_, new GPEventGetItemsInfo(folder, infoList)); } else { - TQString msg(i18n("Failed to get images information from '%1'\n").tqarg(folder)); + TQString msg(i18n("Failed to get images information from '%1'\n").arg(folder)); error(msg); } } @@ -298,7 +298,7 @@ void GPController::getThumbnail(const TQString& folder, const TQString& imageNam scaleHighlightThumbnail(thumbnail); TQApplication::postEvent(parent_, new GPEventGetThumbnail(folder, imageName, thumbnail)); } else { - kdWarning() << i18n("Failed to get preview for '%1/%2'").tqarg(folder).tqarg(imageName) << endl; + kdWarning() << i18n("Failed to get preview for '%1/%2'").arg(folder).arg(imageName) << endl; } } @@ -307,7 +307,7 @@ void GPController::downloadItem(const TQString& folder, const TQString& itemName int result = camera_->downloadItem(folder, itemName, saveFile); mutex_.unlock(); if (result != GPCamera::GPSuccess) { - TQString msg(i18n("Failed to download '%1' from '%2'").tqarg(itemName).tqarg(folder)); + TQString msg(i18n("Failed to download '%1' from '%2'").arg(itemName).arg(folder)); error(msg); } else { TQApplication::postEvent(parent_, new GPEventDownloadItem(folder, itemName)); @@ -319,7 +319,7 @@ void GPController::openItem(const TQString& folder, const TQString& itemName, co int result = camera_->downloadItem(folder, itemName, saveFile); mutex_.unlock(); if (result != GPCamera::GPSuccess) { - TQString msg(i18n("Failed to open '%1'").tqarg(itemName)); + TQString msg(i18n("Failed to open '%1'").arg(itemName)); error(msg); } else { TQApplication::postEvent(parent_, new GPEventOpenItem(saveFile)); @@ -331,7 +331,7 @@ void GPController::openItemWithService(const TQString& folder, const TQString& i int result = camera_->downloadItem(folder, itemName, saveFile); mutex_.unlock(); if (result != GPCamera::GPSuccess) { - TQString msg(i18n("Failed to open '%1'").tqarg(itemName)); + TQString msg(i18n("Failed to open '%1'").arg(itemName)); error(msg); } else { TQApplication::postEvent(parent_, new GPEventOpenItemWithService(saveFile, serviceName)); @@ -343,7 +343,7 @@ void GPController::deleteItem(const TQString& folder, const TQString& itemName) int result = camera_->deleteItem(folder, itemName); mutex_.unlock(); if (result != GPCamera::GPSuccess) { - TQString msg(i18n("Failed to delete '%1'").tqarg(itemName)); + TQString msg(i18n("Failed to delete '%1'").arg(itemName)); error(msg); } else { TQApplication::postEvent(parent_, new GPEventDeleteItem(folder, itemName)); @@ -355,7 +355,7 @@ void GPController::uploadItem(const TQString& folder, const TQString& uploadName int result = camera_->uploadItem(folder, uploadName, localFile); mutex_.unlock(); if (result != GPCamera::GPSuccess) { - TQString msg(i18n("Failed to upload '%1'").tqarg(localFile)); + TQString msg(i18n("Failed to upload '%1'").arg(localFile)); error(msg); } else { GPFileItemInfoList infoList; diff --git a/kipi-plugins/kameraklient/savefiledialog.cpp b/kipi-plugins/kameraklient/savefiledialog.cpp index a050f014..3e973a15 100644 --- a/kipi-plugins/kameraklient/savefiledialog.cpp +++ b/kipi-plugins/kameraklient/savefiledialog.cpp @@ -34,7 +34,7 @@ namespace KIPIKameraKlientPlugin SavefileDialog::SavefileDialog(const TQString& file, TQWidget *parent, const char* name, bool modal) : TQDialog(parent, name, modal) { TQFileInfo fileInfo(file); setCaption(i18n("File Already Exists")); - TQLabel *descLbl = new TQLabel(i18n("The file '%1' already exists!").tqarg(fileInfo.absFilePath()), this); + TQLabel *descLbl = new TQLabel(i18n("The file '%1' already exists!").arg(fileInfo.absFilePath()), this); renameEdit = new TQLineEdit(this); renameEdit->setText(fileInfo.fileName()); connect(renameEdit, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(slot_renameEnabled())); diff --git a/kipi-plugins/kameraklient/thumbitem.cpp b/kipi-plugins/kameraklient/thumbitem.cpp index 608fd1f3..50d3b97b 100644 --- a/kipi-plugins/kameraklient/thumbitem.cpp +++ b/kipi-plugins/kameraklient/thumbitem.cpp @@ -182,9 +182,9 @@ void ThumbItem::paintItem(TQPainter *, const TQColorGroup& cg) { bitBlt(view->viewport(), r.x(), r.y(), &pix, 0, 0, r.width(), r.height()); } -void ThumbItem::tqrepaint() { +void ThumbItem::repaint() { TQRect r(view->contentsRectToViewport(d->rect)); - view->viewport()->tqrepaint(r); + view->viewport()->repaint(r); } TQRect ThumbItem::rect() { @@ -293,7 +293,7 @@ void ThumbItem::setPixmap(const TQPixmap& pixmap) { view->updateItemContainer(this); if(oR.intersects(TQRect(view->contentsX(), view->contentsY(), view->visibleWidth(), view->visibleHeight()))) { - view->viewport()->tqrepaint(oR); + view->viewport()->repaint(oR); } } @@ -310,7 +310,7 @@ void ThumbItem::setText(const TQString& text) { view->updateItemContainer(this); if(oR.intersects(TQRect(view->contentsX(), view->contentsY(), view->visibleWidth(), view->visibleHeight()))) { - view->viewport()->tqrepaint(oR); + view->viewport()->repaint(oR); } } @@ -360,7 +360,7 @@ void ThumbItem::renameItem() { } void ThumbItem::cancelRenameItem() { - tqrepaint(); + repaint(); bool resetFocus = view->viewport()->focusProxy() == renameBox; delete renameBox; diff --git a/kipi-plugins/kameraklient/thumbitem.h b/kipi-plugins/kameraklient/thumbitem.h index 3587476f..984ab65d 100644 --- a/kipi-plugins/kameraklient/thumbitem.h +++ b/kipi-plugins/kameraklient/thumbitem.h @@ -64,7 +64,7 @@ public: virtual void setPixmap(const TQPixmap& pixmap); virtual void setText(const TQString& text); - void tqrepaint(); + void repaint(); ThumbView* iconView(); diff --git a/kipi-plugins/kameraklient/thumbview.cpp b/kipi-plugins/kameraklient/thumbview.cpp index d1135baf..2f7dae9f 100644 --- a/kipi-plugins/kameraklient/thumbview.cpp +++ b/kipi-plugins/kameraklient/thumbview.cpp @@ -237,7 +237,7 @@ void ThumbView::takeItem(ThumbItem *item) { } if (!d->clearing) { TQRect r(contentsRectToViewport(item->rect())); - viewport()->tqrepaint(r); + viewport()->repaint(r); } } @@ -546,7 +546,7 @@ void ThumbView::contentsMouseMoveEvent(TQMouseEvent *e) { if (changed) { emit signalSelectionChanged(); paintRegion.translate(-contentsX(), -contentsY()); - viewport()->tqrepaint(paintRegion); + viewport()->repaint(paintRegion); } ensureVisible(e->pos().x(), e->pos().y()); *d->rubber = r; @@ -945,7 +945,7 @@ void ThumbView::keyPressEvent(TQKeyEvent *e) { return; } if (handled) { - viewport()->tqrepaint(); + viewport()->repaint(); emit signalSelectionChanged(); } } diff --git a/kipi-plugins/metadataedit/commenteditdialog.cpp b/kipi-plugins/metadataedit/commenteditdialog.cpp index 9d4fc87b..e910bd07 100644 --- a/kipi-plugins/metadataedit/commenteditdialog.cpp +++ b/kipi-plugins/metadataedit/commenteditdialog.cpp @@ -105,7 +105,7 @@ CommentEditDialog::CommentEditDialog(TQWidget* parent) TQLabel *title = new TQLabel(i18n("

Enter the image caption hosted by %1. " "This field is not limited (excepted with IPTC). UTF-8 encoding " "will be used to save text.") - .tqarg(KApplication::kApplication()->aboutData()->appName()), + .arg(KApplication::kApplication()->aboutData()->appName()), plainPage()); d->userCommentEdit = new KTextEdit(plainPage()); diff --git a/kipi-plugins/metadataedit/commentremovedialog.cpp b/kipi-plugins/metadataedit/commentremovedialog.cpp index 86f6fddd..5e61fb0a 100644 --- a/kipi-plugins/metadataedit/commentremovedialog.cpp +++ b/kipi-plugins/metadataedit/commentremovedialog.cpp @@ -101,7 +101,7 @@ CommentRemoveDialog::CommentRemoveDialog(TQWidget* parent) TQVBoxLayout *vlay = new TQVBoxLayout(plainPage(), 0, KDialog::spacingHint()); d->removeHOSTCommentCheck = new TQCheckBox(i18n("Remove caption created by %1") - .tqarg(KApplication::kApplication()->aboutData()->appName()), + .arg(KApplication::kApplication()->aboutData()->appName()), plainPage()); d->removeJFIFCommentCheck = new TQCheckBox(i18n("Remove JFIF Comment section"), plainPage()); d->removeEXIFCommentCheck = new TQCheckBox(i18n("Remove EXIF Comment"), plainPage()); diff --git a/kipi-plugins/metadataedit/exifcaption.cpp b/kipi-plugins/metadataedit/exifcaption.cpp index 0bcd96ec..7da7ab40 100644 --- a/kipi-plugins/metadataedit/exifcaption.cpp +++ b/kipi-plugins/metadataedit/exifcaption.cpp @@ -151,7 +151,7 @@ EXIFCaption::EXIFCaption(TQWidget* parent) "will be used to save the text.")); d->syncHOSTCommentCheck = new TQCheckBox(i18n("Sync captions entered through %1") - .tqarg(KApplication::kApplication()->aboutData()->appName()), + .arg(KApplication::kApplication()->aboutData()->appName()), parent); d->syncJFIFCommentCheck = new TQCheckBox(i18n("Sync JFIF Comment section"), parent); d->syncIPTCCaptionCheck = new TQCheckBox(i18n("Sync IPTC caption (warning: limited to 2000 printable " diff --git a/kipi-plugins/metadataedit/exifdatetime.cpp b/kipi-plugins/metadataedit/exifdatetime.cpp index c5da242e..20653917 100644 --- a/kipi-plugins/metadataedit/exifdatetime.cpp +++ b/kipi-plugins/metadataedit/exifdatetime.cpp @@ -106,7 +106,7 @@ EXIFDateTime::EXIFDateTime(TQWidget* parent) d->dateCreatedSubSecEdit = new KIntSpinBox(0, 999, 1, 0, 10, parent); d->dateCreatedSel->setDateTime(TQDateTime::currentDateTime()); d->syncHOSTDateCheck = new TQCheckBox(i18n("Sync creation date entered through %1") - .tqarg(KApplication::kApplication()->aboutData()->appName()), + .arg(KApplication::kApplication()->aboutData()->appName()), parent); d->syncIPTCDateCheck = new TQCheckBox(i18n("Sync IPTC creation date"), parent); KSeparator *line = new KSeparator(Qt::Horizontal, parent); diff --git a/kipi-plugins/metadataedit/exifeditdialog.cpp b/kipi-plugins/metadataedit/exifeditdialog.cpp index c8989a2a..421409e1 100644 --- a/kipi-plugins/metadataedit/exifeditdialog.cpp +++ b/kipi-plugins/metadataedit/exifeditdialog.cpp @@ -277,10 +277,10 @@ void EXIFEditDialog::slotItemChanged() enableButton(Apply, !d->isReadOnly); setCaption(TQString("%1 (%2/%3) - %4") - .tqarg((*d->currItem).filename()) - .tqarg(d->urls.findIndex(*(d->currItem))+1) - .tqarg(d->urls.count()) - .tqarg(i18n("Edit EXIF Metadata")) + + .arg((*d->currItem).filename()) + .arg(d->urls.findIndex(*(d->currItem))+1) + .arg(d->urls.count()) + .arg(i18n("Edit EXIF Metadata")) + (d->isReadOnly ? TQString(" - ") + i18n("(read only)") : TQString())); enableButton(User1, *(d->currItem) != d->urls.last()); enableButton(User2, *(d->currItem) != d->urls.first()); diff --git a/kipi-plugins/metadataedit/iptccaption.cpp b/kipi-plugins/metadataedit/iptccaption.cpp index d5e28231..38ad0536 100644 --- a/kipi-plugins/metadataedit/iptccaption.cpp +++ b/kipi-plugins/metadataedit/iptccaption.cpp @@ -103,7 +103,7 @@ IPTCCaption::IPTCCaption(TQWidget* parent) d->captionEdit = new KTextEdit(parent); d->syncJFIFCommentCheck = new TQCheckBox(i18n("Sync JFIF Comment section"), parent); d->syncHOSTCommentCheck = new TQCheckBox(i18n("Sync caption entered through %1") - .tqarg(KApplication::kApplication()->aboutData()->appName()), + .arg(KApplication::kApplication()->aboutData()->appName()), parent); d->syncEXIFCommentCheck = new TQCheckBox(i18n("Sync EXIF Comment"), parent); KSeparator *line = new KSeparator(Qt::Horizontal, parent); diff --git a/kipi-plugins/metadataedit/iptcdatetime.cpp b/kipi-plugins/metadataedit/iptcdatetime.cpp index f7ff0e1c..f9dd14b7 100644 --- a/kipi-plugins/metadataedit/iptcdatetime.cpp +++ b/kipi-plugins/metadataedit/iptcdatetime.cpp @@ -114,7 +114,7 @@ IPTCDateTime::IPTCDateTime(TQWidget* parent) d->dateCreatedSel = new KDateWidget(parent); d->timeCreatedSel = new KTimeWidget(parent); d->syncHOSTDateCheck = new TQCheckBox(i18n("Sync creation date entered through %1") - .tqarg(KApplication::kApplication()->aboutData()->appName()), + .arg(KApplication::kApplication()->aboutData()->appName()), parent); d->syncEXIFDateCheck = new TQCheckBox(i18n("Sync EXIF creation date"), parent); KSeparator *line = new KSeparator(Qt::Horizontal, parent); diff --git a/kipi-plugins/metadataedit/iptceditdialog.cpp b/kipi-plugins/metadataedit/iptceditdialog.cpp index 0b1d3ede..988b9f18 100644 --- a/kipi-plugins/metadataedit/iptceditdialog.cpp +++ b/kipi-plugins/metadataedit/iptceditdialog.cpp @@ -303,10 +303,10 @@ void IPTCEditDialog::slotItemChanged() enableButton(Apply, !d->isReadOnly); setCaption(TQString("%1 (%2/%3) - %4") - .tqarg((*d->currItem).filename()) - .tqarg(d->urls.findIndex(*(d->currItem))+1) - .tqarg(d->urls.count()) - .tqarg(i18n("Edit IPTC Metadata")) + + .arg((*d->currItem).filename()) + .arg(d->urls.findIndex(*(d->currItem))+1) + .arg(d->urls.count()) + .arg(i18n("Edit IPTC Metadata")) + (d->isReadOnly ? TQString(" - ") + i18n("(read only)") : TQString())); enableButton(User1, *(d->currItem) != d->urls.last()); enableButton(User2, *(d->currItem) != d->urls.first()); diff --git a/kipi-plugins/metadataedit/iptcorigin.cpp b/kipi-plugins/metadataedit/iptcorigin.cpp index 6cf021ae..9202b29f 100644 --- a/kipi-plugins/metadataedit/iptcorigin.cpp +++ b/kipi-plugins/metadataedit/iptcorigin.cpp @@ -417,7 +417,7 @@ IPTCOrigin::IPTCOrigin(TQWidget* parent) for (IPTCOriginPriv::CountryCodeMap::Iterator it = d->countryCodeMap.begin(); it != d->countryCodeMap.end(); ++it ) - d->countryCB->insertItem(TQString("%1 - %2").tqarg(it.key()).tqarg(it.data())); + d->countryCB->insertItem(TQString("%1 - %2").arg(it.key()).arg(it.data())); d->countryCB->listBox()->sort(); diff --git a/kipi-plugins/metadataedit/iptcstatus.cpp b/kipi-plugins/metadataedit/iptcstatus.cpp index 6b05f46d..172f25e9 100644 --- a/kipi-plugins/metadataedit/iptcstatus.cpp +++ b/kipi-plugins/metadataedit/iptcstatus.cpp @@ -456,7 +456,7 @@ void IPTCStatus::applyMetadata(TQByteArray& iptcData) { TQString objectType; objectType.sprintf("%2d", d->objectTypeCB->currentItem()+1); - objectType.append(TQString(":%1").tqarg(d->objectTypeDescEdit->text())); + objectType.append(TQString(":%1").arg(d->objectTypeDescEdit->text())); exiv2Iface.setIptcTagString("Iptc.Application2.ObjectType", objectType); } else if (d->objectTypeCheck->isValid()) @@ -466,7 +466,7 @@ void IPTCStatus::applyMetadata(TQByteArray& iptcData) { TQString objectAttribute; objectAttribute.sprintf("%3d", d->objectAttributeCB->currentItem()+1); - objectAttribute.append(TQString(":%1").tqarg(d->objectAttributeDescEdit->text())); + objectAttribute.append(TQString(":%1").arg(d->objectAttributeDescEdit->text())); exiv2Iface.setIptcTagString("Iptc.Application2.ObjectAttribute", objectAttribute); } else if (d->objectAttributeCheck->isValid()) diff --git a/kipi-plugins/metadataedit/plugin_metadataedit.cpp b/kipi-plugins/metadataedit/plugin_metadataedit.cpp index d43de5a8..b6c9a58a 100644 --- a/kipi-plugins/metadataedit/plugin_metadataedit.cpp +++ b/kipi-plugins/metadataedit/plugin_metadataedit.cpp @@ -238,7 +238,7 @@ void Plugin_MetadataEdit::slotImportExif() if (!exiv2Iface.load(importEXIFFile.path())) { KMessageBox::error(TQT_TQWIDGET(kapp->activeWindow()), - i18n("Cannot load metadata from \"%1\"").tqarg(importEXIFFile.fileName()), + i18n("Cannot load metadata from \"%1\"").arg(importEXIFFile.fileName()), i18n("Import EXIF Metadata")); return; } @@ -247,7 +247,7 @@ void Plugin_MetadataEdit::slotImportExif() if (exifData.isEmpty()) { KMessageBox::error(TQT_TQWIDGET(kapp->activeWindow()), - i18n("\"%1\" do not have EXIF metadata").tqarg(importEXIFFile.fileName()), + i18n("\"%1\" do not have EXIF metadata").arg(importEXIFFile.fileName()), i18n("Import EXIF Metadata")); return; } @@ -256,7 +256,7 @@ void Plugin_MetadataEdit::slotImportExif() TQT_TQWIDGET(kapp->activeWindow()), i18n("EXIF metadata from current selected pictures will be permanently " "replaced by the EXIF content of \"%1\".\n" - "Do you want to continue ?").tqarg(importEXIFFile.fileName()), + "Do you want to continue ?").arg(importEXIFFile.fileName()), i18n("Import EXIF Metadata")) != KMessageBox::Yes) return; @@ -384,7 +384,7 @@ void Plugin_MetadataEdit::slotImportIptc() if (!exiv2Iface.load(importIPTCFile.path())) { KMessageBox::error(TQT_TQWIDGET(kapp->activeWindow()), - i18n("Cannot load metadata from \"%1\"").tqarg(importIPTCFile.fileName()), + i18n("Cannot load metadata from \"%1\"").arg(importIPTCFile.fileName()), i18n("Import IPTC Metadata")); return; } @@ -393,7 +393,7 @@ void Plugin_MetadataEdit::slotImportIptc() if (iptcData.isEmpty()) { KMessageBox::error(TQT_TQWIDGET(kapp->activeWindow()), - i18n("\"%1\" do not have IPTC metadata").tqarg(importIPTCFile.fileName()), + i18n("\"%1\" do not have IPTC metadata").arg(importIPTCFile.fileName()), i18n("Import IPTC Metadata")); return; } @@ -402,7 +402,7 @@ void Plugin_MetadataEdit::slotImportIptc() TQT_TQWIDGET(kapp->activeWindow()), i18n("IPTC metadata from current selected pictures will be permanently " "replaced by the IPTC content of \"%1\".\n" - "Do you want to continue ?").tqarg(importIPTCFile.fileName()), + "Do you want to continue ?").arg(importIPTCFile.fileName()), i18n("Import IPTC Metadata")) != KMessageBox::Yes) return; diff --git a/kipi-plugins/mpegencoder/images2mpg b/kipi-plugins/mpegencoder/images2mpg index 9b15b7ba..ddf265d1 100755 --- a/kipi-plugins/mpegencoder/images2mpg +++ b/kipi-plugins/mpegencoder/images2mpg @@ -858,7 +858,7 @@ while test $CPT -lt $NBFRAMETOTAL;\ if [ $CPT = `echo $((($CPF*$NBFRAMEIMAGE)-$NBFRAMEIMAGE+1))` ]; then # Conversion and resizing the curent image file with ImageMagick. - $MONTAGE_BIN -type TrueColor -quality 100 -tqgeometry 768x576 -texture "$MASK" "${INPUT_IMAGE_FILES[`echo $(($CPF-1))`]}" "$TMPFILENAME.tmp.jpg" + $MONTAGE_BIN -type TrueColor -quality 100 -geometry 768x576 -texture "$MASK" "${INPUT_IMAGE_FILES[`echo $(($CPF-1))`]}" "$TMPFILENAME.tmp.jpg" $CONVERT_BIN -type TrueColor -quality 100 "$TMPFILENAME.tmp.jpg" "$TMPFILENAME.tmp.pnm" # Next input image... @@ -870,7 +870,7 @@ while test $CPT -lt $NBFRAMETOTAL;\ if [ $[$CPT <= `echo $((($CPF*($NBFRAMEIMAGE+$NBFRAMETRANSITION)-$NBFRAMEIMAGE)))`] = 1 ]; then if [ $DISSOLVEVALUE = 99 ]; then - $MONTAGE_BIN -type TrueColor -quality 100 -tqgeometry 768x576 -texture "$MASK" "${INPUT_IMAGE_FILES[`echo $(($CPF-1))`]}" "$TMPFILENAME.tmp.jpg" + $MONTAGE_BIN -type TrueColor -quality 100 -geometry 768x576 -texture "$MASK" "${INPUT_IMAGE_FILES[`echo $(($CPF-1))`]}" "$TMPFILENAME.tmp.jpg" $CONVERT_BIN -type TrueColor -quality 100 "$TMPFILENAME.tmp.jpg" "$TMPFILENAME.next_trans.tmp.pnm" fi diff --git a/kipi-plugins/mpegencoder/kimg2mpg.cpp b/kipi-plugins/mpegencoder/kimg2mpg.cpp index 49f3cd3f..29ec4ce0 100644 --- a/kipi-plugins/mpegencoder/kimg2mpg.cpp +++ b/kipi-plugins/mpegencoder/kimg2mpg.cpp @@ -433,7 +433,7 @@ void KImg2mpgData::slotImagesFilesSelected( TQListBoxItem *item ) TQT_SLOT(slotFailedPreview(const KFileItem*))); int index = m_ImagesFilesListBox->index ( item ); - m_label7->setText(i18n("Image no. %1").tqarg(index + 1)); + m_label7->setText(i18n("Image no. %1").arg(index + 1)); } @@ -578,7 +578,7 @@ void KImg2mpgData::slotEncode( void ) if (TQFile::exists(OutputFileName)) { int Ret=KMessageBox::questionYesNo(this, i18n("The output MPEG file '%1' already exists.\n" - "Do you want overwrite this file?").tqarg(OutputFileName)); + "Do you want overwrite this file?").arg(OutputFileName)); if (Ret == KMessageBox::No) return; } @@ -688,7 +688,7 @@ void KImg2mpgData::slotEncode( void ) if (!TQFile::exists(FileName)) { KMessageBox::error(this, - i18n("Cannot access to file %1, please check the path is right.").tqarg(FileName)); + i18n("Cannot access to file %1, please check the path is right.").arg(FileName)); m_Abort = true; reset(); return; @@ -801,9 +801,9 @@ void KImg2mpgData::ShowNumberImages( int Number ) TotalDuration = TotalDuration.addMSecs((Number+1)*TransitionDuration); if ( Number < 2) - m_label6->setText(i18n("%1 image [%2]").tqarg(Number).tqarg(TotalDuration.toString())); + m_label6->setText(i18n("%1 image [%2]").arg(Number).arg(TotalDuration.toString())); else - m_label6->setText(i18n("%1 images [%2]").tqarg(Number).tqarg(TotalDuration.toString())); + m_label6->setText(i18n("%1 images [%2]").arg(Number).arg(TotalDuration.toString())); } @@ -840,7 +840,7 @@ void KImg2mpgData::readStderr(KProcess *, char *buffer, int buflen) ImgNum = 1; m_frame->setText(i18n("Encoding image file [%1/%2]...") - .tqarg(ImgNum).tqarg(m_ImagesFilesListBox->count())); + .arg(ImgNum).arg(m_ImagesFilesListBox->count())); if (ImgNum > 1) m_ImagesFilesListBox->setSelected(ImgNum-2, false); @@ -912,7 +912,7 @@ void KImg2mpgData::EncodeDone(KProcess*) m_frame->setText(i18n("Encoding terminated...")); int Ret=KMessageBox::warningYesNo(this, i18n("The encoding process has terminated...\n\n" - "Encoding duration: %1").tqarg(Encoding), + "Encoding duration: %1").arg(Encoding), i18n("'images2mpg' Script Execution Terminated"), i18n("&OK"), i18n("Show Process Messages")); @@ -930,7 +930,7 @@ void KImg2mpgData::EncodeDone(KProcess*) m_frame->setText(i18n("Encoding aborted...")); int Ret=KMessageBox::warningYesNo(this, i18n("The encoding process has been aborted...\n\n" - "Encoding duration: %1").tqarg(Encoding), + "Encoding duration: %1").arg(Encoding), i18n("'images2mpg' Script Execution Aborted"), i18n("&OK"), i18n("Show Process Messages")); @@ -1130,7 +1130,7 @@ void KImg2mpgData::RemoveTmpFiles(void) if (m_TmpFolderConfig.isEmpty() != true && tmpFolder.exists() == true) if (DeleteDir(m_TmpFolderConfig) == false) - KMessageBox::error(this, i18n("Cannot remove temporary folder %1!").tqarg(m_TmpFolderConfig)); + KMessageBox::error(this, i18n("Cannot remove temporary folder %1!").arg(m_TmpFolderConfig)); } diff --git a/kipi-plugins/mpegencoder/kimg2mpgbase.ui b/kipi-plugins/mpegencoder/kimg2mpgbase.ui index b83e6444..db56a8e9 100644 --- a/kipi-plugins/mpegencoder/kimg2mpgbase.ui +++ b/kipi-plugins/mpegencoder/kimg2mpgbase.ui @@ -118,7 +118,7 @@ Video Format - + AlignCenter @@ -185,7 +185,7 @@ DVD is an experimental option. Video Type - + AlignCenter @@ -246,7 +246,7 @@ NTSC is an American TV standard; PAL/SECAM is European. Chroma Mode - + AlignCenter @@ -369,7 +369,7 @@ Change it if you have problems with the default value. Image duration - + AlignVCenter @@ -427,7 +427,7 @@ Change it if you have problems with the default value. Transition speed - + AlignVCenter @@ -501,7 +501,7 @@ Change it if you have problems with the default value. Background color - + AlignVCenter @@ -788,7 +788,7 @@ If you want to add some images, click on the 'Add' button or use the drag-and-dr false - + AlignCenter diff --git a/kipi-plugins/picasawebexport/mpform.cpp b/kipi-plugins/picasawebexport/mpform.cpp index 3fdeac6f..004e9a73 100644 --- a/kipi-plugins/picasawebexport/mpform.cpp +++ b/kipi-plugins/picasawebexport/mpform.cpp @@ -76,7 +76,7 @@ void MPForm::finish() bool MPForm::addPair(const TQString& name, const TQString& value, const TQString& contentType) { TQCString str; - TQString content_length = TQString("%1").tqarg(value.length()); + TQString content_length = TQString("%1").arg(value.length()); str += "--"; str += m_boundary; str += "\r\n"; @@ -131,7 +131,7 @@ bool MPForm::addFile(const TQString& name,const TQString& path) TQByteArray imageData = imageFile.readAll(); TQCString str; - TQString file_size = TQString("%1").tqarg(imageFile.size()); + TQString file_size = TQString("%1").arg(imageFile.size()); str += "--"; str += m_boundary; diff --git a/kipi-plugins/picasawebexport/picasawebtalker.cpp b/kipi-plugins/picasawebexport/picasawebtalker.cpp index 319373c3..03e22a2b 100644 --- a/kipi-plugins/picasawebexport/picasawebtalker.cpp +++ b/kipi-plugins/picasawebexport/picasawebtalker.cpp @@ -320,8 +320,8 @@ void PicasawebTalker::addPhotoTag(const TQString& photoURI, const TQString& tag) "%1 " " " - "").tqarg(tag); - TQString postUrl = TQString("%1").tqarg(photoURI); + "").arg(tag); + TQString postUrl = TQString("%1").arg(photoURI); TQByteArray buffer; TQTextStream ts(buffer, IO_Append|IO_WriteOnly); ts.setEncoding(TQTextStream::UnicodeUTF8); @@ -330,7 +330,7 @@ void PicasawebTalker::addPhotoTag(const TQString& photoURI, const TQString& tag) TQString auth_string = "GoogleLogin auth=" + m_token; KIO::TransferJob* job = KIO::http_post(postUrl, buffer, false); job->addMetaData("content-type", "Content-Type: application/atom+xml"); - job->addMetaData("content-length", TQString("Content-Length: %1").tqarg(addTagXML.length())); + job->addMetaData("content-length", TQString("Content-Length: %1").arg(addTagXML.length())); job->addMetaData("customHTTPHeader", "Authorization: " + auth_string ); //connect(job, TQT_SIGNAL(data(KIO::Job*, const TQByteArray&)), @@ -374,13 +374,13 @@ void PicasawebTalker::createAlbum(const TQString& albumTitle, const TQString& al " " " " - " ").tqarg(albumTitle) - .tqarg(albumDesc) - .tqarg(location) - .tqarg(access) - .tqarg(isCommentsEnabled==true?"true":"false") - .tqarg(timestamp) - .tqarg(media_keywords); + " ").arg(albumTitle) + .arg(albumDesc) + .arg(location) + .arg(access) + .arg(isCommentsEnabled==true?"true":"false") + .arg(timestamp) + .arg(media_keywords); TQByteArray buffer; TQTextStream ts(buffer, IO_Append|IO_WriteOnly); @@ -392,7 +392,7 @@ void PicasawebTalker::createAlbum(const TQString& albumTitle, const TQString& al TQString auth_string = "GoogleLogin auth=" + m_token; KIO::TransferJob* job = KIO::http_post(postUrl, buffer, false); job->addMetaData("content-type", "Content-Type: application/atom+xml"); - job->addMetaData("content-length", TQString("Content-Length: %1").tqarg(newAlbumXML.length())); + job->addMetaData("content-length", TQString("Content-Length: %1").arg(newAlbumXML.length())); job->addMetaData("customHTTPHeader", "Authorization: " + auth_string ); connect(job, TQT_SIGNAL(data(KIO::Job*, const TQByteArray&)), @@ -593,7 +593,7 @@ void PicasawebTalker::slotError(const TQString & error) transError=i18n("Unknown error"); }; - KMessageBox::error(TQT_TQWIDGET(kapp->activeWindow()), i18n("Error Occured: %1\n We can not proceed further").tqarg(transError)); + KMessageBox::error(TQT_TQWIDGET(kapp->activeWindow()), i18n("Error Occured: %1\n We can not proceed further").arg(transError)); //kdDebug()<<"Not handling the error now will see it later"<setLabelText(i18n("Uploading file %1 ").tqarg( KURL(pathComments.first).filename())); + m_progressDlg->setLabelText(i18n("Uploading file %1 ").arg( KURL(pathComments.first).filename())); if (m_progressDlg->isHidden()) m_progressDlg->show(); @@ -558,7 +558,7 @@ void PicasawebWindow::slotAddPhotoFailed(const TQString& msg) { if ( KMessageBox::warningContinueCancel(this, i18n("Failed to upload photo into Picasaweb. %1\nDo you want to continue?") - .tqarg( msg )) != KMessageBox::Continue) + .arg( msg )) != KMessageBox::Continue) { m_uploadQueue.clear(); m_progressDlg->reset(); diff --git a/kipi-plugins/picasawebexport/uploadwidget.ui b/kipi-plugins/picasawebexport/uploadwidget.ui index 35f30ae7..2180ca29 100644 --- a/kipi-plugins/picasawebexport/uploadwidget.ui +++ b/kipi-plugins/picasawebexport/uploadwidget.ui @@ -168,7 +168,7 @@ - + WordBreak|AlignVCenter @@ -193,7 +193,7 @@ PicasaWeb Uploader - + AlignCenter diff --git a/kipi-plugins/printwizard/cropframe.cpp b/kipi-plugins/printwizard/cropframe.cpp index 4f9cf2e3..b92c3927 100644 --- a/kipi-plugins/printwizard/cropframe.cpp +++ b/kipi-plugins/printwizard/cropframe.cpp @@ -118,7 +118,7 @@ void CropFrame::init(TPhoto *photo, int width, int height, bool autoRotate, bool m_cropRegion = _photoToScreenRect(m_photo->cropRegion); if (paint) - tqrepaint(false); + repaint(false); } TQRect CropFrame::_screenToPhotoRect(TQRect r) @@ -263,7 +263,7 @@ void CropFrame::mouseMoveEvent(TQMouseEvent *e) m_cropRegion.setRect(newX, newY, newW, newH); m_photo->cropRegion = _screenToPhotoRect(m_cropRegion); - tqrepaint(false); + repaint(false); } } @@ -295,14 +295,14 @@ void CropFrame::keyPressEvent(TQKeyEvent *e) m_cropRegion.setRect(newX, newY, w, h); m_photo->cropRegion = _screenToPhotoRect(m_cropRegion); - tqrepaint(false); + repaint(false); } void CropFrame::setColor(TQColor c) { m_color = c; - tqrepaint(false); + repaint(false); } TQColor CropFrame::color() diff --git a/kipi-plugins/printwizard/frmprintwizard.cpp b/kipi-plugins/printwizard/frmprintwizard.cpp index 2962791b..b3f3ccc8 100644 --- a/kipi-plugins/printwizard/frmprintwizard.cpp +++ b/kipi-plugins/printwizard/frmprintwizard.cpp @@ -282,7 +282,7 @@ void FrmPrintWizard::updateCropFrame(TPhoto *photo, int photoIndex) { TPhotoSize *s = m_photoSizes.at(ListPhotoSizes->currentItem()); cropFrame->init(photo, getLayout(photoIndex)->width(), getLayout(photoIndex)->height(), s->autoRotate); - LblCropPhoto->setText(i18n("Photo %1 of %2").tqarg( TQString::number(m_photos.at() + 1) ).tqarg( TQString::number(m_photos.count()) )); + LblCropPhoto->setText(i18n("Photo %1 of %2").arg( TQString::number(m_photos.at() + 1) ).arg( TQString::number(m_photos.count()) )); } void FrmPrintWizard::BtnCropPrev_clicked() @@ -541,7 +541,7 @@ TQString FrmPrintWizard::captionFormatter(TPhoto *photo, const TQString& format) TQString resolution; TQSize imageSize = photo->exiv2Iface()->getImageDimensions(); if (imageSize.isValid()) { - resolution = TQString( "%1x%2" ).tqarg( imageSize.width()).tqarg( imageSize.height()); + resolution = TQString( "%1x%2" ).arg( imageSize.width()).arg( imageSize.height()); } str.replace("\\n", "\n"); @@ -997,7 +997,7 @@ void FrmPrintWizard::previewPhotos() p.end(); BmpFirstPagePreview->setPixmap(img); LblPreview->setText(i18n("Page ") + TQString::number(m_currentPreviewPage + 1) + i18n(" of ") + TQString::number(getPageCount())); - LblPreview->setText(i18n("Page %1 of %2").tqarg(m_currentPreviewPage + 1).tqarg(getPageCount())); + LblPreview->setText(i18n("Page %1 of %2").arg(m_currentPreviewPage + 1).arg(getPageCount())); manageBtnPreviewPage(); manageBtnPrintOrder(); diff --git a/kipi-plugins/printwizard/frmprintwizardbase.ui b/kipi-plugins/printwizard/frmprintwizardbase.ui index 2d1a9fd4..00dc5e58 100644 --- a/kipi-plugins/printwizard/frmprintwizardbase.ui +++ b/kipi-plugins/printwizard/frmprintwizardbase.ui @@ -156,7 +156,7 @@ Click the 'Next' button to begin. - + WordBreak|AlignVCenter @@ -496,7 +496,7 @@ Click the 'Next' button to begin. %a aperture %l focal length \n newline - + WordBreak|AlignVCenter @@ -793,7 +793,7 @@ Click the 'Next' button to begin. This wizard will output each page to this folder with the filename kipi_printwizard_1, kipi_printwizard_2, etc. - + WordBreak|AlignVCenter @@ -1047,7 +1047,7 @@ Click the 'Next' button to begin. Photos: - + AlignVCenter|AlignRight @@ -1072,7 +1072,7 @@ Click the 'Next' button to begin. <p align="right">0</p> - + WordBreak|AlignVCenter|AlignLeft @@ -1101,7 +1101,7 @@ Click the 'Next' button to begin. Sheets: - + AlignVCenter|AlignRight @@ -1126,7 +1126,7 @@ Click the 'Next' button to begin. <p align="right">0</p> - + WordBreak|AlignVCenter|AlignLeft @@ -1155,7 +1155,7 @@ Click the 'Next' button to begin. Empty Q_SLOTS: - + WordBreak|AlignVCenter|AlignRight @@ -1180,7 +1180,7 @@ Click the 'Next' button to begin. <p align="right">0</p> - + WordBreak|AlignVCenter|AlignLeft @@ -1343,7 +1343,7 @@ Click the 'Next' button to begin. Number of times to print selected photo: - + AlignVCenter|AlignRight @@ -1461,7 +1461,7 @@ Click the 'Next' button to begin. true - + AlignVCenter @@ -1649,7 +1649,7 @@ Click the 'Next' button to begin. false - + WordBreak|AlignTop|AlignLeft @@ -1975,7 +1975,7 @@ Click the 'Next' button to begin. Click the Next button to print. - + AlignTop|AlignHCenter @@ -2180,7 +2180,7 @@ Click the 'Next' button to begin. Complete. Click Finish to exit the Print Wizard. - + AlignTop|AlignHCenter diff --git a/kipi-plugins/rawconverter/actionthread.cpp b/kipi-plugins/rawconverter/actionthread.cpp index 1d6934b4..ed48d519 100644 --- a/kipi-plugins/rawconverter/actionthread.cpp +++ b/kipi-plugins/rawconverter/actionthread.cpp @@ -172,33 +172,33 @@ void ActionThread::run() identify = info.make + TQString("-") + info.model; else { - identify = i18n("Make: %1\n").tqarg(info.make); - identify.append(i18n("Model: %1\n").tqarg(info.model)); + identify = i18n("Make: %1\n").arg(info.make); + identify.append(i18n("Model: %1\n").arg(info.model)); if (info.dateTime.isValid()) { identify.append(i18n("Created: %1\n") - .tqarg(KGlobal::locale()->formatDateTime(info.dateTime, true, true))); + .arg(KGlobal::locale()->formatDateTime(info.dateTime, true, true))); } if (info.aperture != -1.0) { - identify.append(i18n("Aperture: f/%1\n").tqarg(TQString::number(info.aperture))); + identify.append(i18n("Aperture: f/%1\n").arg(TQString::number(info.aperture))); } if (info.focalLength != -1.0) { - identify.append(i18n("Focal: %1 mm\n").tqarg(info.focalLength)); + identify.append(i18n("Focal: %1 mm\n").arg(info.focalLength)); } if (info.exposureTime != -1.0) { - identify.append(i18n("Exposure: 1/%1 s\n").tqarg(info.exposureTime)); + identify.append(i18n("Exposure: 1/%1 s\n").arg(info.exposureTime)); } if (info.sensitivity != -1) { - identify.append(i18n("Sensitivity: %1 ISO").tqarg(info.sensitivity)); + identify.append(i18n("Sensitivity: %1 ISO").arg(info.sensitivity)); } } } diff --git a/kipi-plugins/rawconverter/batchdialog.cpp b/kipi-plugins/rawconverter/batchdialog.cpp index 729c8f74..a852c32d 100644 --- a/kipi-plugins/rawconverter/batchdialog.cpp +++ b/kipi-plugins/rawconverter/batchdialog.cpp @@ -520,7 +520,7 @@ void BatchDialog::processed(const TQString& file, const TQString& tmpFile) if (::stat(TQFile::encodeName(destFile), &statBuf) == 0) { KIO::RenameDlg dlg(this, i18n("Save Raw Image converted from '%1' as") - .tqarg(m_currentConvertItem->src), + .arg(m_currentConvertItem->src), tmpFile, destFile, KIO::RenameDlg_Mode(KIO::M_SINGLE | KIO::M_OVERWRITE | KIO::M_SKIP)); @@ -548,7 +548,7 @@ void BatchDialog::processed(const TQString& file, const TQString& tmpFile) { if (::rename(TQFile::encodeName(tmpFile), TQFile::encodeName(destFile)) != 0) { - KMessageBox::error(this, i18n("Failed to save image %1").tqarg( destFile )); + KMessageBox::error(this, i18n("Failed to save image %1").arg( destFile )); m_currentConvertItem->viewItem->setPixmap(1, SmallIcon("cancel")); } else diff --git a/kipi-plugins/rawconverter/clistviewitem.h b/kipi-plugins/rawconverter/clistviewitem.h index a9645949..3473a1de 100644 --- a/kipi-plugins/rawconverter/clistviewitem.h +++ b/kipi-plugins/rawconverter/clistviewitem.h @@ -80,7 +80,7 @@ public: void setEnabled(bool d) { m_enabled = d; - tqrepaint(); + repaint(); } bool isEnabled(void) @@ -90,18 +90,18 @@ public: protected: - void paintCell(TQPainter *p, const TQColorGroup &cg, int column, int width, int tqalignment) + void paintCell(TQPainter *p, const TQColorGroup &cg, int column, int width, int alignment) { if (m_enabled) { - KListViewItem::paintCell(p, cg, column, width, tqalignment); + KListViewItem::paintCell(p, cg, column, width, alignment); } else { TQColorGroup _cg( cg ); TQColor c = _cg.text(); _cg.setColor( TQColorGroup::Text, TQt::gray ); - KListViewItem::paintCell( p, _cg, column, width, tqalignment ); + KListViewItem::paintCell( p, _cg, column, width, alignment ); _cg.setColor( TQColorGroup::Text, c ); } } diff --git a/kipi-plugins/rawconverter/plugin_rawconverter.cpp b/kipi-plugins/rawconverter/plugin_rawconverter.cpp index 483a063d..ee70d5d0 100644 --- a/kipi-plugins/rawconverter/plugin_rawconverter.cpp +++ b/kipi-plugins/rawconverter/plugin_rawconverter.cpp @@ -167,7 +167,7 @@ void Plugin_RawConverter::slotActivateSingle() if (!isRAWFile(images.images()[0].path())) { KMessageBox::error(TQT_TQWIDGET(kapp->activeWindow()), - i18n("\"%1\" is not a Raw file.").tqarg(images.images()[0].fileName())); + i18n("\"%1\" is not a Raw file.").arg(images.images()[0].fileName())); return; } diff --git a/kipi-plugins/rawconverter/rawdecodingiface.cpp b/kipi-plugins/rawconverter/rawdecodingiface.cpp index 2da4272b..d9d8e5f7 100644 --- a/kipi-plugins/rawconverter/rawdecodingiface.cpp +++ b/kipi-plugins/rawconverter/rawdecodingiface.cpp @@ -184,7 +184,7 @@ bool RawDecodingIface::loadedFromDcraw(const TQString& filePath, // -- Write image data into destination file ------------------------------- TQByteArray ICCColorProfile = getICCProfilFromFile(m_rawDecodingSettings.outputColorSpace); - TQString soft = TQString("Kipi-plugins v.%1").tqarg(kipiplugins_version); + TQString soft = TQString("Kipi-plugins v.%1").arg(kipiplugins_version); TQFileInfo fi(filePath); destPath = fi.dirPath(true) + TQString("/") + ".kipi-rawconverter-tmp-" + TQString::number(::time(0)); @@ -304,7 +304,7 @@ bool RawDecodingIface::loadedFromDcraw(const TQString& filePath, TQString libpngver(PNG_HEADER_VERSION_STRING); libpngver.replace('\n', ' '); - soft.append(TQString(" (%1)").tqarg(libpngver)); + soft.append(TQString(" (%1)").arg(libpngver)); png_text text; text.key = "Software"; text.text = (char *)soft.ascii(); @@ -384,7 +384,7 @@ bool RawDecodingIface::loadedFromDcraw(const TQString& filePath, TQString libtiffver(TIFFLIB_VERSION_STR); libtiffver.replace('\n', ' '); - soft.append(TQString(" ( %1 )").tqarg(libtiffver)); + soft.append(TQString(" ( %1 )").arg(libtiffver)); TIFFSetField(tif, TIFFTAG_SOFTWARE, (const char*)soft.ascii()); // Write ICC profil. diff --git a/kipi-plugins/rawconverter/singledialog.cpp b/kipi-plugins/rawconverter/singledialog.cpp index a9fff662..10263196 100644 --- a/kipi-plugins/rawconverter/singledialog.cpp +++ b/kipi-plugins/rawconverter/singledialog.cpp @@ -433,7 +433,7 @@ void SingleDialog::processed(const TQString&, const TQString& tmpFile) struct stat statBuf; if (::stat(TQFile::encodeName(destFile), &statBuf) == 0) { - KIO::RenameDlg dlg(this, i18n("Save Raw Image converted from '%1' as").tqarg(fi.fileName()), + KIO::RenameDlg dlg(this, i18n("Save Raw Image converted from '%1' as").arg(fi.fileName()), tmpFile, destFile, KIO::RenameDlg_Mode(KIO::M_SINGLE | KIO::M_OVERWRITE | KIO::M_SKIP)); @@ -460,7 +460,7 @@ void SingleDialog::processed(const TQString&, const TQString& tmpFile) { if (::rename(TQFile::encodeName(tmpFile), TQFile::encodeName(destFile)) != 0) { - KMessageBox::error(this, i18n("Failed to save image %1").tqarg( destFile )); + KMessageBox::error(this, i18n("Failed to save image %1").arg( destFile )); } } } diff --git a/kipi-plugins/sendimages/plugin_sendimages.cpp b/kipi-plugins/sendimages/plugin_sendimages.cpp index 598317fd..14078874 100644 --- a/kipi-plugins/sendimages/plugin_sendimages.cpp +++ b/kipi-plugins/sendimages/plugin_sendimages.cpp @@ -174,14 +174,14 @@ void Plugin_SendImages::customEvent(TQCustomEvent *event) case(KIPISendimagesPlugin::ResizeImages): { text = i18n("Resizing '%1' from Album '%2'...") - .tqarg(d->fileName).tqarg(d->albumName); + .arg(d->fileName).arg(d->albumName); break; } case(KIPISendimagesPlugin::Progress): { text = i18n("Using '%1' from Album '%2' without resizing...") - .tqarg(d->fileName).tqarg(d->albumName); + .arg(d->fileName).arg(d->albumName); break; } @@ -204,7 +204,7 @@ void Plugin_SendImages::customEvent(TQCustomEvent *event) case(KIPISendimagesPlugin::ResizeImages): { text = i18n("Failed to resize '%1' from Album '%2'") - .tqarg(d->fileName).tqarg(d->albumName); + .arg(d->fileName).arg(d->albumName); break; } @@ -223,7 +223,7 @@ void Plugin_SendImages::customEvent(TQCustomEvent *event) case(KIPISendimagesPlugin::ResizeImages): { text = i18n("Resizing '%1' from Album '%2' completed.") - .tqarg(d->fileName).tqarg(d->albumName); + .arg(d->fileName).arg(d->albumName); break; } diff --git a/kipi-plugins/sendimages/sendimages.cpp b/kipi-plugins/sendimages/sendimages.cpp index 0b2a4bc7..ce221049 100644 --- a/kipi-plugins/sendimages/sendimages.cpp +++ b/kipi-plugins/sendimages/sendimages.cpp @@ -337,7 +337,7 @@ void SendImages::makeCommentsFile(void) anyCommentsPresent = true; ImageCommentsText += i18n("Caption for image \"%1\": %2\n") - .tqarg(targetFile).tqarg(commentItem); + .arg(targetFile).arg(commentItem); //Tags from the database if (m_interface->hasFeature(KIPI::HostSupportsTags)) @@ -345,7 +345,7 @@ void SendImages::makeCommentsFile(void) TQMap attribs=info.attributes(); if (attribs["tags"].asStringList().count() > 0) { - ImageCommentsText += i18n("Tags: %2\n").tqarg(attribs["tags"].asStringList().join(",")); + ImageCommentsText += i18n("Tags: %2\n").arg(attribs["tags"].asStringList().join(",")); anyCommentsPresent = true; } } @@ -487,7 +487,7 @@ bool SendImages::invokeMailAgent(void) KMessageBox::error(TQT_TQWIDGET(kapp->activeWindow()), i18n("Cannot start '%1' program;\nplease " "check your installation.") - .tqarg(m_sendImagesDialog->m_mailAgentName->currentText())); + .arg(m_sendImagesDialog->m_mailAgentName->currentText())); else agentInvoked = true; } @@ -516,7 +516,7 @@ bool SendImages::invokeMailAgent(void) KMessageBox::error(TQT_TQWIDGET(kapp->activeWindow()), i18n("Cannot start '%1' program;\nplease " "check your installation.") - .tqarg(m_sendImagesDialog->m_mailAgentName->currentText())); + .arg(m_sendImagesDialog->m_mailAgentName->currentText())); else agentInvoked = true; } @@ -538,7 +538,7 @@ bool SendImages::invokeMailAgent(void) KMessageBox::error(TQT_TQWIDGET(kapp->activeWindow()), i18n("Cannot start '%1' program;\nplease " "check your installation.") - .tqarg(m_sendImagesDialog->m_mailAgentName->currentText())); + .arg(m_sendImagesDialog->m_mailAgentName->currentText())); else agentInvoked = true; } @@ -564,7 +564,7 @@ bool SendImages::invokeMailAgent(void) KMessageBox::error(TQT_TQWIDGET(kapp->activeWindow()), i18n("Cannot start '%1' program;\nplease " "check your installation.") - .tqarg(m_sendImagesDialog->m_mailAgentName->currentText())); + .arg(m_sendImagesDialog->m_mailAgentName->currentText())); else agentInvoked = true; } @@ -627,7 +627,7 @@ bool SendImages::invokeMailAgent(void) KMessageBox::error(TQT_TQWIDGET(kapp->activeWindow()), i18n("Cannot start '%1' program;\nplease " "check your installation.") - .tqarg(m_sendImagesDialog->m_mailAgentName->currentText())); + .arg(m_sendImagesDialog->m_mailAgentName->currentText())); else { agentInvoked = true; m_invokedBefore=true; @@ -642,7 +642,7 @@ bool SendImages::invokeMailAgent(void) void SendImages::removeTmpFiles(void) { if (DeleteDir(m_tmp) == false) - KMessageBox::error(TQT_TQWIDGET(kapp->activeWindow()), i18n("Cannot remove temporary folder %1.").tqarg(m_tmp)); + KMessageBox::error(TQT_TQWIDGET(kapp->activeWindow()), i18n("Cannot remove temporary folder %1.").arg(m_tmp)); } ///Checks if directory is empty and invokes its deletion @@ -884,7 +884,7 @@ void SendImages::slotMozillaExited(KProcess*) KMessageBox::error(TQT_TQWIDGET(kapp->activeWindow()), i18n("Cannot start '%1' program;\nplease " "check your installation.") - .tqarg(m_sendImagesDialog->m_mailAgentName->currentText())); + .arg(m_sendImagesDialog->m_mailAgentName->currentText())); } else { diff --git a/kipi-plugins/sendimages/sendimagesdialog.cpp b/kipi-plugins/sendimages/sendimagesdialog.cpp index 7f828bcc..a99fdaff 100644 --- a/kipi-plugins/sendimages/sendimagesdialog.cpp +++ b/kipi-plugins/sendimages/sendimagesdialog.cpp @@ -469,12 +469,12 @@ void SendImagesDialog::setupEmailOptions(void) "and if the target mailbox size is not limited.

" "%5: use this if you have no size or speed restrictions.

" "%6: use this only for printing purpose.

") - .tqarg(i18n("very small (320 pixels)")) - .tqarg(i18n("small (640 pixels)")) - .tqarg(i18n("medium (800 pixels)")) - .tqarg(i18n("big (1024 pixels)")) - .tqarg(i18n("very big (1280 pixels)")) - .tqarg(i18n("huge - for printing (1600 pixels)")); + .arg(i18n("very small (320 pixels)")) + .arg(i18n("small (640 pixels)")) + .arg(i18n("medium (800 pixels)")) + .arg(i18n("big (1024 pixels)")) + .arg(i18n("very big (1280 pixels)")) + .arg(i18n("huge - for printing (1600 pixels)")); TQWhatsThis::add( m_imagesResize, whatsThis ); m_labelImageSize = new TQLabel( i18n("Sent image size:"), groupBox2); @@ -620,8 +620,8 @@ void SendImagesDialog::slotImageSelected( TQListBoxItem * item ) if ( !pitem ) return; - m_ImageComments->setText( i18n("Caption: %1").tqarg(pitem->comments()) ); - m_ImageAlbum->setText( i18n("Album: %1").tqarg(pitem->album()) ); + m_ImageComments->setText( i18n("Caption: %1").arg(pitem->comments()) ); + m_ImageAlbum->setText( i18n("Album: %1").arg(pitem->album()) ); m_imageLabel->clear(); if ( m_thumbJob ) diff --git a/kipi-plugins/simpleviewerexport/simpleviewerexport.cpp b/kipi-plugins/simpleviewerexport/simpleviewerexport.cpp index 8be9611f..87f5f2a8 100644 --- a/kipi-plugins/simpleviewerexport/simpleviewerexport.cpp +++ b/kipi-plugins/simpleviewerexport/simpleviewerexport.cpp @@ -149,7 +149,7 @@ bool SimpleViewerExport::configure() int ret = KMessageBox::warningYesNoCancel(TQT_TQWIDGET(kapp->activeWindow()), i18n("Target folder %1 already exists.\n" "Do you want to overwrite it (all data in this folder will be lost)") - .tqarg(m_configDlg->exportURL())); + .arg(m_configDlg->exportURL())); switch(ret) { @@ -157,7 +157,7 @@ bool SimpleViewerExport::configure() if(!KIO::NetAccess::del(m_configDlg->exportURL(), TQT_TQWIDGET(kapp->activeWindow()))) { KMessageBox::error(TQT_TQWIDGET(kapp->activeWindow()), i18n("Could not delete %1\n" - "Please choose another export folder").tqarg(m_configDlg->exportURL())); + "Please choose another export folder").arg(m_configDlg->exportURL())); configured = false; } break; @@ -267,7 +267,7 @@ void SimpleViewerExport::slotProcess() int ret = KMessageBox::warningYesNo(TQT_TQWIDGET(kapp->activeWindow()), i18n("Export was canceled.\n" "Do you want to delete the yet created files in %1 ?") - .tqarg(m_configDlg->exportURL())); + .arg(m_configDlg->exportURL())); if(ret == KMessageBox::Yes) { KIO::NetAccess::del(m_configDlg->exportURL(), TQT_TQWIDGET(kapp->activeWindow())); @@ -288,7 +288,7 @@ bool SimpleViewerExport::createExportDirectories() KURL root = m_configDlg->exportURL(); if(!KIO::NetAccess::mkdir(root, TQT_TQWIDGET(kapp->activeWindow()))) { - m_progressDlg->addedAction(i18n("Could not create folder '%1'").tqarg(root.url()), + m_progressDlg->addedAction(i18n("Could not create folder '%1'").arg(root.url()), KIPI::ErrorMessage); return(false); } @@ -297,7 +297,7 @@ bool SimpleViewerExport::createExportDirectories() thumbsDir.addPath("/thumbs"); if(!KIO::NetAccess::mkdir(thumbsDir, TQT_TQWIDGET(kapp->activeWindow()))) { - m_progressDlg->addedAction(i18n("Could not create folder '%1'").tqarg(thumbsDir.url()), + m_progressDlg->addedAction(i18n("Could not create folder '%1'").arg(thumbsDir.url()), KIPI::ErrorMessage); return(false); } @@ -306,7 +306,7 @@ bool SimpleViewerExport::createExportDirectories() imagesDir.addPath("/images"); if(!KIO::NetAccess::mkdir(imagesDir, TQT_TQWIDGET(kapp->activeWindow()))) { - m_progressDlg->addedAction(i18n("Could not create folder '%1'").tqarg(imagesDir.url()), + m_progressDlg->addedAction(i18n("Could not create folder '%1'").arg(imagesDir.url()), KIPI::ErrorMessage); return(false); } @@ -377,7 +377,7 @@ bool SimpleViewerExport::exportImages() KURL url = *it; TQFileInfo fileInfo(url.path()); - m_progressDlg->addedAction(i18n("Processing %1").tqarg(url.filename()), KIPI::StartingMessage); + m_progressDlg->addedAction(i18n("Processing %1").arg(url.filename()), KIPI::StartingMessage); // Check if RAW file. #if KDCRAW_VERSION < 0x000106 @@ -392,27 +392,27 @@ bool SimpleViewerExport::exportImages() if(image.isNull()) { - m_progressDlg->addedAction(i18n("Could not open image '%1'").tqarg(url.filename()), + m_progressDlg->addedAction(i18n("Could not open image '%1'").arg(url.filename()), KIPI::WarningMessage); continue; } if(!createThumbnail(image, thumbnail)) { - m_progressDlg->addedAction(i18n("Could not create thumbnail from '%1'").tqarg(url.filename()), + m_progressDlg->addedAction(i18n("Could not create thumbnail from '%1'").arg(url.filename()), KIPI::WarningMessage); continue; } if(resizeImages && !resizeImage(image, maxSize, image)) { - m_progressDlg->addedAction(i18n("Could not resize image '%1'").tqarg(url.filename()), + m_progressDlg->addedAction(i18n("Could not resize image '%1'").arg(url.filename()), KIPI::WarningMessage); continue; } meta.load(url.path()); - newName = TQString("%1.%2").tqarg(tmp.sprintf("%03i", index)).tqarg(TQString("jpg")); + newName = TQString("%1.%2").arg(tmp.sprintf("%03i", index)).arg(TQString("jpg")); KURL thumbnailPath(thumbsDir); thumbnailPath.addPath(newName); diff --git a/kipi-plugins/slideshow/slideshowconfig.cpp b/kipi-plugins/slideshow/slideshowconfig.cpp index d372f95a..77a68e50 100644 --- a/kipi-plugins/slideshow/slideshowconfig.cpp +++ b/kipi-plugins/slideshow/slideshowconfig.cpp @@ -615,7 +615,7 @@ void SlideShowConfig::slotImagesFilesSelected( TQListBoxItem *item ) TQT_SLOT(slotFailedPreview(const KFileItem*))); int index = m_ImagesFilesListBox->index ( item ); - m_label7->setText(i18n("Image no. %1").tqarg(index + 1)); + m_label7->setText(i18n("Image no. %1").arg(index + 1)); } void SlideShowConfig::slotAddDropItems(KURL::List filesUrl) @@ -735,9 +735,9 @@ void SlideShowConfig::ShowNumberImages( int Number ) TotalDuration = TotalDuration.addMSecs((Number-1)*TransitionDuration); if ( Number < 2) - m_label6->setText(i18n("%1 image [%2]").tqarg(Number).tqarg(TotalDuration.toString())); + m_label6->setText(i18n("%1 image [%2]").arg(Number).arg(TotalDuration.toString())); else - m_label6->setText(i18n("%1 images [%2]").tqarg(Number).tqarg(TotalDuration.toString())); + m_label6->setText(i18n("%1 images [%2]").arg(Number).arg(TotalDuration.toString())); } void SlideShowConfig::slotGotPreview(const KFileItem*, const TQPixmap &pixmap) @@ -766,7 +766,7 @@ void SlideShowConfig::slotStartClicked() if (!TQFile::exists(pitem->path())) { KMessageBox::error(this, - i18n("Cannot access to file %1, please check the path is right.").tqarg(pitem->path())); + i18n("Cannot access to file %1, please check the path is right.").arg(pitem->path())); return; } m_urlList->append(pitem->path()); // Input images files. diff --git a/kipi-plugins/slideshow/slideshowconfigbase.ui b/kipi-plugins/slideshow/slideshowconfigbase.ui index 07c2e71d..c455a3b5 100644 --- a/kipi-plugins/slideshow/slideshowconfigbase.ui +++ b/kipi-plugins/slideshow/slideshowconfigbase.ui @@ -396,7 +396,7 @@ If you want to add some images, click on the 'Add' button or use the drag-and-dr false - + AlignCenter diff --git a/kipi-plugins/sync/gallerywindow.cpp b/kipi-plugins/sync/gallerywindow.cpp index aa7c0fd8..eaaee83f 100644 --- a/kipi-plugins/sync/gallerywindow.cpp +++ b/kipi-plugins/sync/gallerywindow.cpp @@ -331,18 +331,18 @@ void GalleryWindow::slotPhotos( const TQValueList& photoList) TQString styleSheet = TQString( "body { margin: 8px; font-size: %1px; " " color: %2; background-color: %3;}" ) - .tqarg( pxSize ) - .tqarg( colorGroup().text().name() ) - .tqarg( colorGroup().base().name() ); + .arg( pxSize ) + .arg( colorGroup().text().name() ) + .arg( colorGroup().base().name() ); styleSheet += TQString( "a { font-size: %1px; color: %2; " "text-decoration: none;}" ) - .tqarg( pxSize ) - .tqarg( colorGroup().text().name() ); + .arg( pxSize ) + .arg( colorGroup().text().name() ); styleSheet += TQString( "i { font-size: %1px; color: %2; " "text-decoration: none;}" ) - .tqarg( pxSize-2 ) - .tqarg( TQColor("steelblue").name() ); + .arg( pxSize-2 ) + .arg( TQColor("steelblue").name() ); m_photoView->begin(); m_photoView->setUserStyleSheet( styleSheet ); @@ -363,13 +363,13 @@ void GalleryWindow::slotPhotos( const TQValueList& photoList) m_photoView->write( "" + TQString("") - .tqarg(imageurl.url()) + .arg(imageurl.url()) + TQString("
") - .tqarg(thumburl.url()) + .arg(thumburl.url()) + photo.name + ( photo.caption.isEmpty() ? TQString() : TQString("
%1") - .tqarg(photo.caption) ) + .arg(photo.caption) ) + "" ); } @@ -514,7 +514,7 @@ void GalleryWindow::slotNewAlbum() if (!clean) { KMessageBox::error( this, i18n("Sorry, these characters are not allowed in album name: %1") - .tqarg("\\ / * ? \" \' & < > | . + # ( ) or spaces") ); + .arg("\\ / * ? \" \' & < > | . + # ( ) or spaces") ); return; } @@ -584,7 +584,7 @@ void GalleryWindow::slotAddPhotoNext() } m_progressDlg->setLabelText( i18n("Uploading file %1 ") - .tqarg( KURL(pathComments.first).filename() ) ); + .arg( KURL(pathComments.first).filename() ) ); if (m_progressDlg->isHidden()) m_progressDlg->show(); diff --git a/kipi-plugins/sync/sinks.cpp b/kipi-plugins/sync/sinks.cpp index 55f370b6..7acd7341 100644 --- a/kipi-plugins/sync/sinks.cpp +++ b/kipi-plugins/sync/sinks.cpp @@ -96,8 +96,8 @@ Sinks::Sinks() if (sink_id > mMaxSinkId) mMaxSinkId = sink_id; - type = config.readEntry(TQString("Type%1").tqarg(sink_id)); - name = config.readEntry(TQString("Name%1").tqarg(sink_id)); + type = config.readEntry(TQString("Type%1").arg(sink_id)); + name = config.readEntry(TQString("Name%1").arg(sink_id)); Sink* p_sink = SinkFactory::Create(type, sink_id, name, &config, p_wallet); if (p_sink) mSinks.append(p_sink); diff --git a/kipi-plugins/sync/sinks/gallery/galleryform.cpp b/kipi-plugins/sync/sinks/gallery/galleryform.cpp index 9c90dfa1..3207f67e 100644 --- a/kipi-plugins/sync/sinks/gallery/galleryform.cpp +++ b/kipi-plugins/sync/sinks/gallery/galleryform.cpp @@ -58,7 +58,7 @@ GalleryForm::~GalleryForm() void GalleryForm::addPair(const TQString& name, const TQString& value) { if (Gallery2 == mVersion) - return addPairRaw(TQString("g2_form[%1]").tqarg(name), value); + return addPairRaw(TQString("g2_form[%1]").arg(name), value); return addPairRaw(name, value); } diff --git a/kipi-plugins/sync/sinks/gallery/gallerysink.cpp b/kipi-plugins/sync/sinks/gallery/gallerysink.cpp index 3035e277..c40b725a 100644 --- a/kipi-plugins/sync/sinks/gallery/gallerysink.cpp +++ b/kipi-plugins/sync/sinks/gallery/gallerysink.cpp @@ -51,11 +51,11 @@ GallerySink::GallerySink(unsigned int sinkId, TQString name, KConfig* pConfig, K mpJob(0), m_loggedIn(false) { - TQString tmp = pConfig->readEntry(TQString("URL%1").tqarg(sinkId)); + TQString tmp = pConfig->readEntry(TQString("URL%1").arg(sinkId)); mURL = KURL(tmp); - mUsername = pConfig->readEntry(TQString("Username%1").tqarg(sinkId)); + mUsername = pConfig->readEntry(TQString("Username%1").arg(sinkId)); if (pWallet) - pWallet->readPassword(TQString("Password%1").tqarg(sinkId), mPassword); + pWallet->readPassword(TQString("Password%1").arg(sinkId), mPassword); } GallerySink::~GallerySink() @@ -72,12 +72,12 @@ const KIPI2::CollectionList* GallerySink::getCollections() void GallerySink::Save(KConfig* pConfig, KWallet::Wallet* pWallet) { - pConfig->writeEntry(TQString("Name%1").tqarg(mSinkId), mName); - pConfig->writeEntry(TQString("Type%1").tqarg(mSinkId), Type()); - pConfig->writeEntry(TQString("URL%1").tqarg(mSinkId), TQString(mURL.url())); - pConfig->writeEntry(TQString("Username%1").tqarg(mSinkId), mUsername); + pConfig->writeEntry(TQString("Name%1").arg(mSinkId), mName); + pConfig->writeEntry(TQString("Type%1").arg(mSinkId), Type()); + pConfig->writeEntry(TQString("URL%1").arg(mSinkId), TQString(mURL.url())); + pConfig->writeEntry(TQString("Username%1").arg(mSinkId), mUsername); if (pWallet) - pWallet->writePassword(TQString("Password%1").tqarg(mSinkId), mPassword); + pWallet->writePassword(TQString("Password%1").arg(mSinkId), mPassword); } diff --git a/kipi-plugins/timeadjust/timeadjustdialog.cpp b/kipi-plugins/timeadjust/timeadjustdialog.cpp index b29f3c76..23d50b5f 100644 --- a/kipi-plugins/timeadjust/timeadjustdialog.cpp +++ b/kipi-plugins/timeadjust/timeadjustdialog.cpp @@ -403,7 +403,7 @@ void TimeAdjustDialog::slotUpdateExample() TQString newDate = date.toString(Qt::LocalDate); d->exampleAdj->setText(i18n("%1
would, for example, " "change into
%2") - .tqarg(oldDate).tqarg(newDate)); + .arg(oldDate).arg(newDate)); } void TimeAdjustDialog::slotAdjustmentTypeChanged() diff --git a/kipi-plugins/wallpaper/plugin_wallpaper.cpp b/kipi-plugins/wallpaper/plugin_wallpaper.cpp index 576ac489..7ae11076 100644 --- a/kipi-plugins/wallpaper/plugin_wallpaper.cpp +++ b/kipi-plugins/wallpaper/plugin_wallpaper.cpp @@ -254,7 +254,7 @@ void Plugin_WallPaper::setWallpaper(int tqlayout) } TQString cmd = TQString("dcop kdesktop KBackgroundIface setWallpaper '%1' %2") - .tqarg(path).tqarg(tqlayout); + .arg(path).arg(tqlayout); KRun::runCommand(cmd); } -- cgit v1.2.3