diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-12-18 18:35:10 -0600 |
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2012-06-20 05:10:16 +0200 |
| commit | 5fcaf38922885bbb138ba17ff7d2e9ec9ad0c0c2 (patch) | |
| tree | 4d54dd823cb40aaaa4aa3b41e2169a97472b6ff5 /kbabel/catalogmanager/libsvn/svnhandler.cpp | |
| parent | 1a3af445fb662a07622941caf81e368c8408b192 (diff) | |
| download | tdesdk-5fcaf38922885bbb138ba17ff7d2e9ec9ad0c0c2.tar.gz tdesdk-5fcaf38922885bbb138ba17ff7d2e9ec9ad0c0c2.zip | |
Rename old tq methods that no longer need a unique name
(cherry picked from commit 1dd83e5f38d1c16d3e6da18d0caca0ee093ab58f)
Diffstat (limited to 'kbabel/catalogmanager/libsvn/svnhandler.cpp')
| -rw-r--r-- | kbabel/catalogmanager/libsvn/svnhandler.cpp | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/kbabel/catalogmanager/libsvn/svnhandler.cpp b/kbabel/catalogmanager/libsvn/svnhandler.cpp index 5f91e1e8..d00c0858 100644 --- a/kbabel/catalogmanager/libsvn/svnhandler.cpp +++ b/kbabel/catalogmanager/libsvn/svnhandler.cpp @@ -83,7 +83,7 @@ void SVNHandler::setPOTBaseDir( const TQString& dir ) emit signalIsPOTRepository( _isPOTRepository ); } -TQString SVNHandler::filetqStatus( const FiletqStatus status ) const +TQString SVNHandler::fileStatus( const FileStatus status ) const { switch ( status ) { case NO_REPOSITORY: @@ -115,7 +115,7 @@ TQString SVNHandler::filetqStatus( const FiletqStatus status ) const } } -SVNHandler::FiletqStatus SVNHandler::fstatus( const TQString& filename ) const +SVNHandler::FileStatus SVNHandler::fstatus( const TQString& filename ) const { // no valid repository if ( !_isPORepository ) @@ -145,7 +145,7 @@ SVNHandler::FiletqStatus SVNHandler::fstatus( const TQString& filename ) const int errorLine, errorCol; TQDomNodeList nodelist; TQDomNode node; - TQDomElement entry, wctqStatus; + TQDomElement entry, wcStatus; // Parse the output. if ( !doc.setContent( out.getOutput(), &errorMsg, &errorLine, &errorCol ) ) { @@ -177,22 +177,22 @@ SVNHandler::FiletqStatus SVNHandler::fstatus( const TQString& filename ) const if ( node.isNull() ) return ERROR_IN_WC; - wctqStatus = node.toElement(); + wcStatus = node.toElement(); - if ( wctqStatus.attributeNode("item").value() == "normal" ) + if ( wcStatus.attributeNode("item").value() == "normal" ) return UP_TO_DATE; - if ( wctqStatus.attributeNode("item").value() == "modified" ) + if ( wcStatus.attributeNode("item").value() == "modified" ) return LOCALLY_MODIFIED; - if ( wctqStatus.attributeNode("item").value() == "conflicted" ) + if ( wcStatus.attributeNode("item").value() == "conflicted" ) return CONFLICT; - if ( wctqStatus.attributeNode("item").value() == "unversioned" ) + if ( wcStatus.attributeNode("item").value() == "unversioned" ) return NOT_IN_SVN; // TODO Ignored entry should have separate return value probably. - if ( wctqStatus.attributeNode("item").value() == "ignored" ) + if ( wcStatus.attributeNode("item").value() == "ignored" ) return NOT_IN_SVN; - if ( wctqStatus.attributeNode("item").value() == "added" ) + if ( wcStatus.attributeNode("item").value() == "added" ) return LOCALLY_ADDED; - if ( wctqStatus.attributeNode("item").value() == "deleted" ) + if ( wcStatus.attributeNode("item").value() == "deleted" ) return LOCALLY_REMOVED; // TODO What to do with "missing", "incomplete", "replaced", "merged", // "obstructed", "external"? Can these appear at all in our case? @@ -269,7 +269,7 @@ no_status_xml: } -TQString SVNHandler::svntqStatus( const TQString& filename ) const +TQString SVNHandler::svnStatus( const TQString& filename ) const { return map[filename]; } @@ -491,7 +491,7 @@ void SVNHandler::processDiff( TQString output ) KMessageBox::error( 0, error ); } -bool SVNHandler::isConsideredModified( const FiletqStatus status ) const +bool SVNHandler::isConsideredModified( const FileStatus status ) const { /* * A file is modified if it is either: |