Remove additional unneeded tq method conversions

(cherry picked from commit 7e66d7c3611d907ea28b140281b472bb1c406be6)

15 files changed, 54 insertions, 54 deletions

diff --git a/vcs/clearcase/clearcasepart.cpp b/vcs/clearcase/clearcasepart.cpp
index 9b1cd67b..198cc1db 100644
--- a/vcs/clearcase/clearcasepart.cpp
+++ b/vcs/clearcase/clearcasepart.cpp
@@ -86,7 +86,7 @@ void ClearcasePart::contextMenu(TQPopupMenu *popup, const Context *context)
 
         KPopupMenu *sub = new KPopupMenu(popup);
         TQString name = fi.fileName();
-        sub->insertTitle( i18n("Actions for %1").tqarg(name) );
+        sub->insertTitle( i18n("Actions for %1").arg(name) );
         sub->insertItem( i18n("Checkin"),
                          this, TQT_SLOT(slotCheckin()) );
         sub->insertItem( i18n("Checkout"),
diff --git a/vcs/cvsservice/annotatepage.cpp b/vcs/cvsservice/annotatepage.cpp
index 4c838cf9..98d4894e 100644
--- a/vcs/cvsservice/annotatepage.cpp
+++ b/vcs/cvsservice/annotatepage.cpp
@@ -106,7 +106,7 @@ void AnnotatePage::slotJobExited( bool normalExit, int exitStatus )
 
     if (!normalExit)
     {
-        KMessageBox::sorry( this, i18n("Annotate failed with exitStatus == %1").tqarg( exitStatus), i18n("Annotate Failed") );
+        KMessageBox::sorry( this, i18n("Annotate failed with exitStatus == %1").arg( exitStatus), i18n("Annotate Failed") );
         return;
     }
 
diff --git a/vcs/cvsservice/cvslogdialog.cpp b/vcs/cvsservice/cvslogdialog.cpp
index 86ad3cbe..ff36c19d 100644
--- a/vcs/cvsservice/cvslogdialog.cpp
+++ b/vcs/cvsservice/cvslogdialog.cpp
@@ -79,7 +79,7 @@ void CVSLogDialog::slotDiffRequested( const TQString &pathName, const TQString &
     kdDebug(9006) << "CVSLogDialog::slotDiffRequested()" << endl;
 
     // Create a new CVSDiffPage and start diffing process
-    TQString diffTitle =  i18n("Diff between %1 and %2").tqarg( revA ).tqarg( revB );
+    TQString diffTitle =  i18n("Diff between %1 and %2").arg( revA ).arg( revB );
     TQVBox *vbox = addVBoxPage( diffTitle );
     CVSDiffPage *diffPage = new CVSDiffPage( m_cvsService, vbox );
     diffPage->startDiff( pathName, revA, revB );
diff --git a/vcs/cvsservice/cvslogpage.cpp b/vcs/cvsservice/cvslogpage.cpp
index f50afdc5..c0ade68e 100644
--- a/vcs/cvsservice/cvslogpage.cpp
+++ b/vcs/cvsservice/cvslogpage.cpp
@@ -113,7 +113,7 @@ void CVSLogPage::slotJobExited( bool normalExit, int exitStatus )
 //    m_part->core()->running( m_part, false );
     if (!normalExit)
     {
-        KMessageBox::sorry( this, i18n("Log failed with exitStatus == %1").tqarg( exitStatus), i18n("Log Failed") );
+        KMessageBox::sorry( this, i18n("Log failed with exitStatus == %1").arg( exitStatus), i18n("Log Failed") );
         return;
     }
 
diff --git a/vcs/cvsservice/cvsprocesswidget.cpp b/vcs/cvsservice/cvsprocesswidget.cpp
index 0eeba29e..d4de15c1 100644
--- a/vcs/cvsservice/cvsprocesswidget.cpp
+++ b/vcs/cvsservice/cvsprocesswidget.cpp
@@ -142,7 +142,7 @@ bool CvsProcessWidget::startJob( const DCOPRef &aJob )
     // disconnect 3rd party slots from our signals
     disconnect( TQT_SIGNAL(jobFinished(bool, int)) );
 
-    showInfo( i18n("Started job: %1").tqarg( cmdLine ) );
+    showInfo( i18n("Started job: %1").arg( cmdLine ) );
 
 #ifdef MYDCOPDEBUG
     g_dcopExitCounter = 0;
@@ -187,7 +187,7 @@ void CvsProcessWidget::slotJobExited( bool normalExit, int exitStatus )
         m_job = 0;
     }
     TQString exitMsg = i18n("Job finished with exitCode == %1");
-    showInfo( exitMsg.tqarg( exitStatus) );
+    showInfo( exitMsg.arg( exitStatus) );
 
     m_part->core()->running( m_part, false );
     m_part->mainWindow()->statusBar()->message( i18n("Done CVS command ..."), 2000 );
diff --git a/vcs/cvsservice/diffdialog.cpp b/vcs/cvsservice/diffdialog.cpp
index a141d2a8..c86ae0ce 100644
--- a/vcs/cvsservice/diffdialog.cpp
+++ b/vcs/cvsservice/diffdialog.cpp
@@ -83,7 +83,7 @@ void DiffDialog::languageChange() {
     
     //FIXME:  We need a function in CVSEntry to return the latest revision there is in cvs
 //    if(!m_entry.revision().isNull())
-//      diffLocalHeadRadio->setText( tr2i18n( "Local copy and &HEAD (%1)" ).tqarg( m_entry.revision()) );
+//      diffLocalHeadRadio->setText( tr2i18n( "Local copy and &HEAD (%1)" ).arg( m_entry.revision()) );
 }
 
 #include "diffdialog.moc"
diff --git a/vcs/cvsservice/diffwidget.cpp b/vcs/cvsservice/diffwidget.cpp
index 972d90d6..2ecf8ddc 100644
--- a/vcs/cvsservice/diffwidget.cpp
+++ b/vcs/cvsservice/diffwidget.cpp
@@ -70,7 +70,7 @@ TQPopupMenu* KDiffTextEdit::createPopupMenu( const TQPoint& p )
   int i = 0;
 
   for ( TQStringList::Iterator it = extPartsTranslated.begin(); it != extPartsTranslated.end(); ++it ) {
-    popup->insertItem( i18n( "Show in %1" ).tqarg( *it ), i + POPUP_BASE, i );
+    popup->insertItem( i18n( "Show in %1" ).arg( *it ), i + POPUP_BASE, i );
     i++;
   }
   if ( !extPartsTranslated.isEmpty() )
diff --git a/vcs/cvsservice/editorsdialog.cpp b/vcs/cvsservice/editorsdialog.cpp
index 79695840..47e1b0ac 100644
--- a/vcs/cvsservice/editorsdialog.cpp
+++ b/vcs/cvsservice/editorsdialog.cpp
@@ -61,7 +61,7 @@ void EditorsDialog::slotJobExited( bool normalExit, int exitStatus )
 {
     if (!normalExit)
     {
-        KMessageBox::sorry( this, i18n("Log failed with exitStatus == %1").tqarg( exitStatus), i18n("Log Failed") );
+        KMessageBox::sorry( this, i18n("Log failed with exitStatus == %1").arg( exitStatus), i18n("Log Failed") );
         return;
     }
 
diff --git a/vcs/cvsservice/integrator/integratordlg.cpp b/vcs/cvsservice/integrator/integratordlg.cpp
index 4f833220..32184c45 100644
--- a/vcs/cvsservice/integrator/integratordlg.cpp
+++ b/vcs/cvsservice/integrator/integratordlg.cpp
@@ -81,11 +81,11 @@ void IntegratorDlg::init_clicked()
         if (!proc->normalExit())
             KMessageBox::error(this, i18n("cvs init did not exit normally. Please check if cvs is installed and works correctly."), i18n("Init CVS Repository"));
         else if (proc->exitStatus() != 0)
-            KMessageBox::error(this, i18n("cvs init exited with status %1. Please check if the cvs location is correct.").tqarg(proc->exitStatus()), i18n("Init CVS Repository"));
+            KMessageBox::error(this, i18n("cvs init exited with status %1. Please check if the cvs location is correct.").arg(proc->exitStatus()), i18n("Init CVS Repository"));
         else
         {
-            repository->insertItem(TQString(":local:%1").tqarg(url));
-            repository->setCurrentText(TQString(":local:%1").tqarg(url));
+            repository->insertItem(TQString(":local:%1").arg(url));
+            repository->setCurrentText(TQString(":local:%1").arg(url));
         }
     }
 }
