diff options
Diffstat (limited to 'kioslave/svn/ksvnd/ksvnd.cpp')
-rw-r--r-- | kioslave/svn/ksvnd/ksvnd.cpp | 30 |
1 files changed, 15 insertions, 15 deletions
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<KURL> 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"; |