Rename old tq methods that no longer need a unique name

14 files changed, 52 insertions, 52 deletions

diff --git a/vcs/subversion/commitdlgbase.ui b/vcs/subversion/commitdlgbase.ui
index d557aa91..d472c8f1 100644
--- a/vcs/subversion/commitdlgbase.ui
+++ b/vcs/subversion/commitdlgbase.ui
@@ -58,7 +58,7 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="tqsizeHint">
+                            <property name="sizeHint">
                                 <size>
                                     <width>220</width>
                                     <height>20</height>
diff --git a/vcs/subversion/integrator/svnintegratordlgbase.ui b/vcs/subversion/integrator/svnintegratordlgbase.ui
index 52ce91a5..700b3edb 100644
--- a/vcs/subversion/integrator/svnintegratordlgbase.ui
+++ b/vcs/subversion/integrator/svnintegratordlgbase.ui
@@ -156,7 +156,7 @@ http://localhost/svn/projectname/trunk</string>
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>21</width>
                             <height>131</height>
diff --git a/vcs/subversion/kdevsvnd.cpp b/vcs/subversion/kdevsvnd.cpp
index c5c341a5..5e2ec8d9 100644
--- a/vcs/subversion/kdevsvnd.cpp
+++ b/vcs/subversion/kdevsvnd.cpp
@@ -239,7 +239,7 @@ TQCString KDevSvnd::sslPasswdDlg(TQString promptMsg)
 // 	return false;
 // }
 //
-// int KSvnd::gettqStatus( const KURL::List& list ) {
+// int KSvnd::getStatus( const KURL::List& list ) {
 // 	int result = 0;
 // 	uint files = 0, folders = 0, parentsentries = 0, parentshavesvn = 0, subdirhavesvn = 0, external = 0;
 // 	for ( TQValueListConstIterator<KURL> it = list.begin(); it != list.end() ; ++it ) {
@@ -299,18 +299,18 @@ TQCString KDevSvnd::sslPasswdDlg(TQString promptMsg)
 //
 // TQStringList KSvnd::getActionMenu ( const KURL::List &list ) {
 // 	TQStringList result;
-// 	int listtqStatus = gettqStatus( list );
+// 	int listStatus = getStatus( list );
 //
-// 	if ( !(listtqStatus & SomeAreInParentsEntries) &&
-// 	     !(listtqStatus & SomeAreExternalToParent) &&
-// 	     !(listtqStatus & SomeHaveSvn)) {
-// 		if( list.size() == 1 && listtqStatus & SomeAreFolders) {
+// 	if ( !(listStatus & SomeAreInParentsEntries) &&
+// 	     !(listStatus & SomeAreExternalToParent) &&
+// 	     !(listStatus & SomeHaveSvn)) {
+// 		if( list.size() == 1 && listStatus & SomeAreFolders) {
 // 			result << "Checkout";
 // 			result << "Export";
 // //			result << "CreateRepository";
 // 			result << "Import";
 // 		}
-// 	} else if ( (listtqStatus & AllAreInParentsEntries) ) {
+// 	} else if ( (listStatus & AllAreInParentsEntries) ) {
 // 		result << "Diff";
 // 		//In SVN
 // //		result << "ShowLog";
@@ -320,7 +320,7 @@ TQCString KDevSvnd::sslPasswdDlg(TQString promptMsg)
 // //		result << "Update to revision..."
 // 		result << "Rename";
 // 		result << "Delete";
-// 		if( listtqStatus & SomeAreFolders && !(listtqStatus & SomeAreFiles)) {
+// 		if( listStatus & SomeAreFolders && !(listStatus & SomeAreFiles)) {
 // 			result << "Revert";
 // //			result << "Cleanup";
 // 		}
@@ -328,19 +328,19 @@ TQCString KDevSvnd::sslPasswdDlg(TQString promptMsg)
 // //		result << "BranchTag";
 // 		result << "Switch";
 // 		result << "Merge";
-// 		if( listtqStatus & SomeAreFolders && !(listtqStatus & SomeAreFiles)) {
+// 		if( listStatus & SomeAreFolders && !(listStatus & SomeAreFiles)) {
 // //			result << "Export";
 // //			result << "Relocate";
 // 			result << "_SEPARATOR_";
 // 			result << "Add";
 // 		}
 // 		result << "_SEPARATOR_";
