From 1de96857f5b0ed5d4a36e9486ffc8c7f8c802f98 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Mon, 19 Dec 2011 11:58:08 -0600 Subject: Remove additional unneeded tq method conversions --- kget/dlgDirectories.cpp | 4 +-- kget/dlgIndividual.cpp | 4 +-- kget/kfileio.cpp | 32 +++++++++++------------ kget/kget_plug_in/kget_linkview.cpp | 2 +- kget/kget_plug_in/links.cpp | 6 ++--- kget/kmainwidget.cpp | 52 ++++++++++++++++++------------------- kget/logwindow.cpp | 2 +- kget/safedelete.cpp | 4 +-- kget/settings.cpp | 8 +++--- kget/settings.h | 2 +- kget/transfer.cpp | 14 +++++----- kget/transferlist.cpp | 4 +-- 12 files changed, 67 insertions(+), 67 deletions(-) (limited to 'kget') diff --git a/kget/dlgDirectories.cpp b/kget/dlgDirectories.cpp index 29d11dc0..a373cc67 100644 --- a/kget/dlgDirectories.cpp +++ b/kget/dlgDirectories.cpp @@ -94,7 +94,7 @@ void DlgDirectories::addEntry() TQDir f(dir); if (!f.exists()) { - KMessageBox::error(this, i18n("Folder does not exist:\n%1").tqarg(dir), i18n("Error")); + KMessageBox::error(this, i18n("Folder does not exist:\n%1").arg(dir), i18n("Error")); return; } @@ -130,7 +130,7 @@ void DlgDirectories::changeEntry() TQDir f(dir); if (!f.exists()) { - KMessageBox::error(this, i18n("Folder does not exist:\n%1").tqarg(dir), i18n("Error")); + KMessageBox::error(this, i18n("Folder does not exist:\n%1").arg(dir), i18n("Error")); return; } diff --git a/kget/dlgIndividual.cpp b/kget/dlgIndividual.cpp index 91b34007..030d3f2f 100644 --- a/kget/dlgIndividual.cpp +++ b/kget/dlgIndividual.cpp @@ -218,13 +218,13 @@ void DlgIndividual::setPercent(unsigned long percent) { m_pProgressBar->setValue(percent); m_pDockIndividual->setValue(percent); - setCaption(i18n("%1% of %2 - %3").tqarg(percent).tqarg(KIO::convertSize(m_iTotalSize)).tqarg(m_location.fileName())); + setCaption(i18n("%1% of %2 - %3").arg(percent).arg(KIO::convertSize(m_iTotalSize)).arg(m_location.fileName())); } void DlgIndividual::setProcessedSize(KIO::filesize_t bytes) { - sizeLabel->setText(i18n("%1 of %2").tqarg(KIO::convertSize(bytes)).tqarg(KIO::convertSize(m_iTotalSize))); + sizeLabel->setText(i18n("%1 of %2").arg(KIO::convertSize(bytes)).arg(KIO::convertSize(m_iTotalSize))); } diff --git a/kget/kfileio.cpp b/kget/kfileio.cpp index 51149baa..59f26af6 100644 --- a/kget/kfileio.cpp +++ b/kget/kfileio.cpp @@ -42,17 +42,17 @@ TQString kFileToString(const TQString & aFileName, bool aEnsureNL, bool aVerbose if (!info.exists()) { if (aVerbose) - KMessageBox::error(tqApp->mainWidget(), i18n("The specified file does not exist:\n%1").tqarg(aFileName)); + KMessageBox::error(tqApp->mainWidget(), i18n("The specified file does not exist:\n%1").arg(aFileName)); return TQString(); } if (info.isDir()) { if (aVerbose) - KMessageBox::error(tqApp->mainWidget(), i18n("This is a folder and not a file:\n%1").tqarg(aFileName)); + KMessageBox::error(tqApp->mainWidget(), i18n("This is a folder and not a file:\n%1").arg(aFileName)); return TQString(); } if (!info.isReadable()) { if (aVerbose) - KMessageBox::error(tqApp->mainWidget(), i18n("You do not have read permission for the file:\n%1").tqarg(aFileName)); + KMessageBox::error(tqApp->mainWidget(), i18n("You do not have read permission for the file:\n%1").arg(aFileName)); return TQString(); } if (len <= 0) @@ -62,13 +62,13 @@ TQString kFileToString(const TQString & aFileName, bool aEnsureNL, bool aVerbose if (aVerbose) switch (file.status()) { case IO_ReadError: - KMessageBox::error(tqApp->mainWidget(), i18n("Could not read file:\n%1").tqarg(aFileName)); + KMessageBox::error(tqApp->mainWidget(), i18n("Could not read file:\n%1").arg(aFileName)); break; case IO_OpenError: - KMessageBox::error(tqApp->mainWidget(), i18n("Could not open file:\n%1").tqarg(aFileName)); + KMessageBox::error(tqApp->mainWidget(), i18n("Could not open file:\n%1").arg(aFileName)); break; default: - KMessageBox::error(tqApp->mainWidget(), i18n("Error while reading file:\n%1").tqarg(aFileName)); + KMessageBox::error(tqApp->mainWidget(), i18n("Error while reading file:\n%1").arg(aFileName)); } return TQString(); } @@ -82,8 +82,8 @@ TQString kFileToString(const TQString & aFileName, bool aEnsureNL, bool aVerbose result[len] = '\0'; if (readLen < len) { - TQString msg = i18n("Could only read %1 bytes of %2.").tqarg(KGlobal::locale()->formatNumber(readLen, - 0)).tqarg(KGlobal::locale()->formatNumber(len, 0)); + TQString msg = i18n("Could only read %1 bytes of %2.").arg(KGlobal::locale()->formatNumber(readLen, + 0)).arg(KGlobal::locale()->formatNumber(len, 0)); KMessageBox::error(tqApp->mainWidget(), msg); return TQString(); @@ -107,7 +107,7 @@ static bool kBytesToFile(const char *aBuffer, int len, const TQString & aFileNam if (info.exists()) { if (aAskIfExists) { - TQString str = i18n("File %1 exists.\nDo you want to replace it?").tqarg(aFileName); + TQString str = i18n("File %1 exists.\nDo you want to replace it?").arg(aFileName); rc = KMessageBox::questionYesNo(tqApp->mainWidget(), str, TQString(), i18n("Replace"),KStdGuiItem::cancel()); if (rc != KMessageBox::Yes) @@ -124,7 +124,7 @@ static bool kBytesToFile(const char *aBuffer, int len, const TQString & aFileNam // failed to rename file if (!aVerbose) return FALSE; - rc = KMessageBox::warningContinueCancel(tqApp->mainWidget(), i18n("Failed to make a backup copy of %1.\nContinue anyway?").tqarg(aFileName)); + rc = KMessageBox::warningContinueCancel(tqApp->mainWidget(), i18n("Failed to make a backup copy of %1.\nContinue anyway?").arg(aFileName)); if (rc != KMessageBox::Continue) return FALSE; } @@ -135,13 +135,13 @@ static bool kBytesToFile(const char *aBuffer, int len, const TQString & aFileNam if (aVerbose) switch (file.status()) { case IO_WriteError: - KMessageBox::error(tqApp->mainWidget(), i18n("Could not write to file:\n%1").tqarg(aFileName)); + KMessageBox::error(tqApp->mainWidget(), i18n("Could not write to file:\n%1").arg(aFileName)); break; case IO_OpenError: - KMessageBox::error(tqApp->mainWidget(), i18n("Could not open file for writing:\n%1").tqarg(aFileName)); + KMessageBox::error(tqApp->mainWidget(), i18n("Could not open file for writing:\n%1").arg(aFileName)); break; default: - KMessageBox::error(tqApp->mainWidget(), i18n("Error while writing file:\n%1").tqarg(aFileName)); + KMessageBox::error(tqApp->mainWidget(), i18n("Error while writing file:\n%1").arg(aFileName)); } return FALSE; } @@ -149,11 +149,11 @@ static bool kBytesToFile(const char *aBuffer, int len, const TQString & aFileNam writeLen = file.writeBlock(aBuffer, len); if (writeLen < 0) { - KMessageBox::error(tqApp->mainWidget(), i18n("Could not write to file:\n%1").tqarg(aFileName)); + KMessageBox::error(tqApp->mainWidget(), i18n("Could not write to file:\n%1").arg(aFileName)); return FALSE; } else if (writeLen < len) { - TQString msg = i18n("Could only write %1 bytes of %2.").tqarg(KGlobal::locale()->formatNumber(writeLen, - 0)).tqarg(KGlobal::locale()->formatNumber(len, + TQString msg = i18n("Could only write %1 bytes of %2.").arg(KGlobal::locale()->formatNumber(writeLen, + 0)).arg(KGlobal::locale()->formatNumber(len, 0)); KMessageBox::error(tqApp->mainWidget(), msg); diff --git a/kget/kget_plug_in/kget_linkview.cpp b/kget/kget_plug_in/kget_linkview.cpp index 69a3cfc1..938ad205 100644 --- a/kget/kget_plug_in/kget_linkview.cpp +++ b/kget/kget_plug_in/kget_linkview.cpp @@ -139,7 +139,7 @@ void KGetLinkView::slotStartLeech() void KGetLinkView::setPageURL( const TQString& url ) { - setPlainCaption( i18n( "Links in: %1 - KGet" ).tqarg( url ) ); + setPlainCaption( i18n( "Links in: %1 - KGet" ).arg( url ) ); } void KGetLinkView::slotSelectAll() diff --git a/kget/kget_plug_in/links.cpp b/kget/kget_plug_in/links.cpp index b1410cef..38392ea0 100644 --- a/kget/kget_plug_in/links.cpp +++ b/kget/kget_plug_in/links.cpp @@ -24,10 +24,10 @@ LinkItem::LinkItem( DOM::Element link ) // somehow getElementsByTagName("#text") doesn't work :( - DOM::NodeList tqchildren = link.childNodes(); - for ( uint i = 0; i < tqchildren.length(); i++ ) + DOM::NodeList children = link.childNodes(); + for ( uint i = 0; i < children.length(); i++ ) { - DOM::Node node = tqchildren.item( i ); + DOM::Node node = children.item( i ); if ( node.nodeType() == DOM::Node::TEXT_NODE ) text.append( node.nodeValue().string() ); } diff --git a/kget/kmainwidget.cpp b/kget/kmainwidget.cpp index c860d66b..e6f2c5a4 100644 --- a/kget/kmainwidget.cpp +++ b/kget/kmainwidget.cpp @@ -223,7 +223,7 @@ KMainWidget::KMainWidget(bool bStartDocked) kdock = new DockWidget(this); connect(kdock, TQT_SIGNAL(quitSelected()), TQT_SLOT(slotQuit())); - // Set tqgeometry + // Set geometry if (ksettings.mainPosition.x() != -1) { resize(ksettings.mainSize); move(ksettings.mainPosition); @@ -411,11 +411,11 @@ void KMainWidget::setupGUI() createGUI("kgetui.rc"); // setup statusbar - statusBar()->insertFixedItem(i18n(" Transfers: %1 ").tqarg(99), ID_TOTAL_TRANSFERS); - statusBar()->insertFixedItem(i18n(" Files: %1 ").tqarg(555), ID_TOTAL_FILES); - statusBar()->insertFixedItem(i18n(" Size: %1 KB ").tqarg("134.56"), ID_TOTAL_SIZE); - statusBar()->insertFixedItem(i18n(" Time: %1 ").tqarg(KIO::convertSeconds(0)), ID_TOTAL_TIME); - statusBar()->insertFixedItem(i18n(" %1 KB/s ").tqarg("123.34"), ID_TOTAL_SPEED); + statusBar()->insertFixedItem(i18n(" Transfers: %1 ").arg(99), ID_TOTAL_TRANSFERS); + statusBar()->insertFixedItem(i18n(" Files: %1 ").arg(555), ID_TOTAL_FILES); + statusBar()->insertFixedItem(i18n(" Size: %1 KB ").arg("134.56"), ID_TOTAL_SIZE); + statusBar()->insertFixedItem(i18n(" Time: %1 ").arg(KIO::convertSeconds(0)), ID_TOTAL_TIME); + statusBar()->insertFixedItem(i18n(" %1 KB/s ").arg("123.34"), ID_TOTAL_SPEED); setAutoSaveSettings( "MainWindow", false /*Settings takes care of size & pos & state */ ); @@ -485,7 +485,7 @@ void KMainWidget::setupWhatsThis() tmp = i18n("Auto paste button toggles the auto-paste mode\n" "on and off.\n" "\n" "When set, KGet will periodically scan the clipboard\n" "for URLs and paste them automatically."); m_paAutoPaste->setWhatsThis(tmp); - tmp = i18n("Drop target button toggles the window style\n" "between a normal window and a drop target.\n" "\n" "When set, the main window will be hidden and\n" "instead a small tqshaped window will appear.\n" "\n" "You can show/hide a normal window with a simple click\n" "on a tqshaped window."); + tmp = i18n("Drop target button toggles the window style\n" "between a normal window and a drop target.\n" "\n" "When set, the main window will be hidden and\n" "instead a small shaped window will appear.\n" "\n" "You can show/hide a normal window with a simple click\n" "on a shaped window."); m_paDropTarget->setWhatsThis(tmp); /* tmp = i18n("Dock widget button toggles the window style\n" "between a normal window and a docked widget.\n" "\n" "When set, the main window will be hidden and\n" "instead a docked widget will appear on the panel.\n" "\n" "You can show/hide a normal window by simply clicking\n" "on a docked widget."); @@ -977,7 +977,7 @@ void KMainWidget::slotOpenTransfer() KURL url = KURL::fromPathOrURL(newtransfer); if (!url.isValid()) { - KMessageBox::error(this, i18n("Malformed URL:\n%1").tqarg(newtransfer), i18n("Error")); + KMessageBox::error(this, i18n("Malformed URL:\n%1").arg(newtransfer), i18n("Error")); ok = false; } } @@ -1114,7 +1114,7 @@ void KMainWidget::addTransferEx(const KURL& url, const KURL& destFile) //check if destination already exists if(KIO::NetAccess::exists(destURL, false, this)) { - if (KMessageBox::warningYesNo(this,i18n("Destination file \n%1\nalready exists.\nDo you want to overwrite it?").tqarg( destURL.prettyURL()), TQString(), i18n("Overwrite"), i18n("Do Not Overwrite") ) + if (KMessageBox::warningYesNo(this,i18n("Destination file \n%1\nalready exists.\nDo you want to overwrite it?").arg( destURL.prettyURL()), TQString(), i18n("Overwrite"), i18n("Do Not Overwrite") ) == KMessageBox::Yes) { bDestisMalformed=false; @@ -1141,7 +1141,7 @@ void KMainWidget::addTransferEx(const KURL& url, const KURL& destFile) // create a new transfer item Transfer *item = myTransferList->addTransfer(url, destURL); - KNotifyClient::event(kdock->winId(), "added", i18n("%1 has been added.").tqarg(url.prettyURL())); + KNotifyClient::event(kdock->winId(), "added", i18n("%1 has been added.").arg(url.prettyURL())); item->updateAll(); // update the remaining fields if (ksettings.b_showIndividual) @@ -1192,7 +1192,7 @@ void KMainWidget::addTransfers( const KURL::List& src, const TQString& destDir ) destURL.setFileName( fileName ); if(KIO::NetAccess::exists(destURL, false, this)) { - if (KMessageBox::warningYesNo(this,i18n("Destination file \n%1\nalready exists.\nDo you want to overwrite it?").tqarg( destURL.prettyURL()), TQString(), i18n("Overwrite"), i18n("Do Not Overwrite") ) + if (KMessageBox::warningYesNo(this,i18n("Destination file \n%1\nalready exists.\nDo you want to overwrite it?").arg( destURL.prettyURL()), TQString(), i18n("Overwrite"), i18n("Do Not Overwrite") ) == KMessageBox::Yes) { SafeDelete::deleteFile( destURL ); @@ -1511,7 +1511,7 @@ void KMainWidget::slotStatusChanged(Transfer * item, int _operation) } else { - KNotifyClient::event(kdock->winId(), "finished", i18n("%1 successfully downloaded.").tqarg(srcurl)); + KNotifyClient::event(kdock->winId(), "finished", i18n("%1 successfully downloaded.").arg(srcurl)); } if ( item ) @@ -2166,11 +2166,11 @@ void KMainWidget::updateStatusBar() } } - statusBar()->changeItem(i18n(" Transfers: %1 ").tqarg(myTransferList->childCount()), ID_TOTAL_TRANSFERS); - statusBar()->changeItem(i18n(" Files: %1 ").tqarg(totalFiles), ID_TOTAL_FILES); - statusBar()->changeItem(i18n(" Size: %1 ").tqarg(KIO::convertSize(totalSize)), ID_TOTAL_SIZE); - statusBar()->changeItem(i18n(" Time: %1 ").tqarg(KIO::convertSeconds(remTime)), ID_TOTAL_TIME); - statusBar()->changeItem(i18n(" %1/s ").tqarg(KIO::convertSize(totalSpeed)), ID_TOTAL_SPEED); + statusBar()->changeItem(i18n(" Transfers: %1 ").arg(myTransferList->childCount()), ID_TOTAL_TRANSFERS); + statusBar()->changeItem(i18n(" Files: %1 ").arg(totalFiles), ID_TOTAL_FILES); + statusBar()->changeItem(i18n(" Size: %1 ").arg(KIO::convertSize(totalSize)), ID_TOTAL_SIZE); + statusBar()->changeItem(i18n(" Time: %1 ").arg(KIO::convertSeconds(remTime)), ID_TOTAL_TIME); + statusBar()->changeItem(i18n(" %1/s ").arg(KIO::convertSize(totalSpeed)), ID_TOTAL_SPEED); //update size for each statusbar field statusBar()->setItemFixed(ID_TOTAL_TRANSFERS, -1); statusBar()->setItemFixed(ID_TOTAL_FILES, -1); @@ -2179,11 +2179,11 @@ void KMainWidget::updateStatusBar() statusBar()->setItemFixed(ID_TOTAL_SPEED, -1); if (kdock) { - tmpstr = i18n("Transfers: %1 ").tqarg(myTransferList->childCount()) + - i18n("
Files: %1 ").tqarg(totalFiles) + - i18n("
Size: %1 ").tqarg(KIO::convertSize(totalSize)) + - i18n("
Time: %1 ").tqarg(KIO::convertSeconds(remTime)) + - i18n("
Speed: %1/s").tqarg(KIO::convertSize(totalSpeed)); + tmpstr = i18n("Transfers: %1 ").arg(myTransferList->childCount()) + + i18n("
Files: %1 ").arg(totalFiles) + + i18n("
Size: %1 ").arg(KIO::convertSize(totalSize)) + + i18n("
Time: %1 ").arg(KIO::convertSeconds(remTime)) + + i18n("
Speed: %1/s").arg(KIO::convertSize(totalSpeed)); kdock->updateToolTip( tmpstr ); //trayicon changes if download is in progress if (totalSpeed == 0) @@ -2461,7 +2461,7 @@ bool KMainWidget::sanityChecksSuccessful( const KURL& url ) if (!url.isValid() || !KProtocolInfo::supportsReading( url ) ) { if (!ksettings.b_expertMode) - KMessageBox::error(this, i18n("Malformed URL:\n%1").tqarg(url.prettyURL()), i18n("Error")); + KMessageBox::error(this, i18n("Malformed URL:\n%1").arg(url.prettyURL()), i18n("Error")); return false; } @@ -2473,7 +2473,7 @@ bool KMainWidget::sanityChecksSuccessful( const KURL& url ) { if ( !ksettings.b_expertMode ) { - KMessageBox::error(this, i18n("Already saving URL\n%1").tqarg(url.prettyURL()), i18n("Error")); + KMessageBox::error(this, i18n("Already saving URL\n%1").arg(url.prettyURL()), i18n("Error")); } transfer->showIndividual(); @@ -2483,7 +2483,7 @@ bool KMainWidget::sanityChecksSuccessful( const KURL& url ) else // transfer is finished, ask if we want to download again { if ( ksettings.b_expertMode || - (KMessageBox::questionYesNo(this, i18n("Already saved URL\n%1\nDownload again?").tqarg(url.prettyURL()),i18n("Question"),i18n("Download Again"),KStdGuiItem::cancel() ) + (KMessageBox::questionYesNo(this, i18n("Already saved URL\n%1\nDownload again?").arg(url.prettyURL()),i18n("Question"),i18n("Download Again"),KStdGuiItem::cancel() ) == KMessageBox::Yes) ) { transfer->slotRequestRemove(); @@ -2498,7 +2498,7 @@ bool KMainWidget::sanityChecksSuccessful( const KURL& url ) // why restrict this to ftp and http? (pfeiffer) // // don't download file URL's TODO : uncomment? // if (url.protocol() == "http" && url.protocol() != "ftp") { -// KMessageBox::error(this, i18n("File protocol not accepted!\n%1").tqarg(url.prettyURL()), i18n("Error")); +// KMessageBox::error(this, i18n("File protocol not accepted!\n%1").arg(url.prettyURL()), i18n("Error")); // #ifdef _DEBUG // sDebugOut << endl; // #endif diff --git a/kget/logwindow.cpp b/kget/logwindow.cpp index 30c6d486..09490134 100644 --- a/kget/logwindow.cpp +++ b/kget/logwindow.cpp @@ -200,7 +200,7 @@ void LogWindow::logTransfer(uint id, const TQString & filename, const TQString & { TQString mixed_msg, single_msg, job_id; - job_id = TQString("Job[%1] : ").tqarg(id); + job_id = TQString("Job[%1] : ").arg(id); mixed_msg = "" + TQTime::currentTime().toString() + " : " + job_id + message; single_msg = "" + TQTime::currentTime().toString() + " : " + message; diff --git a/kget/safedelete.cpp b/kget/safedelete.cpp index 3cf7b8fd..16deb1dd 100644 --- a/kget/safedelete.cpp +++ b/kget/safedelete.cpp @@ -16,7 +16,7 @@ bool SafeDelete::deleteFile( const KURL& url ) { KMessageBox::information(0L, i18n("Not deleting\n%1\nas it is a " - "directory.").tqarg( url.prettyURL() ), + "directory.").arg( url.prettyURL() ), i18n("Not Deleted")); return false; } @@ -28,7 +28,7 @@ bool SafeDelete::deleteFile( const KURL& url ) else KMessageBox::information( 0L, i18n("Not deleting\n%1\nas it is not a local" - " file.").tqarg( url.prettyURL() ), + " file.").arg( url.prettyURL() ), i18n("Not Deleted") ); return false; diff --git a/kget/settings.cpp b/kget/settings.cpp index 6f2a0aa4..9e6adc4d 100644 --- a/kget/settings.cpp +++ b/kget/settings.cpp @@ -175,14 +175,14 @@ Settings::load() listViewFont = config->readFontEntry("Font", &font); - // read main window tqgeometry settings + // read main window geometry settings config->setGroup("MainGeometry"); const TQPoint point(-1,-1); mainPosition = config->readPointEntry("Position", &point); mainSize = config->readSizeEntry("Size"); mainState = config->readUnsignedLongNumEntry("State", 0); - // read drop target tqgeometry settings + // read drop target geometry settings config->setGroup("DropGeometry"); dropPosition = config->readPointEntry("Position", &point); dropState = config->readUnsignedLongNumEntry("State", DEFAULT_DOCK_STATE ); @@ -269,13 +269,13 @@ void Settings::save() config->setGroup("Misc"); config->writeEntry("Font", listViewFont); - // write main window tqgeometry properties + // write main window geometry properties config->setGroup("MainGeometry"); config->writeEntry("Position", kmain->pos()); config->writeEntry("Size", kmain->size()); config->writeEntry("State", KWin::windowInfo(kmain->winId()).state()); - // write drop target tqgeometry properties + // write drop target geometry properties config->setGroup("DropGeometry"); config->writeEntry("Position", kdrop->pos()); unsigned long state = KWin::windowInfo(kdrop->winId()).state(); diff --git a/kget/settings.h b/kget/settings.h index 2571801d..7ed6a875 100644 --- a/kget/settings.h +++ b/kget/settings.h @@ -172,7 +172,7 @@ public: TQFont listViewFont; - // tqgeometry settings + // geometry settings TQPoint mainPosition; TQSize mainSize; unsigned long int mainState; diff --git a/kget/transfer.cpp b/kget/transfer.cpp index a698f979..230daa19 100644 --- a/kget/transfer.cpp +++ b/kget/transfer.cpp @@ -272,8 +272,8 @@ void Transfer::updateAll() updateStatus(status); // first phase of animation - logMessage(i18n("Copy file from: %1").tqarg(src.prettyURL())); - logMessage(i18n("To: %1").tqarg(dest.prettyURL())); + logMessage(i18n("Copy file from: %1").arg(src.prettyURL())); + logMessage(i18n("To: %1").arg(dest.prettyURL())); // source setText(view->lv_url, src.prettyURL()); @@ -291,7 +291,7 @@ void Transfer::updateAll() } if (totalSize != 0) { - //logMessage(i18n("Total size is %1 bytes").tqarg((double)totalSize)); + //logMessage(i18n("Total size is %1 bytes").arg((double)totalSize)); setText(view->lv_total, KIO::convertSize(totalSize)); } else { //logMessage(i18n("Total size is unknown")); @@ -386,7 +386,7 @@ void Transfer::slotResume() status = ST_TRYING; mode = MD_TQUEUED; - logMessage(i18n("Attempt number %1").tqarg(retryCount)); + logMessage(i18n("Attempt number %1").arg(retryCount)); sDebug << "sending Resume to slave " << endl; m_pSlave->Op(Slave::RETR); @@ -581,7 +581,7 @@ void Transfer::slotRenaming(KIO::Job *, const KURL &, const KURL & to) dest = to; - logMessage(i18n("Renaming to %1").tqarg(dest.prettyURL().ascii())); + logMessage(i18n("Renaming to %1").arg(dest.prettyURL().ascii())); // destination setText (view->lv_filename, dest.fileName ()); @@ -623,7 +623,7 @@ void Transfer::slotSpeed(unsigned long bytes_per_second) dlgIndividual->setSpeed(i18n("Stopped")); } else { - TQString tmps = i18n("%1/s").tqarg(KIO::convertSize(speed)); + TQString tmps = i18n("%1/s").arg(KIO::convertSize(speed)); setText(view->lv_speed, tmps); setText(view->lv_remaining, remainingTime); if(dlgIndividual) @@ -644,7 +644,7 @@ void Transfer::slotTotalSize(KIO::filesize_t bytes) if (totalSize == 0) { totalSize = bytes; if (totalSize != 0) { - logMessage(i18n("Total size is %1 bytes").tqarg((double)totalSize,0,'f',0)); + logMessage(i18n("Total size is %1 bytes").arg((double)totalSize,0,'f',0)); setText(view->lv_total, KIO::convertSize(totalSize)); if(dlgIndividual) { diff --git a/kget/transferlist.cpp b/kget/transferlist.cpp index 99372bdb..562432f5 100644 --- a/kget/transferlist.cpp +++ b/kget/transferlist.cpp @@ -96,11 +96,11 @@ TransferList::TransferList(TQWidget * parent, const char *name) animTry.setAutoDelete(true); for (int i = 0; i < 8; i++) { curPix = new TQPixmap(); - curPix->load(locate("appdata", connectPath.tqarg(i))); + curPix->load(locate("appdata", connectPath.arg(i))); animConn.append(curPix); curPix = new TQPixmap(); - curPix->load(locate("appdata", tryPath.tqarg(i))); + curPix->load(locate("appdata", tryPath.arg(i))); animTry.append(curPix); } } -- cgit v1.2.1