From 1dd83e5f38d1c16d3e6da18d0caca0ee093ab58f Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sun, 18 Dec 2011 18:35:10 -0600 Subject: Rename old tq methods that no longer need a unique name --- kioslave/svn/ksvnd/commitdlg.ui | 2 +- kioslave/svn/ksvnd/ksvnd.cpp | 30 ++++++++++++++-------------- kioslave/svn/ksvnd/ksvnd.h | 4 ++-- kioslave/svn/svnhelper/subversioncheckout.ui | 4 ++-- kioslave/svn/svnhelper/subversiondiff.ui | 2 +- kioslave/svn/svnhelper/subversionlog.ui | 2 +- kioslave/svn/svnhelper/subversionswitch.ui | 4 ++-- 7 files changed, 24 insertions(+), 24 deletions(-) (limited to 'kioslave/svn') diff --git a/kioslave/svn/ksvnd/commitdlg.ui b/kioslave/svn/ksvnd/commitdlg.ui index 35b9a97e..8bf31911 100644 --- a/kioslave/svn/ksvnd/commitdlg.ui +++ b/kioslave/svn/ksvnd/commitdlg.ui @@ -58,7 +58,7 @@ Expanding - + 220 20 diff --git a/kioslave/svn/ksvnd/ksvnd.cpp b/kioslave/svn/ksvnd/ksvnd.cpp index fb96c9af..50a53424 100644 --- a/kioslave/svn/ksvnd/ksvnd.cpp +++ b/kioslave/svn/ksvnd/ksvnd.cpp @@ -196,7 +196,7 @@ bool KSvnd::anyValidWorkingCopy( const KURL::List& wclist ) { 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 it = list.begin(); it != list.end() ; ++it ) { @@ -256,18 +256,18 @@ bool KSvnd::isFolder( const KURL& url ) { 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"; @@ -277,7 +277,7 @@ TQStringList KSvnd::getActionMenu ( const KURL::List &list ) { // result << "Update to revision..." result << "Rename"; result << "Delete"; - if( listtqStatus & SomeAreFolders && !(listtqStatus & SomeAreFiles)) { + if( listStatus & SomeAreFolders && !(listStatus & SomeAreFiles)) { result << "Revert"; // result << "Cleanup"; } @@ -285,19 +285,19 @@ TQStringList KSvnd::getActionMenu ( const KURL::List &list ) { // 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"; } } @@ -306,12 +306,12 @@ TQStringList KSvnd::getActionMenu ( const KURL::List &list ) { 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/kioslave/svn/ksvnd/ksvnd.h b/kioslave/svn/ksvnd/ksvnd.h index 78583e02..f28db8bb 100644 --- a/kioslave/svn/ksvnd/ksvnd.h +++ b/kioslave/svn/ksvnd/ksvnd.h @@ -56,7 +56,7 @@ k_dcop: k_dcop_signals: //emitted whenever something happens using subversion ;) // void subversionNotify(const TQString&, int ,int, const TQString& , int , int, long int, const TQString&); -// void subversiontqStatus(const TQString&,int,int,int,int,long int); +// void subversionStatus(const TQString&,int,int,int,int,long int); public slots: @@ -64,7 +64,7 @@ protected: bool isFileInSvnEntries ( const TQString filename, const TQString entfile ); bool isFileInExternals ( const TQString filename, const TQString propfile ); bool isFolder( const KURL& url ); - int gettqStatus( const KURL::List& list ); + int getStatus( const KURL::List& list ); }; #endif diff --git a/kioslave/svn/svnhelper/subversioncheckout.ui b/kioslave/svn/svnhelper/subversioncheckout.ui index 3ed752e7..af848105 100644 --- a/kioslave/svn/svnhelper/subversioncheckout.ui +++ b/kioslave/svn/svnhelper/subversioncheckout.ui @@ -76,7 +76,7 @@ Expanding - + 20 20 @@ -155,7 +155,7 @@ Expanding - + 121 20 diff --git a/kioslave/svn/svnhelper/subversiondiff.ui b/kioslave/svn/svnhelper/subversiondiff.ui index e647f6b6..a624e6bb 100644 --- a/kioslave/svn/svnhelper/subversiondiff.ui +++ b/kioslave/svn/svnhelper/subversiondiff.ui @@ -60,7 +60,7 @@ Expanding - + 20 20 diff --git a/kioslave/svn/svnhelper/subversionlog.ui b/kioslave/svn/svnhelper/subversionlog.ui index 20060f73..e6135a8e 100644 --- a/kioslave/svn/svnhelper/subversionlog.ui +++ b/kioslave/svn/svnhelper/subversionlog.ui @@ -60,7 +60,7 @@ Expanding - + 20 20 diff --git a/kioslave/svn/svnhelper/subversionswitch.ui b/kioslave/svn/svnhelper/subversionswitch.ui index c0642bc4..e5872c58 100644 --- a/kioslave/svn/svnhelper/subversionswitch.ui +++ b/kioslave/svn/svnhelper/subversionswitch.ui @@ -76,7 +76,7 @@ Expanding - + 20 20 @@ -155,7 +155,7 @@ Expanding - + 121 20 -- cgit v1.2.1