-// 		if( listtqStatus & SomeAreFiles && !(listtqStatus & SomeAreFolders)) {
+// 		if( listStatus & SomeAreFiles && !(listStatus & SomeAreFolders)) {
 // 			result << "Blame";
 // 		}
 // 		result << "CreatePatch";
 //
-// 		if( list.size() == 1 && listtqStatus & SomeAreFolders) {
+// 		if( list.size() == 1 && listStatus & SomeAreFolders) {
 // //			result << "ApplyPatchToFolder";
 // 		}
 // 	}
@@ -349,12 +349,12 @@ TQCString KDevSvnd::sslPasswdDlg(TQString promptMsg)
 //
 // TQStringList KSvnd::getTopLevelActionMenu ( const KURL::List &list ) {
 // 	TQStringList result;
-// 	int listtqStatus = gettqStatus( list );
+// 	int listStatus = getStatus( list );
 //
 //
-// 	if ( ( listtqStatus & AllParentsHaveSvn &&
-// 			( ( listtqStatus & SomeAreExternalToParent ) || ( listtqStatus & SomeAreInParentsEntries ) )
-// 				|| ( listtqStatus & SomeHaveSvn ) )
+// 	if ( ( listStatus & AllParentsHaveSvn &&
+// 			( ( listStatus & SomeAreExternalToParent ) || ( listStatus & SomeAreInParentsEntries ) )
+// 				|| ( listStatus & SomeHaveSvn ) )
 // 		) {
 // 		result << "Update";
 // 		result << "Commit";
diff --git a/vcs/subversion/subversion_fileinfo.cpp b/vcs/subversion/subversion_fileinfo.cpp
index 8ea4e4d5..be0a4411 100644
--- a/vcs/subversion/subversion_fileinfo.cpp
+++ b/vcs/subversion/subversion_fileinfo.cpp
@@ -123,14 +123,14 @@ const VCSFileInfoMap *SVNFileInfoProvider::status( const TQString &dirPath ) {
 				if ( rx.search( *it ) == -1 ) break; // something is wrong ! :)
 				curIdx = rx.cap( 1 ).toInt();
 			}
-			slottqStatus(path, text_status, prop_status, repos_text_status, repos_prop_status, rev);
+			slotStatus(path, text_status, prop_status, repos_text_status, repos_prop_status, rev);
 		}
 	}
 	kdDebug(9036) << " Returning VcsFileInfoMap. provider::status() finished " << endl;
     return m_cachedDirEntries;
 }
 
-bool SVNFileInfoProvider::requesttqStatus( const TQString &dirPath, void *callerData, bool recursive, bool checkRepos ) {
+bool SVNFileInfoProvider::requestStatus( const TQString &dirPath, void *callerData, bool recursive, bool checkRepos ) {
 	kdDebug(9036) << "##################################################################################### svn provider : request status" << endl;
     m_savedCallerData = callerData;
     // Flush old cache
@@ -210,14 +210,14 @@ void SVNFileInfoProvider::slotResult( KIO::Job *j ) {
 			if ( rx.search( *it ) == -1 ) break; // something is wrong ! :)
 			curIdx = rx.cap( 1 ).toInt();
 		}
-		slottqStatus(path, text_status, prop_status, repos_text_status, repos_prop_status, rev);
+		slotStatus(path, text_status, prop_status, repos_text_status, repos_prop_status, rev);
 	}
 
 	if ( m_cachedDirEntries )
 		emit statusReady(*m_cachedDirEntries, m_savedCallerData);
 }
 