@@ -122,13 +122,13 @@ void IntegratorDlg::accept()
     proc->setWorkingDirectory(m_projectLocation);
     *proc << "cvs";
     *proc << "-d" << repository->currentText() << "import"
-        << "-m" << TQString("\"%1\"").tqarg(comment->text()) << module->text()
+        << "-m" << TQString("\"%1\"").arg(comment->text()) << module->text()
         << vendorTag->text() << releaseTag->text();
     proc->start(KProcess::Block);
     if (!proc->normalExit())
         KMessageBox::error(this, i18n("cvs import did not exit normally. Please check if cvs is installed and works correctly."), i18n("Init CVS Repository"));
     else if (proc->exitStatus() != 0)
-        KMessageBox::error(this, i18n("cvs import exited with status %1. Please check if the cvs location is correct.").tqarg(proc->exitStatus()), i18n("Init CVS Repository"));
+        KMessageBox::error(this, i18n("cvs import exited with status %1. Please check if the cvs location is correct.").arg(proc->exitStatus()), i18n("Init CVS Repository"));
     else
     {
         kdDebug() << "Project is in: " << m_projectLocation << endl;
diff --git a/vcs/cvsservice/releaseinputdialogbase.ui b/vcs/cvsservice/releaseinputdialogbase.ui
index 2d950e5f..df734c00 100644
--- a/vcs/cvsservice/releaseinputdialogbase.ui
+++ b/vcs/cvsservice/releaseinputdialogbase.ui
@@ -37,7 +37,7 @@
             <property name="title">
                 <string>Revision</string>
             </property>
-            <property name="tqalignment">
+            <property name="alignment">
                 <set>AlignVCenter|AlignLeft</set>
             </property>
             <vbox>
diff --git a/vcs/perforce/perforcepart.cpp b/vcs/perforce/perforcepart.cpp
index 81252366..622128d4 100644
--- a/vcs/perforce/perforcepart.cpp
+++ b/vcs/perforce/perforcepart.cpp
@@ -94,7 +94,7 @@ void PerforcePart::contextMenu(TQPopupMenu *popup, const Context *context)
 
         KPopupMenu *sub = new KPopupMenu(popup);
         TQString name = fi.fileName();
-        sub->insertTitle( i18n("Actions for %1").tqarg(name) );
+        sub->insertTitle( i18n("Actions for %1").arg(name) );
 
         int id = sub->insertItem( i18n("Edit"),
                            this, TQT_SLOT(slotEdit()) );
@@ -153,7 +153,7 @@ void PerforcePart::revert( const TQString& filename )
 {
     if ( KMessageBox::questionYesNo( 0,
             i18n("Do you really want to revert "
-                 "the file %1 and lose all your changes?").tqarg( filename ), TQString(), i18n("Revert"), i18n("Do Not Revert") ) == KMessageBox::Yes ) {
+                 "the file %1 and lose all your changes?").arg( filename ), TQString(), i18n("Revert"), i18n("Do Not Revert") ) == KMessageBox::Yes ) {
         execCommand( "revert", filename );
     }
 }
