From 5d2012b655a8372ef75f76bc2a4f2f39e9e384ef Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Mon, 19 Dec 2011 11:36:27 -0600 Subject: [PATCH] Remove additional unneeded tq method conversions --- keep/app/forcebackupdialog.cpp | 2 +- keep/app/keepmainwindow.cpp | 2 +- keep/app/restorebackupwizard.cpp | 2 +- keep/common/backup.cpp | 4 ++-- keep/common/backuplistviewitem.cpp | 4 ++-- keep/common/listviewtooltip.h | 4 ++-- keep/common/rdbmanager.cpp | 4 ++-- keep/kded/keepkded.cpp | 4 ++-- 8 files changed, 13 insertions(+), 13 deletions(-) diff --git a/keep/app/forcebackupdialog.cpp b/keep/app/forcebackupdialog.cpp index a272be5..81a652b 100644 --- a/keep/app/forcebackupdialog.cpp +++ b/keep/app/forcebackupdialog.cpp @@ -93,7 +93,7 @@ void ForceBackupDialog::slotForceBackup() void ForceBackupDialog::slotBackupError(Backup backup,TQString errorMessage) { - KMessageBox::error(this,i18n("

An error occured making %1 backup:

%2

").tqarg(backup.source()).tqarg(errorMessage)); + KMessageBox::error(this,i18n("

An error occured making %1 backup:

%2

").arg(backup.source()).arg(errorMessage)); } #include "forcebackupdialog.moc" diff --git a/keep/app/keepmainwindow.cpp b/keep/app/keepmainwindow.cpp index fcd1cb2..b23e28b 100644 --- a/keep/app/keepmainwindow.cpp +++ b/keep/app/keepmainwindow.cpp @@ -125,7 +125,7 @@ void KeepMainWindow::slotCheckRDB() { RDBManager manager; if ( manager.isRDB() ) - KMessageBox::information(this, i18n("The application rdiff-backup has been detected on your system.

You're running version %1 of rdiff-backup.").tqarg(manager.RDBVersion())); + KMessageBox::information(this, i18n("The application rdiff-backup has been detected on your system.

You're running version %1 of rdiff-backup.").arg(manager.RDBVersion())); else KMessageBox::error(this,i18n("The application rdiff-backup has not been detected on your system.

If rdiff-backup is not installed, Keep will not be able to make backups. To fix this problem, install rdiff-backup on your system.")); diff --git a/keep/app/restorebackupwizard.cpp b/keep/app/restorebackupwizard.cpp index 93418b8..579e255 100644 --- a/keep/app/restorebackupwizard.cpp +++ b/keep/app/restorebackupwizard.cpp @@ -287,7 +287,7 @@ void RestoreBackupWizard::slotRestoreBackup() void RestoreBackupWizard::slotRestoreError(Backup backup,TQString errorMessage) { - KMessageBox::error(this,i18n("

An error occured restoring %1 backup:

%2

").tqarg(backup.dest()).tqarg(errorMessage)); + KMessageBox::error(this,i18n("

An error occured restoring %1 backup:

%2

").arg(backup.dest()).arg(errorMessage)); } #include "restorebackupwizard.moc" diff --git a/keep/common/backup.cpp b/keep/common/backup.cpp index 5e05a48..98bb4a6 100644 --- a/keep/common/backup.cpp +++ b/keep/common/backup.cpp @@ -160,14 +160,14 @@ TQString Backup::htmlDesc() if ( m_neverDelete ) del = i18n("Never delete"); else - del = i18n("%1 days").tqarg(m_deleteAfter); + del = i18n("%1 days").arg(m_deleteAfter); if ( m_useCompression ) compression = i18n("Yes"); else compression = i18n("No"); TQString html = "

" + i18n("Source directory:") + "
" + m_source + "
" + i18n("Destination directory:") + "
" - + m_dest + "

" + i18n("Interval:") + " " + i18n("%1 days").tqarg(m_interval) + + m_dest + "

" + i18n("Interval:") + " " + i18n("%1 days").arg(m_interval) + "
" + i18n("Delete after:") + " " + del + "
" + i18n("Use compression:") + " " + compression + "

"; diff --git a/keep/common/backuplistviewitem.cpp b/keep/common/backuplistviewitem.cpp index 356c482..90f735d 100644 --- a/keep/common/backuplistviewitem.cpp +++ b/keep/common/backuplistviewitem.cpp @@ -46,12 +46,12 @@ void BackupListViewItem::setBackupText() { setText(0, TQDir(m_backup.source()).dirName() ); setText(1, TQDir(m_backup.dest()).dirName() ); - setText(2, i18n("%1 days").tqarg(m_backup.interval())); + setText(2, i18n("%1 days").arg(m_backup.interval())); TQString deleteAfter; if ( m_backup.neverDelete() == true ) deleteAfter = i18n("Never"); else - deleteAfter = i18n("%1 days").tqarg(m_backup.deleteAfter()); + deleteAfter = i18n("%1 days").arg(m_backup.deleteAfter()); setText(3, deleteAfter); } diff --git a/keep/common/listviewtooltip.h b/keep/common/listviewtooltip.h index a0bd3cc..3a47b4c 100644 --- a/keep/common/listviewtooltip.h +++ b/keep/common/listviewtooltip.h @@ -68,9 +68,9 @@ inline void ListViewToolTip::maybeTip( const TQPoint& p ) { TQString tipStr = backupItem->backup().htmlDesc(); /* if( col == 0 ) - tipStr = TQString( "Contents of this cell: %1" ).tqarg(item->text( 0 ) ); + tipStr = TQString( "Contents of this cell: %1" ).arg(item->text( 0 ) ); else if( col == 1 ) - tipStr = TQString( "Contents of that cell: %1" ).tqarg(item->text( 1 ) ); + tipStr = TQString( "Contents of that cell: %1" ).arg(item->text( 1 ) ); else tipStr = TQString( "Something else" ); */ diff --git a/keep/common/rdbmanager.cpp b/keep/common/rdbmanager.cpp index fb2fa3b..dcb9bf9 100644 --- a/keep/common/rdbmanager.cpp +++ b/keep/common/rdbmanager.cpp @@ -360,7 +360,7 @@ void RDBManager::removeOldIncrements(Backup backup) // Gets the rdiff-backup process KProcess *proc = RDBProcess(); // Adds the options - *proc << "--remove-older-than" << TQString("%1").tqarg(backup.deleteAfter()) + "D"; + *proc << "--remove-older-than" << TQString("%1").arg(backup.deleteAfter()) + "D"; // Adds dest *proc << backup.dest(); // Starts the process @@ -378,7 +378,7 @@ KProcess *RDBManager::RDBProcess(bool isNice,int niceLevel) proc->setUseShell(true); if ( isNice ) { - *proc << "nice" << "-n" << TQString("%1").tqarg(niceLevel); + *proc << "nice" << "-n" << TQString("%1").arg(niceLevel); } *proc << "rdiff-backup"; diff --git a/keep/kded/keepkded.cpp b/keep/kded/keepkded.cpp index 6593ba2..c7e517e 100644 --- a/keep/kded/keepkded.cpp +++ b/keep/kded/keepkded.cpp @@ -56,7 +56,7 @@ void KeepKded::slotBackupError(Backup backup,TQString errorMessage) { if ( KeepSettings::notifyBackupError() ) { - KNotifyClient::userEvent(0,i18n("

An error occured making %1 backup:

%2

").tqarg(backup.source()).tqarg(errorMessage),16,4); + KNotifyClient::userEvent(0,i18n("

An error occured making %1 backup:

%2

").arg(backup.source()).arg(errorMessage),16,4); } log("Backup Error",backup.source(),errorMessage); } @@ -65,7 +65,7 @@ void KeepKded::slotBackupSuccess(Backup backup) { if ( KeepSettings::notifyBackupSuccess() ) { - KNotifyClient::userEvent(0,i18n("

Backup %1 successfully backuped to %2

").tqarg(backup.source()).tqarg(backup.dest()),16,1); + KNotifyClient::userEvent(0,i18n("

Backup %1 successfully backuped to %2

").arg(backup.source()).arg(backup.dest()),16,1); } log("Backup Success",backup.source(),"Successfully backuped to: " + backup.dest() ); }