-void SVNFileInfoProvider::slottqStatus( const TQString& path,int text_status, int prop_status,int repos_text_status, int repos_prop_status, long int rev) {
+void SVNFileInfoProvider::slotStatus( const TQString& path,int text_status, int prop_status,int repos_text_status, int repos_prop_status, long int rev) {
 // 	kdDebug(9036) << "##################################################################################### svn provider : slotstatus"
 // 		<< " path " << path << " text_status " << text_status << " prop_status " << prop_status << " repos_text_status " << repos_text_status
 // 		<< " repos_prop_status " << repos_prop_status << " rev " << rev
diff --git a/vcs/subversion/subversion_fileinfo.h b/vcs/subversion/subversion_fileinfo.h
index dc1bfe1e..4729c35b 100644
--- a/vcs/subversion/subversion_fileinfo.h
+++ b/vcs/subversion/subversion_fileinfo.h
@@ -51,12 +51,12 @@ public:
 	void slotStatusExt( const TQString&, const TQString& , int, int, int, int, long int ) ;
 	
 // -- Async interface for requesting data
-    virtual bool requesttqStatus( const TQString &dirPath, void *callerData, bool recursive = true, bool checkRepos = true );
+    virtual bool requestStatus( const TQString &dirPath, void *callerData, bool recursive = true, bool checkRepos = true );
 
 	TQString projectDirectory() const;
 
 k_dcop:
-	void slottqStatus( const TQString& , int, int, int, int, long int ) ;
+	void slotStatus( const TQString& , int, int, int, int, long int ) ;
 
 public slots:
 	void slotResult( KIO::Job * );
diff --git a/vcs/subversion/subversion_part.cpp b/vcs/subversion/subversion_part.cpp
index a98f2298..af58f7c8 100644
--- a/vcs/subversion/subversion_part.cpp
+++ b/vcs/subversion/subversion_part.cpp
@@ -220,42 +220,42 @@ if(!project())
 							subMenu->insertItem( actionDiff->text(), this, TQT_SLOT(slotDiff()) );
 							subMenu->insertItem( actionLog->text(), this, TQT_SLOT(slotLog()) );
 							}*/
-        subMenu->tqsetWhatsThis(id, i18n("<b>Commit file(s)</b><p>Commits file to repository if modified."));
+        subMenu->setWhatsThis(id, i18n("<b>Commit file(s)</b><p>Commits file to repository if modified."));
 		id = subMenu->insertItem( actionAdd->text(), this, TQT_SLOT(slotAdd()) );
-        subMenu->tqsetWhatsThis(id, i18n("<b>Add file to repository</b><p>Adds file to repository."));
+        subMenu->setWhatsThis(id, i18n("<b>Add file to repository</b><p>Adds file to repository."));
 		id = subMenu->insertItem( actionRemove->text(), this, TQT_SLOT(slotDel()) );
-        subMenu->tqsetWhatsThis(id, i18n("<b>Remove from repository</b><p>Removes file(s) from repository."));
+        subMenu->setWhatsThis(id, i18n("<b>Remove from repository</b><p>Removes file(s) from repository."));
 		id = subMenu->insertItem( actionLog->text(), this, TQT_SLOT(slotLog()) );
-		subMenu->tqsetWhatsThis(id, i18n("<b>Show logs..</b><p>View Logs"));
+		subMenu->setWhatsThis(id, i18n("<b>Show logs..</b><p>View Logs"));
 		id = subMenu->insertItem( actionBlame->text(), this, TQT_SLOT(slotBlame()) );
-		subMenu->tqsetWhatsThis(id, i18n("<b>Blame 0:HEAD </b><p>Show Annotate"));
+		subMenu->setWhatsThis(id, i18n("<b>Blame 0:HEAD </b><p>Show Annotate"));
 		
 		subMenu->insertSeparator();
 		id = subMenu->insertItem( actionDiffLocal->text(), this, TQT_SLOT(slotDiffLocal()) );
-		subMenu->tqsetWhatsThis(id, i18n("<b>Diff</b><p>Diff file to local disk."));
+		subMenu->setWhatsThis(id, i18n("<b>Diff</b><p>Diff file to local disk."));
 
 		id = subMenu->insertItem( actionDiffHead->text(), this, TQT_SLOT(slotDiffHead()) );
-		subMenu->tqsetWhatsThis(id, i18n("<b>Diff</b><p>Diff file to repository."));
+		subMenu->setWhatsThis(id, i18n("<b>Diff</b><p>Diff file to repository."));
 
 		id = subMenu->insertItem( actionUpdate->text(), this, TQT_SLOT(slotUpdate()) );
-        subMenu->tqsetWhatsThis(id, i18n("<b>Update</b><p>Updates file(s) from repository."));
+        subMenu->setWhatsThis(id, i18n("<b>Update</b><p>Updates file(s) from repository."));
 		id = subMenu->insertItem( actionRevert->text(), this, TQT_SLOT(slotRevert()) );
-		subMenu->tqsetWhatsThis(id, i18n("<b>Revert</b><p>Undo local changes.") );
+		subMenu->setWhatsThis(id, i18n("<b>Revert</b><p>Undo local changes.") );
 		id = subMenu->insertItem( actionResolve->text(), this, TQT_SLOT(slotResolve()) );
-		subMenu->tqsetWhatsThis(id, i18n("<b>Resolve</b><p>Resolve conflicting state.") );
+		subMenu->setWhatsThis(id, i18n("<b>Resolve</b><p>Resolve conflicting state.") );
 		id = subMenu->insertItem( actionSwitch->text(), this, TQT_SLOT(slotSwitch()) );
-		subMenu->tqsetWhatsThis(id, i18n("<b>Switch</b><p>Switch working tree.") );
+		subMenu->setWhatsThis(id, i18n("<b>Switch</b><p>Switch working tree.") );
 		id = subMenu->insertItem( actionCopy->text(), this, TQT_SLOT(slotCopy()) );
-		subMenu->tqsetWhatsThis(id, i18n("<b>Copy</b><p>Copy from/between path/URLs") );
+		subMenu->setWhatsThis(id, i18n("<b>Copy</b><p>Copy from/between path/URLs") );
 		id = subMenu->insertItem( actionMerge->text(), this, TQT_SLOT(slotMerge()) );
-		subMenu->tqsetWhatsThis(id, i18n("<b>Merge</b><p>Merge difference to working copy") );
+		subMenu->setWhatsThis(id, i18n("<b>Merge</b><p>Merge difference to working copy") );
 
 		/*
 		subMenu->insertSeparator();
 		id = subMenu->insertItem( actionAddToIgnoreList->text(), this, TQT_SLOT(slotAddToIgnoreList()) );
-        subMenu->tqsetWhatsThis(id, i18n("<b>Ignore in Subversion operations</b><p>Ignores file(s)."));
+        subMenu->setWhatsThis(id, i18n("<b>Ignore in Subversion operations</b><p>Ignores file(s)."));
 		id = subMenu->insertItem( actionRemoveFromIgnoreList->text(), this, TQT_SLOT(slotRemoveFromIgnoreList()) );
-        subMenu->tqsetWhatsThis(id, i18n("<b>Do not ignore in Subversion operations</b><p>Do not ignore file(s)."));
+        subMenu->setWhatsThis(id, i18n("<b>Do not ignore in Subversion operations</b><p>Do not ignore file(s)."));
 */
 		// Now insert in parent menu
 		popup->insertItem( i18n("Subversion"), subMenu );
diff --git a/vcs/subversion/subversiondiff.ui b/vcs/subversion/subversiondiff.ui
index e647f6b6..a624e6bb 100644
--- a/vcs/subversion/subversiondiff.ui
+++ b/vcs/subversion/subversiondiff.ui
@@ -60,7 +60,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
diff --git a/vcs/subversion/svn_co.ui b/vcs/subversion/svn_co.ui
index 73bc66b5..64bd3ed6 100644
--- a/vcs/subversion/svn_co.ui
+++ b/vcs/subversion/svn_co.ui
@@ -269,7 +269,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>191</width>
                             <height>20</height>
diff --git a/vcs/subversion/svn_commitdlgbase.ui b/vcs/subversion/svn_commitdlgbase.ui
index d6ebee02..ea572fc6 100644
--- a/vcs/subversion/svn_commitdlgbase.ui
+++ b/vcs/subversion/svn_commitdlgbase.ui
@@ -56,7 +56,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>335</width>
                     <height>30</height>
diff --git a/vcs/subversion/svn_copydlgwidget.ui b/vcs/subversion/svn_copydlgwidget.ui
index 4361afe2..e874206a 100644
--- a/vcs/subversion/svn_copydlgwidget.ui
+++ b/vcs/subversion/svn_copydlgwidget.ui
@@ -45,7 +45,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>110</width>
                     <height>31</height>
diff --git a/vcs/subversion/svn_fileselectdlg_commit.cpp b/vcs/subversion/svn_fileselectdlg_commit.cpp
index 25149483..0c014a9d 100644
--- a/vcs/subversion/svn_fileselectdlg_commit.cpp
+++ b/vcs/subversion/svn_fileselectdlg_commit.cpp
@@ -86,17 +86,17 @@ SVNFileSelectDlgCommit::SVNFileSelectDlgCommit( KURL::List &urls, subversionPart
 				vcsInfo = it.data();
 //				TQString absPathStr( fileInfo.absFilePath() + "/" + it.key() );
 				TQString absPathStr( fileInfo.filePath() + "/" + it.key() );
-				KURL urlFromtqStatus( absPathStr );
+				KURL urlFromStatus( absPathStr );
 				if( vcsInfo.state == VCSFileInfo::Added || vcsInfo.state == VCSFileInfo::Modified ||
                     vcsInfo.state == VCSFileInfo::Deleted || vcsInfo.state == VCSFileInfo::Replaced){
 
-					this->insertItem( VCSFileInfo::state2String( vcsInfo.state ), urlFromtqStatus );
+					this->insertItem( VCSFileInfo::state2String( vcsInfo.state ), urlFromStatus );
 					
-// 					tobeCommittedUrls.push_back( urlFromtqStatus );
-// 					kdDebug(9036) << "slotCommit() @ DirCase adding " << urlFromtqStatus.prettyURL() << endl;
+// 					tobeCommittedUrls.push_back( urlFromStatus );
+// 					kdDebug(9036) << "slotCommit() @ DirCase adding " << urlFromStatus.prettyURL() << endl;
 				}
 				else{
-					kdDebug(9036) << "slotCommit() @ DirCase ignoring " << urlFromtqStatus.prettyURL() << endl;
+					kdDebug(9036) << "slotCommit() @ DirCase ignoring " << urlFromStatus.prettyURL() << endl;
 				}
 				
 			}
diff --git a/vcs/subversion/svn_logviewwidget.cpp b/vcs/subversion/svn_logviewwidget.cpp
index 541d1674..eaed9c12 100644
--- a/vcs/subversion/svn_logviewwidget.cpp
+++ b/vcs/subversion/svn_logviewwidget.cpp
@@ -52,7 +52,7 @@ SvnLogViewWidget::SvnLogViewWidget(subversionPart *part, TQWidget *parent)
     listView1->addColumn( i18n( "Date" ) );
     listView1->addColumn( i18n( "Author" ) );
     listView1->addColumn( i18n( "Comment" ) );
-    listView1->resize( TQSize(1, 1).expandedTo(tqminimumSizeHint()) );
+    listView1->resize( TQSize(1, 1).expandedTo(minimumSizeHint()) );
     TQFont listView1_font(  listView1->font() );
     listView1_font.setPointSize( 9 );
     listView1->setFont( listView1_font );
@@ -60,7 +60,7 @@ SvnLogViewWidget::SvnLogViewWidget(subversionPart *part, TQWidget *parent)
     listView1->setShowSortIndicator( TRUE );
 
     textEdit1 = new KTextEdit( splitter1, "textEdit1" );
-    textEdit1->resize( TQSize(1, 1).expandedTo(tqminimumSizeHint()) );
+    textEdit1->resize( TQSize(1, 1).expandedTo(minimumSizeHint()) );
     TQFont textEdit1_font(  textEdit1->font() );
     textEdit1_font.setPointSize( 9 );
     textEdit1->setFont( textEdit1_font );
@@ -70,7 +70,7 @@ SvnLogViewWidget::SvnLogViewWidget(subversionPart *part, TQWidget *parent)
     m_layout->addWidget( splitter1, 0, 0 );
     m_layout->setMargin(1);
 
-    resize( TQSize(692, 343).expandedTo(tqminimumSizeHint()) );
+    resize( TQSize(692, 343).expandedTo(minimumSizeHint()) );
     clearWState( WState_Polished );
     
 	connect( listView1, TQT_SIGNAL(clicked( TQListViewItem *)), this, TQT_SLOT(slotClicked(TQListViewItem*)) );
diff --git a/vcs/subversion/svn_mergeoptiondlgbase.ui b/vcs/subversion/svn_mergeoptiondlgbase.ui
index d42a2707..b54ead45 100644
--- a/vcs/subversion/svn_mergeoptiondlgbase.ui
+++ b/vcs/subversion/svn_mergeoptiondlgbase.ui
@@ -279,7 +279,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>171</width>
                     <height>31</height>
diff --git a/vcs/subversion/svn_switchdlgbase.ui b/vcs/subversion/svn_switchdlgbase.ui
index 3c640661..af1d5898 100644
--- a/vcs/subversion/svn_switchdlgbase.ui
+++ b/vcs/subversion/svn_switchdlgbase.ui
@@ -75,7 +75,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>150</width>
                             <height>30</height>