diff --git a/vcs/subversion/subversion_core.cpp b/vcs/subversion/subversion_core.cpp
index f49ac302..285ae4ab 100644
--- a/vcs/subversion/subversion_core.cpp
+++ b/vcs/subversion/subversion_core.cpp
@@ -223,7 +223,7 @@ void subversionCore::diff( const KURL::List& list, const TQString& where){
 			if ( where=="HEAD"){
 				diffTo=i18n("the current svn HEAD version.");
 			}
-			KMessageBox::information( 0, i18n("No differences between the file and %1").tqarg(diffTo), i18n("No difference") );
+			KMessageBox::information( 0, i18n("No differences between the file and %1").arg(diffTo), i18n("No difference") );
 		}
 		diffresult.clear();
 	}
diff --git a/vcs/subversion/svn_kio.cpp b/vcs/subversion/svn_kio.cpp
index 8b97d3f2..7646e727 100644
--- a/vcs/subversion/svn_kio.cpp
+++ b/vcs/subversion/svn_kio.cpp
@@ -223,7 +223,7 @@ svn_error_t* kio_svnProtocol::checkAuth(svn_auth_cred_simple_t **cred, void *bat
 	p->info.url = p->myURL;
 	p->info.username = username; //( const char* )svn_auth_get_parameter( p->ctx->auth_baton, SVN_AUTH_PARAM_DEFAULT_USERNAME );
 	if (realm) {
-		p->info.prompt = i18n("Username and Password for %1.").tqarg(realm);
+		p->info.prompt = i18n("Username and Password for %1.").arg(realm);
 	}
 
 //	if ( !p->checkCachedAuthentication( p->info ) ){
@@ -246,7 +246,7 @@ void kio_svnProtocol::get(const KURL& url ){
 	kdDebug(9036) << "kio_svn::get(const KURL& url)" << endl ;
 
 	TQString remoteServer = url.host();
-	infoMessage(i18n("Looking for %1...").tqarg( remoteServer ) );
+	infoMessage(i18n("Looking for %1...").arg( remoteServer ) );
 
 	apr_pool_t *subpool = svn_pool_create (pool);
 	kbaton *bt = (kbaton*)apr_pcalloc(subpool, sizeof(*bt));
@@ -1261,7 +1261,7 @@ void kio_svnProtocol::svn_switch_relocate( const KURL &wc, const KURL &origUrl,
 	}
 	m_counter = 0L;
 	setMetaData(TQString::number( counter() ).rightJustify( 10,'0' )+ "string",
-				TQString("switched to %1").tqarg( toUrl ) );
+				TQString("switched to %1").arg( toUrl ) );
 	finished();
 	svn_pool_destroy( subpool );
 }
@@ -1384,7 +1384,7 @@ void kio_svnProtocol::commit2(bool recurse, bool keeplocks, const KURL::List& wc
 
 			TQString userstring = i18n ( "Nothing to commit." );
 			if ( SVN_IS_VALID_REVNUM( commit_info->revision ) )
-				userstring = i18n( "Committed revision %1." ).tqarg(commit_info->revision);
+				userstring = i18n( "Committed revision %1." ).arg(commit_info->revision);
 			setMetaData(TQString::number( m_counter ).rightJustify( 10,'0' )+ "path", nurl.path() );
 			setMetaData(TQString::number( m_counter ).rightJustify( 10,'0' )+ "action", "0" );
 			setMetaData(TQString::number( m_counter ).rightJustify( 10,'0' )+ "kind", "0" );
@@ -1584,7 +1584,7 @@ void kio_svnProtocol::svn_copy( const KURL &srcUrl, int srcRev, const TQString &
 	
 	if( commit_info ){
 		setMetaData(TQString::number( counter() ).rightJustify( 10,'0' )+ "string",
-					i18n("Copied Revision %1").tqarg( commit_info->revision) );
+					i18n("Copied Revision %1").arg( commit_info->revision) );
 	} else {
 		setMetaData(TQString::number( counter() ).rightJustify( 10,'0' )+ "string",
 					i18n("Copied") );
@@ -1900,42 +1900,42 @@ void kio_svnProtocol::notify(void *baton, const char *path, svn_wc_notify_action
 	switch ( action ) {
 		case svn_wc_notify_add : //add
 			if (mime_type && (svn_mime_type_is_binary (mime_type)))
-				userstring = i18n( "A (bin) %1" ).tqarg( path );
+				userstring = i18n( "A (bin) %1" ).arg( path );
 			else
-				userstring = i18n( "A %1" ).tqarg( path );
+				userstring = i18n( "A %1" ).arg( path );
 			break;
 		case svn_wc_notify_copy: //copy
-			userstring = i18n( "Copied %1 " ).tqarg( path );
+			userstring = i18n( "Copied %1 " ).arg( path );
 			break;
 		case svn_wc_notify_delete: //delete
 			nb->received_some_change = TRUE;
-			userstring = i18n( "D %1" ).tqarg( path );
+			userstring = i18n( "D %1" ).arg( path );
 			break;
 		case svn_wc_notify_restore : //restore
-			userstring=i18n( "Restored %1." ).tqarg( path );
+			userstring=i18n( "Restored %1." ).arg( path );
 			break;
 		case svn_wc_notify_revert : //revert
-			userstring=i18n( "Reverted %1." ).tqarg( path );
+			userstring=i18n( "Reverted %1." ).arg( path );
 			break;
 		case svn_wc_notify_failed_revert: //failed revert
-			userstring=i18n( "Failed to revert %1.\nTry updating instead." ).tqarg( path );
+			userstring=i18n( "Failed to revert %1.\nTry updating instead." ).arg( path );
 			break;
 		case svn_wc_notify_resolved: //resolved
-			userstring=i18n( "Resolved conflicted state of %1." ).tqarg( path );
+			userstring=i18n( "Resolved conflicted state of %1." ).arg( path );
 			break;
 		case svn_wc_notify_skip: //skip
 			if ( content_state == svn_wc_notify_state_missing )
-				userstring=i18n("Skipped missing target %1.").tqarg( path );
+				userstring=i18n("Skipped missing target %1.").arg( path );
 			else
-				userstring=i18n("Skipped  %1.").tqarg( path );
+				userstring=i18n("Skipped  %1.").arg( path );
 			break;
 		case svn_wc_notify_update_delete: //update_delete
 			nb->received_some_change = TRUE;
-			userstring=i18n( "D %1" ).tqarg( path );
+			userstring=i18n( "D %1" ).arg( path );
 			break;
 		case svn_wc_notify_update_add: //update_add
 			nb->received_some_change = TRUE;
-			userstring=i18n( "A %1" ).tqarg( path );
+			userstring=i18n( "A %1" ).arg( path );
 			break;
 		case svn_wc_notify_update_update: //update_update
 			{
@@ -1980,25 +1980,25 @@ void kio_svnProtocol::notify(void *baton, const char *path, svn_wc_notify_action
 					if (SVN_IS_VALID_REVNUM (revision)) {
 						if (nb->is_export) {
 							if ( nb->in_external )
-								userstring = i18n("Exported external at revision %1.").tqarg( revision );
+								userstring = i18n("Exported external at revision %1.").arg( revision );
 							else
-								userstring = i18n("Exported revision %1.").tqarg( revision );
+								userstring = i18n("Exported revision %1.").arg( revision );
 						} else if (nb->is_checkout) {
 							if ( nb->in_external )
-								userstring = i18n("Checked out external at revision %1.").tqarg( revision );
+								userstring = i18n("Checked out external at revision %1.").arg( revision );
 							else
-								userstring = i18n("Checked out revision %1.").tqarg( revision);
+								userstring = i18n("Checked out revision %1.").arg( revision);
 						} else {
 							if (nb->received_some_change) {
 								if ( nb->in_external )
-									userstring=i18n("Updated external to revision %1.").tqarg( revision );
+									userstring=i18n("Updated external to revision %1.").arg( revision );
 								else
-									userstring = i18n("Updated to revision %1.").tqarg( revision);
+									userstring = i18n("Updated to revision %1.").arg( revision);
 							} else {
 								if ( nb->in_external )
-									userstring = i18n("External at revision %1.").tqarg( revision );
+									userstring = i18n("External at revision %1.").arg( revision );
 								else
-									userstring = i18n("At revision %1.").tqarg( revision);
+									userstring = i18n("At revision %1.").arg( revision);
 							}
 						}
 					} else  /* no revision */ {
@@ -2026,30 +2026,30 @@ void kio_svnProtocol::notify(void *baton, const char *path, svn_wc_notify_action
 			break;
 		case svn_wc_notify_update_external: //update_external
 			nb->in_external = TRUE;
-			userstring = i18n("Fetching external item into %1." ).tqarg( path );
+			userstring = i18n("Fetching external item into %1." ).arg( path );
 			break;
 		case svn_wc_notify_status_completed: //status_completed
 			if (SVN_IS_VALID_REVNUM (revision))
-				userstring = i18n( "Status against revision: %1.").tqarg( revision );
+				userstring = i18n( "Status against revision: %1.").arg( revision );
 			break;
 		case svn_wc_notify_status_external: //status_external
-             userstring = i18n("Performing status on external item at %1.").tqarg( path );
+             userstring = i18n("Performing status on external item at %1.").arg( path );
 			break;
 		case svn_wc_notify_commit_modified: //commit_modified
-			userstring = i18n( "Sending %1").tqarg( path );
+			userstring = i18n( "Sending %1").arg( path );
 			break;
 		case svn_wc_notify_commit_added: //commit_added
 			if (mime_type && svn_mime_type_is_binary (mime_type)) {
-				userstring = i18n( "Adding (bin) %1.").tqarg( path );
+				userstring = i18n( "Adding (bin) %1.").arg( path );
 			} else {
-				userstring = i18n( "Adding %1.").tqarg( path );
+				userstring = i18n( "Adding %1.").arg( path );
 			}
 			break;
 		case svn_wc_notify_commit_deleted: //commit_deleted
-			userstring = i18n( "Deleting %1.").tqarg( path );
+			userstring = i18n( "Deleting %1.").arg( path );
 			break;
 		case svn_wc_notify_commit_replaced: //commit_replaced
-			userstring = i18n( "Replacing %1.").tqarg( path );
+			userstring = i18n( "Replacing %1.").arg( path );
 			break;
 		case svn_wc_notify_commit_postfix_txdelta: //commit_postfix_txdelta
 			if (! nb->sent_first_txdelta) {
@@ -2062,7 +2062,7 @@ void kio_svnProtocol::notify(void *baton, const char *path, svn_wc_notify_action
 
 			break;
 		case svn_wc_notify_blame_revision: //blame_revision
-			userstring = i18n("Blame %1.").tqarg(path);
+			userstring = i18n("Blame %1.").arg(path);
 			break;
 		default:
 			break;
diff --git a/vcs/subversion/svn_switchdlgbase.ui b/vcs/subversion/svn_switchdlgbase.ui
index af1d5898..84d28cf8 100644
--- a/vcs/subversion/svn_switchdlgbase.ui
+++ b/vcs/subversion/svn_switchdlgbase.ui
@@ -24,7 +24,7 @@
                 <cstring>nonRecurseCheck</cstring>
             </property>
             <property name="text">
-                <string>Non-recursive. (Switch its immediate tqchildren only)</string>
+                <string>Non-recursive. (Switch its immediate children only)</string>
             </property>
         </widget>
         <widget class="Line" row="5" column="0" rowspan="1" colspan="2">
diff --git a/vcs/subversion/svnssltrustpromptbase.ui b/vcs/subversion/svnssltrustpromptbase.ui
index a4c5d0c9..fc72c0d5 100644
--- a/vcs/subversion/svnssltrustpromptbase.ui
+++ b/vcs/subversion/svnssltrustpromptbase.ui
@@ -86,7 +86,7 @@
             <property name="text">
                 <string></string>
             </property>
-            <property name="tqalignment">
+            <property name="alignment">
                 <set>WordBreak|AlignVCenter</set>
             </property>
         </widget>